diff --git a/database/db.js b/database/db.js index f69cefe..6d852d9 100644 --- a/database/db.js +++ b/database/db.js @@ -641,7 +641,7 @@ db.getBookmarksByTag = function(params) { } db.getBookmarksSearch = function(params) { - var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d') as last_click FROM `bookmarks` WHERE 1=1"; + var sql = "SELECT id, user_id, title, description, url, public, click_count, DATE_FORMAT(created_at, '%Y-%m-%d %H:%i:%s') as created_at, DATE_FORMAT(last_click, '%Y-%m-%d %H:%i:%s') as last_click FROM `bookmarks` WHERE 1=1"; if (params.dateCreate) { var d = new Date(); @@ -701,22 +701,6 @@ db.getBookmarksSearch = function(params) { }) } -// CREATE TABLE `hot_bookmarks` ( -// `id` int(11) NOT NULL AUTO_INCREMENT, -- id(articleId) -// `date` int(11) NOT NULL DEFAULT 0, -- 日期(自己添加) -// `title` varchar(255) DEFAULT NULL, -- 标题(title) -// `description` varchar(4096) DEFAULT NULL, -- 描述(自己添加) -// `url` varchar(1024) DEFAULT NULL, -- 链接(url) -// `fav_count` smallint DEFAULT 1, -- 总共收藏人数(favCount) -// `created_by` varchar(64) DEFAULT NULL, -- 创建者(sourceName) -// `created_at` bigint DEFAULT 0, -- 创建时间(updatetime) -// `last_click` bigint DEFAULT 0, -- 最后一次点击时间(createtime) -// `snap_url` varchar(1024) DEFAULT NULL, -- 截图链接(imageList[0]) -// `favicon_url` varchar(1024) DEFAULT NULL, -- icon链接(sourceLogo) -// `status` tinyint(4) DEFAULT '0', -- 状态 -// PRIMARY KEY (`id`) -// ); - db.getHotBookmarksSearch = function(params) { var sql = "SELECT id, title, description, url, fav_count, created_by, created_at, last_click, snap_url, favicon_url FROM `hot_bookmarks` WHERE status=0"; diff --git a/public/index.html b/public/index.html index eb7cf75..f3110fe 100644 --- a/public/index.html +++ b/public/index.html @@ -67,5 +67,6 @@ + diff --git a/public/scripts/app-angular.js b/public/scripts/app-angular.js index 3aa53e1..18ab2aa 100644 --- a/public/scripts/app-angular.js +++ b/public/scripts/app-angular.js @@ -63,6 +63,14 @@ app.config(function($stateProvider, $urlRouterProvider, $httpProvider) { }); }); +//自定义过滤器 +app.filter('formatDate', function() { + return function(date) { + console.log(date); + return 22222; + } +}) + console.log([ " _ooOoo_", " o8888888o", diff --git a/public/scripts/controllers/bookmark-info-controller.js b/public/scripts/controllers/bookmark-info-controller.js index 7bdfaa9..9ca14c3 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', '$window', '$filter', '$document', 'bookmarkService', 'pubSubService', function($scope, $state, $timeout, $sce, $window, $filter, $document, bookmarkService, pubSubService) { +app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$window', '$filter', '$document', '$timeout', 'bookmarkService', 'pubSubService', function($scope, $state, $timeout, $sce, $window, $filter, $document, $timeout, bookmarkService, pubSubService) { console.log("Hello bookmarkInfoCtr"); $scope.bookmark = {} $scope.content = ''; @@ -9,8 +9,8 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win $('.ui.modal.js-bookmark-info').modal({ closable: false, }).modal('setting', 'transition', transition()).modal('show'); - bookmark.favicon_url = bookmark.favicon_url || ('http://g.soz.im/'+bookmark.url +'/cdn.ico'); - bookmark.snap_url = bookmark.snap_url || ('./images/snap/'+bookmark.id+'.png'); + bookmark.favicon_url = bookmark.favicon_url || ('http://g.soz.im/' + bookmark.url + '/cdn.ico'); + bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png'); $scope.bookmark = bookmark; $scope.bookmark.description = $sce.trustAsHtml(bookmark.description); $scope.content = ''; @@ -19,7 +19,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win requestId: 1 } $scope.loading = true; - setTimeout(function() { + $timeout(function() { $('.ui.modal.js-bookmark-info').modal("refresh"); }, 500); bookmarkService.getArticle(params) diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index 519a5e1..bf8302e 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -190,6 +190,11 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' } else { $scope.bookmarks = $scope.bookmarkData.bookmarksLatestClick; } + + $timeout(function() { + var timeagoInstance = timeago(); + timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); + }, 100) } $scope.updateCostomTagBookmarks = function(index) { diff --git a/public/scripts/controllers/search-controller.js b/public/scripts/controllers/search-controller.js index d130066..ff95ac0 100644 --- a/public/scripts/controllers/search-controller.js +++ b/public/scripts/controllers/search-controller.js @@ -273,6 +273,10 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi } function transition() { + $timeout(function() { + var timeagoInstance = timeago(); + timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); + }, 100) var className = 'js-table-search'; $('.' + className).transition('hide'); $('.' + className).transition({ diff --git a/public/scripts/controllers/tags-controller.js b/public/scripts/controllers/tags-controller.js index 8c35cd4..e0cdb92 100644 --- a/public/scripts/controllers/tags-controller.js +++ b/public/scripts/controllers/tags-controller.js @@ -41,6 +41,10 @@ app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$tim } else { $scope.bookmarks = $scope.bookmarkData.bookmarksLatestClick; } + $timeout(function() { + var timeagoInstance = timeago(); + timeagoInstance.render(document.querySelectorAll('.need_to_be_rendered'), 'zh_CN'); + }, 100) } $scope.getBookmarks = function(tagId, currentPage) { diff --git a/public/scripts/externe/timeago.min.js b/public/scripts/externe/timeago.min.js new file mode 100644 index 0000000..596f611 --- /dev/null +++ b/public/scripts/externe/timeago.min.js @@ -0,0 +1 @@ +!function(t,e){"object"==typeof module&&module.exports?module.exports=e(t):t.timeago=e(t)}("undefined"!=typeof window?window:this,function(){function t(t){return t instanceof Date?t:isNaN(t)?/^\d+$/.test(t)?new Date(e(t)):(t=(t||"").trim().replace(/\.\d+/,"").replace(/-/,"/").replace(/-/,"/").replace(/(\d)T(\d)/,"$1 $2").replace(/Z/," UTC").replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"),new Date(t)):new Date(e(t))}function e(t){return parseInt(t)}function n(t,n,r){n=d[n]?n:d[r]?r:"en";var i=0,a=t<0?1:0;for(t=Math.abs(t);t>=l[i]&&i(0===i?9:1)&&(i+=1),d[n](t,i)[a].replace("%s",t)}function r(e,n){return n=n?t(n):new Date,(n-t(e))/1e3}function i(t){for(var e=1,n=0,r=Math.abs(t);t>=l[n]&&n1&&(n+="s"),[t+" "+n+" ago","in "+t+" "+n]},zh_CN:function(t,e){if(0===e)return["刚刚","片刻后"];var n=s[parseInt(e/2)];return[t+n+"前",t+n+"后"]}},l=[60,60,24,7,365/7/12,12],h=6,p="datetime";return u.register=function(t,e){d[t]=e},u}); \ No newline at end of file diff --git a/public/views/bookmark-info.html b/public/views/bookmark-info.html index 58a70f0..b05f18b 100644 --- a/public/views/bookmark-info.html +++ b/public/views/bookmark-info.html @@ -19,10 +19,10 @@
- 创建日期：{{bookmark.created_at}} + 创建日期：{{bookmark.created_at}}
- 最后点击：{{bookmark.last_click}} + 最后点击：{{bookmark.last_click}}
diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 2822f18..4e35ac7 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -103,12 +103,10 @@ {{ bookmark.click_count }} - {{ bookmark.created_at.substr(0, 10) }} - + - {{ bookmark.last_click.substr(0, 10) }} - +
diff --git a/public/views/search.html b/public/views/search.html index 21b38b1..91a4c8c 100644 --- a/public/views/search.html +++ b/public/views/search.html @@ -154,12 +154,10 @@ {{ bookmark.click_count || bookmark.fav_count }} - {{ bookmark.created_at.substr(0, 10) }} - + - {{ bookmark.last_click.substr(0, 10) }} - +
diff --git a/public/views/tags.html b/public/views/tags.html index f14f1f1..09aa947 100644 --- a/public/views/tags.html +++ b/public/views/tags.html @@ -73,12 +73,10 @@ {{ bookmark.click_count }} - {{ bookmark.created_at.substr(0, 10) }} - + - {{ bookmark.last_click.substr(0, 10) }} - +