Skip to content

Commit 1d5c7dc

Browse files
committed
Merge branch 'feature/2.0.1'
2 parents c4cc845 + 3f317d1 commit 1d5c7dc

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Version 2.0.1 (2014-10-12)
2+
--------------------------
3+
Made error logging compatible with Internet Explorer (#264)
4+
Fixed SauceLabs red status (#235)
5+
16
Version 2.0.0 (2014-07-03)
27
--------------------------
38
Moved fixUpUrl into its own file, called lib/proxies.js (#112)

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ Licensed under the [Simplified BSD] [bsd] license.
6161
[travis]: http://travis-ci.org/snowplow/snowplow-javascript-tracker
6262
[codeclimate-image]: https://codeclimate.com/github/snowplow/snowplow-javascript-tracker.png
6363
[codeclimate]: https://codeclimate.com/github/snowplow/snowplow-javascript-tracker
64-
[saucelabs]: https://saucelabs.com/u/snowplow_js_tracker
65-
[saucelabs-button-image]: https://saucelabs.com/buildstatus/snowplow_js_tracker
66-
[saucelabs-matrix-image]: https://saucelabs.com/browser-matrix/snowplow_js_tracker.svg
64+
[saucelabs]: https://saucelabs.com/u/snowplow
65+
[saucelabs-button-image]: https://saucelabs.com/buildstatus/snowplow
66+
[saucelabs-matrix-image]: https://saucelabs.com/browser-matrix/snowplow.svg

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "snowplow-tracker",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"devDependencies": {
55
"grunt": "~0.4.2",
66
"intern": "~1.5.0",

src/js/lib/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
* Only log deprecation warnings if they won't cause an error
157157
*/
158158
object.warn = function(message) {
159-
if (typeof console !== undefined) {
159+
if (typeof console !== 'undefined') {
160160
console.warn('Snowplow: ' + message);
161161
}
162162
}

tests/functional/detectors.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ define([
4040

4141
var
4242
// Expected viewport dimensions vary based on browser
43-
expectedViewportWidths = [980, 996, 1024],
44-
expectedViewportHeights = [636, 644, 667, 670, 673, 684, 695, 705, 706, 712],
43+
expectedViewportWidths = [980, 1024, 1280],
44+
expectedViewportHeights = [636, 644, 667, 670, 673, 684, 695, 702, 705, 706, 712],
4545

4646
// User fingerprint varies based on browser features
4747
// TODO: try to hash this off the useragent -
4848
// i.e. formal 1:1 relationship between viewport or signature and an individual browser
4949
expectedSignatures = [
5050
3343029130, // IE9 Windows
5151
1101697779, // IE10
52-
154466408, // IE11
53-
2557409154, // Firefox 27.0 Mac
54-
1076144906, // Firefox 27.0 XP
52+
3875211103, // IE11
53+
2265977041, // Firefox 27.0 Mac
54+
972065378, // Firefox 27.0 XP
5555
3900377526, // Firefox 27.0 Linux
56-
705067259, // Chrome 32.0 Mac OS X
57-
4229530558, // Chrome 32.0 Windows NT
56+
3528351619, // Chrome 32.0 Mac OS X
57+
2660492875, // Chrome 32.0 Windows NT
5858
3773734853, // Chrome 32.0 Linux
59-
3339203264, // Safari 7.0 Mac
60-
3166667154 // Safari 6.0.5 Mac
59+
3882113908, // Safari 7.0 Mac
60+
2336697549 // Safari 6.0.5 Mac
6161
];
6262

6363
registerSuite({

0 commit comments

Comments
 (0)