more-css - npm Package Compare versions

Comparing version 0.10.2 to 0.10.3

build/abbreviationKey.js

@@ -0,0 +0,0 @@ var KEYS = [

build/CalArea.js

@@ -0,0 +0,0 @@ var ImpactChild=function(){var _0=require('./ImpactChild');return _0.hasOwnProperty("ImpactChild")?_0.ImpactChild:_0.hasOwnProperty("default")?_0.default:_0}();

build/calculate.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/checkLevel.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/clone.js

@@ -0,0 +0,0 @@ function clone(obj) {

build/compress.js

@@ -0,0 +0,0 @@ var Clean=function(){var _0=require('clean-css');return _0.hasOwnProperty("Clean")?_0.Clean:_0.hasOwnProperty("default")?_0.default:_0}();

build/concatSelector.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/eventbus.js

@@ -0,0 +0,0 @@ var events = {};

build/exprstmt.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/Fn.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/forstmt.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/getFn.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/getVar.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/ifstmt.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/ignore.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/Impact.js

@@ -0,0 +0,0 @@ var KEY_HASH=function(){var _0=require('./abbreviationKey.js');return _0.hasOwnProperty("KEY_HASH")?_0.KEY_HASH:_0.hasOwnProperty("default")?_0.default:_0}();

build/ImpactChild.js

@@ -0,0 +0,0 @@ var KEY_HASH=function(){var _0=require('./abbreviationKey.js');return _0.hasOwnProperty("KEY_HASH")?_0.KEY_HASH:_0.hasOwnProperty("default")?_0.default:_0}();

build/join.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/More.js

@@ -0,0 +0,0 @@ var fs=function(){var _0=require('fs');return _0.hasOwnProperty("fs")?_0.fs:_0.hasOwnProperty("default")?_0.default:_0}();

build/normalize.js

@@ -0,0 +0,0 @@ exports.default=function(s) {

build/operate.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/preFn.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/preImport.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/preVar.js

@@ -0,0 +0,0 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

build/RegionCompress.js

@@ -0,0 +0,0 @@ var sort=function(){var _0=require('./sort');return _0.hasOwnProperty("sort")?_0.sort:_0.hasOwnProperty("default")?_0.default:_0}();

build/sort.js

@@ -0,0 +0,0 @@ function quickSort(arr, begin, end, compare) {

build/Tree.js

@@ -231,2 +231,19 @@ var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();
           var s = getVar(node.last().token(), self.varHash, self.globalVar);
+          var isFontFamily = false;
+          var parent = node.parent();
+          if(parent.name() == Node.VALUE) {
+            parent = parent.parent();
+            if(parent.name() == Node.STYLE) {
+              if(parent.first().name() == Node.KEY) {
+                var t = parent.first().last();
+                if(t.isToken()) {
+                  t = t.token();
+                  //TODO:vars可以作为key
+                  if(t.type() == Token.KEYWORD && t.content().toLowerCase() == 'font-family') {
+                    isFontFamily = true;
+                  }
+                }
+              }
+            }
+          }
           var c = s.charAt(0);
@@ -237,3 +254,8 @@ if(c != "'" && c != '"') {
           }
-          s = s.replace(/,\s*/g, c + ',' + c);
+          if(isFontFamily) {
+            s = s.replace(/,\s*/g, c + ',' + c);
+          }
+          else {
+            s = s.replace(/^['"]/, '').replace(/['"]$/, '');
+          }
           self.res += s;
@@ -240,0 +262,0 @@ var temp = ignore(node, self.ignores, self.index, true);

index.js

 if(typeof define === 'function' && (define.amd || define.cmd)) {
   define(function(require, exports, module) {
-    require('./fix');
     module.exports = require('./web/More').default;
@@ -8,4 +7,3 @@ });
 else {
-  require('./fix');
   module.exports = require('./build/More').default;
 }

package.json

 {
   "name": "more-css",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "a css pre-compiler&agressive compressor",
@@ -5,0 +5,0 @@ "maintainers": [

README.md

@@ -16,4 +16,4 @@ A css pre-compiler&radical-compressor
 
-详细见：https://github.com/army8735/more/wiki/document
-中文：https://github.com/army8735/more/wiki/文档
+详细见：https://github.com/army8735/more/wiki/文档<br/>
+English：https://github.com/army8735/more/wiki/document
 
@@ -20,0 +20,0 @@ build目录下为nodejs环境的module模块。

src/abbreviationKey.js

@@ -0,0 +0,0 @@ var KEYS = [

src/CalArea.js

@@ -0,0 +0,0 @@ import ImpactChild from './ImpactChild';

src/calculate.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/checkLevel.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/clone.js

@@ -0,0 +0,0 @@ function clone(obj) {

src/compress.js

@@ -0,0 +0,0 @@ import Clean from 'clean-css';

src/concatSelector.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/eventbus.js

@@ -0,0 +0,0 @@ var events = {};

src/exprstmt.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/Fn.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/forstmt.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/getFn.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/getVar.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/ifstmt.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/ignore.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/Impact.js

@@ -0,0 +0,0 @@ import KEY_HASH from './abbreviationKey.js';

src/ImpactChild.js

@@ -0,0 +0,0 @@ import KEY_HASH from './abbreviationKey.js';

src/join.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/More.js

@@ -0,0 +0,0 @@ import fs from 'fs';

src/normalize.js

@@ -0,0 +0,0 @@ export default function(s) {

src/operate.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/preFn.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/preImport.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/preVar.js

@@ -0,0 +0,0 @@ import homunculus from 'homunculus';

src/RegionCompress.js

@@ -0,0 +0,0 @@ import sort from './sort';

src/sort.js

@@ -0,0 +0,0 @@ function quickSort(arr, begin, end, compare) {

src/Tree.js

@@ -231,2 +231,19 @@ import homunculus from 'homunculus';
           var s = getVar(node.last().token(), self.varHash, self.globalVar);
+          var isFontFamily = false;
+          var parent = node.parent();
+          if(parent.name() == Node.VALUE) {
+            parent = parent.parent();
+            if(parent.name() == Node.STYLE) {
+              if(parent.first().name() == Node.KEY) {
+                var t = parent.first().last();
+                if(t.isToken()) {
+                  t = t.token();
+                  //TODO:vars可以作为key
+                  if(t.type() == Token.KEYWORD && t.content().toLowerCase() == 'font-family') {
+                    isFontFamily = true;
+                  }
+                }
+              }
+            }
+          }
           var c = s.charAt(0);
@@ -237,3 +254,8 @@ if(c != "'" && c != '"') {
           }
-          s = s.replace(/,\s*/g, c + ',' + c);
+          if(isFontFamily) {
+            s = s.replace(/,\s*/g, c + ',' + c);
+          }
+          else {
+            s = s.replace(/^['"]/, '').replace(/['"]$/, '');
+          }
           self.res += s;
@@ -240,0 +262,0 @@ var temp = ignore(node, self.ignores, self.index, true);

web/abbreviationKey.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var KEYS = [

web/CalArea.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var ImpactChild=function(){var _0=require('./ImpactChild');return _0.hasOwnProperty("ImpactChild")?_0.ImpactChild:_0.hasOwnProperty("default")?_0.default:_0}();

web/calculate.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/checkLevel.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/clone.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){function clone(obj) {

web/compress.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var Clean=function(){var _0=require('clean-css');return _0.hasOwnProperty("Clean")?_0.Clean:_0.hasOwnProperty("default")?_0.default:_0}();

web/concatSelector.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/eventbus.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var events = {};

web/exprstmt.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/Fn.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/forstmt.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/getFn.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/getVar.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/ifstmt.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/ignore.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/Impact.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var KEY_HASH=function(){var _0=require('./abbreviationKey.js');return _0.hasOwnProperty("KEY_HASH")?_0.KEY_HASH:_0.hasOwnProperty("default")?_0.default:_0}();

web/ImpactChild.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var KEY_HASH=function(){var _0=require('./abbreviationKey.js');return _0.hasOwnProperty("KEY_HASH")?_0.KEY_HASH:_0.hasOwnProperty("default")?_0.default:_0}();

web/join.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/More.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var fs=function(){var _0=require('fs');return _0.hasOwnProperty("fs")?_0.fs:_0.hasOwnProperty("default")?_0.default:_0}();

web/normalize.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){exports.default=function(s) {

web/operate.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/preFn.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/preImport.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/preVar.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();

web/RegionCompress.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){var sort=function(){var _0=require('./sort');return _0.hasOwnProperty("sort")?_0.sort:_0.hasOwnProperty("default")?_0.default:_0}();

web/sort.js

@@ -0,0 +0,0 @@ define(function(require, exports, module){function quickSort(arr, begin, end, compare) {

web/Tree.js

@@ -231,2 +231,19 @@ define(function(require, exports, module){var homunculus=function(){var _0=require('homunculus');return _0.hasOwnProperty("homunculus")?_0.homunculus:_0.hasOwnProperty("default")?_0.default:_0}();
           var s = getVar(node.last().token(), self.varHash, self.globalVar);
+          var isFontFamily = false;
+          var parent = node.parent();
+          if(parent.name() == Node.VALUE) {
+            parent = parent.parent();
+            if(parent.name() == Node.STYLE) {
+              if(parent.first().name() == Node.KEY) {
+                var t = parent.first().last();
+                if(t.isToken()) {
+                  t = t.token();
+                  //TODO:vars可以作为key
+                  if(t.type() == Token.KEYWORD && t.content().toLowerCase() == 'font-family') {
+                    isFontFamily = true;
+                  }
+                }
+              }
+            }
+          }
           var c = s.charAt(0);
@@ -237,3 +254,8 @@ if(c != "'" && c != '"') {
           }
-          s = s.replace(/,\s*/g, c + ',' + c);
+          if(isFontFamily) {
+            s = s.replace(/,\s*/g, c + ',' + c);
+          }
+          else {
+            s = s.replace(/^['"]/, '').replace(/['"]$/, '');
+          }
           self.res += s;
@@ -240,0 +262,0 @@ var temp = ignore(node, self.ignores, self.index, true);

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

Lines of code

10127

increased by0.5%

Worsened metrics

Total package byte prevSize

362139

decreased by-6.09%

Number of package files

96

decreased by-2.04%

No dependency changes