Merge branch 'v0.6'

robflaherty · Jun 13, 2015 · acbd07a · acbd07a
2 parents a01f382 + ecdfdb6
commit acbd07a
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "riveted",
   "main": "riveted.js",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "homepage": "http://riveted.parsnip.io/",
   "authors": [
     "Rob Flaherty"

diff --git a/readme.md b/readme.md
@@ -37,6 +37,8 @@ If you have any questions you can find me on Twitter at [@robflaherty](https://t
 
 ## Changelog
 
+0.6.0 (6/12/15): Added reset method and option for custom GA tracker.
+
 0.5.0 (4/14/15): Option for custom GA global name. Fixes problem with Yoast WP plugin.
 
 0.4.0 (7/19/14): https://github.com/robflaherty/riveted/issues/10

diff --git a/riveted.js b/riveted.js
@@ -1,6 +1,6 @@
 /*!
  * @preserve
- * riveted.js | v0.5.0
+ * riveted.js | v0.6.0
  * Copyright (c) 2015 Rob Flaherty (@robflaherty)
  * Licensed under the MIT license
  */
@@ -21,6 +21,7 @@ var riveted = (function() {
       nonInteraction,
       universalGA,
       classicGA,
+      universalSendCommand,
       googleTagManager,
       gaGlobal;
 
@@ -49,13 +50,18 @@ var riveted = (function() {
         googleTagManager = true;
       }
 
+      if ('tracker' in options && typeof options.tracker === 'string') {
+        universalSendCommand = options.tracker + '.send';
+      } else {
+        universalSendCommand = 'send';
+      }
 
       if (typeof options.eventHandler == 'function') {
-          sendEvent = options.eventHandler;
+        sendEvent = options.eventHandler;
       }
 
       if (typeof options.userTimingHandler == 'function') {
-          sendUserTiming = options.userTimingHandler;
+        sendUserTiming = options.userTimingHandler;
       }
 
       if ('nonInteraction' in options && (options.nonInteraction === false || options.nonInteraction === 'false')) {
@@ -140,7 +146,7 @@ var riveted = (function() {
       } else {
 
         if (universalGA) {
-          window[gaGlobal]('send', 'timing', 'Riveted', 'First Interaction', timingValue);
+          window[gaGlobal](universalSendCommand, 'timing', 'Riveted', 'First Interaction', timingValue);
         }
 
         if (classicGA) {
@@ -164,7 +170,7 @@ var riveted = (function() {
       } else {
 
         if (universalGA) {
-          window[gaGlobal]('send', 'event', 'Riveted', 'Time Spent', time.toString(), reportInterval, {'nonInteraction': nonInteraction});
+          window[gaGlobal](universalSendCommand, 'event', 'Riveted', 'Time Spent', time.toString(), reportInterval, {'nonInteraction': nonInteraction});
         }
 
         if (classicGA) {
@@ -231,6 +237,15 @@ var riveted = (function() {
 
     }
 
+    function resetRiveted() {
+      startTime = new Date();
+      clockTime = 0;
+      started = false;
+      stopped = false;
+      clearTimeout(clockTimer);
+      clearTimeout(idleTimer);
+    }
+
     function trigger() {
 
       if (turnedOff) {
@@ -254,7 +269,8 @@ var riveted = (function() {
       trigger: trigger,
       setIdle: setIdle,
       on: turnOn,
-      off: turnOff
+      off: turnOff,
+      reset: resetRiveted
     };
 
   })();
diff --git a/riveted.min.js b/riveted.min.js
diff --git a/test/test.html b/test/test.html
@@ -14,7 +14,12 @@
   };
 
   var __gaTracker = function(params) {
-    var args = Array.prototype.slice.call(arguments, 1);
+    var args = Array.prototype.slice.call(arguments, 0);
+    console.log("__gaTracker(" + args.join(',') + ");");
+  };
+
+  var ga = function(params) {
+    var args = Array.prototype.slice.call(arguments, 0);
     console.log("ga(" + args.join(',') + ");");
   };
 
@@ -29,7 +34,8 @@
       reportInterval: 2,
       idleTimeout: 5,
       nonInteraction: false,
-      gaGlobal: '__gaTracker'
+      //gaGlobal: '__gaTracker',
+      tracker: 'fooo'
 
       /*eventHandler: function(event) {
         console.log(event);