diff -r 02c04d2c8fd8 -r ac1eacb3aa33 src/widgets/Controller.js --- a/src/widgets/Controller.js Sun Nov 12 22:07:33 2017 +0100 +++ b/src/widgets/Controller.js Wed Sep 04 17:32:50 2024 +0200 @@ -1,57 +1,62 @@ /* Displays Play and Pause buttons, Search Button and Form, Volume Control */ +// Controller -IriSP.Widgets.Controller = function(player, config) { - IriSP.Widgets.Widget.call(this, player, config); - this.lastSearchValue = ""; -}; +import controllerStyles from "./Controller.module.css"; -IriSP.Widgets.Controller.prototype = new IriSP.Widgets.Widget(); +import jQuery from "jquery"; -IriSP.Widgets.Controller.prototype.defaults = { - disable_annotate_btn: false, - disable_search_btn: false, - disable_ctrl_f: false, - disable_fullscreen : true, - always_show_search: false, - enable_quiz_toggle: undefined -}; +const Controller = function (ns) { + return class extends ns.Widgets.Widget { + constructor(player, config) { + super(player, config); + this.lastSearchValue = ""; + } + + static defaults = { + disable_annotate_btn: false, + disable_search_btn: false, + disable_ctrl_f: false, + disable_fullscreen: true, + always_show_search: false, + enable_quiz_toggle: undefined, + }; -IriSP.Widgets.Controller.prototype.template = - '
' - + '
' - + '
' - + '
' - + '{{^disable_annotate_btn}}' - + '
' - + '
' - + '{{/disable_annotate_btn}}' - + '{{^disable_search_btn}}' - + '
' - + '{{/disable_search_btn}}' - + '' - + '
' - + '
' - + '
' - + '
' - + '{{^disable_fullscreen}}
' - + '
' - + '
00:00
' - + '
/
' - + '
00:00
' - + '
' - + '
' - + '
' - + '
' - + '
' - + '
' - + '
' - + '
'; + static template = + '
' + + '
' + + '
' + + '
' + + "{{^disable_annotate_btn}}" + + '
' + + '
' + + "{{/disable_annotate_btn}}" + + "{{^disable_search_btn}}" + + '
' + + "{{/disable_search_btn}}" + + '" + + '
' + + '
' + + "
" + + '
' + + '{{^disable_fullscreen}}
' + + '
' + + '
00:00
' + + '
/
' + + '
00:00
' + + "
" + + '
' + + '
' + + "
" + + '
' + + '
' + + "
" + + "
"; -IriSP.Widgets.Controller.prototype.messages = { - en: { + static messages = { + en: { play_pause: "Play/Pause", mute_unmute: "Mute/Unmute", play: "Play", @@ -64,9 +69,9 @@ total_time: "Total duration", volume: "Volume", volume_control: "Volume control", - enable_quiz: "Enable quiz" - }, - fr: { + enable_quiz: "Enable quiz", + }, + fr: { play_pause: "Lecture/Pause", mute_unmute: "Couper/Activer le son", play: "Lecture", @@ -79,276 +84,301 @@ total_time: "Durée totale", volume: "Niveau sonore", volume_control: "Réglage du niveau sonore", - enable_quiz: "Activer le quiz" - } -}; - -IriSP.Widgets.Controller.prototype.draw = function() { - var _this = this; - this.renderTemplate(); - - // Define blocks - this.$playButton = this.$.find(".Ldt-Ctrl-Play"); - this.$searchBlock = this.$.find(".Ldt-Ctrl-Search"); - this.$searchInput = this.$.find(".Ldt-Ctrl-SearchInput"); - this.$volumeBar = this.$.find(".Ldt-Ctrl-Volume-Bar"); - - // handle events - this.onMediaEvent("play","playButtonUpdater"); - this.onMediaEvent("pause","playButtonUpdater"); - this.onMediaEvent("volumechange","volumeUpdater"); - this.onMediaEvent("timeupdate","timeDisplayUpdater"); - this.onMediaEvent("loadedmetadata","volumeUpdater"); - - // handle clicks - this.$playButton.click(this.functionWrapper("playHandler")); - - if (this.enable_quiz_toggle !== undefined) { - if (this.enable_quiz_toggle) { - this.$.find(".Ldt-Ctrl-Quiz-Enable").addClass("Ldt-Ctrl-Quiz-Toggle-Active"); - this.$.find(".Ldt-Ctrl-Quiz-Create").addClass("Ldt-Ctrl-Quiz-Toggle-Active"); - // this.player.trigger("QuizCreator.show"); - this.$.find("#QuizEditContainer").show(); - } - else - { - this.$.find(".Ldt-Ctrl-Quiz-Enable").removeClass("Ldt-Ctrl-Quiz-Toggle-Active"); - this.$.find(".Ldt-Ctrl-Quiz-Create").removeClass("Ldt-Ctrl-Quiz-Toggle-Active"); - this.player.trigger("QuizCreator.hide"); - this.$.find("#QuizEditContainer").hide(); - } - } else { - this.$.find(".Ldt-Ctrl-Quiz-Enable").hide(); - } - - this.$.find(".Ldt-Ctrl-Annotate").click(function() { - _this.player.trigger("CreateAnnotation.toggle"); - }); - this.$.find(".Ldt-Ctrl-SearchBtn").click(this.functionWrapper("searchButtonHandler")); - - this.$searchInput.keyup(this.functionWrapper("searchHandler")); - this.$searchInput.on("search", this.functionWrapper("searchHandler")); - - // Fullscreen handling - this.$.find(".Ldt-Ctrl-Fullscreen-Button").click(this.functionWrapper("toggleFullscreen")); - var fullscreen_event_name = IriSP.getFullscreenEventname(); - if (fullscreen_event_name) { - document.addEventListener(fullscreen_event_name, function() { - if (IriSP.isFullscreen() && IriSP.getFullscreenElement() == _this.$[0]) { - _this.$.addClass("Ldt-Fullscreen-Element"); - } else { - _this.$.removeClass("Ldt-Fullscreen-Element"); - } - }); + enable_quiz: "Activer le quiz", + }, }; - // Quiz activation - this.$.find(".Ldt-Ctrl-Quiz-Enable").click(this.functionWrapper("toggleQuiz")); - this.$.find(".Ldt-Ctrl-Quiz-Create").click(this.functionWrapper("createQuiz")); + draw() { + var _this = this; + this.renderTemplate(); + + // Define blocks + this.$playButton = this.$.find(".Ldt-Ctrl-Play"); + this.$searchBlock = this.$.find(".Ldt-Ctrl-Search"); + this.$searchInput = this.$.find(".Ldt-Ctrl-SearchInput"); + this.$volumeBar = this.$.find(".Ldt-Ctrl-Volume-Bar"); + + // handle events + this.onMediaEvent("play", "playButtonUpdater"); + this.onMediaEvent("pause", "playButtonUpdater"); + this.onMediaEvent("volumechange", "volumeUpdater"); + this.onMediaEvent("timeupdate", "timeDisplayUpdater"); + this.onMediaEvent("loadedmetadata", "volumeUpdater"); + + // handle clicks + this.$playButton.click(this.functionWrapper("playHandler")); - var _volctrl = this.$.find(".Ldt-Ctrl-Volume-Control"); - this.$.find('.Ldt-Ctrl-Sound') - .click(this.functionWrapper("muteHandler")) - .mouseover(function() { - _volctrl.show(); - }) - .mouseout(function() { - _volctrl.hide(); + if (this.enable_quiz_toggle !== undefined) { + if (this.enable_quiz_toggle) { + this.$.find(".Ldt-Ctrl-Quiz-Enable").addClass( + "Ldt-Ctrl-Quiz-Toggle-Active" + ); + this.$.find(".Ldt-Ctrl-Quiz-Create").addClass( + "Ldt-Ctrl-Quiz-Toggle-Active" + ); + // this.player.trigger("QuizCreator.show"); + this.$.find("#QuizEditContainer").show(); + } else { + this.$.find(".Ldt-Ctrl-Quiz-Enable").removeClass( + "Ldt-Ctrl-Quiz-Toggle-Active" + ); + this.$.find(".Ldt-Ctrl-Quiz-Create").removeClass( + "Ldt-Ctrl-Quiz-Toggle-Active" + ); + this.player.trigger("QuizCreator.hide"); + this.$.find("#QuizEditContainer").hide(); + } + } else { + this.$.find(".Ldt-Ctrl-Quiz-Enable").hide(); + } + + this.$.find(".Ldt-Ctrl-Annotate").click(function () { + _this.player.trigger("CreateAnnotation.toggle"); + }); + this.$.find(".Ldt-Ctrl-SearchBtn").click( + this.functionWrapper("searchButtonHandler") + ); + + this.$searchInput.keyup(this.functionWrapper("searchHandler")); + this.$searchInput.on("search", this.functionWrapper("searchHandler")); + + // Fullscreen handling + this.$.find(".Ldt-Ctrl-Fullscreen-Button").click( + this.functionWrapper("toggleFullscreen") + ); + var fullscreen_event_name = ns.getFullscreenEventname(); + if (fullscreen_event_name) { + document.addEventListener(fullscreen_event_name, function () { + if (ns.isFullscreen() && ns.getFullscreenElement() == _this.$[0]) { + _this.$.addClass("Ldt-Fullscreen-Element"); + } else { + _this.$.removeClass("Ldt-Fullscreen-Element"); + } }); - _volctrl.mouseover(function() { - _volctrl.show(); - }).mouseout(function() { - _volctrl.hide(); - }); + } + + // Quiz activation + this.$.find(".Ldt-Ctrl-Quiz-Enable").click( + this.functionWrapper("toggleQuiz") + ); + this.$.find(".Ldt-Ctrl-Quiz-Create").click( + this.functionWrapper("createQuiz") + ); - // Handle CTRL-F - if (!this.disable_ctrl_f) { + var _volctrl = this.$.find(".Ldt-Ctrl-Volume-Control"); + this.$.find(".Ldt-Ctrl-Sound") + .click(this.functionWrapper("muteHandler")) + .mouseover(function () { + _volctrl.show(); + }) + .mouseout(function () { + _volctrl.hide(); + }); + _volctrl + .mouseover(function () { + _volctrl.show(); + }) + .mouseout(function () { + _volctrl.hide(); + }); + + // Handle CTRL-F + if (!this.disable_ctrl_f) { var _fKey = "F".charCodeAt(0), - _lastCtrlFTime = 0; - IriSP.jQuery(document).keydown(function(_event) { - if (_event.keyCode === _fKey && (_event.ctrlKey || _event.metaKey)) { - var _time = IriSP.jQuery.now(); - if (_time - _lastCtrlFTime > 2000) { - _this.searchButtonHandler(); - } - _lastCtrlFTime = _time; - return false; + _lastCtrlFTime = 0; + jQuery(document).keydown(function (_event) { + if (_event.keyCode === _fKey && (_event.ctrlKey || _event.metaKey)) { + var _time = jQuery.now(); + if (_time - _lastCtrlFTime > 2000) { + _this.searchButtonHandler(); } + _lastCtrlFTime = _time; + return false; + } }); + } + + // Allow Volume Cursor Dragging + this.$volumeBar.slider({ + slide: function (event, ui) { + _this.$volumeBar.attr( + "title", + _this.l10n.volume + ": " + ui.value + "%" + ); + _this.media.setVolume(ui.value / 100); + }, + stop: this.functionWrapper("volumeUpdater"), + }); + + // trigger an ns.Player.MouseOver to the widgets that are interested (i.e : sliderWidget) + this.$.hover( + function () { + _this.player.trigger("Player.MouseOver"); + }, + function () { + _this.player.trigger("Player.MouseOut"); + } + ); + + this.timeDisplayUpdater(new ns.Model.Time(0)); + + var annotations = this.source.getAnnotations(); + annotations.on("search", function (_text) { + _this.$searchInput.val(_text); + _this.showSearchBlock(); + }); + annotations.on("found", function (_text) { + _this.$searchInput.css("background-color", "#e1ffe1"); + }); + annotations.on("not-found", function (_text) { + _this.$searchInput.css("background-color", "#d62e3a"); + }); + annotations.on("search-cleared", function () { + _this.hideSearchBlock(); + }); + if (_this.always_show_search) { + _this.showSearchBlock(); + } } - // Allow Volume Cursor Dragging - this.$volumeBar.slider({ - slide: function(event, ui) { - _this.$volumeBar.attr("title",_this.l10n.volume+': ' + ui.value + '%'); - _this.media.setVolume(ui.value / 100); - }, - stop: this.functionWrapper("volumeUpdater") - }); - - // trigger an IriSP.Player.MouseOver to the widgets that are interested (i.e : sliderWidget) - this.$.hover( - function() { - _this.player.trigger("Player.MouseOver"); - }, - function() { - _this.player.trigger("Player.MouseOut"); - }); - - this.timeDisplayUpdater(new IriSP.Model.Time(0)); + /* Update the elasped time div */ + timeDisplayUpdater(_time) { + // we get it at each call because it may change. + var _totalTime = this.media.duration; + this.$.find(".Ldt-Ctrl-Time-Elapsed").html(_time.toString()); + this.$.find(".Ldt-Ctrl-Time-Total").html(_totalTime.toString()); + } - var annotations = this.source.getAnnotations(); - annotations.on("search", function(_text) { - _this.$searchInput.val(_text); - _this.showSearchBlock(); - }); - annotations.on("found", function(_text) { - _this.$searchInput.css('background-color','#e1ffe1'); - }); - annotations.on("not-found", function(_text) { - _this.$searchInput.css('background-color', "#d62e3a"); - }); - annotations.on("search-cleared", function() { - _this.hideSearchBlock(); - }); - if (_this.always_show_search) { - _this.showSearchBlock(); - } -}; - -/* Update the elasped time div */ -IriSP.Widgets.Controller.prototype.timeDisplayUpdater = function(_time) { - - // we get it at each call because it may change. - var _totalTime = this.media.duration; - this.$.find(".Ldt-Ctrl-Time-Elapsed").html(_time.toString()); - this.$.find(".Ldt-Ctrl-Time-Total").html(_totalTime.toString()); -}; - -/* update the icon of the button - separate function from playHandler + /* update the icon of the button - separate function from playHandler because in some cases (for instance, when the user directly clicks on the jwplayer window) we have to change the icon without playing/pausing */ -IriSP.Widgets.Controller.prototype.playButtonUpdater = function() { - if (this.media.getPaused()) { - /* the background sprite is changed by adding/removing the correct classes */ + playButtonUpdater() { + if (this.media.getPaused()) { + /* the background sprite is changed by adding/removing the correct classes */ this.$playButton - .attr("title", this.l10n.play) - .removeClass("Ldt-Ctrl-Play-PauseState") - .addClass("Ldt-Ctrl-Play-PlayState"); - } else { + .attr("title", this.l10n.play) + .removeClass("Ldt-Ctrl-Play-PauseState") + .addClass("Ldt-Ctrl-Play-PlayState"); + } else { this.$playButton - .attr("title", this.l10n.pause) - .removeClass("Ldt-Ctrl-Play-PlayState") - .addClass("Ldt-Ctrl-Play-PauseState"); + .attr("title", this.l10n.pause) + .removeClass("Ldt-Ctrl-Play-PlayState") + .addClass("Ldt-Ctrl-Play-PauseState"); + } } -}; -//FullScreen -IriSP.Widgets.Controller.prototype.toggleFullscreen = function() { - if (IriSP.isFullscreen()) { - IriSP.setFullScreen(this.$[0], false); - } else { - IriSP.setFullScreen(this.$[0], true); + //FullScreen + toggleFullscreen() { + if (ns.isFullscreen()) { + ns.setFullScreen(this.$[0], false); + } else { + ns.setFullScreen(this.$[0], true); + } } -}; -//Quiz -IriSP.Widgets.Controller.prototype.createQuiz = function() { - this.player.trigger("Quiz.hide"); - this.media.pause(); - this.player.trigger("QuizCreator.create"); -}; + //Quiz + createQuiz() { + this.player.trigger("Quiz.hide"); + this.media.pause(); + this.player.trigger("QuizCreator.create"); + } -IriSP.Widgets.Controller.prototype.toggleQuiz = function() { - this.enable_quiz_toggle = !this.enable_quiz_toggle; - if (this.enable_quiz_toggle) { + toggleQuiz() { + this.enable_quiz_toggle = !this.enable_quiz_toggle; + if (this.enable_quiz_toggle) { $(".Ldt-Ctrl-Quiz-Enable").addClass("Ldt-Ctrl-Quiz-Toggle-Active"); $(".Ldt-Ctrl-Quiz-Create").addClass("Ldt-Ctrl-Quiz-Toggle-Active"); this.player.trigger("Quiz.activate"); - } - else - { + } else { $(".Ldt-Ctrl-Quiz-Enable").removeClass("Ldt-Ctrl-Quiz-Toggle-Active"); $(".Ldt-Ctrl-Quiz-Create").removeClass("Ldt-Ctrl-Quiz-Toggle-Active"); this.player.trigger("Quiz.deactivate"); this.player.trigger("QuizCreator.hide"); - } -}; - -IriSP.Widgets.Controller.prototype.playHandler = function() { - if (this.media.getPaused()) { - this.media.play(); - } else { - this.media.pause(); + } } -}; - -IriSP.Widgets.Controller.prototype.muteHandler = function() { - this.media.setMuted(!this.media.getMuted()); -}; -IriSP.Widgets.Controller.prototype.volumeUpdater = function() { - var _muted = this.media.getMuted(), - _vol = this.media.getVolume(); - if (_vol === false) { - _vol = .5; + playHandler() { + if (this.media.getPaused()) { + this.media.play(); + } else { + this.media.pause(); + } + } + + muteHandler() { + this.media.setMuted(!this.media.getMuted()); } - var _soundCtl = this.$.find(".Ldt-Ctrl-Sound"); - _soundCtl.removeClass("Ldt-Ctrl-Sound-Mute Ldt-Ctrl-Sound-Half Ldt-Ctrl-Sound-Full"); - if (_muted) { - _soundCtl.attr("title", this.l10n.unmute) - .addClass("Ldt-Ctrl-Sound-Mute"); - } else { - _soundCtl.attr("title", this.l10n.mute) - .addClass(_vol < .5 ? "Ldt-Ctrl-Sound-Half" : "Ldt-Ctrl-Sound-Full" ); - } - this.$volumeBar.slider("value", _muted ? 0 : 100 * _vol); -}; -IriSP.Widgets.Controller.prototype.showSearchBlock = function() { - this.$searchBlock.animate({ width:"160px" }, 200); - this.$searchInput.css('background-color','#fff'); - this.$searchInput.focus(); -}; + volumeUpdater() { + var _muted = this.media.getMuted(), + _vol = this.media.getVolume(); + if (_vol === false) { + _vol = 0.5; + } + var _soundCtl = this.$.find(".Ldt-Ctrl-Sound"); + _soundCtl.removeClass( + "Ldt-Ctrl-Sound-Mute Ldt-Ctrl-Sound-Half Ldt-Ctrl-Sound-Full" + ); + if (_muted) { + _soundCtl + .attr("title", this.l10n.unmute) + .addClass("Ldt-Ctrl-Sound-Mute"); + } else { + _soundCtl + .attr("title", this.l10n.mute) + .addClass(_vol < 0.5 ? "Ldt-Ctrl-Sound-Half" : "Ldt-Ctrl-Sound-Full"); + } + this.$volumeBar.slider("value", _muted ? 0 : 100 * _vol); + } -IriSP.Widgets.Controller.prototype.hideSearchBlock = function() { - if (! this.always_show_search) { - this.$searchBlock.animate( { width: 0 }, 200); + showSearchBlock() { + this.$searchBlock.animate({ width: "160px" }, 200); + this.$searchInput.css("background-color", "#fff"); + this.$searchInput.focus(); } -}; -/** react to clicks on the search button */ -IriSP.Widgets.Controller.prototype.searchButtonHandler = function() { - if ( !this.$searchBlock.width() ) { + hideSearchBlock() { + if (!this.always_show_search) { + this.$searchBlock.animate({ width: 0 }, 200); + } + } + + /** react to clicks on the search button */ + searchButtonHandler() { + if (!this.$searchBlock.width()) { this.showSearchBlock(); var _val = this.$searchInput.val(); if (_val) { - this.source.getAnnotations().search(_val); + this.source.getAnnotations().search(_val); } - } else { + } else { this.hideSearchBlock(); + } } + + /** this handler is called whenever the content of the search + field changes */ + searchHandler() { + if (!this.$searchBlock.width()) { + this.$searchBlock.css({ width: "160px" }); + this.$searchInput.css("background-color", "#fff"); + } + var _val = this.$searchInput.val(); + this._positiveMatch = false; + + // do nothing if the search field is empty, instead of highlighting everything. + if (_val !== this.lastSearchValue) { + if (_val) { + this.source.getAnnotations().search(_val); + } else { + this.source.getAnnotations().trigger("clear-search"); + this.$searchInput.css("background-color", ""); + } + } + this.lastSearchValue = _val; + } + }; }; -/** this handler is called whenever the content of the search - field changes */ -IriSP.Widgets.Controller.prototype.searchHandler = function() { - if ( !this.$searchBlock.width() ) { - this.$searchBlock.css({ width:"160px" }); - this.$searchInput.css('background-color','#fff'); - } - var _val = this.$searchInput.val(); - this._positiveMatch = false; - - // do nothing if the search field is empty, instead of highlighting everything. - if (_val !== this.lastSearchValue) { - if (_val) { - this.source.getAnnotations().search(_val); - } else { - this.source.getAnnotations().trigger("clear-search"); - this.$searchInput.css('background-color',''); - } - } - this.lastSearchValue = _val; -}; +export { Controller, controllerStyles };