From 2f1276de98a8479ab46ff050d6f6c2f481414a8e Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Sat, 17 Jun 2017 21:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=8B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B9=A6=E7=AD=BE=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/edit-controller.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js
index 2dac41c..563d6f9 100644
--- a/public/scripts/controllers/edit-controller.js
+++ b/public/scripts/controllers/edit-controller.js
@@ -187,7 +187,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
                 clickTag.clicked = clicked;
             }
         } else {
-            toastr.error('您至少要选择一个分类！最多选择三个分类！' + currCntTag, "错误");
+            toastr.error('您至少要选择一个分类！最多选择三个分类！如果暂时没想到放到哪个分类，可以先选择未分类。', "错误");
         }
 
     }
@@ -251,7 +251,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
             closable: false,
         }).modal('setting', 'transition', dataService.animation()).modal('show');
         $('.ui.checkbox.js-public').checkbox('set checked');
-        cancelDefault = false;
+        cancelDefault = true;
         init();
         getTags({});
         $scope.autoGettitle = false;
@@ -294,10 +294,10 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
                     return 1;
                 })
                 data.forEach((tag) => {
-                    tag.clicked = false;
-                })
-
-                if ($scope.add && data.length >= 1) {
+                        tag.clicked = false;
+                    })
+                    // 只有在新增的时候，才默认最近使用书签分类(编辑，转存不默认)
+                if ($scope.add && data.length >= 1 && $scope.url == '' && $scope.title == '') {
                     data[0].clicked = true;
                 }
                 $scope.tags = data;