Merge branch 'master' of https://github.com/AdFabConnect/abejs

# Conflicts: # package.json # src/server/routes/post-upload.js
abecms · Sep 22, 2016 · 2e88135 · 2e88135
2 parents ac7aefc + b880123
commit 2e88135
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abe-cli",
-  "version": "2.3.14",
+  "version": "2.3.15",
   "description": "Abe command line tool",
   "main": "src/server/app.js",
   "repository": {

diff --git a/src/server/routes/post-upload.js b/src/server/routes/post-upload.js
@@ -63,9 +63,9 @@ var route = function(req, res, next){
           var sfStat = fse.statSync(filePath)
 
           if(sfStat){
-            var nb = filePath.match(/_([0-9]).(jpg|png|gif|svg|mp4)/)
-            if(nb && nb[1]) filePath = filePath.replace(/_([0-9])\.(jpg|png|gif|svg|mp4)/, `_${parseInt(nb[1]) + 1}.$2`)
-            else filePath = filePath.replace(/\.(jpg|png|gif|svg|mp4)/, `_1.$1`)
+            var nb = filePath.match(/_([0-9]).(jpg|png|gif|svg|mp4)/) 
+            if(nb && nb[1]) filePath = filePath.replace(/_([0-9])\.(jpg|png|gif|svg|mp4)/, `_${parseInt(nb[1]) + 1}.$2`) 
+            else filePath = filePath.replace(/\.(jpg|png|gif|svg|mp4)/, `_1.$1`) 
             createImage()
           }
         }
@@ -97,7 +97,7 @@ var route = function(req, res, next){
         var openFile = fse.readFileSync(filePath).toString()
         if(openFile === '') throw new Error('')
         clearInterval(interval)
-        if(/\.(jpg|png|gif|svg)/.test(filePath)) resp = Hooks.instance.trigger('afterSaveImage', resp, req)
+        if(/\.(jpg|png|gif|svg)/.test(filePath)) resp = Hooks.instance.trigger('afterSaveImage', resp, req) 
         res.set('Content-Type', 'application/json')
         res.send(JSON.stringify(resp))
       }