Skip to content

Commit f9f34c1

Browse files
committed
Merge pull request #85 from nschonni/add-ms-viewport
Add @-ms-viewport for IE10
2 parents 8001381 + 24d9deb commit f9f34c1

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

src/css/Tokens.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var Tokens = [
3131
{ name: "FONT_FACE_SYM", text: "@font-face"},
3232
{ name: "CHARSET_SYM", text: "@charset"},
3333
{ name: "NAMESPACE_SYM", text: "@namespace"},
34-
{ name: "VIEWPORT_SYM", text: "@viewport"},
34+
{ name: "VIEWPORT_SYM", text: ["@viewport", "@-ms-viewport"]},
3535
{ name: "UNKNOWN_SYM" },
3636
//{ name: "ATKEYWORD"},
3737

tests/css/Parser.js

+18
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,24 @@
15171517
Assert.isTrue(true); //just don't want an error
15181518
},
15191519

1520+
testMSViewport: function(){
1521+
var parser = new Parser({ strict: true});
1522+
var result = parser.parse("@-ms-viewport { width: 397px; }");
1523+
Assert.isTrue(true);
1524+
},
1525+
1526+
testMSViewportInsideDeviceWidth: function(){
1527+
var parser = new Parser({ strict: true});
1528+
var result = parser.parse("@-ms-viewport { width: device-width; }");
1529+
Assert.isTrue(true);
1530+
},
1531+
1532+
testMSViewportInsideDeviceHeight: function(){
1533+
var parser = new Parser({ strict: true});
1534+
var result = parser.parse("@-ms-viewport { width: device-height; }");
1535+
Assert.isTrue(true);
1536+
},
1537+
15201538
testViewportEventFires: function(){
15211539
var parser = new Parser({ strict:true}),
15221540
calledStart = false,

0 commit comments

Comments
 (0)