Skip to content

Commit 6bc8f69

Browse files
djihdjih
committed
update from master
1 parent 3b9dffd commit 6bc8f69

21 files changed

+99
-425
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
* Add support for logging events to multiple Amplitude apps. **Note this is a major update, and may break backwards compatability.** See [Readme](https://github.com/amplitude/Amplitude-Javascript#300-update-and-logging-events-to-multiple-amplitude-apps) for details.
44
* Init callback now passes the Amplitude instance as an argument to the callback function.
55

6+
### 2.13.0 (May 26, 2016)
7+
8+
* Update our fork of [UAParser.js](https://github.com/faisalman/ua-parser-js) from v0.7.7 to v0.7.10. This will improve the resolution of user agent strings to device and OS information.
9+
610
### 2.12.1 (April 21, 2016)
711

812
* Silence console warnings for various UTM property keys with undefined values.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This Readme will guide you through using Amplitude's Javascript SDK to track use
1212
```html
1313
<script type="text/javascript">
1414
(function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=t.createElement("script");r.type="text/javascript";
15-
r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.12.1-min.gz.js";
15+
r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.13.0-min.gz.js";
1616
r.onload=function(){e.amplitude.runQueuedFunctions()};var i=t.getElementsByTagName("script")[0];
1717
i.parentNode.insertBefore(r,i);function s(e,t){e.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
1818
return this}}var o=function(){this._q=[];return this};var a=["add","append","clearAll","prepend","set","setOnce","unset"];
@@ -435,8 +435,8 @@ If you are using [RequireJS](http://requirejs.org/) to load your Javascript file
435435
```html
436436
<script src='scripts/require.js'></script> <!-- loading RequireJS -->
437437
<script>
438-
require(['https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.12.1-min.gz.js'], function(amplitude) {
439-
amplitude.getInstance().init('YOUR_API_KEY_HERE'); // replace YOUR_API_KEY_HERE with your Amplitude api key.
438+
require(['https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.13.0-min.gz.js'], function(amplitude) {
439+
amplitude.init('YOUR_API_KEY_HERE'); // replace YOUR_API_KEY_HERE with your Amplitude api key.
440440
window.amplitude = amplitude; // You can bind the amplitude object to window if you want to use it directly.
441441
amplitude.getInstance().logEvent('Clicked Link A');
442442
});
@@ -449,7 +449,7 @@ You can also define the path in your RequireJS configuration like so:
449449
<script>
450450
requirejs.config({
451451
paths: {
452-
'amplitude': 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.12.1-min.gz'
452+
'amplitude': 'https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.13.0-min.gz'
453453
}
454454
});
455455

‎amplitude-snippet.min.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(function(e,t){var n=e.amplitude||{_q:[],_iq:{}};var r=t.createElement("script");r.type="text/javascript";
2-
r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.12.1-min.gz.js";
2+
r.async=true;r.src="https://d24n15hnbwhuhn.cloudfront.net/libs/amplitude-2.13.0-min.gz.js";
33
r.onload=function(){e.amplitude.runQueuedFunctions()};var i=t.getElementsByTagName("script")[0];
44
i.parentNode.insertBefore(r,i);function s(e,t){e.prototype[t]=function(){this._q.push([t].concat(Array.prototype.slice.call(arguments,0)));
55
return this}}var o=function(){this._q=[];return this};var a=["add","append","clearAll","prepend","set","setOnce","unset"];

‎amplitude.js‎

Lines changed: 64 additions & 39 deletions
Large diffs are not rendered by default.

‎amplitude.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎component.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"main": "src/index.js",
44
"repo": "amplitude/amplitude-javascript",
55
"description": "Javascript library for Amplitude Analytics",
6-
"version": "2.12.1",
6+
"version": "2.13.0",
77
"keywords": [
88
"analytics",
99
"amplitude"
1010
],
1111
"dependencies": {
12-
"amplitude/ua-parser-js": "407f34a",
12+
"amplitude/ua-parser-js": "fbdb1dc",
1313
"amplitude/JavaScript-MD5": "2350ea9",
1414
"component/object": "0.0.3",
1515
"component/querystring": "1.3.0",

‎documentation/Amplitude.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ <h4 class="name" id="regenerateDeviceId"><span class="type-signature"></span>reg
16231623

16241624

16251625
<div class="description">
1626-
Regenerates a new random deviceId for current user. Note: this is not recommended unless you konw what you
1626+
Regenerates a new random deviceId for current user. Note: this is not recommended unless you know what you
16271627
are doing. This can be used in conjunction with `setUserId(null)` to anonymize users after they log out.
16281628
With a null userId and a completely new deviceId, the current user would appear as a brand new user in dashboard.
16291629
This uses src/uuid.js to regenerate the deviceId.
@@ -2456,6 +2456,8 @@ <h5>Parameters:</h5>
24562456

24572457

24582458

2459+
<dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>Please use amplitude.getInstance().setUserId(userId);</li></ul></dd>
2460+
24592461

24602462

24612463

@@ -3135,7 +3137,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Amplitude
31353137
<br class="clear">
31363138

31373139
<footer>
3138-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Sat May 21 2016 21:10:14 GMT-0700 (PDT)
3140+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri May 27 2016 15:00:10 GMT-0700 (PDT)
31393141
</footer>
31403142

31413143
<script> prettyPrint(); </script>

‎documentation/AmplitudeClient.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ <h4 class="name" id="regenerateDeviceId"><span class="type-signature"></span>reg
16071607

16081608

16091609
<div class="description">
1610-
Regenerates a new random deviceId for current user. Note: this is not recommended unless you konw what you
1610+
Regenerates a new random deviceId for current user. Note: this is not recommended unless you know what you
16111611
are doing. This can be used in conjunction with `setUserId(null)` to anonymize users after they log out.
16121612
With a null userId and a completely new deviceId, the current user would appear as a brand new user in dashboard.
16131613
This uses src/uuid.js to regenerate the deviceId.
@@ -2791,7 +2791,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Amplitude
27912791
<br class="clear">
27922792

27932793
<footer>
2794-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Sat May 21 2016 21:10:14 GMT-0700 (PDT)
2794+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri May 27 2016 15:00:10 GMT-0700 (PDT)
27952795
</footer>
27962796

27972797
<script> prettyPrint(); </script>

‎documentation/Identify.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Amplitude
12951295
<br class="clear">
12961296

12971297
<footer>
1298-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Sat May 21 2016 21:10:14 GMT-0700 (PDT)
1298+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri May 27 2016 15:00:10 GMT-0700 (PDT)
12991299
</footer>
13001300

13011301
<script> prettyPrint(); </script>

‎documentation/Revenue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Amplitude
965965
<br class="clear">
966966

967967
<footer>
968-
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Sat May 21 2016 21:10:14 GMT-0700 (PDT)
968+
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri May 27 2016 15:00:10 GMT-0700 (PDT)
969969
</footer>
970970

971971
<script> prettyPrint(); </script>

0 commit comments

Comments
 (0)