From 678592e30bb65b97135dac33ea91fae428c3d2c8 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Wed, 22 Feb 2017 22:57:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=AF=BC=E8=88=AA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=9B=B4=E5=A4=9A=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/views/bookmarks.html | 20 ++++++++++++--------
 routes/api.js               |  4 ----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html
index d485264..831ff95 100644
--- a/public/views/bookmarks.html
+++ b/public/views/bookmarks.html
@@ -19,16 +19,20 @@
                 </div>
                 <div class="fourteen wide column" ng-if="tag.bookmarks.length">
                     <div class="ui grid container">
-                        <div class="four wide column js-navigate-bookmark" ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmarkEditHover:bookmarkEditHover, bookmark:(!bookmarkNormalHover && !bookmarkEditHover)}" ng-mouseover="edit ? (bookmarkEditHover=true) : (bookmarkNormalHover=true)"
-                            ng-mouseleave="edit ? (bookmarkEditHover=false) : (bookmarkNormalHover=false)" ng-repeat="bookmark in tag.bookmarks" ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{ bookmark.title }}" id="{{bookmark.id}}">
+                        <div
+                            class="four wide column js-navigate-bookmark"
+                            ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmarkEditHover:bookmarkEditHover, bookmark:(!bookmarkNormalHover && !bookmarkEditHover)}"
+                            ng-mouseover="edit ? (bookmarkEditHover=true) : (bookmarkNormalHover=true)"
+                            ng-mouseleave="edit ? (bookmarkEditHover=false) : (bookmarkNormalHover=false)"
+                            ng-repeat="bookmark in tag.bookmarks"
+                            ng-click="jumpToUrl(bookmark.url, bookmark.id)"
+                            title="{{ bookmark.title }}"
+                            id="{{bookmark.id}}">
                             <img class="ui ui middle aligned tiny image bookmarkOperaterHover" style="width:16px;height:16px" ng-src="./images/{{ bookmarkEditHover ? 'delete-hover' : 'delete'}}.png" ng-if="edit" ng-click="delBookmark(bookmark.id)">
                             <img class="ui ui middle aligned tiny image bookmarkOperaterHover" style="width:16px;height:16px;float:right;" ng-src="./images/{{ bookmarkEditHover ? 'edit-bookmark-hover' : 'edit-bookmark'}}.png" ng-if="edit" ng-click="editBookmark(bookmark.id)">
                             <img class="ui ui middle aligned tiny image" ng-src=" http://favicon.byi.pw/?url={{bookmark.url}}" style="width:16px;height:16px" ng-if="!edit">
                             <span>{{ bookmark.title}}</span>
                         </div>
-                        <div class="two wide column js-more-bookmark" ng-class="" ng-mouseover="" ng-mouseleave="" title="查看更多" ng-if="tag.bookmarks.length >= 31" ng-click="jumpToTags(tag.id)">
-                            <img class="ui ui middle aligned tiny image" ng-src="./images/more.png" style="width:16px;height:16px">
-                        </div>
                     </div>
                 </div>
                 <div ng-if="tagIndex === 0" style="width:22px;height:22px;" class="js-edit" ng-click="toggleMode()" title="{{edit ? '退出编辑模式' : '点我进入编辑模式'}}"><img class="ui ui middle aligned tiny image" ng-src="./images/{{ edit ? 'back' : 'edit'}}.png"></div>
@@ -84,12 +88,11 @@
         </tr>
     </tfoot>
 </table>
-
 <div class="ui segment" ng-if="showStyle === 'card'">
     <div class="ui five link stackable cards" infinite-scroll='loadCardData()' infinite-scroll-immediate-check="false">
         <div class="card" ng-repeat="bookmark in bookmarks">
             <div class="image" href="{{ bookmark.url }}" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
-                <img ng-src="./images/snap/{{bookmark.id}}.png" err-src="./images/snap/default.png" />
+                <img ng-src="./images/snap/{{bookmark.id}}.png" err-src="./images/snap/default.png"/>
             </div>
             <div class="content" ng-click="jumpToUrl(bookmark.url, bookmark.id)">
                 <div class="description bookmarkTitle">
@@ -113,5 +116,6 @@
             </div>
         </div>
     </div>
-    <div class="ui massive text centered inline loader" ng-class="{active:loadBusy, disabled:!loadBusy}"> 正在加载中...</div>
+    <div class="ui massive text centered inline loader" ng-class="{active:loadBusy, disabled:!loadBusy}">
+        正在加载中...</div>
 </div>
diff --git a/routes/api.js b/routes/api.js
index 7c2818f..bbe6131 100644
--- a/routes/api.js
+++ b/routes/api.js
@@ -251,10 +251,6 @@ api.get('/bookmarks', function(req, res) {
                     }
                     tag.click += bookmark.click_count;
                     tag.bookmarks.push(bookmark);
-                    // if (bookmark.id && tag.bookmarks.length < 31) {
-                    //     tag.click += bookmark.click_count;
-                    //     tag.bookmarks.push(bookmark);
-                    // }
                 });
                 if (result && result.length > 0) {
                     data.push(tag);