cssstyle 1.1.0 → 1.1.1

package/lib/parsers.js

@@ -21,7 +21,7 @@ exports.TYPES = {
 // rough regular expressions
 var integerRegEx = /^[\-+]?[0-9]+$/;
 var numberRegEx = /^[\-+]?[0-9]*\.[0-9]+$/;
-var lengthRegEx = /^(0|[\-+]?[0-9]*\.?[0-9]+(in|cm|em|mm|pt|pc|px|ex|rem))$/;
+var lengthRegEx = /^(0|[\-+]?[0-9]*\.?[0-9]+(in|cm|em|mm|pt|pc|px|ex|rem|vh|vw))$/;
 var percentRegEx = /^[\-+]?[0-9]*\.?[0-9]+%$/;
 var urlRegEx = /^url\(\s*([^\)]*)\s*\)$/;
 var stringRegEx = /^(\"[^\"]*\"|\'[^\']*\')$/;

package/package.json

@@ -6,7 +6,7 @@
     "CSSStyleDeclaration",
     "StyleSheet"
   ],
-  "version": "1.1.0",
+  "version": "1.1.1",
   "homepage": "https://github.com/jsakas/CSSStyleDeclaration",
   "maintainers": [
     {
@@ -51,7 +51,7 @@
   },
   "scripts": {
     "test": "node ./scripts/generate_properties.js && node ./scripts/generate_valid_properties.js && nodeunit tests",
-    "prepublish": "node ./scripts/generate_properties.js && node ./scripts/generate_valid_properties.js"
+    "prepare": "node ./scripts/generate_properties.js && node ./scripts/generate_valid_properties.js"
   },
   "license": "MIT"
 }

package/tests/tests.js

@@ -56,9 +56,9 @@ module.exports = {
     'Test From Style String': function (test) {
         var style = new cssstyle.CSSStyleDeclaration();
         test.expect(8);
-        style.cssText = 'color: blue; background-color: red; width: 78%';
-        test.ok(3 === style.length, 'length is not 3');
-        test.ok('color: blue; background-color: red; width: 78%;' === style.cssText, 'cssText is wrong');
+        style.cssText = 'color: blue; background-color: red; width: 78%; height: 50vh;';
+        test.ok(4 === style.length, 'length is not 4');
+        test.ok('color: blue; background-color: red; width: 78%; height: 50vh;' === style.cssText, 'cssText is wrong');
         test.ok('blue' === style.getPropertyValue('color'), "getPropertyValue('color') failed");
         test.ok('color' === style.item(0), 'item(0) failed');
         test.ok('background-color' === style[1], 'style[1] failed');
@@ -108,13 +108,17 @@ module.exports = {
     },
     'Test width and height Properties and null and empty strings': function (test) {
         var style = new cssstyle.CSSStyleDeclaration();
-        test.expect(7);
+        test.expect(9);
         style.height = 6;
         test.ok('' === style.height, 'height does not remain unset');
         style.width = 0;
         test.ok('0px' === style.width, 'width is not 0px');
         style.height = '34%';
         test.ok('34%' === style.height, 'height is not 34%');
+        style.height = '100vh';
+        test.ok('100vh' === style.height, 'height is not 100vh');
+        style.height = '100vw';
+        test.ok('100vw' === style.height, 'height is not 100vw');
         style.height = '';
         test.ok(style.length === 1, 'length is not 1');
         test.ok('width: 0px;' === style.cssText, 'cssText is not "width: 0px;"');