Merge branch 'master' of github.com:danwilson/google-analytics-plugin

tgensol · Dec 7, 2016 · 497cd79 · 497cd79
2 parents 99b1fe5 + bce495d
commit 497cd79
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/browser/UniversalAnalyticsProxy.js b/browser/UniversalAnalyticsProxy.js
@@ -156,7 +156,7 @@ UniversalAnalyticsProxy.prototype = {
     });
   },
 
-  _ensureEcommerce() {
+  _ensureEcommerce: function() {
     if (this._isEcommerceRequired) return;
     this._ga('require', 'ecommerce');
     this._isEcommerceRequired = true;
@@ -185,7 +185,7 @@ function send(fn) {
 }
 
 function bindAll(that, names) {
-  names.forEach((name) => {
+  names.forEach(function(name) {
     if (typeof that[name] === 'function') {
       that[name] = that[name].bind(that);
     }
@@ -195,7 +195,6 @@ function bindAll(that, names) {
 function loadGoogleAnalytics(name) {
   window['GoogleAnalyticsObject'] = name;
   window[name] = window[name] || function () {
-    console.log(arguments);
     (window[name].q = window[name].q || []).push(arguments)
   };
   var script = document.createElement('script');

diff --git a/ios/UniversalAnalyticsPlugin.m b/ios/UniversalAnalyticsPlugin.m
@@ -52,11 +52,15 @@ - (void) setAllowIDFACollection: (CDVInvokedUrlCommand*) command
 - (void) addCustomDimensionsToTracker: (id<GAITracker>)tracker
 {
     if (_customDimensions) {
-      for (NSNumber *key in _customDimensions) {
+      for (NSString *key in _customDimensions.allKeys) {
         NSString *value = [_customDimensions objectForKey:key];
 
+        NSNumberFormatter *f = [[NSNumberFormatter alloc] init];
+        f.numberStyle = NSNumberFormatterDecimalStyle;
+        NSNumber *myKey = [f numberFromString:@"42"];
+
         /* NSLog(@"Setting tracker dimension slot %@: <%@>", key, value); */
-        [tracker set:[GAIFields customDimensionForIndex:[key intValue]]
+        [tracker set:[GAIFields customDimensionForIndex:myKey.unsignedIntegerValue]
         value:value];
       }
     }
@@ -159,14 +163,14 @@ - (void) enableUncaughtExceptionReporting: (CDVInvokedUrlCommand*)command
 - (void) addCustomDimension: (CDVInvokedUrlCommand*)command
 {
     CDVPluginResult* pluginResult = nil;
-    NSString* key = [command.arguments objectAtIndex:0];
+    NSNumber* key = [command.arguments objectAtIndex:0];
     NSString* value = [command.arguments objectAtIndex:1];
 
     if ( ! _customDimensions) {
       _customDimensions = [[NSMutableDictionary alloc] init];
     }
 
-    _customDimensions[key] = value;
+    _customDimensions[key.stringValue] = value;
 
     pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];

diff --git a/www/analytics.js b/www/analytics.js
@@ -49,6 +49,9 @@ UniversalAnalyticsPlugin.prototype.trackView = function(screen, campaingUrl, new
 };
 
 UniversalAnalyticsPlugin.prototype.addCustomDimension = function(key, value, success, error) {
+  if (typeof key !== "number") {
+    throw Error("key must be a valid integer not '" + typeof key + "'");
+  }
   cordova.exec(success, error, 'UniversalAnalytics', 'addCustomDimension', [key, value]);
 };