diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index a949bdb..539c749 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -51,7 +51,12 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', 'pubSu $scope.login = true; var searchOption = $('.js-search-option').dropdown('get value') || 0; if (searchOption == 0) { - $window.open('http://www.baidu.com/s?tn=mybookmark.cn&ch=3&ie=utf-8&wd=' + encodeURIComponent(searchWord), '_blank'); + $state.go('search', { + searchWord: searchWord, + }, { + reload: true, + }) + updateMenuActive($scope.selectLoginIndex = 0); } else if(searchOption == 1){ $window.open('https://www.google.com.hk/#newwindow=1&safe=strict&q=' + encodeURIComponent(searchWord), '_blank'); } else if(searchOption == 2){ @@ -59,12 +64,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', 'pubSu } else if(searchOption == 3){ $window.open('https://stackoverflow.com/search?q='+ encodeURIComponent(searchWord), '_blank'); } else { - $state.go('search', { - searchWord: searchWord, - }, { - reload: true, - }) - updateMenuActive($scope.selectLoginIndex = 0); + $window.open('http://www.baidu.com/s?tn=mybookmark.cn&ch=3&ie=utf-8&wd=' + encodeURIComponent(searchWord), '_blank'); } } diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js index 1f8bc63..61b6849 100644 --- a/public/scripts/controllers/search-controller.js +++ b/public/scripts/controllers/search-controller.js @@ -2,7 +2,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi console.log("Hello searchCtr...", $stateParams); const perPageItems = 20; var dialog = null; - $scope.bookmarks = []; // 书签数据 + $scope.searchBookmarks = []; // 书签数据 $scope.showSearch = false; // $scope.showTags = false; // $scope.searchWord = ($stateParams && $stateParams.searchWord) || '' @@ -62,7 +62,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi bookmarkService.clickBookmark({ id: id }); - $scope.bookmarks.forEach(function(bookmark) { + $scope.searchBookmarks.forEach(function(bookmark) { if (bookmark.id == id && bookmark.own) { bookmark.click_count += 1; bookmark.last_click = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss"); @@ -234,7 +234,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi console.log(params); bookmarkService.searchHotBookmarks(params) .then((data) => { - $scope.bookmarks = []; + $scope.searchBookmarks = []; data.bookmarks.forEach((bookmark) => { bookmark.tags = [{ id: -1, @@ -242,7 +242,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi }] bookmark.created_at = $filter('date')(new Date(bookmark.created_at), "yyyy-MM-dd HH:mm:ss"); bookmark.last_click = $filter('date')(new Date(bookmark.last_click), "yyyy-MM-dd HH:mm:ss"); - $scope.bookmarks.push(bookmark); + $scope.searchBookmarks.push(bookmark); }) $scope.bookmarkCount = data.totalItems; $scope.totalPages = Math.ceil($scope.bookmarkCount / perPageItems); @@ -256,7 +256,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi } else { bookmarkService.searchBookmarks(params) .then((data) => { - $scope.bookmarks = data.bookmarks; + $scope.searchBookmarks = data.bookmarks; $scope.bookmarkCount = data.totalItems; $scope.totalPages = Math.ceil($scope.bookmarkCount / perPageItems); $scope.loading = false; diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index 6a144a4..8dd3a8b 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -11,7 +11,7 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim $scope.tags = []; // 书签数据 $scope.tagsIndex = []; // 书签索引 $scope.bookmarkClicked = false; - $scope.bookmarks = []; + $scope.bookmarksByTag = []; $scope.bookmarkCount = 0; $scope.totalPages = 0; $scope.currentPage = 1; @@ -35,27 +35,27 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim } $scope.order = $scope.order.map(() => false); $scope.order[index] = true; - $scope.bookmarks = []; + $scope.bookmarksByTag = []; if ($scope.order[0]) { $scope.bookmarkData.bookmarks.sort(clickCmp); $scope.bookmarkData.bookmarks.forEach((bookmark) => { if (bookmark.type == 1) { - $scope.bookmarks.push(bookmark); + $scope.bookmarksByTag.push(bookmark); } }) } else if ($scope.order[1]) { $scope.bookmarkData.bookmarks.sort((a, b) => a.created_at >= b.created_at ? -1 : 1); $scope.bookmarkData.bookmarks.forEach((bookmark) => { if (bookmark.type == 2) { - $scope.bookmarks.push(bookmark); + $scope.bookmarksByTag.push(bookmark); } }) } else { $scope.bookmarkData.bookmarks.sort((a, b) => a.last_click >= b.last_click ? -1 : 1); $scope.bookmarkData.bookmarks.forEach((bookmark) => { if (bookmark.type == 3) { - $scope.bookmarks.push(bookmark); + $scope.bookmarksByTag.push(bookmark); } }) } diff --git a/public/views/menus.html b/public/views/menus.html index c1f8df2..24f2af9 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -39,14 +39,14 @@