diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index 98940ba..28c92af 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -13,10 +13,13 @@ app.controller('bookmarksCtr', ['$scope', '$stateParams', '$filter', 'bookmarkSe pubSubService.subscribe('MenuCtr.bookmarks', $scope, function(event, data) { console.log('subscribe MenuCtr.bookmarks', data); - $scope.showSearch = (Math.random() >= 0.5); - if ($scope.showSearch) { - semanticInit(); - } + // $scope.showSearch = (Math.random() >= 0.5); + // if ($scope.showSearch) { + // setTimeout(() => { + // semanticInit(); + // }, 100); + // + // } getBookmarks(data); }); diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index 39bdc7c..6fb823d 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -8,11 +8,14 @@ app.controller('menuCtr', ['$scope', '$state', 'pubSubService', function($scope, /** * @todo http://stackoverflow.com/questions/31449948/ui-router-state-go-not-working */ - if ($scope.login) { - setTimeout(() => { - $state.go('bookmarks', {foo: 'i love you', bar: 'hello world'}) - }, 0); - } + if ($scope.login) { + setTimeout(() => { + $state.go('bookmarks', { + foo: 'i love you', + bar: 'hello world' + }) + }, 0); + } // 登陆之后显示的菜单数据。uiSerf:内部跳转链接。 $scope.loginMenus = [{ @@ -86,6 +89,9 @@ app.controller('menuCtr', ['$scope', '$state', 'pubSubService', function($scope, } function semanticInit() { - $('.ui.dropdown').dropdown(); + // $('.ui.dropdown').dropdown(); + $('.ui.dropdown.js-bookmark-dropdown').dropdown({ + maxSelections: 2, + }); } }]); diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 762a3e4..82dd6cc 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -7,7 +7,6 @@
全站书签
-
@@ -24,7 +23,6 @@
- -
-
-
-
搜索
- - - + + + @@ -64,14 +58,16 @@ - + + + -
标题描述创建日期最后点击日期点击次数 链接 标签
{{ bookmark.title }}{{ bookmark.description }}{{ bookmark.create_date }}{{ bookmark.click_latest_date }}{{ bookmark.click_count }} {{ bookmark.url }} {{ bookmark.tags }}
+ +
+ + +
diff --git a/public/views/menus.html b/public/views/menus.html index a5f7309..48d9084 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -1,6 +1,33 @@