From 1fa868efa2aad9ade5e9d456dba691064d1b3c2e Mon Sep 17 00:00:00 2001
From: Alex <kokomini@qq.com>
Date: Tue, 8 Aug 2017 09:24:56 +0800
Subject: [PATCH] =?UTF-8?q?=20=20=E2=97=8F=20=E4=BF=AE=E5=A4=8D=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95=E5=A4=A7=E5=B0=8F=20bug=20=20=20=E2=97=8F=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20notification=20=E6=98=BE=E7=A4=BA=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/style.css                  |   3 ++-
 icon/{logo.icns => -logo.icns} | Bin
 icon/{logo.ico => -logo.ico}   | Bin
 icon/{logo.png => -logo.png}   | Bin
 index.html                     |   2 +-
 js/index.js                    |   7 +------
 main.js                        |   6 +++---
 package.json                   |   1 +
 8 files changed, 8 insertions(+), 11 deletions(-)
 rename icon/{logo.icns => -logo.icns} (100%)
 rename icon/{logo.ico => -logo.ico} (100%)
 rename icon/{logo.png => -logo.png} (100%)

diff --git a/css/style.css b/css/style.css
index 2e66e5a..ff8ec53 100644
--- a/css/style.css
+++ b/css/style.css
@@ -331,7 +331,8 @@
 	background-color: #fff;
 	box-shadow: 0 2px 4px rgba(0,0,0,.12),0 0 6px rgba(0,0,0,.04);
 	transition: opacity .3s,transform .3s,right .3s,top .4s;
-	overflow: hidden
+	overflow: hidden;
+	opacity: 0;
 }
 
 .notification .icon-circle-check {
diff --git a/icon/logo.icns b/icon/-logo.icns
similarity index 100%
rename from icon/logo.icns
rename to icon/-logo.icns
diff --git a/icon/logo.ico b/icon/-logo.ico
similarity index 100%
rename from icon/logo.ico
rename to icon/-logo.ico
diff --git a/icon/logo.png b/icon/-logo.png
similarity index 100%
rename from icon/logo.png
rename to icon/-logo.png
diff --git a/index.html b/index.html
index fabe114..cf32a5e 100644
--- a/index.html
+++ b/index.html
@@ -96,7 +96,7 @@ <h1 class="title current-tips" v-cloak>操作 {{ currentCategory }} 文件</h1>
       <!-- <span class="loading-log">{{currentStatus}}</span> -->
     </div>
     <transition name="notification-fade">
-    <div v-show="isDone" class="notification" style="top: 16px; z-index: 2002;"><div class="notification__group notification__notitle"><h2 class="notification__title" style="display: none;">提示</h2><div class="notification__content">处理成功</div><div class="notification__closeBtn icon-close"></div></div></div>
+    <div v-show="isDone" class="notification" style="top: 16px; z-index: 9;" :style="{opacity: 1}"><div class="notification__group notification__notitle"><h2 class="notification__title" style="display: none;">提示</h2><div class="notification__content">处理成功</div><div class="notification__closeBtn icon-close"></div></div></div>
     </transition>
   </div>
   <script type="text/javascript" src="./js/jquery-1.8.2.js"></script>
diff --git a/js/index.js b/js/index.js
index e1d54ae..1009896 100644
--- a/js/index.js
+++ b/js/index.js
@@ -88,7 +88,7 @@ let defaultActions = [{
                 icon: 'html',
                 disabled: false,
                 isSolo: true,
-                wiki: 'https://github.com/SuperAL/splice/wiki/%E5%90%88%E5%B9%B6-css-js',
+                wiki: 'https://www.zybuluo.com/alexlee/note/841903',
                 configs: [{
                         type: 'custom-checkbox',
                         label: '是否压缩合并后的 js',
@@ -247,7 +247,6 @@ var app = new Vue({
         actions: deepClone(storedActions ? storedActions : defaultActions),
         currentCategory: '',
         currentActions: [],
-        isVueLoading: true,
         isLoading: false,
         loadingMsg: '处理中...',
         isDone: false,
@@ -271,10 +270,6 @@ var app = new Vue({
     },
     watch: {
         isLoading(newVal) {
-          if (this.isVueLoading) {
-            this.isVueLoading = false;
-            return;
-          }
           if (!newVal) {
               let vm = this;
               vm.isDone = true;
diff --git a/main.js b/main.js
index 218383f..c76bd8d 100644
--- a/main.js
+++ b/main.js
@@ -9,7 +9,7 @@ const url = require('url')
 
 // 开发时使用：自动更新
 // build: 打包时需注释掉
-require('electron-reload')(__dirname, { ignored: /node_modules|[\/\\]\./ });
+// require('electron-reload')(__dirname, { ignored: /node_modules|[\/\\]\./ });
 
 
 // Keep a global reference of the window object, if you don't, the window will
@@ -18,7 +18,7 @@ let mainWindow
 
 function createWindow() {
   // Create the browser window.
-  mainWindow = new BrowserWindow({ minWidth: 1000, minHeight: 650 })
+  mainWindow = new BrowserWindow({ width: 1000, height: 650, minWidth: 1000, minHeight: 650 })
 
   // and load the index.html of the app.
   mainWindow.loadURL(url.format({
@@ -32,7 +32,7 @@ function createWindow() {
 
   // Open the DevTools.
   // build: 打包时需注释掉
-  mainWindow.webContents.openDevTools()
+  // mainWindow.webContents.openDevTools()
 
   // 快捷键 Ctrl+Alt+R 刷新页面 
   globalShortcut.register('Ctrl+Alt+R', function () {
diff --git a/package.json b/package.json
index 460bf63..63970ca 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "watch": "watchify js/es6.js -t babelify -o js/index.js --debug --verbose",
     "quickexe": "electron-packager .",
     "package": "electron-packager ./ DemoApps --overwrite --app-version=1.0.0 --platform=win32 --arch=all --out=../DemoApps --version=1.2.1 --icon=./public/img/app-icon.icns",
+    "pack:mac": "electron-packager ./ Splice --platform=darwin --arch=x64 --overwrite --out=../splice-dist/ --icon=icon/logo.icns --version 1.2.5  --ignore='(.DS_Store)'",
     "pack:win": "electron-packager ./ Splice --platform=win32 --arch=x64 --overwrite --out=../splice-dist/ --icon=icon/logo.ico --version 1.2.5",
     "pack:win32": "electron-packager ./ Splice --platform=win32 --arch=ia32 --overwrite --out=../splice-dist/ --icon=icon/logo.ico --version 1.2.5"
   },