cleanup

Author: Daniel Jih

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## Unreleased
 
 * Add `logEventWithTimestamp` to allow logging events with a custom timestamp. The timestamp should a number representing the time in milliseconds since epoch. See [documentation](https://rawgit.com/amplitude/Amplitude-Javascript/master/documentation/AmplitudeClient.html) for more details.
-* Add configuration option `deviceIdFromUrlParam`, which when set to `true` will have the SDK parse device Ids from url parameter `amp_device_id` if available. DeviceIds defined in the configuration options during init will take priority over device Ids from url parameters.
+* Add configuration option `deviceIdFromUrlParam`, which when set to `true` will have the SDK parse device IDs from url parameter `amp_device_id` if available. Device IDs defined in the configuration options during init will take priority over device IDs from url parameters.
 
 ### 3.3.2 (October 28, 2016)
 

README.md

@@ -328,7 +328,7 @@ amplitude.getInstance().init('YOUR_API_KEY_HERE', null, {
 | cookieExpiration | number | The number of days after which the Amplitude cookie will expire | 365\*10 (10 years) |
 | cookieName | string | Custom name for the Amplitude cookie | 'amplitude_id' |
 | deviceId | string | Custom device ID to set. Note this is not recommended unless you really know what you are doing (like if you have your own system for tracking user devices) | Randomly generated UUID |
-| deviceIdFromUrlParam | boolean | If `true`, the SDK will parse device Id values from url parameter `amp_device_id` if available. Device Ids defined in the configuration options during init will take priority over device Ids from url parameters.
+| deviceIdFromUrlParam | boolean | If `true`, the SDK will parse device ID values from url parameter `amp_device_id` if available. Device IDs defined in the configuration options during init will take priority over device IDs from url parameters.
 | domain | string | Custom cookie domain | The top domain of the current page's url |
 | eventUploadPeriodMillis | number | Amount of time in milliseconds that the SDK waits before uploading events if `batchEvents` is `true`. | 30\*1000 (30 sec) |
 | eventUploadThreshold | number | Minimum number of events to batch together per request if `batchEvents` is `true`. | 30 |

test/browser/amplitudejs.html

@@ -87,26 +87,26 @@
     }
 </script>
 <script>
-    amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true, includeUtm: true, includeGclid: true, deviceId: 'dcdf0a79-8676-5cc3-95fc-fa53517293ad'}, function() {
+    amplitude.init('a2dbce0e18dfe5f8e74493843ff5c053', null, {includeReferrer: true, includeUtm: true, includeGclid: true}, function() {
         alert(amplitude.options.deviceId);
     });
-    // amplitude.setVersionName('Web');
-    // amplitude.identify(new amplitude.Identify().add('photoCount', 1));
-    // amplitude.identify(new amplitude.Identify().add('photoCount', 1).set('gender', 'male').unset('karma'));
-    // amplitude.logEvent('pageLoad');
+    amplitude.setVersionName('Web');
+    amplitude.identify(new amplitude.Identify().add('photoCount', 1));
+    amplitude.identify(new amplitude.Identify().add('photoCount', 1).set('gender', 'male').unset('karma'));
+    amplitude.logEvent('pageLoad');
 
-    // amplitude.getInstance('app2').logEvent('log event before init');
-    // amplitude.getInstance('app2').init('1d2fe1e104eb3f07a24e94d359f70fd5', 'checkers@gmail.com', {includeReferrer: true}, function(instance) {
-    //     alert(instance.options.deviceId);
-    // });
-    // amplitude.getInstance('app2').identify(new amplitude.Identify().set('key', 'value'));
-    // amplitude.getInstance('app2').logEvent('app 2 page load');
+    amplitude.getInstance('app2').logEvent('log event before init');
+    amplitude.getInstance('app2').init('1d2fe1e104eb3f07a24e94d359f70fd5', 'checkers@gmail.com', {includeReferrer: true}, function(instance) {
+        alert(instance.options.deviceId);
+    });
+    amplitude.getInstance('app2').identify(new amplitude.Identify().set('key', 'value'));
+    amplitude.getInstance('app2').logEvent('app 2 page load');
 
-    // amplitude.getInstance('app3').init('a2dbce0e18dfe5f8e74493843ff5c053', null, {batchEvents: true, eventUploadThreshold: 2});
-    // amplitude.getInstance('app3').logEvent('app3 page Load');
+    amplitude.getInstance('app3').init('a2dbce0e18dfe5f8e74493843ff5c053', null, {batchEvents: true, eventUploadThreshold: 2});
+    amplitude.getInstance('app3').logEvent('app3 page Load');
 
-    // amplitude.getInstance('app4').init('1d2fe1e104eb3f07a24e94d359f70fd5', 'joe@gmail.com');
-    // amplitude.getInstance('app4').logEvent('app 4 page load');
+    amplitude.getInstance('app4').init('1d2fe1e104eb3f07a24e94d359f70fd5', 'joe@gmail.com');
+    amplitude.getInstance('app4').logEvent('app 4 page load');
 </script>
 <body>
 <h3>Amplitude JS Test</h3>