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('

数据获取失败,可能是服务器不允许获取,或者是https网站!

'); - 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 @@ -
-
-
-

- +
+
+
+
{{ bookmark.description }}
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 @@
{{ note.brief }}
-
{{ note.content }}
+
{{ note.content }}