From cad9a57f8b8df6ce52632aec941f4106a672dd06 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Tue, 20 Jun 2017 22:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B9=A6=E7=AD=BE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=9C=A8=E8=8E=B7=E5=8F=96=E4=B9=A6=E7=AD=BE?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E5=8A=A0=E8=BD=BD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/scripts/controllers/edit-controller.js b/public/scripts/controllers/edit-controller.js
index 563d6f9..776b604 100644
--- a/public/scripts/controllers/edit-controller.js
+++ b/public/scripts/controllers/edit-controller.js
@@ -16,9 +16,20 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
                     url: newUrl,
                     requestId: 0,
                 }
+                $scope.loadTitle = true;
                 bookmarkService.getArticle(params)
-                    .then((data) => $scope.title = data.title)
-                    .catch((err) => console.log('getTitle err', err))
+                    .then((data) => {
+                        $scope.loadTitle = false;
+                        $scope.title = data.title;
+                        if (!$scope.title) {
+                            toastr.error('获取书签标题失败，请手动填入', "提示");
+                        }
+                    })
+                    .catch((err) => {
+                        console.log('getTitle err', err);
+                        toastr.error('获取书签标题失败：' + JSON.stringify(err) + '，请手动填入', "提示");
+                        $scope.loadTitle = false;
+                    })
             }
         }
     });
@@ -310,6 +321,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', '$document', 'ngDialo
         $scope.add = true;
         $scope.loadTags = true;
         $scope.autoGettitle = true;
+        $scope.loadTitle = false;
         $scope.id = '';
         $scope.url = '';
         $scope.title = '';
diff --git a/public/views/edit.html b/public/views/edit.html
index 23f0ee1..e256797 100644
--- a/public/views/edit.html
+++ b/public/views/edit.html
@@ -13,7 +13,10 @@
                     </div>
                     <div class="required eight wide field" ng-class="{error:titleError}">
                         <label>书签标题</label>
-                        <input type="text" placeholder="" ng-model="title">
+                        <div class="ui icon input" ng-class="{loading:loadTitle}">
+                            <input type="text" ng-attr-placeholder="{{loadTitle ? '正在获取书签标题。。。' : '在书签链接处粘贴正确的网站会自动获取'}}" ng-model="title">
+                            <i class="search icon" ng-show="loadTitle && title.length==0"></i>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -33,7 +36,13 @@
             </div>
             <div class="field">
                 <label>描述</label>
-                <div style="border-radius:4px;border:1px solid #DEDEDE;min-height:88px;" name="text" ng-model="description" required medium-editor bind-options="{'placeholder': {text: '可以是网站的说明，也可以备忘一下账号或者摘抄内容，就算公开你的链接，这个也只有自己能在详情里面看到'},
+                <div
+                    style="border-radius:4px;border:1px solid #DEDEDE;min-height:88px;"
+                    name="text"
+                    ng-model="description"
+                    required
+                    medium-editor
+                    bind-options="{'placeholder': {text: '可以是网站的说明，也可以备忘一下账号或者摘抄内容，就算公开你的链接，这个也只有自己能在详情里面看到'},
                     'buttons': ['bold', 'italic', 'underline', 'header1', 'header2', 'quote', 'orderedlist', 'unorderedlist']}"></div>
             </div>
             <div class="field">