From 2047eb84337bf958cd7ebdcb7e50d8f490b4822e Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 26 Jun 2017 10:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0=E4=B9=A6?=
 =?UTF-8?q?=E7=AD=BE=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=9C=A8=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B9=A6=E7=AD=BE?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 6273c43..cc6a454 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -102,7 +102,9 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
             currentPage: currentPage,
             perPageItems: perPageItems,
         };
-        $($scope.showMode == 'item' ? '.js-tag-costomTag' : '.js-tags-table').transition('hide');
+        if (!forbidTransition) {
+            $($scope.showMode == 'item' ? '.js-tag-costomTag' : '.js-tags-table').transition('hide');
+        }
         bookmarkService.getBookmarksByTag(params)
             .then((data) => {
                 $scope.bookmarkData = data;
@@ -519,8 +521,8 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
             if (!find) {
                 if (data.tags.map((tag) => tag.id).indexOf($scope.currentTagId) >= 0) {
                     if (!$scope.editMode) {
-                        $scope.getBookmarks($scope.currentTagId, $scope.currentPage);
                         forbidTransition = true;
+                        $scope.getBookmarks($scope.currentTagId, $scope.currentPage);
                     }
                     addBookmarkId = data.id;
                 }
diff --git a/public/views/edit.html b/public/views/edit.html
index e256797..432d397 100644
--- a/public/views/edit.html
+++ b/public/views/edit.html
@@ -54,7 +54,7 @@
         </div>
     </div>
     <div class="actions">
-        <div class="ui cancel button" ng-click="cancel()">取消</div>
-        <div class="ui green button" ng-click="ok()">发送</div>
+        <div class="ui cancel button" ng-click="cancel()" style="cursor:default;">取消</div>
+        <div class="ui green button" ng-click="ok()" style="cursor:default;">发送</div>
     </div>
 </div>