From 4e3f73ed8c6a9d2d4649b3456cf8533d47428f3d Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Sat, 10 Jun 2017 23:21:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=88=86=E7=B1=BB=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E5=BF=AB=E6=8D=B7=E9=94=AE=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E7=BC=96=E8=BE=91=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/scripts/controllers/tags-controller.js | 27 ++++++++++++++++++-
 public/views/tags.html                        |  8 +++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index d94f7d5..33d6107 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -1,9 +1,10 @@
-app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$timeout', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $filter, $window, $stateParams, $timeout, ngDialog, bookmarkService, pubSubService, dataService) {
+app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $filter, $window, $stateParams, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello tagsCtr...", $stateParams);
     getTags({});
 
     var perPageItems = 20;
     var dialog = null;
+    $scope.hoverBookmark = null;
     $scope.order = [false, false, false];
     $scope.order[($stateParams && $stateParams.orderIndex) || 1] = true;
     $scope.loadBookmarks = false;
@@ -234,6 +235,10 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
 
     $scope.toggleShowMode = function(showMode) {
         $scope.showMode = showMode;
+        $timeout(function() {
+            timeagoInstance.cancel();
+            timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN');
+        }, 100)
     }
 
     $scope.editTag = function(tag) {
@@ -406,6 +411,26 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
         }, 300)
     }
 
+    $scope.setHoverBookmark = function(bookmark) {
+        $scope.hoverBookmark = bookmark;
+    }
+
+    // 在输入文字的时候也会触发，所以不要用Ctrl,Shift之类的按键
+    $document.bind("keydown", function(event) {
+        $scope.$apply(function() {
+            var key = event.key.toUpperCase();
+            if ($scope.hoverBookmark && dataService.keyShortcuts()) {
+                if (key == 'E') {
+                    $scope.editBookmark($scope.hoverBookmark.id)
+                } else if (key == 'I') {
+                    $scope.detailBookmark($scope.hoverBookmark)
+                } else if (key == 'D') {
+                    $scope.delBookmark($scope.hoverBookmark)
+                }
+            }
+        })
+    });
+
     function getTags(params) {
         $scope.loadTags = true;
         bookmarkService.getTags(params)
diff --git a/public/views/tags.html b/public/views/tags.html
index 11b98d5..ede063b 100644
--- a/public/views/tags.html
+++ b/public/views/tags.html
@@ -65,7 +65,7 @@
         </tr>
     </thead>
     <tbody>
-        <tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}">
+        <tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
             <td>
                 <img class="ui ui middle aligned tiny image" ng-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;">
@@ -105,11 +105,11 @@
 <div class="ui segment js-tag-costomTag" ng-if="bookmarkCount > 0 && showMode=='item'" style="margin-top:-55px;" ng-show="!loadBookmarks && !editMode">
     <div class="ui five column grid">
         <div
+            ng-repeat="bookmark in bookmarksByTag"
             class="column js-costomTag-item"
             ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmark:(!bookmarkNormalHover)}"
-            ng-mouseover="bookmarkNormalHover=true"
-            ng-mouseleave="bookmarkNormalHover=false"
-            ng-repeat="bookmark in bookmarksByTag"
+            ng-mouseover="bookmarkNormalHover=true; setHoverBookmark(bookmark)"
+            ng-mouseleave="bookmarkNormalHover=false; setHoverBookmark(null)"
             ng-click="jumpToUrl(bookmark.url, bookmark.id)"
             title="{{ bookmark.title }}"
             id="{{bookmark.id}}">