diff --git a/public/scripts/controllers/hot-controller.js b/public/scripts/controllers/hot-controller.js index c1df1fa..3f9455f 100644 --- a/public/scripts/controllers/hot-controller.js +++ b/public/scripts/controllers/hot-controller.js @@ -1,4 +1,4 @@ -app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, ngDialog, bookmarkService, pubSubService, dataService) { +app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) { console.log("Hello hotCtr..."); $scope.bookmarks = []; // 书签数据 $scope.bookmarkNormalHover = false; @@ -117,6 +117,20 @@ app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$windo } } + // 快捷键r随机推荐 + $document.bind("keydown", function(event) { + $scope.$apply(function() { + // console.log(event.keyCode); + var menusScope = $('div[ng-controller="menuCtr"]').scope(); + var login = (menusScope && menusScope.login) || false; + var blur = (menusScope && menusScope.blur) || false; + // r按键,显示 + if (event.keyCode == 82 && login && (!blur)) { + $scope.randomHotBookmarks(); + } + }) + }); + $scope.randomHotBookmarks = function() { var menusScope = $('div[ng-controller="menuCtr"]').scope(); var login = (menusScope && menusScope.login) || false; diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index 9ca37b6..7e387e6 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -7,6 +7,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time $scope.showStyle = null; $scope.searchHistory = []; $scope.historyTypes = dataService.historyTypes; + $scope.blur = false; // 防止在登陆的情况下,在浏览器里面直接输入url,这时候要更新菜单选项 pubSubService.subscribe('Common.menuActive', $scope, function(event, params) { @@ -19,6 +20,10 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time $scope.loginMenus = dataService.loginMenus; // 登陆之后显示的菜单数据。uiSerf:内部跳转链接。 $scope.notLoginMenus = dataService.notLoginMenus; // 未登陆显示的菜单数据 + $scope.inputBlur = function(blur) { + $scope.blur = blur; + } + /** * @func * @desc 点击搜索按钮搜索书签 diff --git a/public/scripts/controllers/note-controller.js b/public/scripts/controllers/note-controller.js index d3f3a58..523a160 100644 --- a/public/scripts/controllers/note-controller.js +++ b/public/scripts/controllers/note-controller.js @@ -1,4 +1,4 @@ -app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, ngDialog, bookmarkService, pubSubService, dataService) { +app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) { console.log("Hello noteCtr...", $stateParams); const perPageItems = 35; @@ -44,6 +44,24 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind } } + // 快捷键a增加书签 + $document.bind("keydown", function(event) { + $scope.$apply(function() { + var menusScope = $('div[ng-controller="menuCtr"]').scope(); + var login = (menusScope && menusScope.login) || false; + var blur = (menusScope && menusScope.blur) || false; + // a按键,显示 + if (event.keyCode == 65 && login && (!blur) && (!$scope.add)) { + $scope.showAddNote(); + } + + // Esc按键,退出 + if (event.keyCode == 27 && login && (!blur) && ($scope.add)) { + $scope.showAddNote(); + } + }) + }); + $scope.showAddNote = function() { $scope.add = (!$scope.add); $scope.edit = false; diff --git a/public/views/home.html b/public/views/home.html index 3c6ccc9..aa56fb6 100644 --- a/public/views/home.html +++ b/public/views/home.html @@ -20,8 +20,8 @@

7、书签可以作为公有或者私有,公有可供所有人搜索。(完成)

8、可以将搜索到其他用户的书签转存为自己的书签。(已完成)

9、可以将书签导出来,然后导入到浏览器。(未完成)

-

10、在热门标签里面,有在网上找的热门书签。可以转存收藏到自己书签里面。(完成)

-

11、新增备忘录功能,有时候随手要做点纪录,就方便了。双击备忘录可查看详情!(完成)

+

10、在热门标签里面,有在网上找的热门书签。可以转存收藏到自己书签里面。快捷键R随机查看热门书签。(完成)

+

11、新增备忘录功能,有时候随手要做点纪录,就方便了。快捷键A增加备忘录。双击备忘录可查看详情!(完成)

联系方式

微信跟QQ:530485521,记得备注加:书签。

开发备忘(非开发人员请无视)

diff --git a/public/views/hot.html b/public/views/hot.html index 3ec475f..138a621 100644 --- a/public/views/hot.html +++ b/public/views/hot.html @@ -24,7 +24,7 @@ -
+
diff --git a/public/views/menus.html b/public/views/menus.html index fe8e560..b75b0f2 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -46,7 +46,17 @@ - +
- +
diff --git a/public/views/settings.html b/public/views/settings.html index 3007b8c..01ac003 100644 --- a/public/views/settings.html +++ b/public/views/settings.html @@ -62,26 +62,30 @@
-
{{user.created_at.substring(0, 4)}}
{{user.created_at.substring(5, 10)}} +
{{user.created_at.substring(0, 4)}}
+ {{user.created_at.substring(5, 10)}}
注册时间
-
{{user.last_login.substring(0, 4)}}
{{user.last_login.substring(5, 10)}} +
{{user.last_login.substring(0, 4)}}
+ {{user.last_login.substring(5, 10)}}
最近登陆
- {{ tagCnt }} + + {{ tagCnt }}
分类数目
- {{ bookmarkCnt }} + + {{ bookmarkCnt }}
书签数目
@@ -143,8 +147,8 @@

7、书签可以作为公有或者私有,公有可供所有人搜索。(完成)

8、可以将搜索到其他用户的书签转存为自己的书签。(已完成)

9、可以将书签导出来,然后导入到浏览器。(未完成)

-

10、在热门标签里面,有在网上找的热门书签。可以转存收藏到自己书签里面。(完成)

-

11、新增备忘录功能,有时候随手要做点纪录,就方便了。双击备忘录可查看详情!(完成)

+

10、在热门标签里面,有在网上找的热门书签。可以转存收藏到自己书签里面。快捷键R随机查看热门书签。(完成)

+

11、新增备忘录功能,有时候随手要做点纪录,就方便了。快捷键A增加备忘录。双击备忘录可查看详情!(完成)

联系方式

微信跟QQ:530485521,记得备注加:书签。

开发备忘(非开发人员请无视)