jss-extend - npm Package Compare versions

Comparing version 2.0.2 to 2.0.3

dist/jss-extend.js

@@ -100,8 +100,7 @@ (function webpackUniversalModuleDefinition(root, factory) {
 	  for (var _prop in style) {
-	    if (_prop !== 'extend') {
-	      if (isObject(newStyle[_prop]) && isObject(style[_prop])) {
-	        extend(rule, newStyle[_prop], style[_prop]);
-	      } else if (!newStyle[_prop]) {
-	        newStyle[_prop] = style[_prop];
-	      }
+	    if (_prop === 'extend') continue;
+	    if (isObject(newStyle[_prop]) && isObject(style[_prop])) {
+	      extend(rule, newStyle[_prop], style[_prop]);
+	    } else {
+	      newStyle[_prop] = style[_prop];
 	    }
@@ -108,0 +107,0 @@ }

dist/jss-extend.min.js

@@ -1,1 +0,1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.jssExtend=t():e.jssExtend=t()}(this,function(){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t){"use strict";function n(e){return e&&"object"===("undefined"==typeof e?"undefined":r(e))&&!Array.isArray(e)}function o(e,t,r){if("string"==typeof r.extend){if(e.options&&e.options.sheet){var f=e.options.sheet.getRule(r.extend);f&&(f===e?i("[JSS] A rule tries to extend itself \r\n"+e.toString()):o(e,t,f.originalStyle))}}else if(Array.isArray(r.extend))for(var s=0;s<r.extend.length;s++)o(e,t,r.extend[s]);else for(var d in r.extend)"extend"===d?o(e,t,r.extend.extend):n(r.extend[d])?(t[d]||(t[d]={}),o(e,t[d],r.extend[d])):t[d]=r.extend[d];for(var u in r)"extend"!==u&&(n(t[u])&&n(r[u])?o(e,t[u],r[u]):t[u]||(t[u]=r[u]));return t}Object.defineProperty(t,"__esModule",{value:!0});var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},i=console.warn.bind(console);t["default"]=function(){return function(e){e.style&&e.style.extend&&(e.style=o(e,{},e.style))}}}])});
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.jssExtend=t():e.jssExtend=t()}(this,function(){return function(e){function t(o){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return e[o].call(r.exports,r,r.exports,t),r.loaded=!0,r.exports}var n={};return t.m=e,t.c=n,t.p="",t(0)}([function(e,t){"use strict";function n(e){return e&&"object"===("undefined"==typeof e?"undefined":r(e))&&!Array.isArray(e)}function o(e,t,r){if("string"==typeof r.extend){if(e.options&&e.options.sheet){var f=e.options.sheet.getRule(r.extend);f&&(f===e?i("[JSS] A rule tries to extend itself \r\n"+e.toString()):o(e,t,f.originalStyle))}}else if(Array.isArray(r.extend))for(var s=0;s<r.extend.length;s++)o(e,t,r.extend[s]);else for(var d in r.extend)"extend"===d?o(e,t,r.extend.extend):n(r.extend[d])?(t[d]||(t[d]={}),o(e,t[d],r.extend[d])):t[d]=r.extend[d];for(var u in r)"extend"!==u&&(n(t[u])&&n(r[u])?o(e,t[u],r[u]):t[u]=r[u]);return t}Object.defineProperty(t,"__esModule",{value:!0});var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol?"symbol":typeof e},i=console.warn.bind(console);t["default"]=function(){return function(e){e.style&&e.style.extend&&(e.style=o(e,{},e.style))}}}])});

history.md

@@ -0,1 +1,5 @@
+## 2.0.3 / 2016-10-17
+
+- fixed regression bug introduced in 2.0.2 - rules own properties should always override extended props.
+
 ## 2.0.2 / 2016-10-11
@@ -2,0 +6,0 @@

lib/index.js

@@ -44,8 +44,7 @@ 'use strict';
   for (var _prop in style) {
-    if (_prop !== 'extend') {
-      if (isObject(newStyle[_prop]) && isObject(style[_prop])) {
-        extend(rule, newStyle[_prop], style[_prop]);
-      } else if (!newStyle[_prop]) {
-        newStyle[_prop] = style[_prop];
-      }
+    if (_prop === 'extend') continue;
+    if (isObject(newStyle[_prop]) && isObject(style[_prop])) {
+      extend(rule, newStyle[_prop], style[_prop]);
+    } else {
+      newStyle[_prop] = style[_prop];
     }
@@ -52,0 +51,0 @@ }

package.json

 {
   "name": "jss-extend",
   "description": "JSS plugin that enables inheritance",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "author": {
@@ -6,0 +6,0 @@ "name": "Oleg Slobodskoi",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

13225

increased by0.46%

Worsened metrics

Lines of code

192

decreased by-1.03%

No dependency changes