diff --git a/dist/videojs.ga.js b/dist/videojs.ga.js index dbda0a2..34fe5d5 100644 --- a/dist/videojs.ga.js +++ b/dist/videojs.ga.js @@ -1,13 +1,13 @@ /* -* videojs-ga - v0.4.2 - 2015-02-06 -* Copyright (c) 2015 Michael Bensoussan +* videojs-ga - v0.4.2 - 2016-04-26 +* Copyright (c) 2016 Michael Bensoussan * Licensed MIT */ (function() { var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; videojs.plugin('ga', function(options) { - var dataSetupOptions, defaultsEventsToTrack, end, error, eventCategory, eventLabel, eventsToTrack, fullscreen, loaded, parsedOptions, pause, percentsAlreadyTracked, percentsPlayedInterval, play, resize, seekEnd, seekStart, seeking, sendbeacon, timeupdate, volumeChange; + var dataSetupOptions, defaultsEventsToTrack, end, error, eventCategory, eventLabel, eventsToTrack, fullscreen, getEventLabel, loaded, parsedOptions, pause, percentsAlreadyTracked, percentsPlayedInterval, play, resize, seekEnd, seekStart, seeking, sendbeacon, timeupdate, volumeChange; if (options == null) { options = {}; } @@ -27,6 +27,13 @@ percentsAlreadyTracked = []; seekStart = seekEnd = 0; seeking = false; + getEventLabel = function() { + if (typeof eventLabel === 'function') { + return eventLabel(); + } else { + return eventLabel; + } + }; loaded = function() { if (!eventLabel) { eventLabel = this.currentSrc().split("/").slice(-1)[0].replace(/\.(\w{3,4})(\?.*)?$/i, ''); @@ -106,12 +113,12 @@ ga('send', 'event', { 'eventCategory': eventCategory, 'eventAction': action, - 'eventLabel': eventLabel, + 'eventLabel': getEventLabel(), 'eventValue': value, 'nonInteraction': nonInteraction }); } else if (window._gaq) { - _gaq.push(['_trackEvent', eventCategory, action, eventLabel, value, nonInteraction]); + _gaq.push(['_trackEvent', eventCategory, action, getEventLabel(), value, nonInteraction]); } else if (options.debug) { console.log("Google Analytics not detected"); } diff --git a/dist/videojs.ga.min.js b/dist/videojs.ga.min.js index b57c784..7d7914c 100644 --- a/dist/videojs.ga.min.js +++ b/dist/videojs.ga.min.js @@ -1,6 +1,6 @@ /* -* videojs-ga - v0.4.2 - 2015-02-06 -* Copyright (c) 2015 Michael Bensoussan +* videojs-ga - v0.4.2 - 2016-04-26 +* Copyright (c) 2016 Michael Bensoussan * Licensed MIT */ -(function(){var a=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};videojs.plugin("ga",function(b){var c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w;return null==b&&(b={}),c={},this.options()["data-setup"]&&(l=JSON.parse(this.options()["data-setup"]),l.ga&&(c=l.ga)),d=["loaded","percentsPlayed","start","end","seek","play","pause","resize","volumeChange","error","fullscreen"],i=b.eventsToTrack||c.eventsToTrack||d,o=b.percentsPlayedInterval||c.percentsPlayedInterval||10,g=b.eventCategory||c.eventCategory||"Video",h=b.eventLabel||c.eventLabel,b.debug=b.debug||!1,n=[],s=r=0,t=!1,k=function(){h||(h=this.currentSrc().split("/").slice(-1)[0].replace(/\.(\w{3,4})(\?.*)?$/i,"")),a.call(i,"loadedmetadata")>=0&&u("loadedmetadata",!0)},v=function(){var b,c,d,e,f;for(b=Math.round(this.currentTime()),c=Math.round(this.duration()),e=Math.round(b/c*100),d=f=0;99>=f;d=f+=o)e>=d&&a.call(n,d)<0&&(a.call(i,"start")>=0&&0===d&&e>0?u("start",!0):a.call(i,"percentsPlayed")>=0&&0!==e&&u("percent played",!0,d),e>0&&n.push(d));a.call(i,"seek")>=0&&(s=r,r=b,Math.abs(s-r)>1&&(t=!0,u("seek start",!1,s),u("seek end",!1,r)))},e=function(){u("end",!0)},p=function(){var a;a=Math.round(this.currentTime()),u("play",!0,a),t=!1},m=function(){var a,b;a=Math.round(this.currentTime()),b=Math.round(this.duration()),a===b||t||u("pause",!1,a)},w=function(){var a;a=this.muted()===!0?0:this.volume(),u("volume change",!1,a)},q=function(){u("resize - "+this.width()+"*"+this.height(),!0)},f=function(){var a;a=Math.round(this.currentTime()),u("error",!0,a)},j=function(){var a;a=Math.round(this.currentTime()),("function"==typeof this.isFullscreen?this.isFullscreen():void 0)||("function"==typeof this.isFullScreen?this.isFullScreen():void 0)?u("enter fullscreen",!1,a):u("exit fullscreen",!1,a)},u=function(a,c,d){window.ga?ga("send","event",{eventCategory:g,eventAction:a,eventLabel:h,eventValue:d,nonInteraction:c}):window._gaq?_gaq.push(["_trackEvent",g,a,h,d,c]):b.debug&&console.log("Google Analytics not detected")},this.ready(function(){return this.on("loadedmetadata",k),this.on("timeupdate",v),a.call(i,"end")>=0&&this.on("ended",e),a.call(i,"play")>=0&&this.on("play",p),a.call(i,"pause")>=0&&this.on("pause",m),a.call(i,"volumeChange")>=0&&this.on("volumechange",w),a.call(i,"resize")>=0&&this.on("resize",q),a.call(i,"error")>=0&&this.on("error",f),a.call(i,"fullscreen")>=0?this.on("fullscreenchange",j):void 0}),{sendbeacon:u}})}).call(this); \ No newline at end of file +(function(){var a=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};videojs.plugin("ga",function(b){var c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x;return null==b&&(b={}),c={},this.options()["data-setup"]&&(m=JSON.parse(this.options()["data-setup"]),m.ga&&(c=m.ga)),d=["loaded","percentsPlayed","start","end","seek","play","pause","resize","volumeChange","error","fullscreen"],i=b.eventsToTrack||c.eventsToTrack||d,p=b.percentsPlayedInterval||c.percentsPlayedInterval||10,g=b.eventCategory||c.eventCategory||"Video",h=b.eventLabel||c.eventLabel,b.debug=b.debug||!1,o=[],t=s=0,u=!1,k=function(){return"function"==typeof h?h():h},l=function(){h||(h=this.currentSrc().split("/").slice(-1)[0].replace(/\.(\w{3,4})(\?.*)?$/i,"")),a.call(i,"loadedmetadata")>=0&&v("loadedmetadata",!0)},w=function(){var b,c,d,e,f;for(b=Math.round(this.currentTime()),c=Math.round(this.duration()),e=Math.round(b/c*100),d=f=0;99>=f;d=f+=p)e>=d&&a.call(o,d)<0&&(a.call(i,"start")>=0&&0===d&&e>0?v("start",!0):a.call(i,"percentsPlayed")>=0&&0!==e&&v("percent played",!0,d),e>0&&o.push(d));a.call(i,"seek")>=0&&(t=s,s=b,Math.abs(t-s)>1&&(u=!0,v("seek start",!1,t),v("seek end",!1,s)))},e=function(){v("end",!0)},q=function(){var a;a=Math.round(this.currentTime()),v("play",!0,a),u=!1},n=function(){var a,b;a=Math.round(this.currentTime()),b=Math.round(this.duration()),a===b||u||v("pause",!1,a)},x=function(){var a;a=this.muted()===!0?0:this.volume(),v("volume change",!1,a)},r=function(){v("resize - "+this.width()+"*"+this.height(),!0)},f=function(){var a;a=Math.round(this.currentTime()),v("error",!0,a)},j=function(){var a;a=Math.round(this.currentTime()),("function"==typeof this.isFullscreen?this.isFullscreen():void 0)||("function"==typeof this.isFullScreen?this.isFullScreen():void 0)?v("enter fullscreen",!1,a):v("exit fullscreen",!1,a)},v=function(a,c,d){window.ga?ga("send","event",{eventCategory:g,eventAction:a,eventLabel:k(),eventValue:d,nonInteraction:c}):window._gaq?_gaq.push(["_trackEvent",g,a,k(),d,c]):b.debug&&console.log("Google Analytics not detected")},this.ready(function(){return this.on("loadedmetadata",l),this.on("timeupdate",w),a.call(i,"end")>=0&&this.on("ended",e),a.call(i,"play")>=0&&this.on("play",q),a.call(i,"pause")>=0&&this.on("pause",n),a.call(i,"volumeChange")>=0&&this.on("volumechange",x),a.call(i,"resize")>=0&&this.on("resize",r),a.call(i,"error")>=0&&this.on("error",f),a.call(i,"fullscreen")>=0?this.on("fullscreenchange",j):void 0}),{sendbeacon:v}})}).call(this); \ No newline at end of file diff --git a/src/videojs.ga.coffee b/src/videojs.ga.coffee index 495d4bb..c9ae5b0 100644 --- a/src/videojs.ga.coffee +++ b/src/videojs.ga.coffee @@ -33,6 +33,9 @@ videojs.plugin 'ga', (options = {}) -> seekStart = seekEnd = 0 seeking = false + getEventLabel = -> + return if typeof eventLabel is 'function' then eventLabel() else eventLabel + loaded = -> unless eventLabel eventLabel = @currentSrc().split("/").slice(-1)[0].replace(/\.(\w{3,4})(\?.*)?$/i,'') @@ -116,11 +119,11 @@ videojs.plugin 'ga', (options = {}) -> ga 'send', 'event', 'eventCategory' : eventCategory 'eventAction' : action - 'eventLabel' : eventLabel + 'eventLabel' : getEventLabel() 'eventValue' : value 'nonInteraction' : nonInteraction else if window._gaq - _gaq.push(['_trackEvent', eventCategory, action, eventLabel, value, nonInteraction]) + _gaq.push(['_trackEvent', eventCategory, action, getEventLabel(), value, nonInteraction]) else if options.debug console.log("Google Analytics not detected") return