cssstyle 0.2.34 → 0.3.1

package/lib/CSSStyleDeclaration.js

@@ -95,6 +95,7 @@ CSSStyleDeclaration.prototype = {
 
         var prevValue = this._values[name];
         delete this._values[name];
+        delete this._importants[name];
 
         var index = Array.prototype.indexOf.call(this, name);
         if (index < 0) {

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))$/;
+var lengthRegEx = /^(0|[\-+]?[0-9]*\.?[0-9]+(in|cm|em|mm|pt|pc|px|ex|rem))$/;
 var percentRegEx = /^[\-+]?[0-9]*\.?[0-9]+%$/;
 var urlRegEx = /^url\(\s*([^\)]*)\s*\)$/;
 var stringRegEx = /^(\"[^\"]*\"|\'[^\']*\')$/;
@@ -470,7 +470,7 @@ exports.shorthandParser = function parse(v, shorthand_for) {
     var type = exports.valueType(v);
     if (type === exports.TYPES.NULL_OR_EMPTY_STR) {
         Object.keys(shorthand_for).forEach(function (property) {
-            obj[property] = v;
+            obj[property] = '';
         });
         return obj;
     }
@@ -519,7 +519,10 @@ exports.shorthandSetter = function (property, shorthand_for) {
             // in case it gets translated into something else (0 -> 0px)
             obj[subprop] = this[camel];
             this.removeProperty(subprop);
-            this._values[subprop] = obj[subprop];
+            // don't add in empty properties
+            if (obj[subprop] !== '') {
+                this._values[subprop] = obj[subprop];
+            }
         }, this);
         Object.keys(shorthand_for).forEach(function (subprop) {
             if (!obj.hasOwnProperty(subprop)) {

package/lib/properties/alignContent.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('align-content', v);
+    },
+    get: function () {
+        return this.getPropertyValue('align-content');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/alignItems.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('align-items', v);
+    },
+    get: function () {
+        return this.getPropertyValue('align-items');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/backgroundPosition.js

@@ -5,6 +5,9 @@ var parsers = require('../parsers');
 var valid_keywords = ['top', 'center', 'bottom', 'left', 'right'];
 
 var parse = function parse(v) {
+    if (v === '' || v === null) {
+        return undefined;
+    }
     var parts = v.split(/\s+/);
     if (parts.length > 2 || parts.length < 1) {
         return undefined;

package/lib/properties/borderSpacing.js

@@ -7,6 +7,9 @@ var parsers = require('../parsers');
 // if two, the first applies to the horizontal and the second applies to vertical spacing
 
 var parse = function parse(v) {
+    if (v === '' || v === null) {
+        return undefined;
+    }
     if (v.toLowerCase() === 'inherit') {
         return v;
     }

package/lib/properties/flexDirection.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('flex-direction', v);
+    },
+    get: function () {
+        return this.getPropertyValue('flex-direction');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/flexFlow.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('flex-flow', v);
+    },
+    get: function () {
+        return this.getPropertyValue('flex-flow');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/flexWrap.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('flex-wrap', v);
+    },
+    get: function () {
+        return this.getPropertyValue('flex-wrap');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/fontFamily.js

@@ -5,6 +5,9 @@ var valueType = require('../parsers').valueType;
 
 var partsRegEx = /\s*,\s*/;
 module.exports.isValid = function isValid(v) {
+    if (v === '' || v === null) {
+        return true;
+    }
     var parts = v.split(partsRegEx);
     var len = parts.length;
     var i;

package/lib/properties/height.js

@@ -2,9 +2,19 @@
 
 var parseMeasurement = require('../parsers').parseMeasurement;
 
+function parse(v) {
+    if (String(v).toLowerCase() === 'auto') {
+        return 'auto';
+    }
+    if (String(v).toLowerCase() === 'inherit') {
+        return 'inherit';
+    }
+    return parseMeasurement(v);
+}
+
 module.exports.definition = {
     set: function (v) {
-        this._setProperty('height', parseMeasurement(v));
+        this._setProperty('height', parse(v));
     },
     get: function () {
         return this.getPropertyValue('height');

package/lib/properties/justifyContent.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('justify-content', v);
+    },
+    get: function () {
+        return this.getPropertyValue('justify-content');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/transform.js

@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports.definition = {
+    set: function (v) {
+        this._setProperty('transform', v);
+    },
+    get: function () {
+        return this.getPropertyValue('transform');
+    },
+    enumerable: true,
+    configurable: true
+};

package/lib/properties/width.js

@@ -2,9 +2,19 @@
 
 var parseMeasurement = require('../parsers').parseMeasurement;
 
+function parse(v) {
+    if (String(v).toLowerCase() === 'auto') {
+        return 'auto';
+    }
+    if (String(v).toLowerCase() === 'inherit') {
+        return 'inherit';
+    }
+    return parseMeasurement(v);
+}
+
 module.exports.definition = {
     set: function (v) {
-        this._setProperty('width', parseMeasurement(v));
+        this._setProperty('width', parse(v));
     },
     get: function () {
         return this.getPropertyValue('width');