From bdb9a931fc7445926a0ee97b05578416996755f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B05BEE13=2E=E5=8D=A2=E9=83=B4=E7=BE=A4?= <lucq@vanke.com>
Date: Mon, 26 Oct 2020 10:10:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8F=8C=E5=87=BB=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6=E5=A4=87=E5=BF=98=E5=86=85=E5=AE=B9=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B9=A6=E7=AD=BE=E5=A4=87=E5=BF=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/bookmark-info-controller.js   | 25 -------------------
 www/views/bookmark-info.html                  |  9 +++----
 www/views/note.html                           |  2 +-
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/www/scripts/controllers/bookmark-info-controller.js b/www/scripts/controllers/bookmark-info-controller.js
index 5ec9f7d..8406efd 100644
--- a/www/scripts/controllers/bookmark-info-controller.js
+++ b/www/scripts/controllers/bookmark-info-controller.js
@@ -12,31 +12,6 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win
     bookmark.favicon_url = 'https://favicon.lucq.fun/?url=' + bookmark.url;
     $scope.bookmark = bookmark;
     $scope.bookmark.description = $sce.trustAsHtml(bookmark.description);
-    $scope.content = $sce.trustAsHtml(bookmark.content) || '';
-    if (!$scope.content) {
-      $timeout(function () {
-        $('.ui.modal.js-bookmark-info').modal("refresh");
-        $("p").css("word-wrap", "break-word");
-      }, 500);
-      $scope.loading = true;
-      try {
-        let data = get("article", { url: bookmark.url });
-        $scope.content = data.content ? $sce.trustAsHtml(data.content) : $sce.trustAsHtml('<p>数据获取失败，可能是服务器不允许获取，或者是https网站！</p>');
-        setTimeout(function () {
-          $('.ui.modal.js-bookmark-info').modal && $('.ui.modal.js-bookmark-info').modal("refresh");
-        }, 100);
-      } catch (error) {
-
-      }
-      $scope.loading = false;
-    } else {
-      setTimeout(function () {
-        $('.ui.modal.js-bookmark-info').modal && $('.ui.modal.js-bookmark-info').modal("refresh");
-      }, 10);
-      setTimeout(function () {
-        $('.modals').animate({ scrollTop: 0 }, 100);
-      }, 500);
-    }
   });
 
   $scope.jumpToUrl = async function (url, id) {
diff --git a/www/views/bookmark-info.html b/www/views/bookmark-info.html
index 7f6ab9c..19bd42c 100644
--- a/www/views/bookmark-info.html
+++ b/www/views/bookmark-info.html
@@ -40,11 +40,10 @@
       </div>
     </div>
   </div>
-  <div class="ui divider"></div>
-  <div class="content" style="padding:0 20px">
-    <div class="description js-content">
-      <p ng-bind-html="content"></p>
-      <img class="ui centered medium image" src="/images/loading.gif" ng-show="loading">
+  <div class="ui divider" ng-if="bookmark.description"></div>
+  <div class="content" ng-if="bookmark.description" style="margin-top:-14px;">
+    <div class="description">
+      <pre class="note-content" style="font-size: 16px;">{{ bookmark.description }}</pre>
     </div>
   </div>
   <div class="actions">
diff --git a/www/views/note.html b/www/views/note.html
index 6b40b8f..08138c2 100644
--- a/www/views/note.html
+++ b/www/views/note.html
@@ -33,7 +33,7 @@
   </div>
   <div class="ui vertical segment" ng-repeat="note in notes" ng-click="noteClick(note)" ng-mouseover="setHoverNote(note)" ng-mouseleave="setHoverNote(null)" id="{{note.id}}" style="margin: 0px; padding: 10px 0px">
     <pre class="note-content" title="单击查看详情，C复制，D删除，E编辑" style="margin: 0px; padding-left: 14px; padding-right: 14px" ng-if="!note.detail">{{ note.brief }}</pre>
-    <pre class="note-content" title="双击复制" ng-dblclick="copy(note.content)" style="margin: 0px; font-size: 16px; padding: 60px 14px" ng-if="note.detail">{{ note.content }}</pre>
+    <pre class="note-content" style="margin: 0px; font-size: 16px; padding: 60px 14px" ng-if="note.detail">{{ note.content }}</pre>
     <div class="ui right aligned grid" ng-show="note.detail">
       <div class="sixteen wide column" style="margin: 0px 20px 0px 0px; padding: 20px 0px 0px 0px">
         <div class="extra content" ng-show="true" ng-mouseleave="note.edit=false;" style="height: 50px">