liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更换获取favicon地址

This commit is contained in:
luchenqun 2018-04-02 16:31:48 +08:00
parent 4e2b1543d1
commit 0b121340b7
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/controllers/bookmark-info-controller.js
View File

@ -9,7 +9,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win
$('.ui.modal.js-bookmark-info').modal({ $('.ui.modal.js-bookmark-info').modal({
closable: false, closable: false,
}).modal('setting', 'transition', dataService.animation()).modal('show'); }).modal('setting', 'transition', dataService.animation()).modal('show');
bookmark.favicon_url = bookmark.favicon_url || ('https://api.statvoo.com/favicon/?url=' + bookmark.url); bookmark.favicon_url = bookmark.favicon_url || ('https://api.byi.pw/favicon/?url=' + bookmark.url);
bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png'); bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png');
$scope.bookmark = bookmark; $scope.bookmark = bookmark;
$scope.bookmark.description = $sce.trustAsHtml(bookmark.description); $scope.bookmark.description = $sce.trustAsHtml(bookmark.description);

8
public/views/bookmarks.html
View File

@ -30,7 +30,7 @@
id="{{bookmark.id}}"> id="{{bookmark.id}}">
<img <img
class="ui ui middle aligned tiny image bookmarkInfo" class="ui ui middle aligned tiny image bookmarkInfo"
ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}"
style="width:16px;height:16px;" style="width:16px;height:16px;"
ng-click="detailBookmark(bookmark);$event.stopPropagation()" ng-click="detailBookmark(bookmark);$event.stopPropagation()"
favicon-err="./images/favicon/{{bookmark.id}}.ico"> favicon-err="./images/favicon/{{bookmark.id}}.ico">
@ -66,7 +66,7 @@
id="{{bookmark.id}}"> id="{{bookmark.id}}">
<img <img
class="ui ui middle aligned tiny image bookmarkInfo" class="ui ui middle aligned tiny image bookmarkInfo"
ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}"
style="width:16px;height:16px;" style="width:16px;height:16px;"
ng-click="detailBookmark(bookmark);$event.stopPropagation()" ng-click="detailBookmark(bookmark);$event.stopPropagation()"
favicon-err="./images/favicon/{{bookmark.id}}.ico"> favicon-err="./images/favicon/{{bookmark.id}}.ico">
@ -89,7 +89,7 @@
<tbody> <tbody>
<tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)"> <tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
<td> <td>
<img class="ui ui middle aligned tiny image" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico"> <img class="ui ui middle aligned tiny image" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
<span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;"> <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
{{ bookmark.title }} {{ bookmark.title }}
</span> </span>
@ -142,7 +142,7 @@
</div> </div>
<div class="extra content" ng-show="!bookmark.edit" style="height:50px;padding-right:2px;padding-left:8px;"> <div class="extra content" ng-show="!bookmark.edit" style="height:50px;padding-right:2px;padding-left:8px;">
<span class="left floated like" style="margin-top:6px;"> <span class="left floated like" style="margin-top:6px;">
<img class="ui ui middle aligned tiny image" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico"> <img class="ui ui middle aligned tiny image" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
创建于: 创建于:
<span title="{{bookmark.created_at}}" class="need_to_be_rendered" data-timeago="{{bookmark.created_at}}"></span> <span title="{{bookmark.created_at}}" class="need_to_be_rendered" data-timeago="{{bookmark.created_at}}"></span>
<!-- {{ bookmark.created_at }} --> <!-- {{ bookmark.created_at }} -->

2
public/views/search.html
View File

@ -142,7 +142,7 @@
ng-if="searchHotBookmarks"> ng-if="searchHotBookmarks">
<img <img
class="ui ui middle aligned mini image" class="ui ui middle aligned mini image"
ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}"
style="width:16px;height:16px;cursor:pointer;" style="width:16px;height:16px;cursor:pointer;"
ng-click="jumpToUrl(bookmark.url, bookmark.id)" ng-click="jumpToUrl(bookmark.url, bookmark.id)"
favicon-err="./images/favicon/{{bookmark.id}}.ico" favicon-err="./images/favicon/{{bookmark.id}}.ico"

4
public/views/tags.html
View File

@ -85,7 +85,7 @@
<tbody> <tbody>
<tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)"> <tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
<td> <td>
<img class="ui ui middle aligned tiny image" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" <img class="ui ui middle aligned tiny image" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;"
ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico"> ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
<span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;"> <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
{{ bookmark.title }} {{ bookmark.title }}
@ -129,7 +129,7 @@
<div ng-repeat="bookmark in bookmarksByTag" class="column js-costomTag-item" ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmark:(!bookmarkNormalHover)}" <div ng-repeat="bookmark in bookmarksByTag" class="column js-costomTag-item" ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmark:(!bookmarkNormalHover)}"
ng-mouseover="bookmarkNormalHover=true; setHoverBookmark(bookmark)" ng-mouseleave="bookmarkNormalHover=false; setHoverBookmark(null)" ng-mouseover="bookmarkNormalHover=true; setHoverBookmark(bookmark)" ng-mouseleave="bookmarkNormalHover=false; setHoverBookmark(null)"
ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{ bookmark.title }}" id="{{bookmark.id}}"> ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{ bookmark.title }}" id="{{bookmark.id}}">
<img class="ui ui middle aligned tiny image bookmarkInfo" ng-src="https://api.statvoo.com/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;" <img class="ui ui middle aligned tiny image bookmarkInfo" ng-src="https://api.byi.pw/favicon/?url={{bookmark.url}}" style="width:16px;height:16px;"
ng-click="detailBookmark(bookmark);$event.stopPropagation()" favicon-err="./images/favicon/{{bookmark.id}}.ico"> ng-click="detailBookmark(bookmark);$event.stopPropagation()" favicon-err="./images/favicon/{{bookmark.id}}.ico">
<span>{{ bookmark.title}}</span> <span>{{ bookmark.title}}</span>
</div> </div>

4
routes/api.js
View File

@ -1223,9 +1223,9 @@ api.getFaviconByTimer = function() {
}); });
} else { } else {
// http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍 // http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍
var faviconUrl = "https://api.statvoo.com/favicon/?url=" + url; // 默认地址 var faviconUrl = "https://api.byi.pw/favicon/?url=" + url; // 默认地址
if (faviconState == 1) { if (faviconState == 1) {
faviconUrl = "http://favicon.byi.pw/?url=" + url; faviconUrl = "https://api.statvoo.com/favicon/?url=" + url;
} else if (faviconState == 2) { } else if (faviconState == 2) {
faviconUrl = "http://www.google.com/s2/favicons?domain=" + url; faviconUrl = "http://www.google.com/s2/favicons?domain=" + url;
} }