From 1c7770672239b43188ea827e6e904d67e0916d8f Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Sun, 5 Feb 2017 10:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=A0=87=E7=AD=BE=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=83=BD=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E7=AD=BE=E4=B8=8A=E9=99=90=E4=B8=BA30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/bookmarks-controller.js | 1 -
 public/scripts/controllers/edit-controller.js      | 5 +++++
 public/scripts/controllers/tags-controller.js      | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index fcbd0d9..dc5ad4e 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -98,7 +98,6 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
                     }
                 } else {
                     $scope.bookmarks = data;
-                    data.forEach((item) => console.log(item.name, item.click));
                     if ($scope.bookmarks.length == 0) {
                         toastr.info('您还没有书签，请点击菜单栏的添加按钮进行添加', "提示");
                     }
diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js
index 300e994..d368823 100644
--- a/public/scripts/controllers/edit-controller.js
+++ b/public/scripts/controllers/edit-controller.js
@@ -41,6 +41,11 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', 'bookmarkService', 'p
             }
         });
 
+        if (tags.length + $scope.tags.length >= 30) {
+            toastr.error('标签个数总数不能超过30个！', "提示");
+            return;
+        }
+
         bookmarkService.addTags(params)
             .then((data) => {
                 $scope.tags = data;
diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index ad05644..c35a5cf 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -21,6 +21,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', 'book
     $scope.getBookmarks = function(tagId, currentPage) {
         $scope.bookmarkClicked = true;
         $scope.currentTagId = tagId;
+        $scope.currentPage = currentPage;
         $scope.loadBookmarks = true;
 
         $scope.tags.forEach(function(tag) {
@@ -76,8 +77,6 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', 'book
     }
 
     $scope.delBookmark = function(bookmarkId) {
-        toastr.warning('功能暂未实现。。。', "警告");
-        return;
         var params = {
             id: bookmarkId
         }