liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

取消双击复制备忘内容，显示书签备忘

This commit is contained in:
B05BEE13.卢郴群 2020-10-26 10:10:59 +08:00
parent f667b0f290
commit bdb9a931fc
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
www/scripts/controllers/bookmark-info-controller.js
View File

@ -12,31 +12,6 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win
bookmark.favicon_url = 'https://favicon.lucq.fun/?url=' + bookmark.url; bookmark.favicon_url = 'https://favicon.lucq.fun/?url=' + bookmark.url;
$scope.bookmark = bookmark; $scope.bookmark = bookmark;
$scope.bookmark.description = $sce.trustAsHtml(bookmark.description); $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) { $scope.jumpToUrl = async function (url, id) {

9
www/views/bookmark-info.html
View File

@ -40,11 +40,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui divider"></div> <div class="ui divider" ng-if="bookmark.description"></div>
<div class="content" style="padding:0 20px"> <div class="content" ng-if="bookmark.description" style="margin-top:-14px;">
<div class="description js-content"> <div class="description">
<p ng-bind-html="content"></p> <pre class="note-content" style="font-size: 16px;">{{ bookmark.description }}</pre>
<img class="ui centered medium image" src="/images/loading.gif" ng-show="loading">
</div> </div>
</div> </div>
<div class="actions"> <div class="actions">

2
www/views/note.html
View File

@ -33,7 +33,7 @@
</div> </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"> <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="单击查看详情，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="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="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"> <div class="extra content" ng-show="true" ng-mouseleave="note.edit=false;" style="height: 50px">