Merge pull request #105 from sparanoid/viewport-unit-update

Update viewport units

Author: nzakas

src/css/PropertyValuePart.js

@@ -46,7 +46,8 @@ function PropertyValuePart(text, line, col){
             case "ch":
             case "vh":
             case "vw":
-            case "vm":
+            case "vmax":
+            case "vmin":
                 this.type = "length";
                 break;
 

src/css/TokenStream.js

@@ -642,7 +642,7 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
             ident = this.readName(reader.read());
             value += ident;
 
-            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^vm$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)){
+            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^vmax$|^vmin$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)){
                 tt = Tokens.LENGTH;
             } else if (/^deg|^rad$|^grad$/i.test(ident)){
                 tt = Tokens.ANGLE;

tests/css/Parser.js

@@ -1025,15 +1025,26 @@
             Assert.areEqual("vw", result.parts[0].units);
         },
 
+        testViewportRelativeMaxValue: function(){
+            var parser = new Parser();
+            var result = parser.parsePropertyValue("50vmax");
+
+            Assert.isInstanceOf(parserlib.css.PropertyValue, result);
+            Assert.areEqual(1, result.parts.length);
+            Assert.areEqual("length", result.parts[0].type);
+            Assert.areEqual(50, result.parts[0].value);
+            Assert.areEqual("vmax", result.parts[0].units);
+        },
+
         testViewportRelativeMinValue: function(){
             var parser = new Parser();
-            var result = parser.parsePropertyValue("50vm");
+            var result = parser.parsePropertyValue("50vmin");
 
             Assert.isInstanceOf(parserlib.css.PropertyValue, result);
             Assert.areEqual(1, result.parts.length);
             Assert.areEqual("length", result.parts[0].type);
             Assert.areEqual(50, result.parts[0].value);
-            Assert.areEqual("vm", result.parts[0].units);
+            Assert.areEqual("vmin", result.parts[0].units);
         },
 
         testPercentageValue: function(){

tests/css/TokenStream.js

@@ -313,9 +313,13 @@
             "50.0REM"    : [CSSTokens.LENGTH],
             ".5rEm"      : [CSSTokens.LENGTH],
 
-            "5vm"       : [CSSTokens.LENGTH],
-            "50.0VM"    : [CSSTokens.LENGTH],
-            ".5vM"      : [CSSTokens.LENGTH],
+            "5vmax"      : [CSSTokens.LENGTH],
+            "50.0VMAX"   : [CSSTokens.LENGTH],
+            ".5vMax"     : [CSSTokens.LENGTH],
+
+            "5vmin"      : [CSSTokens.LENGTH],
+            "50.0VMIN"   : [CSSTokens.LENGTH],
+            ".5vMin"     : [CSSTokens.LENGTH],
 
             "5ch"       : [CSSTokens.LENGTH],
             "50.0CH"    : [CSSTokens.LENGTH],