From 2348e22d0a4260c1568424deb632c70720758665 Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 21 Nov 2016 17:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8jquery=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E4=B9=A6=E7=AD=BE=E7=BC=96=E8=BE=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=9B=BA=E5=AE=9A=E5=9C=A8=E5=8F=B3=E4=B8=8A=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/controllers/bookmarks-controller.js | 12 ++++++++++--
 public/views/bookmarks.html                     | 17 +++++------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index 3033973..ddcdf58 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -85,7 +85,15 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
             .catch((err) => console.log('getBookmarks err', err));
     }
 
-    $scope.$on('viewContentLoaded', function(elementRenderFinishedEvent) {
-        $('.ui.dropdown').dropdown();
+    // TODO: 我要将编辑按钮固定在容器的右上角 
+    $(window).resize(function() {
+        var top = $('.js-segment-navigate').offset().top;
+        var left = $('.js-segment-navigate').offset().left;
+        var width = $('.js-segment-navigate').width();
+        // console.log('js-edit position update', top+10, left+width-10)
+        $('.js-edit').offset({
+            top: top+10,
+            left: left+width-10,
+        })
     });
 }]);
diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html
index cb47513..568a00a 100644
--- a/public/views/bookmarks.html
+++ b/public/views/bookmarks.html
@@ -1,21 +1,14 @@
-<div class="ui segment" ng-if="showStyle === 'navigate'">
+<div class="ui segment js-segment-navigate" ng-if="showStyle === 'navigate'">
     <div class="ui container" ng-repeat="tag in bookmarks" ng-init="tagIndex=$index">
         <div class="ui grid">
-            <div class=" row">
+            <div class="row">
                 <div class="wrap" style="width:88px;color:#0aa770;text-align:left;margin-left:20px;">
                     <span title="{{ tag.name }}">{{ tag.name }}</span>
                 </div>
                 <div class="fourteen wide column" ng-if="tag.bookmarks.length">
                     <div class="ui grid container">
-                        <div
-                            class="two 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="two 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://www.google.com/s2/favicons?domain={{ bookmark.url }}" style="width:16px;height:16px" ng-if="!edit">
@@ -23,7 +16,7 @@
                         </div>
                     </div>
                 </div>
-                <div ng-if="tagIndex === 0" style="width:32px;height:32px;padding-right:10px;" ng-click="toggleMode()" title="{{edit ? '退出编辑模式' : '点我进入编辑模式'}}"><img class="ui ui middle aligned tiny image" ng-src="./images/{{ edit ? 'back' : 'edit'}}.png"></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>
             </div>
         </div>
         <div class="ui divider"></div>