auto-sprites - npm Package Compare versions

Comparing version 0.0.8 to 0.0.9

auto-sprites.js

@@ -106,3 +106,3 @@ var path = require('path'),
                         next();
-                    });
+                });
             }
@@ -109,0 +109,0 @@

diagonal-packer.js

@@ -1,18 +0,25 @@
-var VerticalPacker = function(){
+var DialonalPacker = function(){
 
 };
 //自下而上的拼图
-VerticalPacker.prototype = {
+DialonalPacker.prototype = {
 
     //[w:10,h:10]
     fit:function(blocks){
-        var n, node, block, len = blocks.length;
-        var w = len > 0 ? blocks[0].w : 0;
-        var h = len > 0 ? blocks[0].h : 0;
+        var n, block, len = blocks.length, prevBlock;
+
+
         // this.root = { x: 0, y: 0, w: w, h: h };
         for (n = 0; n < len ; n++) {
+
             block = blocks[n];
 
             if(!this.root){
-                this.root = {x:0,y:0,w:block.w,h:block.h};
+                this.root = {
+                    x:0,
+                    y:0,
+                    w:block.w,
+                    h:block.h
+                };
+
                 block.fit = this.root;
@@ -23,7 +30,7 @@ }else{
                     y:0,
-                    w:this.root.w+Math.abs(this.root.w-block.w),
-                    h:this.root.h+block.h,
-                    down:{
-                        x:0,
-                        y:this.root.h,
+                    w:block.w+this.root.w,
+                    h:block.h+this.root.h,
+                    rightTop:{
+                        x:this.root.w,
+                        y:0,
                         w:block.w,
@@ -33,4 +40,12 @@ h:block.h
                 }
-                block.fit = this.root.down;
+                block.fit = this.root.rightTop;
             }
+
+
+            for(var j=0;j<n;j++){
+                prevBlock = blocks[j];
+                if(prevBlock.fit){
+                    prevBlock.fit.y += block.h;
+                }
+            }
         }
@@ -40,2 +55,2 @@ }
 
-module.exports = VerticalPacker;
+module.exports = DialonalPacker;

index.js

@@ -18,3 +18,3 @@ var pegasus = require('pegasus'),
 
-            console.log(req.path);
+
             this.autoSprites = new AutoSprites({
@@ -21,0 +21,0 @@ data:res.body('utf-8'),

merge-image.js

 var util = require('pegasus').util,
     path = require('path'),
-    im = require('./image-magick'),
+
     gd = require('node-gd'),
@@ -132,2 +132,3 @@ fs = require('fs'),
     createPng: function (w, h) {
+
         var img = gd.createTrueColor(w, h);
@@ -176,6 +177,8 @@ if (img) {
                 item = result[key];
-                if (item.imageMeta && item.imageMeta.hasDraw) {
-                    hasDrawImages.push(item);
-                } else {
-                    newDrawImages.push(item);
+                if(item.imageMeta){
+                    if (item.imageMeta.hasDraw) {
+                        hasDrawImages.push(item);
+                    } else {
+                        newDrawImages.push(item);
+                    }
                 }
@@ -234,2 +237,7 @@ }
                 (position[1] - style.fit.y) + 'px', '');
+
+            //合并样式 替换成background的形式
+
+            rule.removeProperty('background-layout');
+
         });
@@ -236,0 +244,0 @@ }

package.json

 {
   "name": "auto-sprites",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "一个用于天马的自动合并图片的模块",
@@ -5,0 +5,0 @@ "main": "index.js",

parse-background.js

@@ -13,5 +13,20 @@ var util = require('pegasus').util,
         {
+            reg:/\?diagonal/,
+            callback:function(result){
+                result['background-layout'] = 'diagonal';
+            }
+
+        },
+
+        {
             reg: /(url\(['"]?.*?['"]?\))/,
             callback: function (result, match) {
-                result['background-image'] = match[0];
+                //去除时间戳等其他标识
+                var timeStampReg =  /(\?.*)\)$/,
+                    timeStampMatch =  match[0].match(timeStampReg);
+                if(timeStampMatch) {
+                    result['background-image'] = match[0].replace(timeStampMatch[1],'');
+                }else{
+                    result['background-image'] = match[0];
+                }
             }
@@ -18,0 +33,0 @@ },

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

Shell access

Supply chain risk

This module accesses the system shell. Accessing the system shell increases the risk of executing arbitrary code.

Found 1 instance in 1 package

Improved metrics

Number of low supply chain risk alerts

5

decreased by-28.57%

Number of medium supply chain risk alerts

0

decreased by-100%

Worsened metrics

Total package byte prevSize

28137

decreased by-23.38%

Number of package files

11

decreased by-15.38%

Lines of code

791

decreased by-22.68%

No dependency changes