Skip to content

Commit 8b74cef

Browse files
committed
fix
1 parent 5f71989 commit 8b74cef

1 file changed

Lines changed: 27 additions & 4 deletions

File tree

Picviewer CE+/Picviewer CE+.user.js

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// @description Powerful picture viewing tool online, which can popup/scale/rotate/batch save pictures or find the HD original picture automatically
77
// @description:zh-CN NLF 的围观图修改版,增加高清原图查找显示(在线看图工具,支持图片翻转、旋转、缩放、弹出大图、批量保存、查找原图)
88
// @description:zh-TW NLF 的圍觀圖修改版,增加高清原圖查詢顯示(線上看圖工具,支援圖片翻轉、旋轉、縮放、彈出大圖、批量儲存、查詢原圖)
9-
// @version 2017.2.27.1
9+
// @version 2017.3.2.1
1010
// @created 2011-6-15
1111
// @namespace http://userscripts.org/users/NLF
1212
// @homepage http://hoothin.com
@@ -39,10 +39,10 @@
3939
;(function(topObject,window,document,unsafeWindow){
4040
'use strict';
4141

42+
var prefs;
4243
function init(topObject,window,document,arrayFn,envir,storage,unsafeWindow){
43-
4444
// 默认设置,请到设置界面修改
45-
var prefs={
45+
prefs={
4646
floatBar:{//浮动工具栏相关设置.
4747
butonOrder:['actual','gallery','magnifier','current','search'],//按钮排列顺序'actual'(实际的图片),'current'(当前显示的图片),'magnifier'(放大镜观察),'gallery'(图集)
4848
showDelay:366,//浮动工具栏显示延时.单位(毫秒)
@@ -134,6 +134,7 @@
134134
// lowLevel: true, // 如果有多个图片,优先选择低一级的
135135

136136
debug: false,
137+
firstEngine:"Tineye"
137138
};
138139

139140
//各网站高级规则;
@@ -4928,6 +4929,7 @@ left:0px;\
49284929
setSearchState("");
49294930
}
49304931
searchButton.addEventListener('click',function(e){
4932+
sortSearch();
49314933
searchImgByImg(self.img.src, function(srcs, index){
49324934
from=index;
49334935
self.srcs=srcs;
@@ -6504,6 +6506,7 @@ background-color:rgba(255, 0, 0, 0.150);\
65046506
} else {
65056507
if (!this.data.xhr) {
65066508
if(this.buttonType == 'search'){
6509+
sortSearch();
65076510
let from=0;
65086511
let searchFun=function(){
65096512
console.log(self.data.imgSrc);
@@ -8170,6 +8173,16 @@ background-image:url("'+ prefs.icons.magnifier +'");\
81708173
type: 'checkbox',
81718174
"default": prefs.debug
81728175
},
8176+
'firstEngine': {
8177+
label: '首选搜图引擎',
8178+
type: 'select',
8179+
options: {
8180+
"Tineye":"Tineye",
8181+
"Google":"Google",
8182+
"Baidu":"Baidu"
8183+
},
8184+
"default": prefs.firstEngine,
8185+
},
81738186
},
81748187
events: {
81758188
open: function(doc, win, frame) {
@@ -8345,6 +8358,16 @@ background-image:url("'+ prefs.icons.magnifier +'");\
83458358
}
83468359

83478360
var searchSort=["Tineye","Google","Baidu"];
8361+
function sortSearch(){
8362+
for(var i=0;i<searchSort.length;i++){
8363+
if(searchSort[i]==prefs.firstEngine){
8364+
searchSort.splice(i,1);
8365+
break;
8366+
}
8367+
}
8368+
searchSort.unshift(prefs.firstEngine);
8369+
}
8370+
83488371
function searchImgByImg(imgSrc, callBack, onError, noneResult, searchFrom){
83498372
let srcs=[];
83508373
var searchBaidu=function(){
@@ -8381,7 +8404,7 @@ background-image:url("'+ prefs.icons.magnifier +'");\
83818404
};
83828405
var searchGoogle=function(){
83838406
setSearchState("谷歌识图开始……");
8384-
getUrl("https://www.google.com/searchbyimage?image_url="+encodeURIComponent(imgSrc), function(d){
8407+
getUrl("https://www.google.com/searchbyimage?safe=off&image_url="+encodeURIComponent(imgSrc), function(d){
83858408
let googleHtml=document.implementation.createHTMLDocument('');
83868409
googleHtml.documentElement.innerHTML = d.responseText;
83878410
let sizeUrl=googleHtml.querySelector("div.card-section>div>div>span.gl>a");

0 commit comments

Comments
 (0)