From 26ee7d6ee4e7aac66222f8de6423a3877fae38be Mon Sep 17 00:00:00 2001
From: luchenqun <luchenqun@qq.com>
Date: Mon, 27 Feb 2017 18:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=8B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E7=BA=A0=E6=AD=A3?=
 =?UTF-8?q?=E7=9A=84timer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controllers/bookmarks-controller.js       | 18 +++++++++--------
 public/scripts/controllers/tags-controller.js | 20 ++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js
index 89a48ec..2d23a39 100644
--- a/public/scripts/controllers/bookmarks-controller.js
+++ b/public/scripts/controllers/bookmarks-controller.js
@@ -188,14 +188,16 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '
         if ($scope.showStyle == 'navigate') {
             for (var i = 1; i <= 100; i += 10) {
                 setTimeout(function() {
-                    var t = $('.js-segment-navigate').offset().top;
-                    var l = $('.js-segment-navigate').offset().left;
-                    var w = $('.js-segment-navigate').width();
-                    // console.log('js-edit position update', top+10, left+width-10)
-                    $('.js-bookmark-edit').offset({
-                        top: t + 10,
-                        left: l + w - 10,
-                    })
+                    var offset = $('.js-segment-navigate').offset();
+                    if (offset) {
+                        var t = offset.top;
+                        var l = offset.left;
+                        var w = $('.js-segment-navigate').width();
+                        $('.js-bookmark-edit').offset({
+                            top: t + 10,
+                            left: l + w - 10,
+                        })
+                    }
                 }, 100 * i)
             }
         }
diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js
index 314c59f..68f2a9d 100644
--- a/public/scripts/controllers/tags-controller.js
+++ b/public/scripts/controllers/tags-controller.js
@@ -320,16 +320,18 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim
     updateEditPos();
 
     function updateEditPos() {
-        for (var i = 1; i <= 100; i+=10) {
+        for (var i = 1; i <= 100; i += 10) {
             setTimeout(function() {
-                var t = $('.js-tags').offset().top;
-                var l = $('.js-tags').offset().left;
-                var w = $('.js-tags').width();
-                // console.log('js-edit position update', top+10, left+width-10)
-                $('.js-edit').offset({
-                    top: t + 10,
-                    left: l + w - 10,
-                })
+                var offset = $('.js-tags').offset();
+                if (offset) {
+                    var t = offset.top;
+                    var l = offset.left;
+                    var w = $('.js-tags').width();
+                    $('.js-edit').offset({
+                        top: t + 10,
+                        left: l + w - 10,
+                    })
+                }
             }, 100 * i)
         }
     }