Cherry pick onInit function from 5.0.0

CHANGELOG.md

@@ -1,4 +1,20 @@
-### 4.6.0 (February 25, 2018)
+### 5.0.0 (Unreleased)
+
+* Add `onInit` method that accepts a callback that will be invoked after init
+* Allow for api endpoints that do not end with a trailing slash
+* Sync with upstream ua-parser for user agent parsing
+* Upgrade rollup/babel dependencies
+
+## Breaking Changes
+* Drop JSON polyfill. This will break IE 7 and older. You can install your own JSON polyfill before loading amplitude.
+* Stop committing generated files to the master branch in the git repository (do not install amplitude from git).
+* Drop custom user agent parsing for symbian and blackberry
+
+### 4.7.0 (March 12, 2019)
+
+* Cherry-picked from 5.0.0: Add `onInit` method that accepts a callback that will be invoked after init
+
+### 4.6.0 (February 25, 2019)
 
 * Add support for unsetting utm params when a new session is created
 * Update dependencies to pass yarn audit

README.md

@@ -11,7 +11,7 @@ Please see our [installation guide](https://amplitude.zendesk.com/hc/en-us/artic
 [![npm version](https://badge.fury.io/js/amplitude-js.svg)](https://badge.fury.io/js/amplitude-js)
 [![Bower version](https://badge.fury.io/bo/amplitude-js.svg)](https://badge.fury.io/bo/amplitude-js)
 
-[4.6.0 - Released on February 25, 2019](https://github.com/amplitude/Amplitude-JavaScript/releases/latest)
+[4.7.0 - Released on March 12, 2019](https://github.com/amplitude/Amplitude-JavaScript/releases/latest)
 
 
 # JavaScript SDK Reference #

amplitude-snippet.min.js

@@ -1,6 +1,6 @@
 (function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=t.createElement("script")
 ;r.type="text/javascript";r.async=true
-;r.src="https://cdn.amplitude.com/libs/amplitude-4.6.0-min.gz.js"
+;r.src="https://cdn.amplitude.com/libs/amplitude-4.7.0-min.gz.js"
 ;r.onload=function(){if(e.amplitude.runQueuedFunctions){
 e.amplitude.runQueuedFunctions()}else{
 console.log("[Amplitude] Error: could not load SDK")}}

amplitude.js

@@ -3801,7 +3801,7 @@ var uuid = function uuid(a) {
     );
 };
 
-var version = '4.6.0';
+var version = '4.7.0';
 
 var getLanguage = function getLanguage() {
     return navigator && (navigator.languages && navigator.languages[0] || navigator.language || navigator.userLanguage) || undefined;
@@ -3871,6 +3871,7 @@ var AmplitudeClient = function AmplitudeClient(instanceName) {
   this._q = []; // queue for proxied functions before script load
   this._sending = false;
   this._updateScheduled = false;
+  this._onInit = [];
 
   // event meta data
   this._eventId = 0;
@@ -3983,6 +3984,10 @@ AmplitudeClient.prototype.init = function init(apiKey, opt_userId, opt_config, o
       opt_callback(this);
     }
   }
+
+  for (var _i = 0; _i < this._onInit.length; _i++) {
+    this._onInit[_i]();
+  }
 };
 
 /**
@@ -4118,6 +4123,14 @@ AmplitudeClient.prototype.isNewSession = function isNewSession() {
   return this._newSession;
 };
 
+/**
+ * Store callbacks to call after init
+ * @private
+ */
+AmplitudeClient.prototype.onInit = function (callback) {
+  this._onInit.push(callback);
+};
+
 /**
  * Returns the id of the current session.
  * @public

package.json

@@ -1,7 +1,7 @@
 {
   "name": "amplitude-js",
   "author": "Amplitude <[email protected]>",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "license": "MIT",
   "description": "Javascript library for Amplitude Analytics",
   "keywords": [

src/amplitude-client.js

@@ -31,6 +31,7 @@ var AmplitudeClient = function AmplitudeClient(instanceName) {
   this._q = []; // queue for proxied functions before script load
   this._sending = false;
   this._updateScheduled = false;
+  this._onInit = [];
 
   // event meta data
   this._eventId = 0;
@@ -149,6 +150,10 @@ AmplitudeClient.prototype.init = function init(apiKey, opt_userId, opt_config, o
       opt_callback(this);
     }
   }
+
+  for (let i = 0; i < this._onInit.length; i++) {
+    this._onInit[i]();
+  }
 };
 
 /**
@@ -285,6 +290,14 @@ AmplitudeClient.prototype.isNewSession = function isNewSession() {
   return this._newSession;
 };
 
+/**
+ * Store callbacks to call after init
+ * @private
+ */
+AmplitudeClient.prototype.onInit = function (callback) {
+  this._onInit.push(callback);
+};
+
 /**
  * Returns the id of the current session.
  * @public

src/amplitude-snippet.js

@@ -3,7 +3,7 @@
   var as = document.createElement('script');
   as.type = 'text/javascript';
   as.async = true;
-  as.src = 'https://cdn.amplitude.com/libs/amplitude-4.6.0-min.gz.js';
+  as.src = 'https://cdn.amplitude.com/libs/amplitude-4.7.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);

src/version.js

@@ -1 +1 @@
-export default '4.6.0';
+export default '4.7.0';

test/amplitude-client.js

@@ -54,6 +54,17 @@ describe('AmplitudeClient', function() {
       assert.equal(new AmplitudeClient('$DEFAULT_INSTANCE')._instanceName, '$default_instance');
     });
 
+    it('should invoke onInit callbacks', function() {
+      let onInitCalled = false;
+      let onInit2Called = false;
+      amplitude.onInit(() => { onInitCalled = true; });
+      amplitude.onInit(() => { onInit2Called = true; });
+
+      amplitude.init(apiKey);
+      assert.ok(onInitCalled);
+      assert.ok(onInit2Called);
+    });
+
     it('fails on invalid apiKeys', function() {
       amplitude.init(null);
       assert.equal(amplitude.options.apiKey, undefined);