From daf79e71f297f383973c6e0b0e6684d0a40406cc Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@juzix.io>
Date: Tue, 15 May 2018 15:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BD=BF=E7=94=A8=E6=99=AE?=
 =?UTF-8?q?=E9=80=9Atextarea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/bookmark-info-controller.js   |   2 +-
 public/views/bookmark-info.html               | 110 +++++++++---------
 public/views/edit.html                        |  11 +-
 3 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/public/scripts/controllers/bookmark-info-controller.js b/public/scripts/controllers/bookmark-info-controller.js
index 609c029..0097d74 100644
--- a/public/scripts/controllers/bookmark-info-controller.js
+++ b/public/scripts/controllers/bookmark-info-controller.js
@@ -27,7 +27,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win
             .then((data) => {
                 $scope.content = data.content ? $sce.trustAsHtml(data.content) : $sce.trustAsHtml('<p>数据获取失败，可能是服务器不允许获取，或者是https网站！</p>');
                 setTimeout(function() {
-                    $('.ui.modal.js-bookmark-info').modal("refresh");
+                    $('.ui.modal.js-bookmark-info').modal && $('.ui.modal.js-bookmark-info').modal("refresh");
                 }, 100);
                 $scope.loading = false;
             })
diff --git a/public/views/bookmark-info.html b/public/views/bookmark-info.html
index 8874825..10d51b1 100644
--- a/public/views/bookmark-info.html
+++ b/public/views/bookmark-info.html
@@ -6,67 +6,73 @@
     <div class="content">
         <div class="ui grid">
             <div class="six wide column">
-                <img class="bordered" ng-src="{{bookmark.snap_url}}" err-src="./images/snap/default.png"/>
+                <img class="bordered" ng-src="{{bookmark.snap_url}}" err-src="./images/snap/default.png" />
             </div>
             <div class="one wide column"></div>
             <div class="nine wide column">
                 <div class="ui  vertically divided grid">
                     <div class="one column row">
                         <div class="column">
-                            <img class="ui middle aligned mini image" ng-src="{{bookmark.favicon_url}}" style="width:16px;height:16px;padding:0;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico" title="点击跳转到原页面">
-                            <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" style="cursor:pointer;" title="点击跳转到原页面">网页地址</span>：<span title="点击复制链接" ng-click="copy(bookmark.url)" class="urlSpan">{{bookmark.url}}
-                                <span></div>
-                            </div>
-                            <div class="two column row">
-                                <div class="column">
-                                    <i class="add to calendar icon"></i>创建日期：<span>{{bookmark.created_at}}</span>
-                                </div>
-                                <div class="column">
-                                    <i class="calendar icon"></i>最后点击：<span>{{bookmark.last_click}}</span>
-                                </div>
-                            </div>
-                            <div class="two column row">
-                                <div class="column" ng-if="bookmark.click_count">
-                                    <i class="hand pointer icon"></i>点击次数：{{bookmark.click_count}}
-                                </div>
-                                <div class="column" ng-if="bookmark.fav_count">
-                                    <i class="heart icon"></i>收藏人数：{{bookmark.fav_count}}
-                                </div>
-                                <div class="column" ng-if="!bookmark.created_by">
-                                    <i class="tags icon"></i>书签分类：
-                                    <div class="ui label" ng-repeat="tag in bookmark.tags">
-                                        {{ tag.name }}
-                                    </div>
-                                </div>
-                                <div class="column" ng-if="bookmark.created_by">
-                                    <i class="info circle icon"></i>来源信息：{{bookmark.created_by}}
-                                </div>
+                            <img class="ui middle aligned mini image" ng-src="{{bookmark.favicon_url}}" style="width:16px;height:16px;padding:0;cursor:pointer;"
+                                ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico"
+                                title="点击跳转到原页面">
+                            <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" style="cursor:pointer;" title="点击跳转到原页面">网页地址</span>：
+                            <span title="点击复制链接" ng-click="copy(bookmark.url)" class="urlSpan">{{bookmark.url}}
+                                <span>
+                        </div>
+                    </div>
+                    <div class="two column row">
+                        <div class="column">
+                            <i class="add to calendar icon"></i>创建日期：
+                            <span>{{bookmark.created_at}}</span>
+                        </div>
+                        <div class="column">
+                            <i class="calendar icon"></i>最后点击：
+                            <span>{{bookmark.last_click}}</span>
+                        </div>
+                    </div>
+                    <div class="two column row">
+                        <div class="column" ng-if="bookmark.click_count">
+                            <i class="hand pointer icon"></i>点击次数：{{bookmark.click_count}}
+                        </div>
+                        <div class="column" ng-if="bookmark.fav_count">
+                            <i class="heart icon"></i>收藏人数：{{bookmark.fav_count}}
+                        </div>
+                        <div class="column" ng-if="!bookmark.created_by">
+                            <i class="tags icon"></i>书签分类：
+                            <div class="ui label" ng-repeat="tag in bookmark.tags">
+                                {{ tag.name }}
                             </div>
                         </div>
+                        <div class="column" ng-if="bookmark.created_by">
+                            <i class="info circle icon"></i>来源信息：{{bookmark.created_by}}
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="ui divider"></div>
-            <div class="content" style="padding:0 0 0 20px">
-                <div class="description">
-                    <div class="ui header">
-                        描述信息
-                    </div>
-                    <p ng-bind-html="bookmark.description"></p>
-                </div>
-            </div>
-            <div class="ui divider"></div>
-            <div class="content" style="padding:0 0 0 20px">
-                <div class="description">
-                    <div class="ui header">
-                        内容摘抄
-                    </div>
-                    <p ng-bind-html="content"></p>
-                    <img class="ui centered medium image" src="/images/loading.gif" ng-show="loading">
-                </div>
-            </div>
-            <div class="actions">
-                <div class="ui right button" ng-click="jumpToUrl(bookmark.url, bookmark.id)">跳转到原页面</div>
-                <button class="positive ui right button">关闭页面</button>
-            </div>
         </div>
+    </div>
+    <div class="ui divider"></div>
+    <div class="content" style="padding:0 10px 0 20px">
+        <div class="description">
+            <div class="ui header">
+                描述信息
+            </div>
+            <pre style="word-break:break-all;white-space: pre-wrap;">{{ bookmark.description }}</pre>
+        </div>
+    </div>
+    <div class="ui divider"></div>
+    <div class="content" style="padding:0 0 0 20px">
+        <div class="description">
+            <div class="ui header">
+                内容摘抄
+            </div>
+            <p ng-bind-html="content"></p>
+            <img class="ui centered medium image" src="/images/loading.gif" ng-show="loading">
+        </div>
+    </div>
+    <div class="actions">
+        <div class="ui right button" ng-click="jumpToUrl(bookmark.url, bookmark.id)">跳转到原页面</div>
+        <button class="positive ui right button">关闭页面</button>
+    </div>
+</div>
\ No newline at end of file
diff --git a/public/views/edit.html b/public/views/edit.html
index 432d397..ebe65dd 100644
--- a/public/views/edit.html
+++ b/public/views/edit.html
@@ -35,15 +35,8 @@
                 </div>
             </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: '可以是网站的说明，也可以备忘一下账号或者摘抄内容，就算公开你的链接，这个也只有自己能在详情里面看到'},
-                    'buttons': ['bold', 'italic', 'underline', 'header1', 'header2', 'quote', 'orderedlist', 'unorderedlist']}"></div>
+                <label>内容</label>
+                <textarea name="text" rows="6" placeholder="可以是网站的说明，也可以备忘一下账号或者摘抄内容，就算公开你的链接，这个也只有自己能在详情里面看到" ng-model="description"></textarea>
             </div>
             <div class="field">
                 <div class="ui checkbox checked js-public">