From 3059b18bf8af57759feaed3a71c7d76a5804dac2 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Mon, 27 Feb 2017 14:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=8D=E5=88=B6=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E8=AF=A6=E6=83=85=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/bookmark-info-controller.js | 19 ++++++++++++++++--- .../controllers/bookmarks-controller.js | 5 +---- .../scripts/controllers/search-controller.js | 4 ---- public/scripts/controllers/tags-controller.js | 5 +---- public/views/bookmark-info.html | 5 +++-- public/views/bookmarks.html | 3 +-- public/views/search.html | 3 +-- public/views/tags.html | 3 +-- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/public/scripts/controllers/bookmark-info-controller.js b/public/scripts/controllers/bookmark-info-controller.js index 6c570ab..f6eb00a 100644 --- a/public/scripts/controllers/bookmark-info-controller.js +++ b/public/scripts/controllers/bookmark-info-controller.js @@ -1,4 +1,4 @@ -app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', 'bookmarkService', 'pubSubService', function($scope, $state, $timeout, $sce, bookmarkService, pubSubService) { +app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$window', '$filter', 'bookmarkService', 'pubSubService', function($scope, $state, $timeout, $sce, $window, $filter, bookmarkService, pubSubService) { console.log("Hello bookmarkInfoCtr"); $scope.bookmark = {} $scope.content = ''; @@ -6,7 +6,9 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', 'book pubSubService.subscribe('TagCtr.showBookmarkInfo', $scope, function(event, bookmark) { console.log('subscribe TagCtr.showBookmarkInfo', bookmark); - $('.ui.modal.js-bookmark-info').modal('show'); + $('.ui.modal.js-bookmark-info').modal({ + closable: false, + }).modal('show'); $scope.bookmark = bookmark; $scope.content = ''; var params = { @@ -17,7 +19,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', 'book bookmarkService.getArticle(params) .then((data) => { $scope.content = data.content ? $sce.trustAsHtml(data.content) : $sce.trustAsHtml('

数据获取失败，可能是服务器不允许获取，或者是https网站！

'); - setTimeout(function(){ + setTimeout(function() { $('.ui.modal.js-bookmark-info').modal("refresh"); }, 100); $scope.loading = false; @@ -27,4 +29,15 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', 'book $scope.loading = false; }) }); + + $scope.jumpToUrl = function(url, id) { + $window.open(url, '_blank'); + if ($scope.bookmark.own) { + bookmarkService.clickBookmark({ + id: id + }); + $scope.bookmark.click_count += 1; + $scope.bookmark.last_click = $filter("date")(new Date(), "yyyy-MM-dd"); + } + } }]); diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index 0edcd49..7704045 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -87,7 +87,7 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' $scope.detailBookmark = function(b) { var bookmark = $.extend(true, {}, b); // 利用jQuery执行深度拷贝 - console.log(JSON.stringify(bookmark), ' ddddd ', JSON.stringify(b)); + bookmark.own = true; if ($scope.showStyle == 'navigate') { bookmark.last_click = bookmark.last_click.substring(0, 10); bookmark.created_at = bookmark.created_at.substring(0, 10); @@ -104,9 +104,6 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' id: bookmark.id }); } - $scope.copyBookmark = function(bookmarkUrl) { - toastr.warning('功能暂未实现。。。', "警告"); - } $scope.jumpToTags = function(tagId) { $state.go('tags', { diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js index f6388fb..21dc004 100644 --- a/public/scripts/controllers/search-controller.js +++ b/public/scripts/controllers/search-controller.js @@ -98,10 +98,6 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi pubSubService.publish('TagCtr.showBookmarkInfo', bookmark); } - $scope.copyBookmark = function(bookmarkUrl) { - toastr.warning('功能暂未实现。。。', "警告"); - } - $scope.search = function() { var params = {} params.userRange = $('.js-user-range').dropdown('get value'); diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index 5b8ab55..23d11f4 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -118,16 +118,13 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim } $scope.detailBookmark = function(bookmark) { + bookmark.own = true; pubSubService.publish('TagCtr.showBookmarkInfo', bookmark); bookmarkService.clickBookmark({ id: bookmark.id }); } - $scope.copyBookmark = function(bookmarkUrl) { - toastr.warning('功能暂未实现。。。', "警告"); - } - $scope.toggleMode = function() { $scope.edit = !$scope.edit; if (!$scope.edit) { diff --git a/public/views/bookmark-info.html b/public/views/bookmark-info.html index 1ec766d..7582b11 100644 --- a/public/views/bookmark-info.html +++ b/public/views/bookmark-info.html @@ -13,7 +13,7 @@
- 网页地址：{{bookmark.url}} + 网页地址：{{bookmark.url}}
@@ -59,6 +59,7 @@
- +
跳转到原页面
+
diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 9b37f35..cb1a9a7 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -50,7 +50,7 @@ 创建日期 最后点击 分类 - 操作 + 操作 @@ -76,7 +76,6 @@ - diff --git a/public/views/search.html b/public/views/search.html index 2ab0819..ec39cea 100644 --- a/public/views/search.html +++ b/public/views/search.html @@ -124,7 +124,7 @@ 创建日期 最后点击 分类 - 操作 + 操作 @@ -154,7 +154,6 @@ - diff --git a/public/views/tags.html b/public/views/tags.html index 16205ef..05d947f 100644 --- a/public/views/tags.html +++ b/public/views/tags.html @@ -54,7 +54,7 @@ 创建日期 最后点击 分类 - 操作 + 操作 @@ -80,7 +80,6 @@ -