Skip to content

Commit e942499

Browse files
committed
detect ie using javascript
1 parent e36d1aa commit e942499

7 files changed

Lines changed: 51 additions & 26 deletions

File tree

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ node_js:
33
- "0.10"
44
before_install:
55
- "curl -L http://git.io/ejPSng | /bin/sh"
6+
env:
7+
- METEOR_ENV=test

assets/after.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,22 @@ if( window.JSON
1212
&& Array.prototype.map
1313
&& JSON.parse
1414
&& JSON.stringify
15-
&& !Zone.disabled) {
15+
&& isBrowserAllowed()) {
1616
Zone.init();
1717
Zone.inited = true;
1818
restoreOriginals();
1919
}
20+
21+
function isBrowserAllowed() {
22+
var ieVersion = isIE();
23+
if(!ieVersion) {
24+
return true;
25+
} else {
26+
return ieVersion > 9;
27+
}
28+
}
29+
30+
function isIE () {
31+
var myNav = navigator.userAgent.toLowerCase();
32+
return (myNav.indexOf('msie') != -1) ? parseInt(myNav.split('msie')[1]) : false;
33+
}

assets/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,4 @@ function restoreOriginals() {
431431

432432
function pickAllArgs(context, args) {
433433
return args;
434-
}
434+
}

package.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ Package.on_test(function (api) {
3636
'tests/hijacks/subscriptions.js',
3737
'tests/hijacks/collections.js',
3838
], 'client');
39-
40-
process.env['METEOR_ENV'] = 'test';
4139
});
4240

4341
function addPackageFiles(api) {

server/inject.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ if(Package['inject-initial']) {
66
// for Meteor 0.9 +
77
Inject = Package['meteorhacks:inject-initial'].Inject;
88

9-
// meteor test-packages prefix the package with `loca-test:`
10-
// that's why we need this hack
9+
// this is a trick to idnentify the test environment
10+
// need to set this env var before running tests
1111
if(process.env['METEOR_ENV'] == 'test') {
1212
var assets = '/packages/local-test:meteorhacks:zones/assets';
1313
} else {
@@ -19,7 +19,6 @@ var HTML = [
1919
'<script src="'+assets+'/utils.js" type="text/javascript"></script>',
2020
'<script src="'+assets+'/before.js" type="text/javascript"></script>',
2121
'<script src="'+assets+'/zone.js" type="text/javascript"></script>',
22-
'<!--[if lt IE 10 ]> <script>Zone.disabled=true</script> <![endif]-->',
2322
'<script src="'+assets+'/tracer.js" type="text/javascript"></script>',
2423
'<script src="'+assets+'/after.js" type="text/javascript"></script>',
2524
'<script src="'+assets+'/reporters.js" type="text/javascript"></script>',

tests/loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ function getSrc(el) {
6767
}
6868

6969
function replacePackageName (path) {
70-
return path.replace(/\/packages\/(.*)\/assets/, '/packages/*/assets');
70+
return path.replace(/(.*)\/packages\/(.*)\/assets/, '/packages/*/assets');
7171
}

versions.json

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"dependencies": [
33
[
44
"application-configuration",
5-
"1.0.0"
5+
"1.0.1"
66
],
77
[
88
"binary-heap",
99
"1.0.0"
1010
],
1111
[
1212
"blaze",
13-
"1.0.3"
13+
"2.0.0"
1414
],
1515
[
1616
"blaze-tools",
@@ -24,17 +24,21 @@
2424
"check",
2525
"1.0.0"
2626
],
27+
[
28+
"ddp",
29+
"1.0.8"
30+
],
2731
[
2832
"deps",
29-
"1.0.1"
33+
"1.0.2"
3034
],
3135
[
3236
"ejson",
33-
"1.0.0"
37+
"1.0.1"
3438
],
3539
[
3640
"follower-livedata",
37-
"1.0.0"
41+
"1.0.1"
3842
],
3943
[
4044
"geojson-utils",
@@ -62,15 +66,15 @@
6266
],
6367
[
6468
"livedata",
65-
"1.0.7"
69+
"1.0.8"
6670
],
6771
[
6872
"logging",
6973
"1.0.2"
7074
],
7175
[
7276
"meteor",
73-
"1.0.2"
77+
"1.0.3"
7478
],
7579
[
7680
"meteorhacks:inject-initial",
@@ -82,15 +86,15 @@
8286
],
8387
[
8488
"minimongo",
85-
"1.0.1"
89+
"1.0.2"
8690
],
8791
[
88-
"mongo-livedata",
89-
"1.0.3"
92+
"mongo",
93+
"1.0.4"
9094
],
9195
[
9296
"observe-sequence",
93-
"1.0.1"
97+
"1.0.2"
9498
],
9599
[
96100
"ordered-dict",
@@ -102,7 +106,11 @@
102106
],
103107
[
104108
"reactive-dict",
105-
"1.0.0"
109+
"1.0.1"
110+
],
111+
[
112+
"reactive-var",
113+
"1.0.1"
106114
],
107115
[
108116
"retry",
@@ -114,31 +122,35 @@
114122
],
115123
[
116124
"session",
117-
"1.0.0"
125+
"1.0.1"
118126
],
119127
[
120128
"spacebars",
121-
"1.0.0"
129+
"1.0.1"
122130
],
123131
[
124132
"spacebars-compiler",
125-
"1.0.1"
133+
"1.0.2"
126134
],
127135
[
128136
"templating",
129-
"1.0.4"
137+
"1.0.5"
138+
],
139+
[
140+
"tracker",
141+
"1.0.2"
130142
],
131143
[
132144
"ui",
133-
"1.0.0"
145+
"1.0.1"
134146
],
135147
[
136148
"underscore",
137149
"1.0.0"
138150
],
139151
[
140152
"webapp",
141-
"1.0.2"
153+
"1.0.3"
142154
]
143155
],
144156
"pluginDependencies": [],

0 commit comments

Comments
 (0)