mixpanel-browser 2.46.0 → 2.48.0

package/dist/mixpanel.amd.js

@@ -2,7 +2,7 @@ define(function () { 'use strict';
 
     var Config = {
         DEBUG: false,
-        LIB_VERSION: '2.46.0'
+        LIB_VERSION: '2.48.0'
     };
 
     // since es6 imports are static and we run unit tests from the console, window won't be defined when importing this file
@@ -832,20 +832,24 @@ define(function () { 'use strict';
 
     _.UUID = (function() {
 
-        // Time/ticks information
-        // 1*new Date() is a cross browser version of Date.now()
+        // Time-based entropy
         var T = function() {
-            var d = 1 * new Date(),
-                i = 0;
-
-            // this while loop figures how many browser ticks go by
-            // before 1*new Date() returns a new number, ie the amount
-            // of ticks that go by per millisecond
-            while (d == 1 * new Date()) {
-                i++;
+            var time = 1 * new Date(); // cross-browser version of Date.now()
+            var ticks;
+            if (window$1.performance && window$1.performance.now) {
+                ticks = window$1.performance.now();
+            } else {
+                // fall back to busy loop
+                ticks = 0;
+
+                // this while loop figures how many browser ticks go by
+                // before 1*new Date() returns a new number, ie the amount
+                // of ticks that go by per millisecond
+                while (time == 1 * new Date()) {
+                    ticks++;
+                }
             }
-
-            return d.toString(16) + i.toString(16);
+            return time.toString(16) + Math.floor(ticks).toString(16);
         };
 
         // Math.Random entropy
@@ -900,6 +904,7 @@ define(function () { 'use strict';
         'baiduspider',
         'bingbot',
         'bingpreview',
+        'chrome-lighthouse',
         'facebookexternal',
         'petalbot',
         'pinterest',
@@ -1412,21 +1417,42 @@ define(function () { 'use strict';
         };
     })();
 
+    var CAMPAIGN_KEYWORDS = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_content', 'utm_term'];
+    var CLICK_IDS = ['dclid', 'fbclid', 'gclid', 'ko_click_id', 'li_fat_id', 'msclkid', 'ttclid', 'twclid', 'wbraid'];
+
     _.info = {
-        campaignParams: function() {
-            var campaign_keywords = 'utm_source utm_medium utm_campaign utm_content utm_term'.split(' '),
-                kw = '',
+        campaignParams: function(default_value) {
+            var kw = '',
                 params = {};
-            _.each(campaign_keywords, function(kwkey) {
+            _.each(CAMPAIGN_KEYWORDS, function(kwkey) {
                 kw = _.getQueryParam(document$1.URL, kwkey);
                 if (kw.length) {
                     params[kwkey] = kw;
+                } else if (default_value !== undefined) {
+                    params[kwkey] = default_value;
+                }
+            });
+
+            return params;
+        },
+
+        clickParams: function() {
+            var id = '',
+                params = {};
+            _.each(CLICK_IDS, function(idkey) {
+                id = _.getQueryParam(document$1.URL, idkey);
+                if (id.length) {
+                    params[idkey] = id;
                 }
             });
 
             return params;
         },
 
+        marketingParams: function() {
+            return _.extend(_.info.campaignParams(), _.info.clickParams());
+        },
+
         searchEngine: function(referrer) {
             if (referrer.search('https?://(.*)google.([^/?]*)') === 0) {
                 return 'google';
@@ -1623,12 +1649,13 @@ define(function () { 'use strict';
             });
         },
 
-        pageviewInfo: function(page) {
+        mpPageViewProperties: function() {
             return _.strip_empty_properties({
-                'mp_page': page,
-                'mp_referrer': document$1.referrer,
-                'mp_browser': _.info.browser(userAgent, navigator.vendor, windowOpera),
-                'mp_platform': _.info.os()
+                'current_page_title': document$1.title,
+                'current_domain': window$1.location.hostname,
+                'current_url_path': window$1.location.pathname,
+                'current_url_protocol': window$1.location.protocol,
+                'current_url_search': window$1.location.search
             });
         }
     };
@@ -3106,7 +3133,7 @@ define(function () { 'use strict';
         return this._mixpanel._track_or_batch({
             type: 'groups',
             data: date_encoded_data,
-            endpoint: this._get_config('api_host') + '/groups/',
+            endpoint: this._get_config('api_host') + '/' +  this._get_config('api_routes')['groups'],
             batcher: this._mixpanel.request_batchers.groups
         }, callback);
     };
@@ -3467,7 +3494,7 @@ define(function () { 'use strict';
         return this._mixpanel._track_or_batch({
             type: 'people',
             data: date_encoded_data,
-            endpoint: this._get_config('api_host') + '/engage/',
+            endpoint: this._get_config('api_host') + '/' +  this._get_config('api_routes')['engage'],
             batcher: this._mixpanel.request_batchers.people
         }, callback);
     };
@@ -3503,11 +3530,12 @@ define(function () { 'use strict';
 
     MixpanelPeople.prototype._flush_one_queue = function(action, action_method, callback, queue_to_params_fn) {
         var _this = this;
-        var queued_data = _.extend({}, this._mixpanel['persistence']._get_queue(action));
+        var queued_data = _.extend({}, this._mixpanel['persistence'].load_queue(action));
         var action_params = queued_data;
 
         if (!_.isUndefined(queued_data) && _.isObject(queued_data) && !_.isEmptyObject(queued_data)) {
             _this._mixpanel['persistence']._pop_from_people_queue(action, queued_data);
+            _this._mixpanel['persistence'].save();
             if (queue_to_params_fn) {
                 action_params = queue_to_params_fn(queued_data);
             }
@@ -3529,8 +3557,6 @@ define(function () { 'use strict';
         _set_callback, _add_callback, _append_callback, _set_once_callback, _union_callback, _unset_callback, _remove_callback
     ) {
         var _this = this;
-        var $append_queue = this._mixpanel['persistence']._get_queue(APPEND_ACTION);
-        var $remove_queue = this._mixpanel['persistence']._get_queue(REMOVE_ACTION);
 
         this._flush_one_queue(SET_ACTION, this.set, _set_callback);
         this._flush_one_queue(SET_ONCE_ACTION, this.set_once, _set_once_callback);
@@ -3540,6 +3566,7 @@ define(function () { 'use strict';
 
         // we have to fire off each $append individually since there is
         // no concat method server side
+        var $append_queue = this._mixpanel['persistence'].load_queue(APPEND_ACTION);
         if (!_.isUndefined($append_queue) && _.isArray($append_queue) && $append_queue.length) {
             var $append_item;
             var append_callback = function(response, data) {
@@ -3551,16 +3578,17 @@ define(function () { 'use strict';
                 }
             };
             for (var i = $append_queue.length - 1; i >= 0; i--) {
+                $append_queue = this._mixpanel['persistence'].load_queue(APPEND_ACTION);
                 $append_item = $append_queue.pop();
+                _this._mixpanel['persistence'].save();
                 if (!_.isEmptyObject($append_item)) {
                     _this.append($append_item, append_callback);
                 }
             }
-            // Save the shortened append queue
-            _this._mixpanel['persistence'].save();
         }
 
         // same for $remove
+        var $remove_queue = this._mixpanel['persistence'].load_queue(REMOVE_ACTION);
         if (!_.isUndefined($remove_queue) && _.isArray($remove_queue) && $remove_queue.length) {
             var $remove_item;
             var remove_callback = function(response, data) {
@@ -3572,12 +3600,13 @@ define(function () { 'use strict';
                 }
             };
             for (var j = $remove_queue.length - 1; j >= 0; j--) {
+                $remove_queue = this._mixpanel['persistence'].load_queue(REMOVE_ACTION);
                 $remove_item = $remove_queue.pop();
+                _this._mixpanel['persistence'].save();
                 if (!_.isEmptyObject($remove_item)) {
                     _this.remove($remove_item, remove_callback);
                 }
             }
-            _this._mixpanel['persistence'].save();
         }
     };
 
@@ -3659,6 +3688,9 @@ define(function () { 'use strict';
 
     MixpanelPersistence.prototype.properties = function() {
         var p = {};
+
+        this.load();
+
         // Filter out reserved properties
         _.each(this['props'], function(v, k) {
             if (!_.include(RESERVED_PROPERTIES, k)) {
@@ -3735,6 +3767,7 @@ define(function () { 'use strict';
 
     MixpanelPersistence.prototype.save = function() {
         if (this.disabled) { return; }
+
         this.storage.set(
             this.name,
             _.JSONEncode(this['props']),
@@ -3746,6 +3779,11 @@ define(function () { 'use strict';
         );
     };
 
+    MixpanelPersistence.prototype.load_prop = function(key) {
+        this.load();
+        return this['props'][key];
+    };
+
     MixpanelPersistence.prototype.remove = function() {
         // remove both domain and subdomain cookies
         this.storage.remove(this.name, false, this.cookie_domain);
@@ -3769,6 +3807,8 @@ define(function () { 'use strict';
             if (typeof(default_value) === 'undefined') { default_value = 'None'; }
             this.expire_days = (typeof(days) === 'undefined') ? this.default_expiry : days;
 
+            this.load();
+
             _.each(props, function(val, prop) {
                 if (!this['props'].hasOwnProperty(prop) || this['props'][prop] === default_value) {
                     this['props'][prop] = val;
@@ -3790,8 +3830,8 @@ define(function () { 'use strict';
         if (_.isObject(props)) {
             this.expire_days = (typeof(days) === 'undefined') ? this.default_expiry : days;
 
+            this.load();
             _.extend(this['props'], props);
-
             this.save();
 
             return true;
@@ -3800,19 +3840,13 @@ define(function () { 'use strict';
     };
 
     MixpanelPersistence.prototype.unregister = function(prop) {
+        this.load();
         if (prop in this['props']) {
             delete this['props'][prop];
             this.save();
         }
     };
 
-    MixpanelPersistence.prototype.update_campaign_params = function() {
-        if (!this.campaign_params_saved) {
-            this.register_once(_.info.campaignParams());
-            this.campaign_params_saved = true;
-        }
-    };
-
     MixpanelPersistence.prototype.update_search_keyword = function(referrer) {
         this.register(_.info.searchInfo(referrer));
     };
@@ -3833,19 +3867,6 @@ define(function () { 'use strict';
         });
     };
 
-    // safely fills the passed in object with stored properties,
-    // does not override any properties defined in both
-    // returns the passed in object
-    MixpanelPersistence.prototype.safe_merge = function(props) {
-        _.each(this['props'], function(val, prop) {
-            if (!(prop in props)) {
-                props[prop] = val;
-            }
-        });
-
-        return props;
-    };
-
     MixpanelPersistence.prototype.update_config = function(config) {
         this.default_expiry = this.expire_days = config['cookie_expiration'];
         this.set_disabled(config['disable_persistence']);
@@ -3989,7 +4010,7 @@ define(function () { 'use strict';
     };
 
     MixpanelPersistence.prototype._pop_from_people_queue = function(queue, data) {
-        var q = this._get_queue(queue);
+        var q = this['props'][this._get_queue_key(queue)];
         if (!_.isUndefined(q)) {
             _.each(data, function(v, k) {
                 if (queue === APPEND_ACTION || queue === REMOVE_ACTION) {
@@ -4005,11 +4026,13 @@ define(function () { 'use strict';
                     delete q[k];
                 }
             }, this);
-
-            this.save();
         }
     };
 
+    MixpanelPersistence.prototype.load_queue = function(queue) {
+        return this.load_prop(this._get_queue_key(queue));
+    };
+
     MixpanelPersistence.prototype._get_queue_key = function(queue) {
         if (queue === SET_ACTION) {
             return SET_QUEUE_KEY;
@@ -4030,25 +4053,21 @@ define(function () { 'use strict';
         }
     };
 
-    MixpanelPersistence.prototype._get_queue = function(queue) {
-        return this['props'][this._get_queue_key(queue)];
-    };
     MixpanelPersistence.prototype._get_or_create_queue = function(queue, default_val) {
         var key = this._get_queue_key(queue);
         default_val = _.isUndefined(default_val) ? {} : default_val;
-
         return this['props'][key] || (this['props'][key] = default_val);
     };
 
     MixpanelPersistence.prototype.set_event_timer = function(event_name, timestamp) {
-        var timers = this['props'][EVENT_TIMERS_KEY] || {};
+        var timers = this.load_prop(EVENT_TIMERS_KEY) || {};
         timers[event_name] = timestamp;
         this['props'][EVENT_TIMERS_KEY] = timers;
         this.save();
     };
 
     MixpanelPersistence.prototype.remove_event_timer = function(event_name) {
-        var timers = this['props'][EVENT_TIMERS_KEY] || {};
+        var timers = this.load_prop(EVENT_TIMERS_KEY) || {};
         var timestamp = timers[event_name];
         if (!_.isUndefined(timestamp)) {
             delete this['props'][EVENT_TIMERS_KEY][event_name];
@@ -4119,11 +4138,18 @@ define(function () { 'use strict';
         };
     }
 
+    var DEFAULT_API_ROUTES = {
+        'track': 'track/',
+        'engage': 'engage/',
+        'groups': 'groups/'
+    };
+
     /*
      * Module-level globals
      */
     var DEFAULT_CONFIG = {
         'api_host':                          'https://api-js.mixpanel.com',
+        'api_routes':                        DEFAULT_API_ROUTES,
         'api_method':                        'POST',
         'api_transport':                     'XHR',
         'api_payload_format':                PAYLOAD_TYPE_BASE64,
@@ -4137,6 +4163,9 @@ define(function () { 'use strict';
         'cookie_domain':                     '',
         'cookie_name':                       '',
         'loaded':                            NOOP_FUNC,
+        'track_marketing':                   true,
+        'track_pageview':                    false,
+        'skip_first_touch_marketing':        false,
         'store_google':                      true,
         'save_referrer':                     true,
         'test':                              false,
@@ -4203,6 +4232,25 @@ define(function () { 'use strict';
         instance['people'] = new MixpanelPeople();
         instance['people']._init(instance);
 
+        if (!instance.get_config('skip_first_touch_marketing')) {
+            // We need null UTM params in the object because
+            // UTM parameters act as a tuple. If any UTM param
+            // is present, then we set all UTM params including
+            // empty ones together
+            var utm_params = _.info.campaignParams(null);
+            var initial_utm_params = {};
+            var has_utm = false;
+            _.each(utm_params, function(utm_value, utm_key) {
+                initial_utm_params['initial_' + utm_key] = utm_value;
+                if (utm_value) {
+                    has_utm = true;
+                }
+            });
+            if (has_utm) {
+                instance['people'].set_once(initial_utm_params);
+            }
+        }
+
         // if any instance on the page has debug = true, we set the
         // global debug to be true
         Config.DEBUG = Config.DEBUG || instance.get_config('debug');
@@ -4234,7 +4282,7 @@ define(function () { 'use strict';
      *     mixpanel.library_name.track(...);
      *
      * @param {String} token   Your Mixpanel API token
-     * @param {Object} [config]  A dictionary of config options to override. <a href="https://github.com/mixpanel/mixpanel-js/blob/8b2e1f7b/src/mixpanel-core.js#L87-L110">See a list of default config options</a>.
+     * @param {Object} [config]  A dictionary of config options to override. <a href="https://github.com/mixpanel/mixpanel-js/blob/v2.46.0/src/mixpanel-core.js#L88-L127">See a list of default config options</a>.
      * @param {String} [name]    The name for the new mixpanel instance that you want created
      */
     MixpanelLib.prototype.init = function (token, config, name) {
@@ -4272,7 +4320,7 @@ define(function () { 'use strict';
         // default to JSON payload for standard mixpanel.com API hosts
         if (!('api_payload_format' in config)) {
             var api_host = config['api_host'] || DEFAULT_CONFIG['api_host'];
-            if (api_host.match(/\.mixpanel\.com$/)) {
+            if (api_host.match(/\.mixpanel\.com/)) {
                 variable_features['api_payload_format'] = PAYLOAD_TYPE_JSON;
             }
         }
@@ -4300,6 +4348,10 @@ define(function () { 'use strict';
             if (!_.localStorage.is_supported(true) || !USE_XHR) {
                 this._batch_requests = false;
                 console.log('Turning off Mixpanel request-queueing; needs XHR and localStorage support');
+                _.each(this.get_batcher_configs(), function(batcher_config) {
+                    console.log('Clearing batch queue ' + batcher_config.queue_key);
+                    _.localStorage.remove(batcher_config.queue_key);
+                });
             } else {
                 this.init_batchers();
                 if (sendBeacon && window$1.addEventListener) {
@@ -4347,6 +4399,10 @@ define(function () { 'use strict';
                 '$device_id': uuid
             }, '');
         }
+
+        if (this.get_config('track_pageview')) {
+            this.track_pageview();
+        }
     };
 
     // Private methods
@@ -4360,7 +4416,7 @@ define(function () { 'use strict';
     MixpanelLib.prototype._set_default_superprops = function() {
         this['persistence'].update_search_keyword(document$1.referrer);
         if (this.get_config('store_google')) {
-            this['persistence'].update_campaign_params();
+            this.register(_.info.campaignParams(), {persistent: false});
         }
         if (this.get_config('save_referrer')) {
             this['persistence'].update_referrer_info(document$1.referrer);
@@ -4643,12 +4699,22 @@ define(function () { 'use strict';
         return !!this.request_batchers.events;
     };
 
+    MixpanelLib.prototype.get_batcher_configs = function() {
+        var queue_prefix = '__mpq_' + this.get_config('token');
+        var api_routes = this.get_config('api_routes');
+        this._batcher_configs = this._batcher_configs || {
+            events: {type: 'events', endpoint: '/' + api_routes['track'], queue_key: queue_prefix + '_ev'},
+            people: {type: 'people', endpoint: '/' + api_routes['engage'], queue_key: queue_prefix + '_pp'},
+            groups: {type: 'groups', endpoint: '/' + api_routes['groups'], queue_key: queue_prefix + '_gr'}
+        };
+        return this._batcher_configs;
+    };
+
     MixpanelLib.prototype.init_batchers = function() {
-        var token = this.get_config('token');
         if (!this.are_batchers_initialized()) {
             var batcher_for = _.bind(function(attrs) {
                 return new RequestBatcher(
-                    '__mpq_' + token + attrs.queue_suffix,
+                    attrs.queue_key,
                     {
                         libConfig: this['config'],
                         sendRequestFunc: _.bind(function(data, options, cb) {
@@ -4667,10 +4733,11 @@ define(function () { 'use strict';
                     }
                 );
             }, this);
+            var batcher_configs = this.get_batcher_configs();
             this.request_batchers = {
-                events: batcher_for({type: 'events', endpoint: '/track/', queue_suffix: '_ev'}),
-                people: batcher_for({type: 'people', endpoint: '/engage/', queue_suffix: '_pp'}),
-                groups: batcher_for({type: 'groups', endpoint: '/groups/', queue_suffix: '_gr'})
+                events: batcher_for(batcher_configs.events),
+                people: batcher_for(batcher_configs.people),
+                groups: batcher_for(batcher_configs.groups)
             };
         }
         if (this.get_config('batch_autostart')) {
@@ -4679,6 +4746,7 @@ define(function () { 'use strict';
     };
 
     MixpanelLib.prototype.start_batch_senders = function() {
+        this._batchers_were_started = true;
         if (this.are_batchers_initialized()) {
             this._batch_requests = true;
             _.each(this.request_batchers, function(batcher) {
@@ -4830,7 +4898,7 @@ define(function () { 'use strict';
         }
 
         // set defaults
-        properties = properties || {};
+        properties = _.extend({}, properties);
         properties['token'] = this.get_config('token');
 
         // set $duration if time_event was previously called for this event
@@ -4842,6 +4910,10 @@ define(function () { 'use strict';
 
         this._set_default_superprops();
 
+        var marketing_properties = this.get_config('track_marketing')
+            ? _.info.marketingParams()
+            : {};
+
         // note: extend writes to the first object, so lets make sure we
         // don't write to the persistence properties object and info
         // properties object by passing in a new object
@@ -4850,6 +4922,7 @@ define(function () { 'use strict';
         properties = _.extend(
             {},
             _.info.properties(),
+            marketing_properties,
             this['persistence'].properties(),
             this.unpersisted_superprops,
             properties
@@ -4871,7 +4944,7 @@ define(function () { 'use strict';
         var ret = this._track_or_batch({
             type: 'events',
             data: data,
-            endpoint: this.get_config('api_host') + '/track/',
+            endpoint: this.get_config('api_host') + '/' + this.get_config('api_routes')['track'],
             batcher: this.request_batchers.events,
             should_send_immediately: should_send_immediately,
             send_request_options: options
@@ -4917,13 +4990,14 @@ define(function () { 'use strict';
      */
     MixpanelLib.prototype.add_group = addOptOutCheckMixpanelLib(function(group_key, group_id, callback) {
         var old_values = this.get_property(group_key);
+        var prop = {};
         if (old_values === undefined) {
-            var prop = {};
             prop[group_key] = [group_id];
             this.register(prop);
         } else {
             if (old_values.indexOf(group_id) === -1) {
                 old_values.push(group_id);
+                prop[group_key] = old_values;
                 this.register(prop);
             }
         }
@@ -5010,17 +5084,54 @@ define(function () { 'use strict';
     };
 
     /**
-     * Track mp_page_view event. This is now ignored by the server.
+     * Track a default Mixpanel page view event, which includes extra default event properties to
+     * improve page view data. The `config.track_pageview` option for <a href="#mixpanelinit">mixpanel.init()</a>
+     * may be turned on for tracking page loads automatically.
      *
-     * @param {String} [page] The url of the page to record. If you don't include this, it defaults to the current url.
-     * @deprecated
+     * ### Usage
+     *
+     *     // track a default $mp_web_page_view event
+     *     mixpanel.track_pageview();
+     *
+     *     // track a page view event with additional event properties
+     *     mixpanel.track_pageview({'ab_test_variant': 'card-layout-b'});
+     *
+     *     // example approach to track page views on different page types as event properties
+     *     mixpanel.track_pageview({'page': 'pricing'});
+     *     mixpanel.track_pageview({'page': 'homepage'});
+     *
+     *     // UNCOMMON: Tracking a page view event with a custom event_name option. NOT expected to be used for
+     *     // individual pages on the same site or product. Use cases for custom event_name may be page
+     *     // views on different products or internal applications that are considered completely separate
+     *     mixpanel.track_pageview({'page': 'customer-search'}, {'event_name': '[internal] Admin Page View'});
+     *
+     * @param {Object} [properties] An optional set of additional properties to send with the page view event
+     * @param {Object} [options] Page view tracking options
+     * @param {String} [options.event_name] - Alternate name for the tracking event
+     * @returns {Boolean|Object} If the tracking request was successfully initiated/queued, an object
+     * with the tracking payload sent to the API server is returned; otherwise false.
      */
-    MixpanelLib.prototype.track_pageview = function(page) {
-        if (_.isUndefined(page)) {
-            page = document$1.location.href;
+    MixpanelLib.prototype.track_pageview = addOptOutCheckMixpanelLib(function(properties, options) {
+        if (typeof properties !== 'object') {
+            properties = {};
         }
-        this.track('mp_page_view', _.info.pageviewInfo(page));
-    };
+        options = options || {};
+        var event_name = options['event_name'] || '$mp_web_page_view';
+
+        var default_page_properties = _.extend(
+            _.info.mpPageViewProperties(),
+            _.info.campaignParams(),
+            _.info.clickParams()
+        );
+
+        var event_properties = _.extend(
+            {},
+            default_page_properties,
+            properties
+        );
+
+        return this.track(event_name, event_properties);
+    });
 
     /**
      * Track clicks on a set of document elements. Selector must be a
@@ -5431,6 +5542,16 @@ define(function () { 'use strict';
      * The default config is:
      *
      *     {
+     *       // host for requests (customizable for e.g. a local proxy)
+     *       api_host: 'https://api-js.mixpanel.com',
+     *
+     *       // endpoints for different types of requests
+     *       api_routes: {
+     *         track: 'track/',
+     *         engage: 'engage/',
+     *         groups: 'groups/',
+     *       }
+     *
      *       // HTTP method for tracking requests
      *       api_method: 'POST'
      *
@@ -5516,10 +5637,20 @@ define(function () { 'use strict';
      *       // secure, meaning they will only be transmitted over https
      *       secure_cookie: false
      *
+     *       // disables enriching user profiles with first touch marketing data
+     *       skip_first_touch_marketing: false
+     *
      *       // the amount of time track_links will
      *       // wait for Mixpanel's servers to respond
      *       track_links_timeout: 300
      *
+     *       // adds any UTM parameters and click IDs present on the page to any events fired
+     *       track_marketing: true
+     *
+     *       // enables automatic page view tracking using default page view events through
+     *       // the track_pageview() method
+     *       track_pageview: false
+     *
      *       // if you set upgrade to be true, the library will check for
      *       // a cookie from our old js library and import super
      *       // properties from it, then the old cookie is deleted
@@ -5604,7 +5735,7 @@ define(function () { 'use strict';
      * @param {String} property_name The name of the super property you want to retrieve
      */
     MixpanelLib.prototype.get_property = function(property_name) {
-        return this['persistence']['props'][property_name];
+        return this['persistence'].load_prop([property_name]);
     };
 
     MixpanelLib.prototype.toString = function() {
@@ -5677,9 +5808,13 @@ define(function () { 'use strict';
         }
 
         if (disabled) {
-            _.each(this.request_batchers, function(batcher) {
-                batcher.clear();
-            });
+            this.stop_batch_senders();
+        } else {
+            // only start batchers after opt-in if they have previously been started
+            // in order to avoid unintentionally starting up batching for the first time
+            if (this._batchers_were_started) {
+                this.start_batch_senders();
+            }
         }
     };
 
@@ -5881,37 +6016,38 @@ define(function () { 'use strict';
     // EXPORTS (for closure compiler)
 
     // MixpanelLib Exports
-    MixpanelLib.prototype['init']                               = MixpanelLib.prototype.init;
-    MixpanelLib.prototype['reset']                              = MixpanelLib.prototype.reset;
-    MixpanelLib.prototype['disable']                            = MixpanelLib.prototype.disable;
-    MixpanelLib.prototype['time_event']                         = MixpanelLib.prototype.time_event;
-    MixpanelLib.prototype['track']                              = MixpanelLib.prototype.track;
-    MixpanelLib.prototype['track_links']                        = MixpanelLib.prototype.track_links;
-    MixpanelLib.prototype['track_forms']                        = MixpanelLib.prototype.track_forms;
-    MixpanelLib.prototype['track_pageview']                     = MixpanelLib.prototype.track_pageview;
-    MixpanelLib.prototype['register']                           = MixpanelLib.prototype.register;
-    MixpanelLib.prototype['register_once']                      = MixpanelLib.prototype.register_once;
-    MixpanelLib.prototype['unregister']                         = MixpanelLib.prototype.unregister;
-    MixpanelLib.prototype['identify']                           = MixpanelLib.prototype.identify;
-    MixpanelLib.prototype['alias']                              = MixpanelLib.prototype.alias;
-    MixpanelLib.prototype['name_tag']                           = MixpanelLib.prototype.name_tag;
-    MixpanelLib.prototype['set_config']                         = MixpanelLib.prototype.set_config;
-    MixpanelLib.prototype['get_config']                         = MixpanelLib.prototype.get_config;
-    MixpanelLib.prototype['get_property']                       = MixpanelLib.prototype.get_property;
-    MixpanelLib.prototype['get_distinct_id']                    = MixpanelLib.prototype.get_distinct_id;
-    MixpanelLib.prototype['toString']                           = MixpanelLib.prototype.toString;
-    MixpanelLib.prototype['opt_out_tracking']                   = MixpanelLib.prototype.opt_out_tracking;
-    MixpanelLib.prototype['opt_in_tracking']                    = MixpanelLib.prototype.opt_in_tracking;
-    MixpanelLib.prototype['has_opted_out_tracking']             = MixpanelLib.prototype.has_opted_out_tracking;
-    MixpanelLib.prototype['has_opted_in_tracking']              = MixpanelLib.prototype.has_opted_in_tracking;
-    MixpanelLib.prototype['clear_opt_in_out_tracking']          = MixpanelLib.prototype.clear_opt_in_out_tracking;
-    MixpanelLib.prototype['get_group']                          = MixpanelLib.prototype.get_group;
-    MixpanelLib.prototype['set_group']                          = MixpanelLib.prototype.set_group;
-    MixpanelLib.prototype['add_group']                          = MixpanelLib.prototype.add_group;
-    MixpanelLib.prototype['remove_group']                       = MixpanelLib.prototype.remove_group;
-    MixpanelLib.prototype['track_with_groups']                  = MixpanelLib.prototype.track_with_groups;
-    MixpanelLib.prototype['start_batch_senders']                = MixpanelLib.prototype.start_batch_senders;
-    MixpanelLib.prototype['stop_batch_senders']                 = MixpanelLib.prototype.stop_batch_senders;
+    MixpanelLib.prototype['init']                      = MixpanelLib.prototype.init;
+    MixpanelLib.prototype['reset']                     = MixpanelLib.prototype.reset;
+    MixpanelLib.prototype['disable']                   = MixpanelLib.prototype.disable;
+    MixpanelLib.prototype['time_event']                = MixpanelLib.prototype.time_event;
+    MixpanelLib.prototype['track']                     = MixpanelLib.prototype.track;
+    MixpanelLib.prototype['track_links']               = MixpanelLib.prototype.track_links;
+    MixpanelLib.prototype['track_forms']               = MixpanelLib.prototype.track_forms;
+    MixpanelLib.prototype['track_pageview']            = MixpanelLib.prototype.track_pageview;
+    MixpanelLib.prototype['register']                  = MixpanelLib.prototype.register;
+    MixpanelLib.prototype['register_once']             = MixpanelLib.prototype.register_once;
+    MixpanelLib.prototype['unregister']                = MixpanelLib.prototype.unregister;
+    MixpanelLib.prototype['identify']                  = MixpanelLib.prototype.identify;
+    MixpanelLib.prototype['alias']                     = MixpanelLib.prototype.alias;
+    MixpanelLib.prototype['name_tag']                  = MixpanelLib.prototype.name_tag;
+    MixpanelLib.prototype['set_config']                = MixpanelLib.prototype.set_config;
+    MixpanelLib.prototype['get_config']                = MixpanelLib.prototype.get_config;
+    MixpanelLib.prototype['get_property']              = MixpanelLib.prototype.get_property;
+    MixpanelLib.prototype['get_distinct_id']           = MixpanelLib.prototype.get_distinct_id;
+    MixpanelLib.prototype['toString']                  = MixpanelLib.prototype.toString;
+    MixpanelLib.prototype['opt_out_tracking']          = MixpanelLib.prototype.opt_out_tracking;
+    MixpanelLib.prototype['opt_in_tracking']           = MixpanelLib.prototype.opt_in_tracking;
+    MixpanelLib.prototype['has_opted_out_tracking']    = MixpanelLib.prototype.has_opted_out_tracking;
+    MixpanelLib.prototype['has_opted_in_tracking']     = MixpanelLib.prototype.has_opted_in_tracking;
+    MixpanelLib.prototype['clear_opt_in_out_tracking'] = MixpanelLib.prototype.clear_opt_in_out_tracking;
+    MixpanelLib.prototype['get_group']                 = MixpanelLib.prototype.get_group;
+    MixpanelLib.prototype['set_group']                 = MixpanelLib.prototype.set_group;
+    MixpanelLib.prototype['add_group']                 = MixpanelLib.prototype.add_group;
+    MixpanelLib.prototype['remove_group']              = MixpanelLib.prototype.remove_group;
+    MixpanelLib.prototype['track_with_groups']         = MixpanelLib.prototype.track_with_groups;
+    MixpanelLib.prototype['start_batch_senders']       = MixpanelLib.prototype.start_batch_senders;
+    MixpanelLib.prototype['stop_batch_senders']        = MixpanelLib.prototype.stop_batch_senders;
+    MixpanelLib.prototype['DEFAULT_API_ROUTES']        = DEFAULT_API_ROUTES;
 
     // MixpanelPersistence Exports
     MixpanelPersistence.prototype['properties']            = MixpanelPersistence.prototype.properties;