搜索默认书签，书签，搜索，书签分类页面书签用不同变量
This commit is contained in:
luchenqun
parent
6cfd37a60b
commit
3cf3854718
|
|
@ -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');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,14 +39,14 @@
|
|||
<div class="ui transparent icon input">
|
||||
<label for="lcq">
|
||||
<div class="ui inline dropdown js-search-option" style="margin-top:3px;" js-search-option-init>
|
||||
<div class="text " style="color:#C9C9C9;font-weight:normal;">百度</div>
|
||||
<div class="text " style="color:#C9C9C9;font-weight:normal;">书签</div>
|
||||
<i class="angle down icon"></i>
|
||||
<div class="menu">
|
||||
<div class="active item" data-value="0">百度</div>
|
||||
<div class="item active" data-value="0">书签</div>
|
||||
<div class="item" data-value="1">谷歌</div>
|
||||
<div class="item" data-value="2">Github</div>
|
||||
<div class="item" data-value="3">栈溢出</div>
|
||||
<div class="item" data-value="4">书签</div>
|
||||
<div class="item" data-value="4">百度</div>
|
||||
</div>
|
||||
</div>
|
||||
</label>
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}">
|
||||
<tr ng-repeat="bookmark in searchBookmarks" id="{{ bookmark.id }}">
|
||||
<td>
|
||||
<img
|
||||
class="ui ui middle aligned mini image"
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}">
|
||||
<tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}">
|
||||
<td>
|
||||
<img class="ui ui middle aligned tiny image" ng-src="http://g.soz.im/{{bookmark.url}}/cdn.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
|
||||
<span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
|
||||
|
|
|
|||
Loading…
Reference in New Issue