diff --git a/public/scripts/app-angular.js b/public/scripts/app-angular.js index 3c9b3e1..2766bff 100644 --- a/public/scripts/app-angular.js +++ b/public/scripts/app-angular.js @@ -1,110 +1,110 @@ -var app = angular.module('bookmarkApp', ['ui.router', 'ngCookies', 'infinite-scroll', 'angular-sortable-view', 'ngDialog']); - -app.config(function($stateProvider, $urlRouterProvider, $httpProvider) { - $urlRouterProvider.otherwise("/"); - - $stateProvider - .state('bookmarks', { - url: '/bookmarks', - templateUrl: '/views/bookmarks.html', - params: { - showStyle: null, - }, - controller: 'bookmarksCtr' - }) - .state('hot', { - url: '/hot', - templateUrl: '/views/hot.html', - controller: 'hotCtr' - }) - .state('praise', { - url: '/praise', - templateUrl: '/views/praise.html', - controller: 'praiseCtr' - }) - .state('note', { - url: '/note', - templateUrl: '/views/note.html', - params: { - searchWord: null, - key:null, - }, - controller: 'noteCtr' - }) - .state('search', { - url: '/search', - templateUrl: '/views/search.html', - params: { - searchWord: null, - }, - controller: 'searchCtr' - }) - .state('tags', { - url: '/tags', - templateUrl: '/views/tags.html', - params: { - tagId: null, - orderIndex: null, - }, - controller: 'tagsCtr' - }) - .state('advice', { - url: '/advice', - templateUrl: '/views/advice.html', - controller: 'adviceCtr' - }) - .state('settings', { - url: '/settings', - templateUrl: '/views/settings.html', - params: { - formIndex: null, - }, - controller: 'settingsCtr' - }) - .state('login', { - url: '/login', - templateUrl: '/views/login.html', - params: { - showStyle: 'table', - }, - controller: 'loginCtr' - }) - .state('/', { - url: '/', - templateUrl: '/views/home.html', - controller: 'homeCtr' - }); -}); - -console.log([ - " _ooOoo_", - " o8888888o", - " 88\" . \"88", - " (| -_- |)", - " O\\ = /O", - " ____/`---'\\____", - " .' \\\\| |// `.", - " / \\\\||| : |||// \\", - " / _||||| -:- |||||- \\", - " | | \\\\\\ - /// | |", - " | \\_| ''\\---/'' | |", - " \\ .-\\__ `-` ___/-. /", - " ___`. .' /--.--\\ `. . __", - " .\"\" '< `.___\\_<|>_/___.' >'\"\".", - " | | : `- \\`.;`\\ _ /`;.`/ - ` : | |", - " \\ \\ `-. \\_ __\\ /__ _/ .-` / /", - "======`-.____`-.___\\_____/___.-`____.-'======", - " `=---='", - "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", - " 佛祖保佑 永无BUG", - " 写字楼里写字间，写字间里程序员；", - " 程序人员写程序，又拿程序换酒钱。", - " 酒醒只在网上坐，酒醉还来网下眠；", - " 酒醉酒醒日复日，网上网下年复年。", - " 但愿老死电脑间，不愿鞠躬老板前；", - " 奔驰宝马贵者趣，公交自行程序员。", - " 别人笑我忒疯癫，我笑自己命太贱；", - " 不见满街漂亮妹，哪个归得程序员？", -].join('\n')); - -console.log = function(){} +var app = angular.module('bookmarkApp', ['ui.router', 'ngCookies', 'infinite-scroll', 'angular-sortable-view', 'ngDialog']); + +app.config(function($stateProvider, $urlRouterProvider, $httpProvider) { + $urlRouterProvider.otherwise("/"); + + $stateProvider + .state('bookmarks', { + url: '/bookmarks', + templateUrl: '/views/bookmarks.html', + params: { + showStyle: null, + }, + controller: 'bookmarksCtr' + }) + .state('hot', { + url: '/hot', + templateUrl: '/views/hot.html', + controller: 'hotCtr' + }) + .state('praise', { + url: '/praise', + templateUrl: '/views/praise.html', + controller: 'praiseCtr' + }) + .state('note', { + url: '/note', + templateUrl: '/views/note.html', + params: { + searchWord: null, + key:null, + }, + controller: 'noteCtr' + }) + .state('search', { + url: '/search', + templateUrl: '/views/search.html', + params: { + searchWord: null, + }, + controller: 'searchCtr' + }) + .state('tags', { + url: '/tags', + templateUrl: '/views/tags.html', + params: { + tagId: null, + orderIndex: null, + }, + controller: 'tagsCtr' + }) + .state('advice', { + url: '/advice', + templateUrl: '/views/advice.html', + controller: 'adviceCtr' + }) + .state('settings', { + url: '/settings', + templateUrl: '/views/settings.html', + params: { + formIndex: null, + }, + controller: 'settingsCtr' + }) + .state('login', { + url: '/login', + templateUrl: '/views/login.html', + params: { + showStyle: 'table', + }, + controller: 'loginCtr' + }) + .state('/', { + url: '/', + templateUrl: '/views/home.html', + controller: 'homeCtr' + }); +}); + +console.log([ + " _ooOoo_", + " o8888888o", + " 88\" . \"88", + " (| -_- |)", + " O\\ = /O", + " ____/`---'\\____", + " .' \\\\| |// `.", + " / \\\\||| : |||// \\", + " / _||||| -:- |||||- \\", + " | | \\\\\\ - /// | |", + " | \\_| ''\\---/'' | |", + " \\ .-\\__ `-` ___/-. /", + " ___`. .' /--.--\\ `. . __", + " .\"\" '< `.___\\_<|>_/___.' >'\"\".", + " | | : `- \\`.;`\\ _ /`;.`/ - ` : | |", + " \\ \\ `-. \\_ __\\ /__ _/ .-` / /", + "======`-.____`-.___\\_____/___.-`____.-'======", + " `=---='", + "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", + " 佛祖保佑 永无BUG", + " 写字楼里写字间，写字间里程序员；", + " 程序人员写程序，又拿程序换酒钱。", + " 酒醒只在网上坐，酒醉还来网下眠；", + " 酒醉酒醒日复日，网上网下年复年。", + " 但愿老死电脑间，不愿鞠躬老板前；", + " 奔驰宝马贵者趣，公交自行程序员。", + " 别人笑我忒疯癫，我笑自己命太贱；", + " 不见满街漂亮妹，哪个归得程序员？", +].join('\n')); + +// console.log = function(){} diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js index 9e293b3..39320f6 100644 --- a/public/scripts/controllers/menus-controller.js +++ b/public/scripts/controllers/menus-controller.js @@ -10,6 +10,7 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time $scope.quickUrl = {}; $scope.longPress = false; $scope.user = {}; + $scope.searching = true; // 防止在登陆的情况下，在浏览器里面直接输入url，这时候要更新菜单选项 pubSubService.subscribe('Common.menuActive', $scope, function (event, params) { @@ -42,11 +43,11 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time * @func * @desc 点击搜索按钮搜索书签 */ - $scope.search = function (searchWord) { + $scope.search = function (searchWord, searchOption) { console.log('search......', searchWord); $scope.login = true; - var searchOption = $('.js-search-option').dropdown('get value') || 0; + // var searchOption = $('.js-search-option').dropdown('get value') || 0; if (searchOption == 0) { $state.go('search', { searchWord: searchWord, @@ -97,6 +98,16 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time } } + $scope.readySearch = function () { + $scope.searching = true; + } + + $scope.exitSearch = function () { + $scope.searching = false; + $scope.searchWord = ""; + $(".search-item").val(""); + } + $scope.searchByHistory = function (type, data) { $scope.searchWord = data; $('.search-item').val($scope.searchWord); @@ -260,6 +271,21 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time updateMenuActive($scope.selectLoginIndex = dataService.LoginIndexNote); $state.go('note', { key: key }, { reload: true }) } + return; + } + + if (key == 'S') { + $scope.searching = true; + $(".search-item").focus(); + var count = 1; + var sId = setInterval(function() { + $(".search-item").val(""); + count++; + if(count>=5) { + clearInterval(sId); + } + }, 3) + return; } if (key == ',' || key == '.' || key == '/') { @@ -321,5 +347,4 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time } }) }); - }]); diff --git a/public/scripts/services/data-service.js b/public/scripts/services/data-service.js index c6d553c..9dc5810 100644 --- a/public/scripts/services/data-service.js +++ b/public/scripts/services/data-service.js @@ -89,6 +89,7 @@ app.factory('dataService', [function() { 'D': '在有关书签页面，用作删除书签', 'I': '在有关书签页面，用作查看书签详情', 'R': '在热门收藏界面，已用作随机查看热门收藏', + 'S': '在任意界面，已用做快速进入搜索页面', 'INSERT': '全局页面，已用做添加书签', 'ESC': '全局页面，已用做退出弹窗', ',': '跳转到分类定制点击次数', diff --git a/public/views/menus.html b/public/views/menus.html index 4d52ece..411cb26 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -1,6 +1,6 @@
- +
{{ menu.title }}
@@ -29,34 +29,43 @@
-
-
-
-