update from master

Author: djih

CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Unreleased
 
+<<<<<<< HEAD
 * Add initial_referrer and initial_referring_domain user properties, which persist the initial referrer for the duration of the user's session.
+=======
+## 2.6.2 (November 17, 2015)
+
+* Fix bug where response code is not passed to XDomainRequest callback (affects IE versions 10 and lower).
+>>>>>>> origin/master
 
 ## 2.6.1 (November 6, 2015)
 

README.md

@@ -10,7 +10,7 @@ Amplitude-Javascript
 ```
 <script type="text/javascript">
   (function(t,e){var n=t.amplitude||{};var r=e.createElement("script");r.type="text/javascript";
-  r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.6.1-min.gz.js";
+  r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.6.2-min.gz.js";
   r.onload=function(){t.amplitude.runQueuedFunctions()};var s=e.getElementsByTagName("script")[0];
   s.parentNode.insertBefore(r,s);var i=function(){this._q=[];return this};function o(t){
   i.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
@@ -172,8 +172,9 @@ amplitude.init('YOUR_API_KEY_HERE', null, {
 | includeReferrer | If `true`, includes `referrer` and `referring_domain` as user propeties on all events uploaded. | `false` |
 | batchEvents | If `true`, events are batched together and uploaded only when the number of unsent events is greater than or equal to `eventUploadThreshold` or after `eventUploadPeriodMillis` milliseconds have passed since the first unsent event was logged. | `false` |
 | eventUploadThreshold | Minimum number of events to batch together per request if `batchEvents` is `true`. | 30 |
-| eventUploadPeriodMillis | Amount of time in milliseconds that the SDK waits before uploading events if `batchEvents` is `true`. | 30*1000 |
+| eventUploadPeriodMillis | Amount of time in milliseconds that the SDK waits before uploading events if `batchEvents` is `true`. | 30\*1000 (30 sec) |
 | deviceId | Custom device ID to set | Randomly generated UUID |
+| sessionTimeout | Time between logged events before a new session starts in milliseconds | 30\*60\*1000 (30 min) |
 
 
 # Advanced #

amplitude-snippet.min.js

@@ -1,5 +1,5 @@
 (function(t,e){var n=t.amplitude||{};var r=e.createElement("script");r.type="text/javascript";
-r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.6.1-min.gz.js";
+r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.6.2-min.gz.js";
 r.onload=function(){t.amplitude.runQueuedFunctions()};var s=e.getElementsByTagName("script")[0];
 s.parentNode.insertBefore(r,s);var i=function(){this._q=[];return this};function o(t){
 i.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0)));

amplitude.js

@@ -2286,8 +2286,18 @@ Request.prototype.send = function(callback) {
     var xdr = new window.XDomainRequest();
     xdr.open('POST', this.url, true);
     xdr.onload = function() {
-      callback(xdr.responseText);
+      callback(200, xdr.responseText);
     };
+    xdr.onerror = function () {
+      // status code not available from xdr, try string matching on responseText
+      if (xdr.responseText === 'Request Entity Too Large') {
+        callback(413, xdr.responseText);
+      } else {
+        callback(500, xdr.responseText);
+      }
+    };
+    xdr.ontimeout = function () {};
+    xdr.onprogress = function() {};
     xdr.send(querystring.stringify(this.data));
   } else {
     var xhr = new XMLHttpRequest();
@@ -3359,7 +3369,7 @@ module.exports = uuid;
 
 }, {}],
 12: [function(require, module, exports) {
-module.exports = '2.6.1';
+module.exports = '2.6.2';
 
 }, {}],
 13: [function(require, module, exports) {

amplitude.min.js

@@ -3,7 +3,7 @@
   "main": "src/index.js",
   "repo": "amplitude/amplitude-javascript",
   "description": "Javascript library for Amplitude Analytics",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "keywords": [
     "analytics",
     "amplitude"

component.json

@@ -1,7 +1,7 @@
 {
   "name": "amplitude-js",
   "author": "Amplitude <support@amplitude.com>",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "license": "MIT",
   "description": "Javascript library for Amplitude Analytics",
   "keywords": [

package.json

@@ -3,7 +3,7 @@
   var as = document.createElement('script');
   as.type = 'text/javascript';
   as.async = true;
-  as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.6.1-min.gz.js';
+  as.src = 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.6.2-min.gz.js';
   as.onload = function() { window.amplitude.runQueuedFunctions(); };
   var s = document.getElementsByTagName('script')[0];
   s.parentNode.insertBefore(as, s);

src/amplitude-snippet.js

@@ -1 +1 @@
-module.exports = '2.6.1';
+module.exports = '2.6.2';

src/version.js

@@ -14,8 +14,18 @@ Request.prototype.send = function(callback) {
     var xdr = new window.XDomainRequest();
     xdr.open('POST', this.url, true);
     xdr.onload = function() {
-      callback(xdr.responseText);
+      callback(200, xdr.responseText);
     };
+    xdr.onerror = function () {
+      // status code not available from xdr, try string matching on responseText
+      if (xdr.responseText === 'Request Entity Too Large') {
+        callback(413, xdr.responseText);
+      } else {
+        callback(500, xdr.responseText);
+      }
+    };
+    xdr.ontimeout = function () {};
+    xdr.onprogress = function() {};
     xdr.send(querystring.stringify(this.data));
   } else {
     var xhr = new XMLHttpRequest();