diff --git a/public/scripts/controllers/bookmark-info-controller.js b/public/scripts/controllers/bookmark-info-controller.js index 9a05f30..2feb12a 100644 --- a/public/scripts/controllers/bookmark-info-controller.js +++ b/public/scripts/controllers/bookmark-info-controller.js @@ -1,63 +1,63 @@ -app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$window', '$filter', '$document', '$timeout', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $timeout, $sce, $window, $filter, $document, $timeout, bookmarkService, pubSubService, dataService) { - console.log("Hello bookmarkInfoCtr"); - $scope.bookmark = {} - $scope.content = ''; - $scope.loading = false; - - pubSubService.subscribe('TagCtr.showBookmarkInfo', $scope, function(event, bookmark) { - console.log('subscribe TagCtr.showBookmarkInfo', bookmark); - $('.ui.modal.js-bookmark-info').modal({ - closable: false, - }).modal('setting', 'transition', dataService.animation()).modal('show'); - bookmark.favicon_url = bookmark.favicon_url || ('http://47.75.89.228:3000/?url=' + bookmark.url); - bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png'); - $scope.bookmark = bookmark; - $scope.bookmark.description = $sce.trustAsHtml(bookmark.description); - $scope.content = ''; - var params = { - url: bookmark.url, - requestId: 1 - } - $scope.loading = true; - $timeout(function() { - $('.ui.modal.js-bookmark-info').modal("refresh"); - $("p").css("word-wrap", "break-word"); - }, 500); - bookmarkService.getArticle(params) - .then((data) => { - $scope.content = data.content ? $sce.trustAsHtml(data.content) : $sce.trustAsHtml('

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

'); - setTimeout(function() { - $('.ui.modal.js-bookmark-info').modal && $('.ui.modal.js-bookmark-info').modal("refresh"); - }, 100); - $scope.loading = false; - }) - .catch((err) => { - $scope.content = $sce.trustAsHtml('

数据获取失败:' + JSON.stringify(err) + '

'); - $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 HH:mm:ss"); - } - } - - $scope.copy = function(url) { - dataService.clipboard(url); - } - - $document.bind("keydown", function(event) { - $scope.$apply(function() { - // Esc按键，退出 - if (event.keyCode == 27) { - $('.ui.modal.js-bookmark-info').modal("hide"); - } - }) - }); -}]); +app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$window', '$filter', '$document', '$timeout', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $timeout, $sce, $window, $filter, $document, $timeout, bookmarkService, pubSubService, dataService) { + console.log("Hello bookmarkInfoCtr"); + $scope.bookmark = {} + $scope.content = ''; + $scope.loading = false; + + pubSubService.subscribe('TagCtr.showBookmarkInfo', $scope, function(event, bookmark) { + console.log('subscribe TagCtr.showBookmarkInfo', bookmark); + $('.ui.modal.js-bookmark-info').modal({ + closable: false, + }).modal('setting', 'transition', dataService.animation()).modal('show'); + bookmark.favicon_url = bookmark.favicon_url || ('http://favicon.luchenqun.com/?url=' + bookmark.url); + bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png'); + $scope.bookmark = bookmark; + $scope.bookmark.description = $sce.trustAsHtml(bookmark.description); + $scope.content = ''; + var params = { + url: bookmark.url, + requestId: 1 + } + $scope.loading = true; + $timeout(function() { + $('.ui.modal.js-bookmark-info').modal("refresh"); + $("p").css("word-wrap", "break-word"); + }, 500); + bookmarkService.getArticle(params) + .then((data) => { + $scope.content = data.content ? $sce.trustAsHtml(data.content) : $sce.trustAsHtml('

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

'); + setTimeout(function() { + $('.ui.modal.js-bookmark-info').modal && $('.ui.modal.js-bookmark-info').modal("refresh"); + }, 100); + $scope.loading = false; + }) + .catch((err) => { + $scope.content = $sce.trustAsHtml('

数据获取失败:' + JSON.stringify(err) + '

'); + $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 HH:mm:ss"); + } + } + + $scope.copy = function(url) { + dataService.clipboard(url); + } + + $document.bind("keydown", function(event) { + $scope.$apply(function() { + // Esc按键，退出 + if (event.keyCode == 27) { + $('.ui.modal.js-bookmark-info').modal("hide"); + } + }) + }); +}]); diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 43c2af4..8d3b341 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -1,162 +1,162 @@ - -
-
-
-
-
- {{ tag.name }} -
-
-
-
- - {{ bookmark.title}} -
-
-
-
-
-
-
-
-
-
-
-
-
- {{ tag.name }} -
-
-
-
-
-
-
- - {{ bookmark.title}} -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
标题链接点击次数创建日期最后点击分类操作
- - - {{ bookmark.title }} - - - {{ bookmark.url }} - {{ bookmark.click_count }} - - - - -
- {{ tag.name }} -
- 		- - - -
- -
-
-
-
-
-
- {{bookmark.title}} -
-
-
- -
-
-
- {{ tag.name }} -
-
-
- - -
-
- - - - -
-
-
-
-
- 正在加载中...
+ +
+
+
+
+
+ {{ tag.name }} +
+
+
+
+ + {{ bookmark.title}} +
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ tag.name }} +
+
+
+
+
+
+
+ + {{ bookmark.title}} +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标题链接点击次数创建日期最后点击分类操作
+ + + {{ bookmark.title }} + + + {{ bookmark.url }} + {{ bookmark.click_count }} + + + + +
+ {{ tag.name }} +
+ 		+ + + +
+ +
+
+
+
+
+
+ {{bookmark.title}} +
+
+
+ +
+
+
+ {{ tag.name }} +
+
+
+ + +
+
+ + + + +
+
+
+
+
+ 正在加载中...
diff --git a/public/views/search.html b/public/views/search.html index 22e9aca..d4c8a4b 100644 --- a/public/views/search.html +++ b/public/views/search.html @@ -1,196 +1,196 @@ -
- 加载中，请稍候...
-
-
- 共为您找到相关书签约{{bookmarkCount}}个 -
-
- - 搜索工具 -
-
-
-
搜索范围
- -
-
自己书签
-
全站书签
-
热门收藏
-
-
-
-
-
-
创建时间不限
- -
-
创建时间不限
-
今天
-
一周内
-
一月内
-
一年内
-
-
自定义
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
确定
-
-
-
-
-
-
-
点击时间不限
- -
-
点击时间不限
-
今天
-
一周内
-
一月内
-
一年内
-
-
自定义
-
-
-
- - -
-
-
-
-
-
- - -
-
-
-
-
确定
-
-
-
-
-
-
- -
-
-
-
分类选择
- -
-
{{tag.name}}
-
-
-
-
-
-
- -
-
-
-
-
- -
-
- - 收起 -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
标题链接{{ searchHotBookmarks ? '收藏人数' : '点击次数'}}创建日期最后点击{{ searchHotBookmarks ? '来源信息' : '分类'}}操作
- - - - {{ bookmark.title }} - - - {{ bookmark.url }} - {{ bookmark.click_count || bookmark.fav_count }} - - - - -
- {{ tag.name }} -
- - {{ bookmark.created_by }} - - 		- - - - - - - - - - - - - -
- -
+
+ 加载中，请稍候...
+
+
+ 共为您找到相关书签约{{bookmarkCount}}个 +
+
+ + 搜索工具 +
+
+
+
搜索范围
+ +
+
自己书签
+
全站书签
+
热门收藏
+
+
+
+
+
+
创建时间不限
+ +
+
创建时间不限
+
今天
+
一周内
+
一月内
+
一年内
+
+
自定义
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
确定
+
+
+
+
+
+
+
点击时间不限
+ +
+
点击时间不限
+
今天
+
一周内
+
一月内
+
一年内
+
+
自定义
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
确定
+
+
+
+
+
+
+ +
+
+
+
分类选择
+ +
+
{{tag.name}}
+
+
+
+
+
+
+ +
+
+
+
+
+ +
+
+ + 收起 +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标题链接{{ searchHotBookmarks ? '收藏人数' : '点击次数'}}创建日期最后点击{{ searchHotBookmarks ? '来源信息' : '分类'}}操作
+ + + + {{ bookmark.title }} + + + {{ bookmark.url }} + {{ bookmark.click_count || bookmark.fav_count }} + + + + +
+ {{ tag.name }} +
+ + {{ bookmark.created_by }} + + 		+ + + + + + + + + + + + + +
+ +
diff --git a/public/views/tags.html b/public/views/tags.html index bfc79d0..00e464a 100644 --- a/public/views/tags.html +++ b/public/views/tags.html @@ -1,159 +1,159 @@ -
-
-
-
-
- {{ costomTag.name }} ({{ costomTag.cnt || 0 }}) -
-
-
-
- {{ tag.name }} ({{ tag.cnt || 0 }}) -
-
-
-
- {{ costomAllUsersTag.name }} ({{ costomAllUsersTag.cnt || 0 }}) -
-
-
-
- - - - -
-
-
-
-
-

提示：拖拽分类即可进行排序。如果添加新的分类，返回之后不会显示添加的分类，因为默认只显示有书签的分类。

-
-
-
- -
-
-
-
- -
-
-
-
-
{{ tag.name }}
-
- - - -
-
-
-
-

书签：{{ tag.cnt || 0 }}个

-

{{ tag.last_use }}

-
-
-
- - -
-
-
-
-
-
- 正在加载中... -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
标题链接点击次数创建日期最后点击分类操作
- - - {{ bookmark.title }} - - - {{ bookmark.url }} - {{ bookmark.click_count }} - - - - -
- {{ tag.name }} -
- 		- - - -
- -
-
-
-
- - {{ bookmark.title}} -
-
-
-
-
-
-
- - 添加日期 -
-
- - 点击次数 -
-
- - 最后点击 -
-
-
-
- -
-
+
+
+
+
+
+ {{ costomTag.name }} ({{ costomTag.cnt || 0 }}) +
+
+
+
+ {{ tag.name }} ({{ tag.cnt || 0 }}) +
+
+
+
+ {{ costomAllUsersTag.name }} ({{ costomAllUsersTag.cnt || 0 }}) +
+
+
+
+ + + + +
+
+
+
+
+

提示：拖拽分类即可进行排序。如果添加新的分类，返回之后不会显示添加的分类，因为默认只显示有书签的分类。

+
+
+
+ +
+
+
+
+ +
+
+
+
+
{{ tag.name }}
+
+ + + +
+
+
+
+

书签：{{ tag.cnt || 0 }}个

+

{{ tag.last_use }}

+
+
+
+ + +
+
+
+
+
+
+ 正在加载中... +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标题链接点击次数创建日期最后点击分类操作
+ + + {{ bookmark.title }} + + + {{ bookmark.url }} + {{ bookmark.click_count }} + + + + +
+ {{ tag.name }} +
+ 		+ + + +
+ +
+
+
+
+ + {{ bookmark.title}} +
+
+
+
+
+
+
+ + 添加日期 +
+
+ + 点击次数 +
+
+ + 最后点击 +
+
+
+
+ +
+
\ No newline at end of file diff --git a/routes/api.js b/routes/api.js index 4aff01b..72fafad 100644 --- a/routes/api.js +++ b/routes/api.js @@ -1236,7 +1236,7 @@ api.getFaviconByTimer = function() { if (/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url)) { // http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍 - var faviconUrl = "http://47.75.89.228:3000/?url=" + url; // 默认地址 + var faviconUrl = "http://favicon.luchenqun.com/?url=" + url; // 默认地址 if (faviconState == 1) { faviconUrl = "http://www.google.com/s2/favicons?domain=" + url; }