From 7290a6b9a700d1a39be0e5ba2562072f961870bb Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Tue, 28 Feb 2017 22:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E9=94=AE=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/menus-controller.js | 7 -------
 public/views/edit.html                         | 2 +-
 public/views/search.html                       | 8 ++++----
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/public/scripts/controllers/menus-controller.js b/public/scripts/controllers/menus-controller.js
index 025c787..f2e38af 100644
--- a/public/scripts/controllers/menus-controller.js
+++ b/public/scripts/controllers/menus-controller.js
@@ -36,13 +36,6 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', 'pubSubService',
         title: '登录|注册'
     }];
 
-    $scope.myKeyup = function(e) {
-        var keycode = window.event ? e.keyCode : e.which;
-        if (keycode == 13) {
-            $scope.searchBookmarks($scope.searchWord);
-        }
-    };
-
     /**
      * @func
      * @desc 点击搜索按钮搜索书签
diff --git a/public/views/edit.html b/public/views/edit.html
index 8144a5c..047ca9c 100644
--- a/public/views/edit.html
+++ b/public/views/edit.html
@@ -24,7 +24,7 @@
                     </div>
                     <div class="eight wide field">
                         <div class="ui action input">
-                            <input type="text" placeholder="多个分类请用中文或英文逗号 , 隔开" ng-model="newTags">
+                            <input type="text" placeholder="多个分类请用中文或英文逗号 , 隔开" ng-model="newTags" ng-keypress="($event.which === 13)?addTags():0">
                             <button class="ui button" ng-click="addTags()">添加新分类</button>
                         </div>
                     </div>
diff --git a/public/views/search.html b/public/views/search.html
index 635444c..d1c27d8 100644
--- a/public/views/search.html
+++ b/public/views/search.html
@@ -86,7 +86,7 @@
     </div>
     <div class="two wide column" ng-show="showSearch">
         <div class="ui transparent icon input" ng-show="!showTags">
-            <input class="prompt" type="text" placeholder="用户账号" ng-model="username">
+            <input class="prompt" type="text" placeholder="用户账号" ng-model="username" ng-keypress="($event.which === 13)?search():0">
         </div>
         <div class="ui grid container" style="padding-top: 8px;">
             <div class="ui multiple dropdown js-search-tags" style="padding:0;" ng-show="showTags" js-dropdown-tags-init>
@@ -100,10 +100,10 @@
     </div>
     <div class="two wide column" ng-show="showSearch">
         <div class="ui transparent input">
-            <input type="text" placeholder="标题，链接..." ng-model="searchWord">
+            <input type="text" placeholder="标题，链接..." ng-model="searchWord" ng-keypress="($event.which === 13)?search():0">
         </div>
     </div>
-    <div class="left floated right aligned two wide column" ng-show="showSearch">
+    <div class=" left floated right aligned two wide column" ng-show=" showSearch">
         <div class="ui grid">
             <div class="four wide column">
                 <i class="search icon" title="搜索" ng-click="search()"></i>
@@ -131,7 +131,7 @@
         <tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}">
             <td>
                 <img class="ui ui middle aligned tiny image" 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;">
+                <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
                     {{ bookmark.title }}
                 </span>
             </td>