cssstyle 0.2.31 → 0.2.37

package/.npmignore

@@ -0,0 +1 @@
+node_module

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

@@ -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)) {
@@ -585,31 +588,72 @@ exports.implicitSetter = function (property_before, property_after, isValid, par
             return undefined;
         }
 
-	    parts = parts.map(function (part) {
+        parts = parts.map(function (part) {
             return parser(part);
         });
         this._setProperty(property_before + property_after, parts.join(' '));
-	    if (parts.length === 1) {
+        if (parts.length === 1) {
             parts[1] = parts[0];
         }
-	    if (parts.length === 2) {
+        if (parts.length === 2) {
             parts[2] = parts[0];
         }
-	    if (parts.length === 3) {
+        if (parts.length === 3) {
             parts[3] = parts[1];
         }
 
-	    for (var i = 0; i < 4; i++) {
-	        var property = property_before + "-" + part_names[i] + property_after;
-	        this.removeProperty(property);
-	        if (parts[i] !== '') {
+        for (var i = 0; i < 4; i++) {
+            var property = property_before + "-" + part_names[i] + property_after;
+            this.removeProperty(property);
+            if (parts[i] !== '') {
                 this._values[property] = parts[i];
             }
-	    }
-	    return v;
+        }
+        return v;
+    };
+};
+
+//
+//  Companion to implicitSetter, but for the individual parts.
+//  This sets the individual value, and checks to see if all four
+//  sub-parts are set.  If so, it sets the shorthand version and removes
+//  the individual parts from the cssText.
+//
+exports.subImplicitSetter = function (prefix, part, isValid, parser) {
+    var property = prefix + '-' + part;
+    var subparts = [prefix+"-top", prefix+"-right", prefix+"-bottom", prefix+"-left"];
+
+    return function (v) {
+        if (typeof v === 'number') {
+            v = v.toString();
+        }
+        if (typeof v !== 'string') {
+            return undefined;
+        }
+        if (!isValid(v)) {
+            return undefined;
+        }
+        v = parser(v);
+        this._setProperty(property,v);
+        var parts = [];
+        for (var i = 0; i < 4; i++) {
+            if (this._values[subparts[i]] == null || this._values[subparts[i]] === '') {
+                break;
+            }
+            parts.push(this._values[subparts[i]]);
+        }
+        if (parts.length === 4) {
+            for (i = 0; i < 4; i++) {
+                this.removeProperty(subparts[i]);
+                this._values[subparts[i]] = parts[i];
+            }
+            this._setProperty(prefix,parts.join(" "));
+        }
+        return v;
     };
 };
 
+
 var camel_to_dashed = /[A-Z]/g;
 /*jslint regexp: true*/
 var first_segment = /^\([^\-]\)-/;

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/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/margin.js

@@ -8,7 +8,7 @@ var isValid = function (v) {
         return true;
     }
     var type = parsers.valueType(v);
-    return type === TYPES.LENGTH || type === TYPES.PERCENT;
+    return type === TYPES.LENGTH || type === TYPES.PERCENT || (type === TYPES.INTEGER && (v === '0' || v === 0));
 };
 
 var parser = function (v) {
@@ -17,7 +17,7 @@ var parser = function (v) {
         return V;
     }
     return parsers.parseMeasurement(v);
-}
+};
 
 var mySetter = parsers.implicitSetter('margin', '', isValid, parser);
 var myGlobal = parsers.implicitSetter('margin', '', function () {
@@ -28,10 +28,10 @@ var myGlobal = parsers.implicitSetter('margin', '', function () {
 
 module.exports.definition = {
     set: function (v) {
-	    if (typeof v === "number") {
+        if (typeof v === "number") {
             v = String(v);
         }
-	    if (typeof v !== "string") {
+        if (typeof v !== "string") {
             return;
         }
         var V = v.toLowerCase();
@@ -54,3 +54,6 @@ module.exports.definition = {
     enumerable: true,
     configurable: true
 };
+
+module.exports.isValid = isValid;
+module.exports.parser = parser;

package/lib/properties/marginBottom.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var margin = require('./margin.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('margin-bottom', v);
-    },
+    set: parsers.subImplicitSetter('margin', 'bottom', margin.isValid, margin.parser),
     get: function () {
         return this.getPropertyValue('margin-bottom');
     },

package/lib/properties/marginLeft.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var margin = require('./margin.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('margin-left', v);
-    },
+    set: parsers.subImplicitSetter('margin', 'left', margin.isValid, margin.parser),
     get: function () {
         return this.getPropertyValue('margin-left');
     },

package/lib/properties/marginRight.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var margin = require('./margin.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('margin-right', v);
-    },
+    set: parsers.subImplicitSetter('margin', 'right', margin.isValid, margin.parser),
     get: function () {
         return this.getPropertyValue('margin-right');
     },

package/lib/properties/marginTop.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var margin = require('./margin.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('margin-top', v);
-    },
+    set: parsers.subImplicitSetter('margin', 'top', margin.isValid, margin.parser),
     get: function () {
         return this.getPropertyValue('margin-top');
     },

package/lib/properties/padding.js

@@ -5,12 +5,12 @@ var TYPES = parsers.TYPES;
 
 var isValid = function (v) {
     var type = parsers.valueType(v);
-    return type === TYPES.LENGTH || type === TYPES.PERCENT;
+    return type === TYPES.LENGTH || type === TYPES.PERCENT || (type === TYPES.INTEGER && (v === '0' || v === 0));
 };
 
 var parser = function (v) {
     return parsers.parseMeasurement(v);
-}
+};
 
 var mySetter = parsers.implicitSetter('padding', '', isValid, parser);
 var myGlobal = parsers.implicitSetter('padding', '', function () {
@@ -21,10 +21,10 @@ var myGlobal = parsers.implicitSetter('padding', '', function () {
 
 module.exports.definition = {
     set: function (v) {
-	    if (typeof v === "number") {
+        if (typeof v === "number") {
             v = String(v);
         }
-	    if (typeof v !== "string") {
+        if (typeof v !== "string") {
             return;
         }
         var V = v.toLowerCase();
@@ -47,3 +47,6 @@ module.exports.definition = {
     enumerable: true,
     configurable: true
 };
+
+module.exports.isValid = isValid;
+module.exports.parser = parser;

package/lib/properties/paddingBottom.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var padding = require('./padding.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('padding-bottom', v);
-    },
+    set: parsers.subImplicitSetter('padding', 'bottom', padding.isValid, padding.parser),
     get: function () {
         return this.getPropertyValue('padding-bottom');
     },

package/lib/properties/paddingLeft.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var padding = require('./padding.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('padding-left', v);
-    },
+    set: parsers.subImplicitSetter('padding', 'left', padding.isValid, padding.parser),
     get: function () {
         return this.getPropertyValue('padding-left');
     },

package/lib/properties/paddingRight.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var padding = require('./padding.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('padding-right', v);
-    },
+    set: parsers.subImplicitSetter('padding', 'right', padding.isValid, padding.parser),
     get: function () {
         return this.getPropertyValue('padding-right');
     },

package/lib/properties/paddingTop.js

@@ -1,9 +1,10 @@
 'use strict';
 
+var padding = require('./padding.js');
+var parsers = require('../parsers.js');
+
 module.exports.definition = {
-    set: function (v) {
-        this._setProperty('padding-top', v);
-    },
+    set: parsers.subImplicitSetter('padding', 'top', padding.isValid, padding.parser),
     get: function () {
         return this.getPropertyValue('padding-top');
     },

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');