diff --git a/www/scripts/controllers/note-controller.js b/www/scripts/controllers/note-controller.js index a4f13e0..09cad54 100644 --- a/www/scripts/controllers/note-controller.js +++ b/www/scripts/controllers/note-controller.js @@ -374,7 +374,8 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind if (tags.length > 0) { get('tags').then((_tags) => { if (JSON.stringify(tags) != JSON.stringify(_tags)) { - localStorage.setItem("tags", JSON.stringify(tags)); + localStorage.setItem("tags", JSON.stringify(_tags)); + updateTags(_tags); } }); } else { diff --git a/www/scripts/controllers/tags-controller.js b/www/scripts/controllers/tags-controller.js index 6b0b07c..126caeb 100644 --- a/www/scripts/controllers/tags-controller.js +++ b/www/scripts/controllers/tags-controller.js @@ -72,16 +72,19 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara for (let tag of $scope.tags) { if (tag.id == $scope.currentTagId) { tag.bookmarkCount = reply.count; + break; } } - let id = setInterval(() => { - if (document.querySelectorAll('.need_to_be_rendered').length > 0) { - timeagoInstance.cancel(); - timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); - clearInterval(id); - } - }, 10); + if ($scope.showMode == 'table' && bookmarks.length > 0) { + let id = setInterval(() => { + if (document.querySelectorAll('.need_to_be_rendered').length > 0) { + timeagoInstance.cancel(); + timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); + clearInterval(id); + } + }, 10); + } pubSubService.publish('Common.menuActive', { login: true, @@ -153,14 +156,11 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara } $scope.editBookmark = function (id) { - console.log('publish bookmarksCtr.editBookmark', { id }); pubSubService.publish('bookmarksCtr.editBookmark', { id }); } $scope.detailBookmark = async function (bookmark) { - bookmark.own = true; pubSubService.publish('TagCtr.showBookmarkInfo', bookmark); - await post("bookmarkClick", { id: bookmark.id }); } $scope.copy = function (url) { @@ -404,8 +404,8 @@ app.controller('tagsCtr', ['$scope', '$filter', '$state', '$window', '$statePara if (tags.length > 0) { get('tags').then((_tags) => { if (JSON.stringify(tags) != JSON.stringify(_tags)) { - localStorage.setItem("tags", JSON.stringify(tags)); - updateTags(tags); + localStorage.setItem("tags", JSON.stringify(_tags)); + updateTags(_tags); } }); } else { diff --git a/www/views/bookmark-info.html b/www/views/bookmark-info.html index 4a5c915..7f6ab9c 100644 --- a/www/views/bookmark-info.html +++ b/www/views/bookmark-info.html @@ -29,18 +29,12 @@
点击次数:{{bookmark.clickCount}}
-
- 收藏人数:{{bookmark.fav_count}} -
-
+
书签分类: -
- {{ tag.name }} +
+ {{ bookmark.tagName }}
-
- 来源信息:{{bookmark.created_by}} -
diff --git a/www/views/menus.html b/www/views/menus.html index f0acd71..df9fe86 100644 --- a/www/views/menus.html +++ b/www/views/menus.html @@ -5,7 +5,7 @@