Merge pull request #40 from rudderlabs/feature/context_page

making release
rudderlabs · Mar 17, 2020 · 7ba2cfd · 7ba2cfd
2 parents 1fd61d7 + 0cb38dd
commit 7ba2cfd
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,14 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [1.1.1-rc.1](https://github.com/rudderlabs/rudder-sdk-js/compare/1.1.1-rc.0...1.1.1-rc.1) - 2020-03-17
+
+### Commits
+
+- add page prop to context and autotrack enabled as option [`b28cb38`](https://github.com/rudderlabs/rudder-sdk-js/commit/b28cb38eb40e6ca7fe9a2e81154b5a88dc2ea7da)
+- Update README.md [`c00027d`](https://github.com/rudderlabs/rudder-sdk-js/commit/c00027d62383f2fcb19119021c767a69c6ebf069)
+
 ## [1.1.1-rc.0](https://github.com/rudderlabs/rudder-sdk-js/compare/1.1.0...1.1.1-rc.0) - 2020-03-16
 
 ### Merged
 
+- add missing dependency [`#38`](https://github.com/rudderlabs/rudder-sdk-js/pull/38)
+- Release [`#37`](https://github.com/rudderlabs/rudder-sdk-js/pull/37)
 - remove default_ip [`#36`](https://github.com/rudderlabs/rudder-sdk-js/pull/36)
 
 ### Commits
 
+- update changelog [`4891420`](https://github.com/rudderlabs/rudder-sdk-js/commit/4891420d427e40e62e39818d93d60190045ef91c)
 - update distfiles and other refactoring [`a757323`](https://github.com/rudderlabs/rudder-sdk-js/commit/a757323210a18bf586eb9cac4a96067916acb73c)
 - Update README.md [`bda368f`](https://github.com/rudderlabs/rudder-sdk-js/commit/bda368f1fa07cc56f14a645776d6c78b4145b9f7)
 

diff --git a/dist/browser.js b/dist/browser.js
@@ -3854,15 +3854,15 @@ var rudderanalytics = (function (exports) {
     this.build = "1.0.0";
     this.name = "RudderLabs JavaScript SDK";
     this.namespace = "com.rudderlabs.javascript";
-    this.version = "1.1.1-rc.0";
+    this.version = "1.1.1-rc.1";
   };
 
   //Library information class
   var RudderLibraryInfo = function RudderLibraryInfo() {
     _classCallCheck(this, RudderLibraryInfo);
 
     this.name = "RudderLabs JavaScript SDK";
-    this.version = "1.1.1-rc.0";
+    this.version = "1.1.1-rc.1";
   }; //Operating System information class
 
 
@@ -8750,7 +8750,7 @@ var rudderanalytics = (function (exports) {
           logger.debug("===in process response=== " + status);
           response = JSON.parse(response);
 
-          if (response.source.useAutoTracking) {
+          if (response.source.useAutoTracking && !this.autoTrackHandlersRegistered) {
             this.autoTrackFeatureEnabled = true;
             addDomEventHandlers(this);
             this.autoTrackHandlersRegistered = true;
@@ -8772,6 +8772,7 @@ var rudderanalytics = (function (exports) {
 
           if (this.autoTrackFeatureEnabled && !this.autoTrackHandlersRegistered) {
             addDomEventHandlers(this);
+            this.autoTrackHandlersRegistered = true;
           }
         }
       }
@@ -9143,8 +9144,10 @@ var rudderanalytics = (function (exports) {
         try {
           if (!this.anonymousId) {
             this.setAnonymousId();
-          }
+          } // assign page properties to context
+
 
+          rudderElement["message"]["context"]["page"] = getDefaultPageProperties();
           rudderElement["message"]["context"]["traits"] = Object.assign({}, this.userTraits);
           logger.debug("anonymousId: ", this.anonymousId);
           rudderElement["message"]["anonymousId"] = this.anonymousId;
@@ -9296,6 +9299,16 @@ var rudderanalytics = (function (exports) {
           configUrl = options.configUrl;
         }
 
+        if (options && options.useAutoTracking) {
+          this.autoTrackFeatureEnabled = true;
+
+          if (this.autoTrackFeatureEnabled && !this.autoTrackHandlersRegistered) {
+            addDomEventHandlers(this);
+            this.autoTrackHandlersRegistered = true;
+            logger.debug("autoTrackHandlersRegistered", this.autoTrackHandlersRegistered);
+          }
+        }
+
         if (options && options.valTrackingList && options.valTrackingList.push == Array.prototype.push) {
           this.trackValues = options.valTrackingList;
         }

diff --git a/dist/rudder-analytics.min.js b/dist/rudder-analytics.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-analytics",
-  "version": "1.1.1-rc.0",
+  "version": "1.1.1-rc.1",
   "description": "",
   "main": "./dist/browser.min.js",
   "scripts": {

diff --git a/release.js b/release.js
@@ -7,9 +7,9 @@ var options = {};
 
 // all options have defaults and can be omitted
 var options = {
-  tag_name: "1.1.1-rc.0",
+  tag_name: "1.1.1-rc.1",
   target_commitish: "master",
-  name: "Pre Release 1.1.1-rc.0",
+  name: "Pre Release 1.1.1-rc.1",
   draft: false,
   prerelease: true,
   repo: "rudder-sdk-js",

diff --git a/tests/html/browser.js b/tests/html/browser.js
@@ -3854,15 +3854,15 @@ var rudderanalytics = (function (exports) {
     this.build = "1.0.0";
     this.name = "RudderLabs JavaScript SDK";
     this.namespace = "com.rudderlabs.javascript";
-    this.version = "1.1.1-rc.0";
+    this.version = "1.1.1-rc.1";
   };
 
   //Library information class
   var RudderLibraryInfo = function RudderLibraryInfo() {
     _classCallCheck(this, RudderLibraryInfo);
 
     this.name = "RudderLabs JavaScript SDK";
-    this.version = "1.1.1-rc.0";
+    this.version = "1.1.1-rc.1";
   }; //Operating System information class
 
 
@@ -8750,7 +8750,7 @@ var rudderanalytics = (function (exports) {
           logger.debug("===in process response=== " + status);
           response = JSON.parse(response);
 
-          if (response.source.useAutoTracking) {
+          if (response.source.useAutoTracking && !this.autoTrackHandlersRegistered) {
             this.autoTrackFeatureEnabled = true;
             addDomEventHandlers(this);
             this.autoTrackHandlersRegistered = true;
@@ -8772,6 +8772,7 @@ var rudderanalytics = (function (exports) {
 
           if (this.autoTrackFeatureEnabled && !this.autoTrackHandlersRegistered) {
             addDomEventHandlers(this);
+            this.autoTrackHandlersRegistered = true;
           }
         }
       }
@@ -9143,8 +9144,10 @@ var rudderanalytics = (function (exports) {
         try {
           if (!this.anonymousId) {
             this.setAnonymousId();
-          }
+          } // assign page properties to context
+
 
+          rudderElement["message"]["context"]["page"] = getDefaultPageProperties();
           rudderElement["message"]["context"]["traits"] = Object.assign({}, this.userTraits);
           logger.debug("anonymousId: ", this.anonymousId);
           rudderElement["message"]["anonymousId"] = this.anonymousId;
@@ -9296,6 +9299,16 @@ var rudderanalytics = (function (exports) {
           configUrl = options.configUrl;
         }
 
+        if (options && options.useAutoTracking) {
+          this.autoTrackFeatureEnabled = true;
+
+          if (this.autoTrackFeatureEnabled && !this.autoTrackHandlersRegistered) {
+            addDomEventHandlers(this);
+            this.autoTrackHandlersRegistered = true;
+            logger.debug("autoTrackHandlersRegistered", this.autoTrackHandlersRegistered);
+          }
+        }
+
         if (options && options.valTrackingList && options.valTrackingList.push == Array.prototype.push) {
           this.trackValues = options.valTrackingList;
         }