Skip to content

Commit

Permalink
6.4.6 增加谷搜客、tmd123搜索，稍微修正手动更新功能
Browse files Browse the repository at this point in the history
  • Loading branch information
@ywzhaiqi
ywzhaiqi committed Sep 26, 2014
1 parent f86ba63 commit 2abb5e6
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Super_preloaderPlus/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "super_preloaderplus_one",
"version": "6.4.5",
"version": "6.4.6",
"devDependencies": {
"grunt": "~0.4.5",
"grunt-contrib-clean": "~0.5.0",
Expand Down
14 changes: 10 additions & 4 deletions Super_preloaderPlus/src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ var setup = function(){
<ul>\
<li>当前版本为 <b>' + scriptInfo.version + ' </b>，上次更新时间为 <b>'+ scriptInfo.updateTime
+ '</b><button id="sp-prefs-checkUpdate" style="width:auto;">更新</button>\
<a target="_blank" href="' + scriptInfo.homepageURL + '"/>脚本主页</a>\
<a id="sp-prefs-homepageURL" target="_blank" href="' + scriptInfo.homepageURL + '"/>脚本主页</a>\
</li>\
<li><input type="checkbox" id="sp-prefs-debug" /> 调试模式</li>\
<li><input type="checkbox" id="sp-prefs-dblclick_pause" /> 鼠标双击暂停翻页（默认为 Ctrl + 长按左键）</li>\
Expand Down Expand Up @@ -166,7 +166,12 @@ var setup = function(){
checkUpdate();
};

var isUpdating = true;
function checkUpdate() {
if (isUpdating) {
return;
}

GM_xmlhttpRequest({
method: "GET",
url: scriptInfo.metaUrl,
Expand Down Expand Up @@ -201,10 +206,11 @@ function checkUpdate() {
}

if (needUpdate) {
if (confirm('本脚本从版本 ' + scriptInfo.version + ' 更新到了版本 ' + latestVersion + '.\n是否要打开脚本链接？')) {
window.open(scriptInfo.downloadUrl);
}
alert('本脚本从版本 ' + scriptInfo.version + ' 更新到了版本 ' + latestVersion + '.\n请点击脚本主页进行安装');
document.getElementById("sp-prefs-homepageURL").boxShadow = '0 0 2px 2px #FF5555';
}

isUpdating = false;
}
});
}
Expand Down
18 changes: 17 additions & 1 deletion Super_preloaderPlus/src/rule.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ var SITEINFO_D={
//高优先级规则,第一个是教程.
var SITEINFO=[
{name: 'Google搜索', //站点名字...(可选)
url: '^https?://(www|encrypted)\\.google(stable)?\\..{2,9}/(webhp|search|#|$|\\?)', // 站点正则...(~~必须~~)
url: '^https?://(?:(?:www|encrypted)\\.google(?:stable)?\\..{2,9}|wen\\.lu)/(?:webhp|search|#|$|\\?)', // 站点正则...(~~必须~~)
//url:'wildc;http://www.google.com.hk/search*',
siteExample:'http://www.google.com', //站点实例...(可选)
enable:true, //启用.(总开关)(可选)
Expand Down Expand Up @@ -292,6 +292,22 @@ var SITEINFO=[
pageElement: '//*[@id="c"]/div'
}
},
{name: '谷搜客',
url: /^https?:\/\/gusouk\.com\/search/i,
siteExample: 'http://gusouk.com/search?q=firefox',
nextLink: 'auto;',
autopager: {
pageElement: '//div[@class="search_result"]'
}
},
{name: 'tmd123搜索', // www.tmd123.com
url: /^https?:\/\/54\.64\.24\.234\/search/i,
siteExample: 'http://54.64.24.234/search/?q=firefox',
nextLink: 'auto;',
autopager: {
pageElement: '//div[@class="search_result"]'
}
},
{name: "Google custom",
url: /^https?:\/\/74\.125\.128\.147\/custom/i,
nextLink: 'id("pnnext") | id("navbar navcnt nav")//td[span]/following-sibling::td[1]/a | id("nn")/parent::a',
Expand Down
38 changes: 30 additions & 8 deletions Super_preloaderPlus/super_preloaderplus_one.user.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// @namespace https://github.com/ywzhaiqi
// @description 预读+翻页..全加速你的浏览体验...
// @author ywzhaiqi && NLF(原作者)
// @version 6.4.5
// @version 6.4.6
// @homepageURL https://greasyfork.org/scripts/293-super-preloaderplus-one

// @grant GM_addStyle
Expand Down Expand Up @@ -40,8 +40,8 @@

// 主要用于 chrome 原生下检查更新，也可用于手动检查更新
var scriptInfo = {
version: '6.4.5',
updateTime: '2014/9/18',
version: '6.4.6',
updateTime: '2014/9/26',
homepageURL: 'https://greasyfork.org/scripts/293-super-preloaderplus-one',
downloadUrl: 'https://greasyfork.org/scripts/293-super-preloaderplus-one/code/Super_preloaderPlus_one.user.js',
metaUrl: 'https://greasyfork.org/scripts/293-super-preloaderplus-one/code/Super_preloaderPlus_one.meta.js',
Expand Down Expand Up @@ -171,7 +171,7 @@ var SITEINFO_D={
//高优先级规则,第一个是教程.
var SITEINFO=[
{name: 'Google搜索', //站点名字...(可选)
url: '^https?://(www|encrypted)\\.google(stable)?\\..{2,9}/(webhp|search|#|$|\\?)', // 站点正则...(~~必须~~)
url: '^https?://(?:(?:www|encrypted)\\.google(?:stable)?\\..{2,9}|wen\\.lu)/(?:webhp|search|#|$|\\?)', // 站点正则...(~~必须~~)
//url:'wildc;http://www.google.com.hk/search*',
siteExample:'http://www.google.com', //站点实例...(可选)
enable:true, //启用.(总开关)(可选)
Expand Down Expand Up @@ -342,6 +342,22 @@ var SITEINFO=[
pageElement: '//*[@id="c"]/div'
}
},
{name: '谷搜客',
url: /^https?:\/\/gusouk\.com\/search/i,
siteExample: 'http://gusouk.com/search?q=firefox',
nextLink: 'auto;',
autopager: {
pageElement: '//div[@class="search_result"]'
}
},
{name: 'tmd123搜索', // www.tmd123.com
url: /^https?:\/\/54\.64\.24\.234\/search/i,
siteExample: 'http://54.64.24.234/search/?q=firefox',
nextLink: 'auto;',
autopager: {
pageElement: '//div[@class="search_result"]'
}
},
{name: "Google custom",
url: /^https?:\/\/74\.125\.128\.147\/custom/i,
nextLink: 'id("pnnext") | id("navbar navcnt nav")//td[span]/following-sibling::td[1]/a | id("nn")/parent::a',
Expand Down Expand Up @@ -3933,7 +3949,7 @@ var setup = function(){
<ul>\
<li>当前版本为 <b>' + scriptInfo.version + ' </b>，上次更新时间为 <b>'+ scriptInfo.updateTime
+ '</b><button id="sp-prefs-checkUpdate" style="width:auto;">更新</button>\
<a target="_blank" href="' + scriptInfo.homepageURL + '"/>脚本主页</a>\
<a id="sp-prefs-homepageURL" target="_blank" href="' + scriptInfo.homepageURL + '"/>脚本主页</a>\
</li>\
<li><input type="checkbox" id="sp-prefs-debug" /> 调试模式</li>\
<li><input type="checkbox" id="sp-prefs-dblclick_pause" /> 鼠标双击暂停翻页（默认为 Ctrl + 长按左键）</li>\
Expand Down Expand Up @@ -3993,7 +4009,12 @@ var setup = function(){
checkUpdate();
};

var isUpdating = true;
function checkUpdate() {
if (isUpdating) {
return;
}

GM_xmlhttpRequest({
method: "GET",
url: scriptInfo.metaUrl,
Expand Down Expand Up @@ -4028,10 +4049,11 @@ function checkUpdate() {
}

if (needUpdate) {
if (confirm('本脚本从版本 ' + scriptInfo.version + ' 更新到了版本 ' + latestVersion + '.\n是否要打开脚本链接？')) {
window.open(scriptInfo.downloadUrl);
}
alert('本脚本从版本 ' + scriptInfo.version + ' 更新到了版本 ' + latestVersion + '.\n请点击脚本主页进行安装');
document.getElementById("sp-prefs-homepageURL").boxShadow = '0 0 2px 2px #FF5555';
}

isUpdating = false;
}
});
}
Expand Down

0 comments on commit 2abb5e6

Please sign in to comment.