From 8fd02b72b0e8ff5822fe37551bb2389adf0365d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Rolf?= Date: Fri, 16 Mar 2018 13:21:53 +0100 Subject: [PATCH 1/7] Added plugin that stores user-interaction data in Matomo (aka Piwik) analogue to the Theodul Matomo Plugin in Opencast. This Plugin works no matter if it is in the Opencast Binding or in the Paella Standalone player. --- config/config.json | 13 +- .../usertracking_matomo_saver.js | 146 ++++++++++++++++++ 2 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 plugins/org.opencast.usertracking.MatomoSaverPlugIn/usertracking_matomo_saver.js diff --git a/config/config.json b/config/config.json index 828aba9c..3362c67e 100644 --- a/config/config.json +++ b/config/config.json @@ -118,7 +118,7 @@ "es.upv.paella.zoomPlugin": {"enabled": false}, "es.upv.paella.windowTitlePlugin": {"enabled": true}, "es.upv.paella.track4kPlugin": { "enabled":true }, - + "//****": "Captions Parser Plugins", "es.upv.paella.captions.DFXPParserPlugin": {"enabled":true}, "es.teltek.paella.captions.WebVTTParserPlugin": {"enabled":true}, @@ -130,9 +130,16 @@ "//****": "User Tracking Saver Plugins", "es.upv.paella.usertracking.elasticsearchSaverPlugin": { "enabled": false, "url": "http://my.elastic.server"}, "es.upv.paella.usertracking.GoogleAnalyticsSaverPlugIn": { "enabled": false, "trackingID": "UA-XXXXXXXX-Y" }, - "es.upv.paella.usertracking.piwikSaverPlugIn": { "enabled": false, "tracker":"//tracker.server.com", "siteId": "1" }, + "es.upv.paella.usertracking.piwikSaverPlugIn": { "enabled": false, "tracker":"http://localhost/piwik/", "siteId": "1" }, + "org.opencast.usertracking.MatomoSaverPlugIn": { + "enabled": false, + "server": "http://localhost/piwik/", + "site_id": 1, + "heartbeat": 30, + "client_id": "Paella Player" + }, "es.teltek.paella.usertracking.xAPISaverPlugin": {"enabled": false, "endpoint":"http://localhost:8081/data/xAPI/", "auth":"auth_key"} - + } }, "standalone" : { diff --git a/plugins/org.opencast.usertracking.MatomoSaverPlugIn/usertracking_matomo_saver.js b/plugins/org.opencast.usertracking.MatomoSaverPlugIn/usertracking_matomo_saver.js new file mode 100644 index 00000000..62511237 --- /dev/null +++ b/plugins/org.opencast.usertracking.MatomoSaverPlugIn/usertracking_matomo_saver.js @@ -0,0 +1,146 @@ + +paella.addPlugin(function() { + return class MatomoTracking extends paella.userTracking.SaverPlugIn { + getName() { return "org.opencast.usertracking.MatomoSaverPlugIn"; } + + checkEnabled(onSuccess) { + + var site_id = this.config.site_id, + server = this.config.server, + heartbeat = this.config.heartbeat, + thisClass = this; + + if (server && site_id){ + if (server.substr(-1) != '/') server += '/'; + require([server + "piwik.js"], function(matomo) { + base.log.debug("Matomo Analytics Enabled"); + paella.userTracking.matomotracker = Piwik.getAsyncTracker( server + "piwik.php", site_id ); + paella.userTracking.matomotracker.client_id = thisClass.config.client_id; + if (heartbeat && heartbeat > 0) paella.userTracking.matomotracker.enableHeartBeatTimer(heartbeat); + if (Piwik && Piwik.MediaAnalytics) Piwik.MediaAnalytics.scanForMedia(); + thisClass.registerVisit(); + }); + onSuccess(true); + } else { + base.log.debug("No Matomo Site ID found in config file. Disabling Matomo Analytics PlugIn"); + onSuccess(false); + } + } + + registerVisit() { + var title, + event_id, + series_title, + series_id, + presenter, + view_mode; + + if (paella.opencast && paella.opencast._episode) { + title = paella.opencast._episode.dcTitle; + event_id = paella.opencast._episode.id; + presenter = paella.opencast._episode.dcCreator; + paella.userTracking.matomotracker.setCustomVariable(5, "client", + (paella.userTracking.matomotracker.client_id || "Paella Opencast")); + } else { + paella.userTracking.matomotracker.setCustomVariable(5, "client", + (paella.userTracking.matomotracker.client_id || "Paella Standalone")); + } + + if (paella.opencast && paella.opencast._episode && paella.opencast._episode.mediapackage) { + series_id = paella.opencast._episode.mediapackage.series; + series_title = paella.opencast._episode.mediapackage.seriestitle; + } + + if (title) + paella.userTracking.matomotracker.setCustomVariable(1, "event", title + " (" + event_id + ")", "page"); + if (series_title) + paella.userTracking.matomotracker.setCustomVariable(2, "series", series_title + " (" + series_id + ")", "page"); + if (presenter) paella.userTracking.matomotracker.setCustomVariable(3, "presenter", presenter, "page"); + paella.userTracking.matomotracker.setCustomVariable(4, "view_mode", view_mode, "page"); + if (title && presenter) { + paella.userTracking.matomotracker.setDocumentTitle(title + " - " + (presenter || "Unknown")); + paella.userTracking.matomotracker.trackPageView(title + " - " + (presenter || "Unknown")); + } else { + paella.userTracking.matomotracker.trackPageView(); + } + } + + log(event, params) { + if (paella.userTracking.matomotracker === undefined) { + base.log.debug("Matomo Tracker is missing"); + return; + } + if ((this.config.category === undefined) || (this.config.category ===true)) { + + var value = ""; + + try { + value = JSON.stringify(params); + } catch(e) {} + + switch (event) { + case paella.events.play: + paella.userTracking.matomotracker.trackEvent("Player.Controls","Play"); + break; + case paella.events.pause: + paella.userTracking.matomotracker.trackEvent("Player.Controls","Pause"); + break; + case paella.events.endVideo: + paella.userTracking.matomotracker.trackEvent("Player.Status","Ended"); + break; + case paella.events.showEditor: + paella.userTracking.matomotracker.trackEvent("Player.Editor","Show"); + break; + case paella.events.hideEditor: + paella.userTracking.matomotracker.trackEvent("Player.Editor","Hide"); + break; + case paella.events.enterFullscreen: + paella.userTracking.matomotracker.trackEvent("Player.View","Fullscreen"); + break; + case paella.events.exitFullscreen: + paella.userTracking.matomotracker.trackEvent("Player.View","ExitFullscreen"); + break; + case paella.events.loadComplete: + paella.userTracking.matomotracker.trackEvent("Player.Status","LoadComplete"); + break; + case paella.events.showPopUp: + paella.userTracking.matomotracker.trackEvent("Player.PopUp","Show", value); + break; + case paella.events.hidePopUp: + paella.userTracking.matomotracker.trackEvent("Player.PopUp","Hide", value); + break; + case paella.events.captionsEnabled: + paella.userTracking.matomotracker.trackEvent("Player.Captions","Enabled", value); + break; + case paella.events.captionsDisabled: + paella.userTracking.matomotracker.trackEvent("Player.Captions","Disabled", value); + break; + case paella.events.setProfile: + paella.userTracking.matomotracker.trackEvent("Player.View","Profile", value); + break; + case paella.events.seekTo: + case paella.events.seekToTime: + paella.userTracking.matomotracker.trackEvent("Player.Controls","Seek", value); + break; + case paella.events.setVolume: + paella.userTracking.matomotracker.trackEvent("Player.Settings","Volume", value); + break; + case paella.events.resize: + paella.userTracking.matomotracker.trackEvent("Player.View","resize", value); + break; + case paella.events.setPlaybackRate: + paella.userTracking.matomotracker.trackEvent("Player.Controls","PlaybackRate", value); + break; + + } + } + } + + } +}); + + + + + + From aa54450e9da6c1ea86a722b7751777d5e3a025db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Rolf?= Date: Fri, 16 Mar 2018 13:36:04 +0100 Subject: [PATCH 2/7] replaced tabs in config files with 2 spaces for improved formating. --- config/config.json | 260 ++++++++++++++++++++++----------------------- 1 file changed, 130 insertions(+), 130 deletions(-) diff --git a/config/config.json b/config/config.json index 3362c67e..644fa16d 100644 --- a/config/config.json +++ b/config/config.json @@ -1,136 +1,136 @@ { - "player":{ - "accessControlClass":"paella.AccessControl", + "player":{ + "accessControlClass":"paella.AccessControl", "profileFrameStrategy": "paella.ProfileFrameStrategy", - "videoQualityStrategy": "paella.LimitedBestFitVideoQualityStrategy", - "videoQualityStrategyParams":{ "maxAutoQualityRes":720 }, - "reloadOnFullscreen": true, - "videoZoom": { - "enabled":true, - "max":800, - "minWindowSize":500 - }, + "videoQualityStrategy": "paella.LimitedBestFitVideoQualityStrategy", + "videoQualityStrategyParams":{ "maxAutoQualityRes":720 }, + "reloadOnFullscreen": true, + "videoZoom": { + "enabled":true, + "max":800, + "minWindowSize":500 + }, - "deprecated-methods":[{"name":"streaming","enabled":true}, - {"name":"html","enabled":true}, - {"name":"flash","enabled":true}, + "deprecated-methods":[{"name":"streaming","enabled":true}, + {"name":"html","enabled":true}, + {"name":"flash","enabled":true}, {"name":"image","enabled":true}], - "methods":[ - { "factory":"ChromaVideoFactory", "enabled":true }, - { "factory":"WebmVideoFactory", "enabled":true }, - { "factory":"Html5VideoFactory", "enabled":true }, - { "factory":"MpegDashVideoFactory", "enabled":true }, - { "factory":"HLSVideoFactory", "enabled":true }, - { "factory":"RTMPVideoFactory", "enabled":true }, - { "factory":"ImageVideoFactory", "enabled":true }, - { "factory":"YoutubeVideoFactory", "enabled":true }, - { "factory":"Video360ThetaFactory", "enabled":true }, - { "factory":"Video360Factory", "enabled":true } - ], - "audioMethods":[ - { "factory":"MultiformatAudioFactory", "enabled":true } - ], + "methods":[ + { "factory":"ChromaVideoFactory", "enabled":true }, + { "factory":"WebmVideoFactory", "enabled":true }, + { "factory":"Html5VideoFactory", "enabled":true }, + { "factory":"MpegDashVideoFactory", "enabled":true }, + { "factory":"HLSVideoFactory", "enabled":true }, + { "factory":"RTMPVideoFactory", "enabled":true }, + { "factory":"ImageVideoFactory", "enabled":true }, + { "factory":"YoutubeVideoFactory", "enabled":true }, + { "factory":"Video360ThetaFactory", "enabled":true }, + { "factory":"Video360Factory", "enabled":true } + ], + "audioMethods":[ + { "factory":"MultiformatAudioFactory", "enabled":true } + ], "rtmpSettings":{ "bufferTime":5, - "requiresSubscription": false + "requiresSubscription": false }, - "slidesMarks":{ - "enabled":true, - "color":"gray" - } - }, - "defaultProfile":"slide_professor", - "data":{ - "enabled":true, - "dataDelegates":{ - "trimming":"CookieDataDelegate", - "visualAnnotations": "VisualAnnotationsDataDelegate", - "metadata":"VideoManifestMetadataDataDelegate", - "cameraTrack":"TrackCameraDataDelegate" - } - }, - "folders": { - "profiles": "config/profiles", - "resources": "resources", - "skins": "resources/style" - }, - "experimental":{ - "autoplay":true - }, - "plugins":{ - "enablePluginsByDefault": false, + "slidesMarks":{ + "enabled":true, + "color":"gray" + } + }, + "defaultProfile":"slide_professor", + "data":{ + "enabled":true, + "dataDelegates":{ + "trimming":"CookieDataDelegate", + "visualAnnotations": "VisualAnnotationsDataDelegate", + "metadata":"VideoManifestMetadataDataDelegate", + "cameraTrack":"TrackCameraDataDelegate" + } + }, + "folders": { + "profiles": "config/profiles", + "resources": "resources", + "skins": "resources/style" + }, + "experimental":{ + "autoplay":true + }, + "plugins":{ + "enablePluginsByDefault": false, - "//**** Instructions: Disable any individual plugin by setting its enable property to false": {"enabled": false}, - "//**** For a list of available plugins and configuration, go to": "https://github.com/polimediaupv/paella/blob/master/doc/plugins.md", - "list":{ - "//****": "Button Plugins", - "edu.harvard.dce.paella.flexSkipPlugin": {"enabled":true, "direction": "Rewind", "seconds": 10}, - "edu.harvard.dce.paella.flexSkipForwardPlugin": {"enabled":true, "direction": "Forward", "seconds": 30}, - "es.upv.paella.captionsPlugin": {"enabled":true, "searchOnCaptions":true}, - "es.upv.paella.extendedTabAdapterPlugin": {"enabled":true}, - "es.upv.paella.footprintsPlugin": {"enabled":false}, - "es.upv.paella.frameControlPlugin": {"enabled": true, "showFullPreview": "auto"}, - "es.upv.paella.fullScreenButtonPlugin": {"enabled":true, "reloadOnFullscreen":{ "enabled":true, "keepUserSelection":true }}, - "es.upv.paella.helpPlugin": {"enabled":true, "langs":["en","es"]}, - "es.upv.paella.multipleQualitiesPlugin": {"enabled":true, "showWidthRes":true}, - "es.upv.paella.playbackRatePlugin": {"enabled":true, "availableRates": [0.75, 1, 1.25, 1.5]}, - "es.upv.paella.playPauseButtonPlugin": {"enabled":true}, - "es.upv.paella.searchPlugin": {"enabled":true, "sortType":"time", "colorSearch":false}, - "es.upv.paella.socialPlugin": {"enabled":true}, - "es.upv.paella.themeChooserPlugin": {"enabled":true}, - "es.upv.paella.viewModePlugin": { "enabled": true }, - "es.upv.paella.volumeRangePlugin":{"enabled":true, "showMasterVolume": true, "showSlaveVolume": false }, - "es.upv.paella.pipModePlugin": { "enabled":true }, - "es.upv.paella.ratePlugin": { "enabled":true }, - "es.upv.paella.videoZoomPlugin": { "enabled":true }, - "es.upv.paella.audioLanguage": { "enabled":true }, - "es.upv.paella.videoZoomToolbarPlugin": { "enabled":false, "targetStreamIndex":0 }, - "es.upv.paella.videoZoomTrack4kPlugin": { "enabled":true, "targetStreamIndex":0, "autoModeByDefault":false }, - "es.upv.paella.airPlayPlugin": { "enabled":true }, + "//**** Instructions: Disable any individual plugin by setting its enable property to false": {"enabled": false}, + "//**** For a list of available plugins and configuration, go to": "https://github.com/polimediaupv/paella/blob/master/doc/plugins.md", + "list":{ + "//****": "Button Plugins", + "edu.harvard.dce.paella.flexSkipPlugin": {"enabled":true, "direction": "Rewind", "seconds": 10}, + "edu.harvard.dce.paella.flexSkipForwardPlugin": {"enabled":true, "direction": "Forward", "seconds": 30}, + "es.upv.paella.captionsPlugin": {"enabled":true, "searchOnCaptions":true}, + "es.upv.paella.extendedTabAdapterPlugin": {"enabled":true}, + "es.upv.paella.footprintsPlugin": {"enabled":false}, + "es.upv.paella.frameControlPlugin": {"enabled": true, "showFullPreview": "auto"}, + "es.upv.paella.fullScreenButtonPlugin": {"enabled":true, "reloadOnFullscreen":{ "enabled":true, "keepUserSelection":true }}, + "es.upv.paella.helpPlugin": {"enabled":true, "langs":["en","es"]}, + "es.upv.paella.multipleQualitiesPlugin": {"enabled":true, "showWidthRes":true}, + "es.upv.paella.playbackRatePlugin": {"enabled":true, "availableRates": [0.75, 1, 1.25, 1.5]}, + "es.upv.paella.playPauseButtonPlugin": {"enabled":true}, + "es.upv.paella.searchPlugin": {"enabled":true, "sortType":"time", "colorSearch":false}, + "es.upv.paella.socialPlugin": {"enabled":true}, + "es.upv.paella.themeChooserPlugin": {"enabled":true}, + "es.upv.paella.viewModePlugin": { "enabled": true }, + "es.upv.paella.volumeRangePlugin":{"enabled":true, "showMasterVolume": true, "showSlaveVolume": false }, + "es.upv.paella.pipModePlugin": { "enabled":true }, + "es.upv.paella.ratePlugin": { "enabled":true }, + "es.upv.paella.videoZoomPlugin": { "enabled":true }, + "es.upv.paella.audioLanguage": { "enabled":true }, + "es.upv.paella.videoZoomToolbarPlugin": { "enabled":false, "targetStreamIndex":0 }, + "es.upv.paella.videoZoomTrack4kPlugin": { "enabled":true, "targetStreamIndex":0, "autoModeByDefault":false }, + "es.upv.paella.airPlayPlugin": { "enabled":true }, - "//****": "Video Overlay Button Plugins", - "es.upv.paella.liveStreamingIndicatorPlugin": { "enabled": true }, - "es.upv.paella.showEditorPlugin":{"enabled":true,"alwaysVisible":true}, - "es.upv.paella.arrowSlidesNavigatorPlugin": {"enabled": true, "showArrowsIn": "slave"}, - "es.upv.paella.videoDataPlugin": { - "enabled": true, - "excludeLocations":[ - "paellaplayer.upv.es" - ], - "excludeParentLocations":[ - "localhost:8000" - ] - }, + "//****": "Video Overlay Button Plugins", + "es.upv.paella.liveStreamingIndicatorPlugin": { "enabled": true }, + "es.upv.paella.showEditorPlugin":{"enabled":true,"alwaysVisible":true}, + "es.upv.paella.arrowSlidesNavigatorPlugin": {"enabled": true, "showArrowsIn": "slave"}, + "es.upv.paella.videoDataPlugin": { + "enabled": true, + "excludeLocations":[ + "paellaplayer.upv.es" + ], + "excludeParentLocations":[ + "localhost:8000" + ] + }, - "//****": "TabBar Plugins", - "es.upv.paella.commentsPlugin": {"enabled": false}, - "es.upv.paella.test.tabBarExamplePlugin": {"enabled": false}, + "//****": "TabBar Plugins", + "es.upv.paella.commentsPlugin": {"enabled": false}, + "es.upv.paella.test.tabBarExamplePlugin": {"enabled": false}, - "//****": "Event Driven Plugins", - "es.upv.paella.blackBoardPlugin": {"enabled": true}, - "es.upv.paella.breaksPlayerPlugin": {"enabled": true}, - "es.upv.paella.overlayCaptionsPlugin": {"enabled": true}, - "es.upv.paella.playButtonOnScreenPlugin": {"enabled":true}, - "es.upv.paella.test.videoLoadPlugin": {"enabled":false}, - "es.upv.paella.translecture.captionsPlugin": {"enabled":true}, - "es.upv.paella.trimmingPlayerPlugin": {"enabled":true}, - "es.upv.paella.zoomPlugin": {"enabled": false}, - "es.upv.paella.windowTitlePlugin": {"enabled": true}, - "es.upv.paella.track4kPlugin": { "enabled":true }, + "//****": "Event Driven Plugins", + "es.upv.paella.blackBoardPlugin": {"enabled": true}, + "es.upv.paella.breaksPlayerPlugin": {"enabled": true}, + "es.upv.paella.overlayCaptionsPlugin": {"enabled": true}, + "es.upv.paella.playButtonOnScreenPlugin": {"enabled":true}, + "es.upv.paella.test.videoLoadPlugin": {"enabled":false}, + "es.upv.paella.translecture.captionsPlugin": {"enabled":true}, + "es.upv.paella.trimmingPlayerPlugin": {"enabled":true}, + "es.upv.paella.zoomPlugin": {"enabled": false}, + "es.upv.paella.windowTitlePlugin": {"enabled": true}, + "es.upv.paella.track4kPlugin": { "enabled":true }, - "//****": "Captions Parser Plugins", - "es.upv.paella.captions.DFXPParserPlugin": {"enabled":true}, - "es.teltek.paella.captions.WebVTTParserPlugin": {"enabled":true}, + "//****": "Captions Parser Plugins", + "es.upv.paella.captions.DFXPParserPlugin": {"enabled":true}, + "es.teltek.paella.captions.WebVTTParserPlugin": {"enabled":true}, - "//****": "Search Service Plugins", - "es.upv.paella.search.captionsSearchPlugin": {"enabled":true}, - "es.upv.paella.frameCaptionsSearchPlugin": {"enabled":true}, + "//****": "Search Service Plugins", + "es.upv.paella.search.captionsSearchPlugin": {"enabled":true}, + "es.upv.paella.frameCaptionsSearchPlugin": {"enabled":true}, - "//****": "User Tracking Saver Plugins", - "es.upv.paella.usertracking.elasticsearchSaverPlugin": { "enabled": false, "url": "http://my.elastic.server"}, - "es.upv.paella.usertracking.GoogleAnalyticsSaverPlugIn": { "enabled": false, "trackingID": "UA-XXXXXXXX-Y" }, - "es.upv.paella.usertracking.piwikSaverPlugIn": { "enabled": false, "tracker":"http://localhost/piwik/", "siteId": "1" }, + "//****": "User Tracking Saver Plugins", + "es.upv.paella.usertracking.elasticsearchSaverPlugin": { "enabled": false, "url": "http://my.elastic.server"}, + "es.upv.paella.usertracking.GoogleAnalyticsSaverPlugIn": { "enabled": false, "trackingID": "UA-XXXXXXXX-Y" }, + "es.upv.paella.usertracking.piwikSaverPlugIn": { "enabled": false, "tracker":"http://localhost/piwik/", "siteId": "1" }, "org.opencast.usertracking.MatomoSaverPlugIn": { "enabled": false, "server": "http://localhost/piwik/", @@ -138,19 +138,19 @@ "heartbeat": 30, "client_id": "Paella Player" }, - "es.teltek.paella.usertracking.xAPISaverPlugin": {"enabled": false, "endpoint":"http://localhost:8081/data/xAPI/", "auth":"auth_key"} + "es.teltek.paella.usertracking.xAPISaverPlugin": {"enabled": false, "endpoint":"http://localhost:8081/data/xAPI/", "auth":"auth_key"} - } - }, + } + }, "standalone" : { "repository": "../repository/" - }, - "skin": { - "available": [ - "dark", - "dark_small", - "light", - "light_small" - ] - } + }, + "skin": { + "available": [ + "dark", + "dark_small", + "light", + "light_small" + ] + } } From a261866b7e8c89672cc4a7ca967f676eec705254 Mon Sep 17 00:00:00 2001 From: Miguel Escriva Date: Tue, 27 Mar 2018 10:43:54 +0200 Subject: [PATCH 3/7] Travis bug --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01fe11dd..e8c96c97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ script: before_deploy: - - export PRERELEASE=$(sh ./.publish_scripts/is_prerelease_version.sh ${TRAVIS_TAG}) + - export PRERELEASE=$(bash ./.publish_scripts/is_prerelease_version.sh ${TRAVIS_TAG}) deploy: From 91a19e5991fc04d92dd7bd2e86b8f97cad87a2a2 Mon Sep 17 00:00:00 2001 From: Miguel Escriva Date: Tue, 27 Mar 2018 10:55:33 +0200 Subject: [PATCH 4/7] Fix bug in paella.MessageBox --- src/01_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/01_utils.js b/src/01_utils.js index 995a7097..c8b945ff 100644 --- a/src/01_utils.js +++ b/src/01_utils.js @@ -503,7 +503,7 @@ Class ("paella.MessageBox", { iframeContainer.style.height = "100%"; messageContainer.appendChild(iframeContainer); - if (paella.player.isFullScreen()) { + if (paella.player && paella.player.isFullScreen()) { paella.player.mainContainer.appendChild(modalContainer); }else{ $('body')[0].appendChild(modalContainer); From 13c46db541f4f3ade0f15a57148431aab068f95c Mon Sep 17 00:00:00 2001 From: Miguel Escriva Date: Tue, 27 Mar 2018 10:58:14 +0200 Subject: [PATCH 5/7] 5.3.2 version --- CHANGELOG | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 7e1c3402..4336fdef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ CHANGELOG ========= +* Paella 5.3.2 + + * Bug fixed in paella.MessageBox + * Bug fixed in travis scripts + * Paella 5.3.1 * Bug fixed in captions load diff --git a/package.json b/package.json index 9822de14..5065087c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "paellaplayer", - "version": "5.3.1", + "version": "5.3.2", "description": "Paella Player", "license": "ECL-2.0", "repository": { From 7404eb1e13736d6df228b969d1bbb47574193c8e Mon Sep 17 00:00:00 2001 From: Miguel Escriva Date: Tue, 27 Mar 2018 11:06:35 +0200 Subject: [PATCH 6/7] changelog --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 4336fdef..4292f74d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,8 @@ CHANGELOG * Paella 5.3.2 * Bug fixed in paella.MessageBox - * Bug fixed in travis scripts + * Bug fixed in travis scripts + * Added Matomo (org.opencast.usertracking.MatomoSaverPlugIn) plugin (thanks to @rrolf) * Paella 5.3.1 From e378f1490aa1c5d055d23eb2d5f85146ad54cf58 Mon Sep 17 00:00:00 2001 From: Miguel Escriva Date: Wed, 28 Mar 2018 12:36:36 +0200 Subject: [PATCH 7/7] Fix bug in paella.MessageBox --- src/01_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/01_utils.js b/src/01_utils.js index c8b945ff..4a3a74ab 100644 --- a/src/01_utils.js +++ b/src/01_utils.js @@ -625,7 +625,7 @@ Class ("paella.MessageBox", { messageContainer.innerHTML = message; modalContainer.appendChild(messageContainer); - if (paella.player.isFullScreen()) { + if (paella.player && paella.player.isFullScreen()) { paella.player.mainContainer.appendChild(modalContainer); }else{ $('body')[0].appendChild(modalContainer);