From d68e50a5024fe7988519dfb2b1beb882d099ded2 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Fri, 22 Apr 2016 12:27:54 -0400 Subject: [PATCH] Adding legacy event_type for language menu events --- common/djangoapps/track/transformers.py | 2 ++ .../xmodule/js/spec/video/video_events_plugin_spec.js | 8 ++++---- .../lib/xmodule/xmodule/js/src/video/09_events_plugin.js | 4 ++-- .../lib/xmodule/xmodule/js/src/video/09_video_caption.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/common/djangoapps/track/transformers.py b/common/djangoapps/track/transformers.py index 471defe9ce..75a943f773 100644 --- a/common/djangoapps/track/transformers.py +++ b/common/djangoapps/track/transformers.py @@ -374,6 +374,8 @@ class VideoEventTransformer(EventTransformer): u'edx.video.seeked': u'seek_video', u'edx.video.transcript.shown': u'show_transcript', u'edx.video.transcript.hidden': u'hide_transcript', + u'edx.video.language_menu.shown': u'video_show_cc_menu', + u'edx.video.language_menu.hidden': u'video_hide_cc_menu', } is_legacy_event = True diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js b/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js index 4124265792..92a967ff3c 100644 --- a/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js +++ b/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js @@ -117,17 +117,17 @@ }); }); - it('can emit "video_show_cc_menu" event', function () { + it('can emit "edx.video.language_menu.shown" event', function () { state.el.trigger('language_menu:show'); - expect(Logger.log).toHaveBeenCalledWith('video_show_cc_menu', { + expect(Logger.log).toHaveBeenCalledWith('edx.video.language_menu.shown', { id: 'id', code: 'html5' }); }); - it('can emit "video_hide_cc_menu" event', function () { + it('can emit "edx.video.language_menu.hidden" event', function () { state.el.trigger('language_menu:hide'); - expect(Logger.log).toHaveBeenCalledWith('video_hide_cc_menu', { + expect(Logger.log).toHaveBeenCalledWith('edx.video.language_menu.hidden', { id: 'id', code: 'html5', language: 'en' diff --git a/common/lib/xmodule/xmodule/js/src/video/09_events_plugin.js b/common/lib/xmodule/xmodule/js/src/video/09_events_plugin.js index 938453f67f..5ed7ed77a2 100644 --- a/common/lib/xmodule/xmodule/js/src/video/09_events_plugin.js +++ b/common/lib/xmodule/xmodule/js/src/video/09_events_plugin.js @@ -105,11 +105,11 @@ define('video/09_events_plugin.js', [], function() { }, onShowLanguageMenu: function () { - this.log('video_show_cc_menu'); + this.log('edx.video.language_menu.shown'); }, onHideLanguageMenu: function () { - this.log('video_hide_cc_menu', { language: this.getCurrentLanguage() }); + this.log('edx.video.language_menu.hidden', { language: this.getCurrentLanguage() }); }, onShowTranscript: function () { diff --git a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js index 592379964f..42e9e2034d 100644 --- a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js +++ b/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js @@ -398,7 +398,7 @@ // present instead of on the container hover, since it wraps // the "CC" and "Transcript" buttons as well. if ($(event.currentTarget).find('.lang').length) { - this.state.el.trigger('language_menu:show'); + this.state.el.trigger('language_menu:hide'); } },