From 68118a2677baa80a6c469a7d130108a1bbb47e0e Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 2 Apr 2018 22:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E7=B1=BB=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/tags-controller.js | 13 +++++--------
 public/views/tags.html                        |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 0f77c1f..0c8990b 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -239,21 +239,18 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
         dataService.clipboard(url);
     }
 
-    $scope.toggleMode = function () {
-        $scope.editMode = !$scope.editMode;
+    $scope.toggleMode = function (mode) {
+        $scope.editMode = mode;
         if (!$scope.editMode) {
             getTags({});
         } else {
-            $('.js-edit').transition('hide'); // 没装完逼之前，不允许切换编辑模式，否则动画模式乱了。
             $('.js-tags-table').transition('hide');
+            $('.js-tag-costomTag').transition('hide');
             $('.stackable.cards .card').transition('hide');
             $('.stackable.cards .card').transition({
                 animation: dataService.animation(),
                 reverse: 'auto', // default setting
-                interval: 50,
-                onComplete: function () {
-                    $('.js-edit').transition('show');
-                }
+                interval: 50
             });
         }
     }
@@ -543,7 +540,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
             getTags({});
         }
     });
-    
+
     setTimeout(() => {
         $('.js-tag-label .ui.label .icon').popup();
     }, 3000);
diff --git a/public/views/tags.html b/public/views/tags.html
index 5086e48..1f46856 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -19,7 +19,7 @@
             <div class="two wide column js-tag-label">
                 <div class="ui small label">
                     <i class="plus icon" data-content="点击添加分类" data-position="top center" ng-click="showAddTag()"></i>
-                    <i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode()"></i>
+                    <i class="pencil alternate icon" data-content="点击进入分类编辑模式" data-position="top center" ng-click="toggleMode(true)"></i>
                     <i class="table icon" style="margin-right:0px;" data-content="点击以条目显示" data-position="top center" ng-show="showMode=='table'" ng-click="toggleShowMode('item')"></i>
                     <i class="list icon" style="margin-right:0px;" data-content="点击以表格显示" data-position="top center" ng-show="showMode=='item'" ng-click="toggleShowMode('table')"></i>
                 </div>
@@ -34,7 +34,7 @@
                     <img src="./images/add-tag.png">
                 </div>
             </div>
-            <div class="card" style="background-color:#F5F5F5;" ng-click="toggleMode()" data-tooltip="退出编辑模式">
+            <div class="card" style="background-color:#F5F5F5;" ng-click="toggleMode(false)" data-tooltip="退出编辑模式">
                 <div class="image">
                     <img src="./images/back-tag.png">
                 </div>