fix snippet

Author: djih

README.md

@@ -17,7 +17,7 @@ Amplitude-Javascript
           return this}}var o=["add","append","clearAll","set","setOnce","unset"];for(var c=0;c<o.length;c++){
           a(o[c])}n.Identify=s;var u=["init","logEvent","logRevenue","setUserId","setUserProperties","setOptOut","setVersionName","setDomain","setDeviceId","setGlobalUserProperties","identify","clearUserProperties"];
           function l(e){function t(t){e[t]=function(){e._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
-          }}for(var n=0;n<u.length;n++){t(u[n])}}l(n);n.getInstance=function(e){e=e||"$defaultInstance";
+          }}for(var n=0;n<u.length;n++){t(u[n])}}l(n);n.getInstance=function(e){e=(!e||e.length===0?"$default_instance":e).toLowerCase();
           if(!n._iq.hasOwnProperty(e)){n._iq[e]={_q:[]};l(n._iq[e])}return n._iq[e]};e.amplitude=n;
           })(window,document);
 

amplitude-segment-snippet.min.js

@@ -3,6 +3,6 @@
 return this}}var s=["add","append","clearAll","set","setOnce","unset"];for(var o=0;o<s.length;o++){
 i(s[o])}n.Identify=r;var a=["init","logEvent","logRevenue","setUserId","setUserProperties","setOptOut","setVersionName","setDomain","setDeviceId","setGlobalUserProperties","identify","clearUserProperties"];
 function c(e){function t(t){e[t]=function(){e._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
-}}for(var n=0;n<a.length;n++){t(a[n])}}c(n);n.getInstance=function(e){e=e||"$defaultInstance";
+}}for(var n=0;n<a.length;n++){t(a[n])}}c(n);n.getInstance=function(e){e=(!e||e.length===0?"$default_instance":e).toLowerCase();
 if(!n._iq.hasOwnProperty(e)){n._iq[e]={_q:[]};c(n._iq[e])}return n._iq[e]};e.amplitude=n;
 })(window,document);

amplitude-snippet.min.js

@@ -6,6 +6,6 @@ s.prototype[e]=function(){this._q.push([e].concat(Array.prototype.slice.call(arg
 return this}}var o=["add","append","clearAll","set","setOnce","unset"];for(var c=0;c<o.length;c++){
 a(o[c])}n.Identify=s;var u=["init","logEvent","logRevenue","setUserId","setUserProperties","setOptOut","setVersionName","setDomain","setDeviceId","setGlobalUserProperties","identify","clearUserProperties"];
 function l(e){function t(t){e[t]=function(){e._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
-}}for(var n=0;n<u.length;n++){t(u[n])}}l(n);n.getInstance=function(e){e=e||"$defaultInstance";
+}}for(var n=0;n<u.length;n++){t(u[n])}}l(n);n.getInstance=function(e){e=(!e||e.length===0?"$default_instance":e).toLowerCase();
 if(!n._iq.hasOwnProperty(e)){n._iq[e]={_q:[]};l(n._iq[e])}return n._iq[e]};e.amplitude=n;
 })(window,document);

amplitude.js

@@ -123,10 +123,7 @@ var Amplitude = function() {
 };
 
 Amplitude.prototype.getInstance = function(instance) {
-  if (utils.isEmptyString(instance)) {
-    instance = DEFAULT_INSTANCE;
-  }
-  instance = instance.toLowerCase();
+  instance = (utils.isEmptyString(instance) ? DEFAULT_INSTANCE : instance).toLowerCase();
 
   var client = this._instances[instance];
   if (client === undefined) {
@@ -295,10 +292,7 @@ var LocalStorageKeys = {
  * AmplitudeClient API
  */
 var AmplitudeClient = function(instanceName) {
-  if (utils.isEmptyString(instanceName)) {
-    instanceName = DEFAULT_INSTANCE;
-  }
-  this._instanceName = instanceName.toLowerCase();
+  this._instanceName = (utils.isEmptyString(instanceName) ? DEFAULT_INSTANCE : instanceName).toLowerCase();
   this._storageSuffix = this._instanceName === DEFAULT_INSTANCE ? '' : '_' + this._instanceName;
   this._unsentEvents = [];
   this._unsentIdentifys = [];
@@ -640,7 +634,15 @@ AmplitudeClient.prototype._saveReferrer = function(referrer) {
   identify.setOnce('initial_referring_domain', referring_domain);
 
   // only save referrer if not already in session storage or if storage disabled
-  var hasSessionStorage = sessionStorage ? true : false;
+  var hasSessionStorage = false;
+  try {
+    if (window.sessionStorage) {
+      hasSessionStorage = true;
+    }
+  } catch (e) {
+    // log(e); // sessionStorage disabled
+  }
+
   if ((hasSessionStorage && !(this._getFromStorage(sessionStorage, LocalStorageKeys.REFERRER))) || !hasSessionStorage) {
     identify.set('referrer', referrer).set('referring_domain', referring_domain);
 

amplitude.min.js

@@ -43,10 +43,7 @@ var LocalStorageKeys = {
  * AmplitudeClient API
  */
 var AmplitudeClient = function(instanceName) {
-  if (utils.isEmptyString(instanceName)) {
-    instanceName = DEFAULT_INSTANCE;
-  }
-  this._instanceName = instanceName.toLowerCase();
+  this._instanceName = (utils.isEmptyString(instanceName) ? DEFAULT_INSTANCE : instanceName).toLowerCase();
   this._storageSuffix = this._instanceName === DEFAULT_INSTANCE ? '' : '_' + this._instanceName;
   this._unsentEvents = [];
   this._unsentIdentifys = [];
@@ -388,7 +385,15 @@ AmplitudeClient.prototype._saveReferrer = function(referrer) {
   identify.setOnce('initial_referring_domain', referring_domain);
 
   // only save referrer if not already in session storage or if storage disabled
-  var hasSessionStorage = sessionStorage ? true : false;
+  var hasSessionStorage = false;
+  try {
+    if (window.sessionStorage) {
+      hasSessionStorage = true;
+    }
+  } catch (e) {
+    // log(e); // sessionStorage disabled
+  }
+
   if ((hasSessionStorage && !(this._getFromStorage(sessionStorage, LocalStorageKeys.REFERRER))) || !hasSessionStorage) {
     identify.set('referrer', referrer).set('referring_domain', referring_domain);
 

src/amplitude-client.js

@@ -29,7 +29,7 @@
   }
   setUpProxy(amplitude);
   amplitude.getInstance = function(instance) {
-    instance = instance || '$defaultInstance';
+    instance = ((!instance || instance.length === 0) ? '$default_instance' : instance).toLowerCase();
     if (!amplitude._iq.hasOwnProperty(instance)) {
       amplitude._iq[instance] = {'_q':[]}; setUpProxy(amplitude._iq[instance]);
     }

src/amplitude-snippet.js

@@ -14,10 +14,7 @@ var Amplitude = function() {
 };
 
 Amplitude.prototype.getInstance = function(instance) {
-  if (utils.isEmptyString(instance)) {
-    instance = DEFAULT_INSTANCE;
-  }
-  instance = instance.toLowerCase();
+  instance = (utils.isEmptyString(instance) ? DEFAULT_INSTANCE : instance).toLowerCase();
 
   var client = this._instances[instance];
   if (client === undefined) {

src/amplitude.js

@@ -32,7 +32,7 @@
       }
       setUpProxy(amplitude);
       amplitude.getInstance = function(instance) {
-        instance = instance || '$defaultInstance';
+        instance = ((!instance || instance.length === 0) ? '$default_instance' : instance).toLowerCase();
         if (!amplitude._iq.hasOwnProperty(instance)) {
           amplitude._iq[instance] = {'_q':[]}; setUpProxy(amplitude._iq[instance]);
         }

test/browser/amplitudejs.html

@@ -32,7 +32,7 @@
       }
       setUpProxy(amplitude);
       amplitude.getInstance = function(instance) {
-        instance = instance || '$defaultInstance';
+        instance = ((!instance || instance.length === 0) ? '$default_instance' : instance).toLowerCase();
         if (!amplitude._iq.hasOwnProperty(instance)) {
           amplitude._iq[instance] = {'_q':[]}; setUpProxy(amplitude._iq[instance]);
         }