From 9ee21324dd030e63be755e862d49654873f2f97a Mon Sep 17 00:00:00 2001 From: Lkytal Date: Sun, 17 Jul 2016 22:19:28 +0800 Subject: [PATCH] 3.2.9 --- README.md | 2 ++ meta/popsearch.meta.js | 2 +- meta/tieba_enhance.meta.js | 4 ++-- popsearch.user.js | 28 +++++++++++++--------------- tieba_enhance.user.js | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index c0d8102..84b2fab 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ GM的"用户脚本设置"下的"Popup Search设置"打开选项选择需要的 Update Log: +* 3.2.8 : Fix multi tabs +* 3.2.7 : Update to jQuery 3.1.0 * 3.2.6 : Auto copying in chrome * 3.2.5 : Translation fixup for large texts * 3.2.4 : Multiline fixup diff --git a/meta/popsearch.meta.js b/meta/popsearch.meta.js index 5501b29..62fce6d 100644 --- a/meta/popsearch.meta.js +++ b/meta/popsearch.meta.js @@ -9,7 +9,7 @@ // @exclude http://acid3.acidtests.org/* // @exclude http://www.acfun.tv/* // @require http://cdn.bootcss.com/jquery/3.1.0/jquery.min.js -// @version 3.2.8 +// @version 3.2.9 // @icon http://lkytal.qiniudn.com/ic.ico // @grant GM_xmlhttpRequest // @grant GM_addStyle diff --git a/meta/tieba_enhance.meta.js b/meta/tieba_enhance.meta.js index 5f71b02..836b1f1 100644 --- a/meta/tieba_enhance.meta.js +++ b/meta/tieba_enhance.meta.js @@ -6,9 +6,9 @@ // @description 贴吧小尾巴, 坟贴提醒, 去除跳转等功能 // @include http://tieba.baidu.com/* // @include https://tieba.baidu.com/* -// @version 6.1.3 +// @version 6.1.4 // @author lkytal -// @require http://libs.baidu.com/jquery/2.1.3/jquery.min.js +// @require http://cdn.bootcss.com/jquery/2.2.4/jquery.min.js // @icon http://lkytal.qiniudn.com/ic.ico // @noframes // @grant unsafeWindow diff --git a/popsearch.user.js b/popsearch.user.js index 683df1f..67eb998 100644 --- a/popsearch.user.js +++ b/popsearch.user.js @@ -9,7 +9,7 @@ // @exclude http://acid3.acidtests.org/* // @exclude http://www.acfun.tv/* // @require http://cdn.bootcss.com/jquery/3.1.0/jquery.min.js -// @version 3.2.8 +// @version 3.2.9 // @icon http://lkytal.qiniudn.com/ic.ico // @grant GM_xmlhttpRequest // @grant GM_addStyle @@ -42,7 +42,7 @@ popData = { log = function(msg) { var text; popData.count += 1; - text = "hit " + popData.count + " : " + msg; + text = "MsgId " + popData.count + " : " + msg; return console.log(text); }; @@ -130,19 +130,17 @@ Init = function() { return popData.mouseIn = 0; }); $('#popupwapper').append(" "); - $('#sgoogle, #sbing, #sbaidu, #openurl').on("click", (function(_this) { - return function(e) { - e.preventDefault(); - $('#ShowUpBox').hide(); - if ((typeof GM_download !== "undefined" && GM_download !== null) || navigator.userAgent.indexOf("Chrome") > -1) { - return GM_openInTab($(_this).attr('href'), { - active: GetOpt("Focus_st") === 1 - }); - } else { - return GM_openInTab($(_this).attr('href'), !GetOpt("Focus_st")); - } - }; - })(this)); + $('#sgoogle, #sbing, #sbaidu, #openurl').on("click", function(e) { + e.preventDefault(); + $('#ShowUpBox').hide(); + if ((typeof GM_download !== "undefined" && GM_download !== null) || navigator.userAgent.indexOf("Chrome") > -1) { + return GM_openInTab($(this).attr('href'), { + active: GetOpt("Focus_st") === 1 + }); + } else { + return GM_openInTab($(this).attr('href'), !GetOpt("Focus_st")); + } + }); UIList = { '#openurl': 'Open_st', '#sSite': 'Site_st', diff --git a/tieba_enhance.user.js b/tieba_enhance.user.js index 6e62c94..4120bd4 100644 --- a/tieba_enhance.user.js +++ b/tieba_enhance.user.js @@ -6,9 +6,9 @@ // @description 贴吧小尾巴, 坟贴提醒, 去除跳转等功能 // @include http://tieba.baidu.com/* // @include https://tieba.baidu.com/* -// @version 6.1.3 +// @version 6.1.4 // @author lkytal -// @require http://libs.baidu.com/jquery/2.1.3/jquery.min.js +// @require http://cdn.bootcss.com/jquery/2.2.4/jquery.min.js // @icon http://lkytal.qiniudn.com/ic.ico // @noframes // @grant unsafeWindow @@ -44,7 +44,7 @@ log = function(msg) { open_setting_window = function() { var UpdateText, ref, ref1, x; $('setting_shadow').remove(); - $('body').append("
\n
\n
重置
\n
保存
\n
设置
\n

\n
\n
坟贴检测
\n
\n

超过\n 天的帖子视为坟贴\n
坟贴禁回
\n
\n

\n
小尾巴
\n
\n
\n
\n
\n
\n
\n
html
\n
javascript
\n
\n
\n
保存当前尾巴
\n
新建尾巴
\n
删除尾巴
\n
\n
\n 预览\n
\n

\n
\n
\n
\n
"); + $('body').append("
重置
保存
设置

坟贴检测

超过 天的帖子视为坟贴
坟贴禁回

小尾巴
html
javascript
保存当前尾巴
新建尾巴
删除尾巴
预览

"); $("#fentie_date")[0].value = tiebaData.fentie_date; if (!tiebaData.fentie_open) { $("#fentie_open").attr("class", "setting_sp_btn close"); @@ -287,7 +287,7 @@ TailInit = function() { if (!tiebaData.tail_open) { return; } - $("a.j_submit.poster_submit").before("\n \n \n \n
\n
\n
\n"); + $("a.j_submit.poster_submit").before("
"); $("#tail_use_text").click(function() { return $("#tail_use_box").slideToggle(400); }); @@ -406,7 +406,7 @@ Init = function() { tiebaData.tail_data[x] = tiebaData.tail_data[x].replace(/!逗号!/g, ",").replace(/!引号!/g, "\""); } } - $("#tb_nav").find("ul:first").append("
  • \n
    \n
    \n 设置\n
    \n
    \n
    • "); + $("#tb_nav").find("ul:first").append("
  • 设置
    • "); jQuery("body").on("mouseover", "a", clearLink); setTimeout(CheckPost, 500); $("#setting_btn").click(function() { @@ -419,4 +419,4 @@ if (window.self === window.top) { setTimeout(Init, 150); } -GM_addStyle("#NotifyTide {\n width: 100%;\n text-align: center;\n color: white;\n font-size: 28px;\n vertical-align: middle;\n pointer-events: none;\n -webkit-user-select: none;\n -moz-user-select: none;\n}\n#NotifyTide p {\n background: rgba(255, 119, 119, .5);\n padding: 25px 0px 25px 0px;\n text-shadow: red 0 0 5px, red 0 0 5px, red 0 0 7px, red 0 0 7px, red 0 0 10px, red 0 0 10px, red 0 0 15px, red 0 0 15px;\n}\n\n#setting_shadow {\n position: fixed;\n z-index: 1024000000;\n bottom: 0;\n left: 0;\n width: 100%;\n height: 100%;\n background: rgba(0, 0, 0, 0.5);\n -moz-transition: 0.4s;\n}\n#setting_window {\n position: fixed;\n top: -moz-calc(50% - 270px);\n top: -webkit-calc(50% - 270px);\n left: -moz-calc(50% - 300px);\n left: -webkit-calc(50% - 300px);\n width: 600px;\n background: #FFF;\n box-shadow: 0 0 5px #222;\n padding: 20px 20px 50px 20px;\n z-index: 1000000000;\n}\n#setting_out_div {\n overflow-y: scroll;\n padding: 0 10px 0 0;\n max-height:500px;\n}\n.setting_btn_inside {\n font-size: 16px;\n padding: 4px;\n -moz-user-select: none;\n cursor: default;\n}\n.setting_btn_inside:hover {\n background: #DDD;\n}\n.setting_btn_inside:active {\n box-shadow: 0 0 3px #999 inset;\n}\n#setting_reset {\n position: absolute;\n top: 14px;\n right: 14px;\n}\n#setting_save {\n display: inline-block;\n position: absolute;\n right: 15px;\n bottom: 10px;\n}\n.setting_sp_btn {\n font-size: 12px;\n padding: 4px;\n -moz-user-select: none;\n cursor: default;\n display: inline-block;\n position: relative;\n}\n.setting_sp_btn.close {\n background: #DDD;\n}\n.setting_sp_btn::before {\n position: absolute;\n right: -26px;\n top: 0;\n content: \"\";\n width: 26px;\n height: 26px;\n background: #6B4;\n -moz-transition: 0.3s;\n}\n.setting_sp_btn.close::before {\n background: #C54;\n}\n.setting_sp_btn:hover {\n background: #DDD;\n}\n.setting_sp_btn:active {\n box-shadow: 0 0 3px #999 inset;\n}\n#setting_sp_q_c {\n margin: 0 0 0 40px !important;\n}\n#setting_window .setting_title {\n font-size: 34px;\n height: 42px;\n line-height: 42px;\n padding: 7px 10px;\n margin: 0 0 0 -7px;\n -moz-user-select: none;\n cursor: default;\n display: inline-block;\n}\n#setting_window p {\n font-size: 18px;\n height: 42px;\n line-height: 50px;\n -moz-user-select: none;\n cursor: default;\n}\n#setting_window p.setting_hide {\n height: 10px;\n line-height: 10px;\n -moz-user-select: none;\n cursor: default;\n}\n#setting_window p.setting_hide.sp {\n background: #CCC !important;\n height: 1px !important;\n margin: 8px 0 !important;\n}\n#setting_window p.setting_hiding_sp {\n height: 1px;\n line-height: 1px;\n -moz-user-select: none;\n cursor: default;\n}\n#setting_window .setting_input {\n -moz-appearance: none;\n border: none;\n background: #DDD;\n height: 28px;\n padding: 0px 7px !important;\n width: 100px;\n margin: 0 10px 0 0 !important;\n font-size: 14px !important;\n}\n#setting_window span {\n font-size: 14px !important;\n margin: 0 10px 0 0 !important;\n -moz-user-select: none;\n cursor: default;\n display: inline-block;\n}\n.setting_textarea {\n -moz-appearance: none !important;\n border: none;\n background: #DDD;\n margin: 10px 0 0 0 !important;\n padding: 7px !important;\n width: 550px;\n height: 100px;\n -moz-box-sizing: border-box;\n font-size: 12px !important;\n}\n#tail_select {\n display: inline-block;\n height: 26px !important;\n line-height: 26px !important;\n width: 450px !important;\n margin: 0px 0 0 40px !important;\n vertical-align: top !important;\n text-align: center !important;\n font-size: 12px !Important;\n -moz-box-sizing: border-box !Important;\n position: relative !important;\n cursor: default !important;\n}\n#tail_select_text {\n height: 26px;\n float: left;\n min-width: 100px !important;\n background: #DDD !important;\n padding: 0 5px !important;\n -moz-box-sizing: border-box !Important;\n}\n#tail_option_box {\n float: left;\n position: absolute !important;\n bottom: 30px;\n left: 0;\n min-width: 100px;\n background: #EEE !important;\n box-shadow: 0 0 3px #666 !important;\n display: inline-block;\n}\n.tail_option {\n padding: 0 8px !important;\n width: auto !important;\n font-size: 12px !important;\n height: 24px !important;\n line-height: 24px !important;\n cursor: default !important;\n}\n.tail_option:hover {\n background: #DDD !important;\n}\n#tail_type {\n background: #DDD !important;\n position: absolute !important;\n top: 0;\n right: 0px;\n}\n#tail_type_text {\n width: 80px !important;\n text-align: center !important;\n}\n#tail_type_box {\n position: absolute !important;\n width: 80px !important;\n bottom: 30px;\n right: 0px;\n background: #EEE;\n box-shadow: 0 0 3px #666;\n}\n.tail_type_option:hover {\n background: #DDD;\n}\n#tail_save {\n font-size: 12px !important;\n position: absolute;\n top: 0;\n right: 90px;\n height: 26px !important;\n padding: 0 !important;\n width: 86px !important;\n}\n#tail_new {\n font-size: 12px !important;\n -moz-box-sizing: border-box !Important;\n padding: 0 !important;\n height: 26px !important;\n width: 60px !important;\n position: absolute !important;\n top: 0 !important;\n right: 180px !important;\n}\n#tail_delete {\n font-size: 12px !important;\n -moz-box-sizing: border-box !Important;\n padding: 0 !important;\n height: 26px !important;\n width: 60px !important;\n position: absolute !important;\n top: 0 !important;\n right: 250px !important;\n}\n#tail_data + span {\n display: block !Important;\n margin: 5px 0 -3px 0 !important;\n font-size: 12px !Important;\n}\n#tail_use {\n margin-left: 20px;\n margin-right: 20px;\n height: 30px;\n width: auto;\n float: left !important;\n cursor: default;\n}\n#tail_use_text {\n width: auto;\n padding: 0 10px;\n line-height: 28px !important;\n text-align: center !important;\n}\n#tail_use_box_out {\n position: absolute !important;\n width: 300px !important;\n}\n#tail_use_box {\n position: absolute !important;\n background: #EEE;\n bottom: 35px;\n left: 0;\n box-shadow: 0 0 3px #666;\n z-index: 100;\n}\n.tail_use_option {\n padding: 0 10px;\n line-height: 30px !important;\n}\n.tail_use_option:hover {\n background: #DDD;\n}"); +GM_addStyle("#NotifyTide { width: 100%; text-align: center; color: white; font-size: 28px; vertical-align: middle; pointer-events: none; -webkit-user-select: none; -moz-user-select: none; } #NotifyTide p { background: rgba(255, 119, 119, .5); padding: 25px 0px 25px 0px; text-shadow: red 0 0 5px, red 0 0 5px, red 0 0 7px, red 0 0 7px, red 0 0 10px, red 0 0 10px, red 0 0 15px, red 0 0 15px; } #setting_shadow { position: fixed; z-index: 1024000000; bottom: 0; left: 0; width: 100%; height: 100%; background: rgba(0, 0, 0, 0.5); -moz-transition: 0.4s; } #setting_window { position: fixed; top: -moz-calc(50% - 270px); top: -webkit-calc(50% - 270px); left: -moz-calc(50% - 300px); left: -webkit-calc(50% - 300px); width: 600px; background: #FFF; box-shadow: 0 0 5px #222; padding: 20px 20px 50px 20px; z-index: 1000000000; } #setting_out_div { overflow-y: scroll; padding: 0 10px 0 0; max-height:500px; } .setting_btn_inside { font-size: 16px; padding: 4px; -moz-user-select: none; cursor: default; } .setting_btn_inside:hover { background: #DDD; } .setting_btn_inside:active { box-shadow: 0 0 3px #999 inset; } #setting_reset { position: absolute; top: 14px; right: 14px; } #setting_save { display: inline-block; position: absolute; right: 15px; bottom: 10px; } .setting_sp_btn { font-size: 12px; padding: 4px; -moz-user-select: none; cursor: default; display: inline-block; position: relative; } .setting_sp_btn.close { background: #DDD; } .setting_sp_btn::before { position: absolute; right: -26px; top: 0; content: \"\"; width: 26px; height: 26px; background: #6B4; -moz-transition: 0.3s; } .setting_sp_btn.close::before { background: #C54; } .setting_sp_btn:hover { background: #DDD; } .setting_sp_btn:active { box-shadow: 0 0 3px #999 inset; } #setting_sp_q_c { margin: 0 0 0 40px !important; } #setting_window .setting_title { font-size: 34px; height: 42px; line-height: 42px; padding: 7px 10px; margin: 0 0 0 -7px; -moz-user-select: none; cursor: default; display: inline-block; } #setting_window p { font-size: 18px; height: 42px; line-height: 50px; -moz-user-select: none; cursor: default; } #setting_window p.setting_hide { height: 10px; line-height: 10px; -moz-user-select: none; cursor: default; } #setting_window p.setting_hide.sp { background: #CCC !important; height: 1px !important; margin: 8px 0 !important; } #setting_window p.setting_hiding_sp { height: 1px; line-height: 1px; -moz-user-select: none; cursor: default; } #setting_window .setting_input { -moz-appearance: none; border: none; background: #DDD; height: 28px; padding: 0px 7px !important; width: 100px; margin: 0 10px 0 0 !important; font-size: 14px !important; } #setting_window span { font-size: 14px !important; margin: 0 10px 0 0 !important; -moz-user-select: none; cursor: default; display: inline-block; } .setting_textarea { -moz-appearance: none !important; border: none; background: #DDD; margin: 10px 0 0 0 !important; padding: 7px !important; width: 550px; height: 100px; -moz-box-sizing: border-box; font-size: 12px !important; } #tail_select { display: inline-block; height: 26px !important; line-height: 26px !important; width: 450px !important; margin: 0px 0 0 40px !important; vertical-align: top !important; text-align: center !important; font-size: 12px !Important; -moz-box-sizing: border-box !Important; position: relative !important; cursor: default !important; } #tail_select_text { height: 26px; float: left; min-width: 100px !important; background: #DDD !important; padding: 0 5px !important; -moz-box-sizing: border-box !Important; } #tail_option_box { float: left; position: absolute !important; bottom: 30px; left: 0; min-width: 100px; background: #EEE !important; box-shadow: 0 0 3px #666 !important; display: inline-block; } .tail_option { padding: 0 8px !important; width: auto !important; font-size: 12px !important; height: 24px !important; line-height: 24px !important; cursor: default !important; } .tail_option:hover { background: #DDD !important; } #tail_type { background: #DDD !important; position: absolute !important; top: 0; right: 0px; } #tail_type_text { width: 80px !important; text-align: center !important; } #tail_type_box { position: absolute !important; width: 80px !important; bottom: 30px; right: 0px; background: #EEE; box-shadow: 0 0 3px #666; } .tail_type_option:hover { background: #DDD; } #tail_save { font-size: 12px !important; position: absolute; top: 0; right: 90px; height: 26px !important; padding: 0 !important; width: 86px !important; } #tail_new { font-size: 12px !important; -moz-box-sizing: border-box !Important; padding: 0 !important; height: 26px !important; width: 60px !important; position: absolute !important; top: 0 !important; right: 180px !important; } #tail_delete { font-size: 12px !important; -moz-box-sizing: border-box !Important; padding: 0 !important; height: 26px !important; width: 60px !important; position: absolute !important; top: 0 !important; right: 250px !important; } #tail_data + span { display: block !Important; margin: 5px 0 -3px 0 !important; font-size: 12px !Important; } #tail_use { margin-left: 20px; margin-right: 20px; height: 30px; width: auto; float: left !important; cursor: default; } #tail_use_text { width: auto; padding: 0 10px; line-height: 28px !important; text-align: center !important; } #tail_use_box_out { position: absolute !important; width: 300px !important; } #tail_use_box { position: absolute !important; background: #EEE; bottom: 35px; left: 0; box-shadow: 0 0 3px #666; z-index: 100; } .tail_use_option { padding: 0 10px; line-height: 30px !important; } .tail_use_option:hover { background: #DDD; }");