Merge pull request #114 from filionf/browser-update

Browser update

Author: samzilverberg

src/browser/MixpanelProxy.js

@@ -36,9 +36,11 @@ function on_mixpanel_loaded(callback) {
       else return false;
     }
 
+    // The original_alias function from MixPanel calls the track and identify functions, which have been changed by this library.
+    // In version 2.39, if the result is smaller than 0, an error occured.
     var r = mixpanel.original_alias(alias, originalId);
 
-    if (typeof r !== "object" || typeof r.properties !== "object") {
+    if (r < 0) {
       if (onFail && typeof onFail === 'function')
         return onFail(errors.invalid('alias', alias));
     } else {
@@ -72,25 +74,22 @@ function on_mixpanel_loaded(callback) {
 
 
 
-  // IDENTITY
+  // IDENTIFY
+  // usePeople is not used. people.identify does not exists in mixpanel-js
   mixpanel.original_identify = mixpanel.identify;
-  mixpanel.identify = function(unique_id, onSuccess, onFail) {
+  mixpanel.identify = function(unique_id, usePeople, onSuccess, onFail) {
 
     if (!unique_id || typeof unique_id !== 'string') {
       if (onFail && typeof onFail === 'function')
         return onFail(errors.invalid('unique_id', unique_id));
       else return false;
     }
 
-    mixpanel.original_identify(unique_id, function(r) {
-      if (typeof r !== "object" || typeof r.properties !== "object") {
-        if (onFail && typeof onFail === 'function')
-          return onFail(errors.invalid('identify', unique_id));
-      } else {
-        if (onSuccess && typeof onSuccess === 'function')
-          return onSuccess();
-      }
-    });
+    mixpanel.original_identify(unique_id);
+    if (onSuccess && typeof onSuccess === 'function')
+      return onSuccess();
+
+    return true;
   };
 
   // registerSuperProperties
@@ -134,7 +133,7 @@ function on_mixpanel_loaded(callback) {
 
   };
 
-  mixpanel.people.original_identify = mixpanel.people.identify;
+  // @deprecated. people.identify does not exists in the mixpanel-js library.
   mixpanel.people.identify = function(distinctId, onSuccess, onFail) {
     return mixpanel.original_identify(distinctId, onSuccess, onFail);
   };
@@ -148,7 +147,7 @@ function on_mixpanel_loaded(callback) {
     }
 
     mixpanel.people.original_set(peopleProperties, function(r) {
-      if (typeof r !== "object") {
+      if (r !== 1) {
         if (onFail && typeof onFail === 'function')
           return onFail(errors.invalid('people.set', peopleProperties));
       } else {