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

修复卡片问题

This commit is contained in:
luchenqun 2017-03-20 12:53:48 +08:00
parent 727b246ba8
commit e154f2b543
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/scripts/controllers/bookmarks-controller.js
View File

@ -56,7 +56,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
}); });
if ($scope.showStyle != 'navigate') { if ($scope.showStyle != 'navigate') {
$scope.bookmarks.forEach(function(bookmark) { $scope.bookmarkData.bookmarks.forEach(function(bookmark) {
if (bookmark.id == id) { if (bookmark.id == id) {
bookmark.click_count += 1; bookmark.click_count += 1;
bookmark.last_click = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss"); bookmark.last_click = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
@ -270,12 +270,11 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
} }
if (params.showStyle == 'card') { if (params.showStyle == 'card') {
$scope.bookmarkData.bookmarks.sort((a, b) => a.created_at >= b.created_at ? -1 : 1); $scope.bookmarkData.bookmarks.sort((a, b) => a.created_at >= b.created_at ? -1 : 1);
var begin = ($scope.currentPage - 1) * perPageItems; $scope.bookmarkData.bookmarks.forEach(bookmark => {
var end = $scope.currentPage * perPageItems; if (bookmark.type == 2) {
var bookmarks = $scope.bookmarkData.bookmarks.slice(begin, end); bookmark.edit = false;
bookmarks.forEach(bookmark => { $scope.bookmarks.push(bookmark);
bookmark.edit = false; }
$scope.bookmarks.push(bookmark);
}) })
$scope.loadBusy = false; $scope.loadBusy = false;
} else if (params.showStyle == 'costomTag') { } else if (params.showStyle == 'costomTag') {

2
public/scripts/controllers/tags-controller.js
View File

@ -122,7 +122,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
bookmarkService.clickBookmark({ bookmarkService.clickBookmark({
id: id id: id
}); });
$scope.bookmarks.forEach(function(bookmark, index) { $scope.bookmarkData.bookmarks.forEach(function(bookmark, index) {
if (bookmark.id == id) { if (bookmark.id == id) {
bookmark.click_count += 1; bookmark.click_count += 1;
bookmark.last_click = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss"); bookmark.last_click = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");