From ae8159d7924cc00f7feebaa1d99cf4b32172a050 Mon Sep 17 00:00:00 2001
From: Daniel Jih <djih@stanford.edu>
Date: Thu, 29 Jun 2017 12:27:03 -0700
Subject: [PATCH 1/2] check sdk loaded properly before running queued functions

---
 amplitude-snippet.min.js       | 13 +++++++------
 src/amplitude-snippet.js       |  2 +-
 test/browser/amplitudejs.html  |  5 +++--
 test/browser/amplitudejs2.html |  5 +++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/amplitude-snippet.min.js b/amplitude-snippet.min.js
index b4f76ef5..7ddc4589 100644
--- a/amplitude-snippet.min.js
+++ b/amplitude-snippet.min.js
@@ -1,11 +1,12 @@
 (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-3.4.0-min.gz.js";
-r.onload=function(){e.amplitude.runQueuedFunctions()};var i=t.getElementsByTagName("script")[0];
-i.parentNode.insertBefore(r,i);function s(e,t){e.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
-return this}}var o=function(){this._q=[];return this};var a=["add","append","clearAll","prepend","set","setOnce","unset"];
-for(var u=0;u<a.length;u++){s(o,a[u])}n.Identify=o;var c=function(){this._q=[];return this;
-};var p=["setProductId","setQuantity","setPrice","setRevenueType","setEventProperties"];
-for(var l=0;l<p.length;l++){s(c,p[l])}n.Revenue=c;var d=["init","logEvent","logRevenue","setUserId","setUserProperties","setOptOut","setVersionName","setDomain","setDeviceId","setGlobalUserProperties","identify","clearUserProperties","setGroup","logRevenueV2","regenerateDeviceId","logEventWithTimestamp","logEventWithGroups"];
+r.onload=function(){if(e.amplitude.runQueuedFunctions){e.amplitude.runQueuedFunctions();
+}else{console.log("[Amplitude] Error: could not load SDK")}};var i=t.getElementsByTagName("script")[0];
+i.parentNode.insertBefore(r,i);function o(e,t){e.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
+return this}}var s=function(){this._q=[];return this};var a=["add","append","clearAll","prepend","set","setOnce","unset"];
+for(var u=0;u<a.length;u++){o(s,a[u])}n.Identify=s;var c=function(){this._q=[];return this;
+};var l=["setProductId","setQuantity","setPrice","setRevenueType","setEventProperties"];
+for(var p=0;p<l.length;p++){o(c,l[p])}n.Revenue=c;var d=["init","logEvent","logRevenue","setUserId","setUserProperties","setOptOut","setVersionName","setDomain","setDeviceId","setGlobalUserProperties","identify","clearUserProperties","setGroup","logRevenueV2","regenerateDeviceId","logEventWithTimestamp","logEventWithGroups"];
 function v(e){function t(t){e[t]=function(){e._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
 }}for(var n=0;n<d.length;n++){t(d[n])}}v(n);n.getInstance=function(e){e=(!e||e.length===0?"$default_instance":e).toLowerCase();
 if(!n._iq.hasOwnProperty(e)){n._iq[e]={_q:[]};v(n._iq[e])}return n._iq[e]};e.amplitude=n;
diff --git a/src/amplitude-snippet.js b/src/amplitude-snippet.js
index a9304334..df1c4fa6 100644
--- a/src/amplitude-snippet.js
+++ b/src/amplitude-snippet.js
@@ -4,7 +4,7 @@
   as.type = 'text/javascript';
   as.async = true;
   as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-3.4.0-min.gz.js';
-  as.onload = function() {window.amplitude.runQueuedFunctions();};
+  as.onload = function() {if(window.amplitude.runQueuedFunctions) {window.amplitude.runQueuedFunctions();} else {console.log('[Amplitude] Error: could not load SDK');}};
   var s = document.getElementsByTagName('script')[0];
   s.parentNode.insertBefore(as, s);
   function proxy(obj, fn) {
diff --git a/test/browser/amplitudejs.html b/test/browser/amplitudejs.html
index a7458d9e..8448043d 100644
--- a/test/browser/amplitudejs.html
+++ b/test/browser/amplitudejs.html
@@ -6,8 +6,8 @@
       var as = document.createElement('script');
       as.type = 'text/javascript';
       as.async = true;
-      as.src = '/amplitude.js';
-      as.onload = function() {window.amplitude.runQueuedFunctions();};
+      as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-3.4.0-min.gz.js';
+      as.onload = function() {if(window.amplitude.runQueuedFunctions) {window.amplitude.runQueuedFunctions();} else {console.log('[Amplitude] Error: could not load SDK');}};
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(as, s);
       function proxy(obj, fn) {
@@ -47,6 +47,7 @@
       window.amplitude = amplitude;
     })(window, document);
 
+
     var setUserId = function() {
         var userId = prompt('Input userId', 'user01');
         amplitude.setUserId(userId);
diff --git a/test/browser/amplitudejs2.html b/test/browser/amplitudejs2.html
index 687d58a3..5257c75f 100644
--- a/test/browser/amplitudejs2.html
+++ b/test/browser/amplitudejs2.html
@@ -6,8 +6,8 @@
       var as = document.createElement('script');
       as.type = 'text/javascript';
       as.async = true;
-      as.src = '/amplitude.js';
-      as.onload = function() {window.amplitude.runQueuedFunctions();};
+      as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-3.4.0-min.gz.js';
+      as.onload = function() {if(window.amplitude.runQueuedFunctions) {window.amplitude.runQueuedFunctions();} else {console.log('[Amplitude] Error: could not load SDK');}};
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(as, s);
       function proxy(obj, fn) {
@@ -47,6 +47,7 @@
       window.amplitude = amplitude;
     })(window, document);
 
+
     var setUserId = function() {
         var userId = prompt('Input userId', 'user01');
         amplitude.setUserId(userId);

From 25d6264b78e462333785c489cc0d8bf0799bf65c Mon Sep 17 00:00:00 2001
From: Daniel Jih <djih@stanford.edu>
Date: Thu, 29 Jun 2017 12:40:32 -0700
Subject: [PATCH 2/2] switch tests back to local script file

---
 test/browser/amplitudejs.html  | 2 +-
 test/browser/amplitudejs2.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/browser/amplitudejs.html b/test/browser/amplitudejs.html
index 8448043d..4c60be84 100644
--- a/test/browser/amplitudejs.html
+++ b/test/browser/amplitudejs.html
@@ -6,7 +6,7 @@
       var as = document.createElement('script');
       as.type = 'text/javascript';
       as.async = true;
-      as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-3.4.0-min.gz.js';
+      as.src = '/amplitude.js';
       as.onload = function() {if(window.amplitude.runQueuedFunctions) {window.amplitude.runQueuedFunctions();} else {console.log('[Amplitude] Error: could not load SDK');}};
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(as, s);
diff --git a/test/browser/amplitudejs2.html b/test/browser/amplitudejs2.html
index 5257c75f..0c727cdf 100644
--- a/test/browser/amplitudejs2.html
+++ b/test/browser/amplitudejs2.html
@@ -6,7 +6,7 @@
       var as = document.createElement('script');
       as.type = 'text/javascript';
       as.async = true;
-      as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-3.4.0-min.gz.js';
+      as.src = '/amplitude.js';
       as.onload = function() {if(window.amplitude.runQueuedFunctions) {window.amplitude.runQueuedFunctions();} else {console.log('[Amplitude] Error: could not load SDK');}};
       var s = document.getElementsByTagName('script')[0];
       s.parentNode.insertBefore(as, s);