From 3e40fe1ba93d254538b445f08a97c114e2c7f4fa Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 29 Mar 2017 12:31:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/controllers/menus-controller.js   | 27 +++++++++++++------
 .../scripts/directives/js-init-directive.js   | 12 +++++++++
 public/views/menus.html                       | 22 +++++++++++----
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js
index 012dbb9..a949bdb 100644
--- a/public/scripts/controllers/menus-controller.js
+++ b/public/scripts/controllers/menus-controller.js
@@ -1,4 +1,4 @@
-app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService', 'bookmarkService', function($scope, $stateParams, $state, pubSubService, bookmarkService) {
+app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', 'pubSubService', 'bookmarkService', function($scope, $stateParams, $state, $window, pubSubService, bookmarkService) {
     console.log("Hello menuCtr")
     $scope.login = false; /**< 是否登陆 */
     $scope.selectLoginIndex = 0; /**< 默认登陆之后的选择的菜单索引，下表从 0 开始 */
@@ -47,14 +47,25 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService',
      * @func
      * @desc 点击搜索按钮搜索书签
      */
-    $scope.searchBookmarks = function(searchWord) {
-        $state.go('search', {
-            searchWord: searchWord,
-        }, {
-            reload: true,
-        })
+    $scope.search = function(searchWord) {
         $scope.login = true;
-        updateMenuActive($scope.selectLoginIndex = 0);
+        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');
+        } else if(searchOption == 1){
+            $window.open('https://www.google.com.hk/#newwindow=1&safe=strict&q=' + encodeURIComponent(searchWord), '_blank');
+        } else if(searchOption == 2){
+            $window.open('https://github.com/search?utf8=%E2%9C%93&q='+ encodeURIComponent(searchWord) +'&type=', '_blank');
+        } 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);
+        }
     }
 
     $scope.updateShowStyle = function(showStyle) {
diff --git a/public/scripts/directives/js-init-directive.js b/public/scripts/directives/js-init-directive.js
index ccd06de..aeb814d 100644
--- a/public/scripts/directives/js-init-directive.js
+++ b/public/scripts/directives/js-init-directive.js
@@ -182,6 +182,18 @@ app.directive('jsMenuInit', function($compile) {
     };
 });
 
+app.directive('jsSearchOptionInit', function($compile) {
+    return {
+        restrict: 'A',
+        link: function($scope, $element, $attrs) {
+            console.log('jsSearchOptionInit......')
+            $('.js-search-option').dropdown({
+                // on: 'hover',
+            });
+        },
+    };
+});
+
 app.directive('errSrc', function() {
     return {
         link: function(scope, element, attrs) {
diff --git a/public/views/menus.html b/public/views/menus.html
index 9e6fafd..c1f8df2 100644
--- a/public/views/menus.html
+++ b/public/views/menus.html
@@ -1,6 +1,6 @@
 <div class="js-menu" ng-controller="menuCtr">
     <div class="ui huge menu js-login-in" ng-if="login">
-        <a class="item" ng-class="{selected:$index===selectLoginIndex}" ui-sref="{{ menu.uiSref }}" ui-sref-opts="{reload: true}" ng-repeat="menu in loginMenus" js-menu-init>
+        <a class="item" ng-class="{selected:$index===selectLoginIndex}" style="cursor:default;" ui-sref="{{ menu.uiSref }}" ui-sref-opts="{reload: true}" ng-repeat="menu in loginMenus" js-menu-init>
             <div>{{ menu.title }}</div>
             <div class="ui floating simple dropdown icon js-bookmark-dropdown" ng-if="$index==0" ng-click="$event.stopPropagation();">
                 <i class="dropdown icon"></i>
@@ -35,12 +35,24 @@
             </div>
         </a>
         <div class="right menu">
-            <div class="item">
+            <div class="item" style="min-width:350px;">
                 <div class="ui transparent icon input">
-                    <input class="prompt" type="text" ng-model="searchWord" placeholder="标题，链接..." ng-keypress="($event.which === 13)?searchBookmarks(searchWord):0">
-                    <i class="search link icon" ng-click="searchBookmarks(searchWord)"></i>
+                    <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>
+                            <i class="angle down icon"></i>
+                            <div class="menu">
+                                <div class="active item" 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>
+                        </div>
+                    </label>
+                    <input class="prompt" type="text" ng-model="searchWord" placeholder="" ng-keypress="($event.which === 13)?search(searchWord):0" id="lcq">
+                    <i class="search link icon" ng-click="search(searchWord)" style="cursor:default;"></i>
                 </div>
-                <div class="results"></div>
             </div>
             <div class="item" title="添加书签" ng-click="showAddBookmarkMoadl()">
                 <i class="add square icon"></i>