revert snippet and browser tests

djih · djih · commit 3ab68092c8aa · 2016-03-15T18:30:21.000-07:00
diff --git a/README.md b/README.md
@@ -9,17 +9,15 @@ Amplitude-Javascript
 
     ```html
         <script type="text/javascript">
-          (function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=t.createElement("script");r.type="text/javascript";
-          r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.0-min.gz.js";
+          (function(e,t){var n=e.amplitude||{_q:[]};var r=t.createElement("script");r.type="text/javascript";
+          r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.1-min.gz.js";
           r.onload=function(){e.amplitude.runQueuedFunctions()};var i=t.getElementsByTagName("script")[0];
           i.parentNode.insertBefore(r,i);var s=function(){this._q=[];return this};function o(e){
           s.prototype[e]=function(){this._q.push([e].concat(Array.prototype.slice.call(arguments,0)));
           return this}}var a=["add","append","clearAll","set","setOnce","unset"];for(var c=0;c<a.length;c++){
           o(a[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||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);
+          }}for(var n=0;n<u.length;n++){t(u[n])}}l(n);e.amplitude=n})(window,document);
 
           amplitude.init("YOUR_API_KEY_HERE");
         </script>
diff --git a/amplitude-segment-snippet.min.js b/amplitude-segment-snippet.min.js
@@ -1,8 +1,6 @@
-(function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=function(){this._q=[];return this;
+(function(e,t){var n=e.amplitude||{_q:[]};var r=function(){this._q=[];return this;
 };function i(e){r.prototype[e]=function(){this._q.push([e].concat(Array.prototype.slice.call(arguments,0)));
 return this}}var o=["add","append","clearAll","set","setOnce","unset"];for(var s=0;s<o.length;s++){
 i(o[s])}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||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);
+}}for(var n=0;n<a.length;n++){t(a[n])}}c(n);e.amplitude=n})(window,document);
diff --git a/amplitude-snippet.min.js b/amplitude-snippet.min.js
@@ -1,11 +1,9 @@
-(function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=t.createElement("script");r.type="text/javascript";
-r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.0-min.gz.js";
+(function(e,t){var n=e.amplitude||{_q:[]};var r=t.createElement("script");r.type="text/javascript";
+r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.1-min.gz.js";
 r.onload=function(){e.amplitude.runQueuedFunctions()};var i=t.getElementsByTagName("script")[0];
 i.parentNode.insertBefore(r,i);var s=function(){this._q=[];return this};function o(e){
 s.prototype[e]=function(){this._q.push([e].concat(Array.prototype.slice.call(arguments,0)));
 return this}}var a=["add","append","clearAll","set","setOnce","unset"];for(var c=0;c<a.length;c++){
 o(a[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||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);
+}}for(var n=0;n<u.length;n++){t(u[n])}}l(n);e.amplitude=n})(window,document);
diff --git a/amplitude.js b/amplitude.js
@@ -3810,7 +3810,6 @@ module.exports = {
   batchEvents: false,
   eventUploadThreshold: 30,
   eventUploadPeriodMillis: 30 * 1000, // 30s
-  newBlankInstance: false
 };
 
 }, {"./language":26}],
diff --git a/amplitude.min.js b/amplitude.min.js
diff --git a/src/amplitude-snippet.js b/src/amplitude-snippet.js
@@ -1,9 +1,9 @@
 (function(window, document) {
-  var amplitude = window.amplitude || {'_q':[], '_iq':{}};
+  var amplitude = window.amplitude || {'_q':[]};
   var as = document.createElement('script');
   as.type = 'text/javascript';
   as.async = true;
-  as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.0-min.gz.js';
+  as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.1-min.gz.js';
   as.onload = function() {window.amplitude.runQueuedFunctions();};
   var s = document.getElementsByTagName('script')[0];
   s.parentNode.insertBefore(as, s);
@@ -28,12 +28,5 @@
     for (var j = 0; j < funcs.length; j++) {proxy(funcs[j]);}
   }
   setUpProxy(amplitude);
-  amplitude.getInstance = function(instance) {
-    instance = ((!instance || instance.length === 0) ? '$default_instance' : instance).toLowerCase();
-    if (!amplitude._iq.hasOwnProperty(instance)) {
-      amplitude._iq[instance] = {'_q':[]}; setUpProxy(amplitude._iq[instance]);
-    }
-    return amplitude._iq[instance];
-  };
   window.amplitude = amplitude;
 })(window, document);
diff --git a/src/options.js b/src/options.js
@@ -19,5 +19,4 @@ module.exports = {
   batchEvents: false,
   eventUploadThreshold: 30,
   eventUploadPeriodMillis: 30 * 1000, // 30s
-  newBlankInstance: false
 };
diff --git a/test/browser/amplitudejs-requirejs.html b/test/browser/amplitudejs-requirejs.html
@@ -4,7 +4,7 @@
 <script>
     requirejs.config({
       paths: {
-        'amplitude': 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.0-min.gz'
+        'amplitude': 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.1-min.gz'
       }
     });
 
diff --git a/test/browser/amplitudejs.html b/test/browser/amplitudejs.html
@@ -2,7 +2,7 @@
 <!--<script src="src/amplitude-snippet.js" type="text/javascript"></script>-->
 <script>
     (function(window, document) {
-      var amplitude = window.amplitude || {'_q':[], '_iq':{}};
+      var amplitude = window.amplitude || {'_q':[]};
       var as = document.createElement('script');
       as.type = 'text/javascript';
       as.async = true;
@@ -31,13 +31,6 @@
         for (var j = 0; j < funcs.length; j++) {proxy(funcs[j]);}
       }
       setUpProxy(amplitude);
-      amplitude.getInstance = function(instance) {
-        instance = ((!instance || instance.length === 0) ? '$default_instance' : instance).toLowerCase();
-        if (!amplitude._iq.hasOwnProperty(instance)) {
-          amplitude._iq[instance] = {'_q':[]}; setUpProxy(amplitude._iq[instance]);
-        }
-        return amplitude._iq[instance];
-      };
       window.amplitude = amplitude;
     })(window, document);
 
@@ -81,19 +74,6 @@
     amplitude.identify(new amplitude.Identify().add('photoCount', 1));
     amplitude.identify(new amplitude.Identify().add('photoCount', 1).set('gender', 'male').unset('karma'));
     amplitude.logEvent('pageLoad');
-
-    amplitude.getInstance('app2').logEvent('log event before init');
-    amplitude.getInstance('app2').init('1d2fe1e104eb3f07a24e94d359f70fd5', 'checkers@gmail.com', {includeReferrer: true}, function() {
-        alert(amplitude.getInstance('app2').options.deviceId);
-    });
-    amplitude.getInstance('app2').identify(new amplitude.Identify().set('key', 'value'));
-    amplitude.getInstance('app2').logEvent('app 2 page load');
-
-    amplitude.getInstance('app3').init('a2dbce0e18dfe5f8e74493843ff5c053', null, {batchEvents: true, eventUploadThreshold: 2});
-    amplitude.getInstance('app3').logEvent('app3 pageLoad');
-
-    amplitude.getInstance('app4').init('1d2fe1e104eb3f07a24e94d359f70fd5', 'joe@gmail.com');
-    amplitude.getInstance('app4').logEvent('app 4 page load');
 </script>
 <body>
 <h3>Amplitude JS Test</h3>
diff --git a/test/browser/amplitudejs2.html b/test/browser/amplitudejs2.html
@@ -2,7 +2,7 @@
 <!--<script src="src/amplitude-snippet.js" type="text/javascript"></script>-->
 <script>
     (function(window, document) {
-      var amplitude = window.amplitude || {'_q':[], '_iq':{}};
+      var amplitude = window.amplitude || {'_q':[]};
       var as = document.createElement('script');
       as.type = 'text/javascript';
       as.async = true;
@@ -31,16 +31,10 @@
         for (var j = 0; j < funcs.length; j++) {proxy(funcs[j]);}
       }
       setUpProxy(amplitude);
-      amplitude.getInstance = function(instance) {
-        instance = ((!instance || instance.length === 0) ? '$default_instance' : instance).toLowerCase();
-        if (!amplitude._iq.hasOwnProperty(instance)) {
-          amplitude._iq[instance] = {'_q':[]}; setUpProxy(amplitude._iq[instance]);
-        }
-        return amplitude._iq[instance];
-      };
       window.amplitude = amplitude;
     })(window, document);
 
+
     var setUserId = function() {
         var userId = prompt('Input userId', 'user01');
         amplitude.setUserId(userId);
@@ -75,7 +69,7 @@
 </script>
 <script>
     amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true}, function() {
-        alert(amplitude.getInstance().options.deviceId);
+        alert(amplitude.options.deviceId);
     });
     amplitude.setVersionName('Web');
     amplitude.identify(new amplitude.Identify().add('photoCount', 1));
diff --git a/test/snippet-tests.js b/test/snippet-tests.js
@@ -24,24 +24,4 @@ describe('Snippet', function() {
     assert.deepEqual(identify._q[2], ['add', 'key3', 2]);
     assert.deepEqual(identify._q[3], ['setOnce', 'key4', 'value2']);
   });
-
-  it('amplitude object should proxy instance functions', function() {
-    amplitude.getInstance(null).init('API_KEY');
-    amplitude.getInstance('$DEFAULT_instance').logEvent('Click');
-    amplitude.getInstance('').clearUserProperties();
-    amplitude.getInstance('INSTANCE1').init('API_KEY1');
-    amplitude.getInstance('instanCE2').init('API_KEY2');
-    amplitude.getInstance('instaNce2').logEvent('Event');
-
-    assert.deepEqual(Object.keys(amplitude._iq), ['$default_instance', 'instance1', 'instance2']);
-    assert.lengthOf(amplitude._iq['$default_instance']._q, 3);
-    assert.deepEqual(amplitude._iq['$default_instance']._q[0], ['init', 'API_KEY']);
-    assert.deepEqual(amplitude._iq['$default_instance']._q[1], ['logEvent', 'Click']);
-    assert.deepEqual(amplitude._iq['$default_instance']._q[2], ['clearUserProperties']);
-    assert.lengthOf(amplitude._iq['instance1']._q, 1);
-    assert.deepEqual(amplitude._iq['instance1']._q[0], ['init', 'API_KEY1']);
-    assert.lengthOf(amplitude._iq['instance2']._q, 2);
-    assert.deepEqual(amplitude._iq['instance2']._q[0], ['init', 'API_KEY2']);
-    assert.deepEqual(amplitude._iq['instance2']._q[1], ['logEvent', 'Event']);
-  });
 });

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`<script>`
`5`	`5`	`requirejs.config({`
`6`	`6`	`paths: {`
`7`		`- 'amplitude': 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.0-min.gz'`
	`7`	`+ 'amplitude': 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.9.1-min.gz'`
`8`	`8`	`}`
`9`	`9`	`});`
`10`	`10`