Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@akoya-tomo
akoya-tomo committed Nov 11, 2019
2 parents af3adea + 38aeb92 commit eb9f1fe
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 22 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ himuro\_majika氏作のユーザースタイルシートも使ってみてくだ
[futaba\_catalog\_mod(クラシックバージョン)](https://userstyles.org/styles/114130/futaba-catalog-mod-classic)

## 更新履歴
* v1.6.6rev26 2019-11-11
- 新レイアウトのカタログに暫定対応
* v1.6.6rev25 2019-09-06
- KOSHIAN カタログマーカー 改 v2.3.0以降のマークに対応
* v1.6.6rev24 2019-07-02
Expand Down
109 changes: 87 additions & 22 deletions futaba_thread_highlighter.user.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// @description スレ本文を検索してカタログでスレッド監視しちゃう
// @include http://*.2chan.net/*/futaba.php?mode=cat*
// @include https://*.2chan.net/*/futaba.php?mode=cat*
// @version 1.6.6rev25
// @version 1.6.6rev26
// @require http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js
// @grant GM_registerMenuCommand
// @grant GM_getValue
Expand Down Expand Up @@ -37,11 +37,15 @@ this.$ = this.jQuery = jQuery.noConflict(true);
var opacityZero = false;
var openedThreadObserver;
var hideFutakuroSearchBar = HIDE_FUTAKURO_SEARCHBAR;
var timerMutated;
var timerMutated, timerAdded;
var isNewLayout = $("#cattable").length && $("#cattable").prop("tagName") != "TABLE";

$(init);

function init(){
if (isNewLayout) {
checkAddedThreads();
}
console.log("futaba_thread_highlighter commmon: " + // eslint-disable-line no-console
GM_getValue("_futaba_thread_search_words", ""));
console.log("futaba_thread_highlighter indivisual: " + // eslint-disable-line no-console
Expand Down Expand Up @@ -457,6 +461,34 @@ this.$ = this.jQuery = jQuery.noConflict(true);
});
}

/**
* ふたばカタログの新レイアウトのスレ追加を検出
*/
function checkAddedThreads() {
var target = $("#cattable").get(0);
var config = { childList: true };
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
var $nodes = $(mutation.addedNodes);
if ($nodes.hasClass("cs")) {
if (timerAdded) {
clearTimeout(timerAdded);
timerAdded = null;
}
timerAdded = setTimeout(function() {
timerAdded = null;
highlight();
mark_akahuku_visited();
pickup_opened_threads();
check_opened_threads_mark();
notifyPickup();
}, 200);
}
});
});
observer.observe(target, config);
}

/*
* 既読スレのマークの状態を取得
*/
Expand All @@ -465,7 +497,7 @@ this.$ = this.jQuery = jQuery.noConflict(true);
return;
}

var target = $("#cattable td");
var target = isNewLayout ? $("#cattable .cs") : $("#cattable td");
var config = { attributes: true , attributeFilter: ["style"] };
// オブザーバインスタンスが既にあれば事前に解除
if (openedThreadObserver) {
Expand All @@ -492,7 +524,7 @@ this.$ = this.jQuery = jQuery.noConflict(true);

if ($(".akahuku_markup_catalog_table").length) {
// 赤福の既読マーク
target = $("#cattable td a[style]");
target = isNewLayout ? $("#cattable .cs .cu a[style]") : $("#cattable td a[style]");
config = { attributes: true, attributeFilter: ["class"] };
for (var j = 0; j < target.length; ++j) {
openedThreadObserver.observe(target[j], config);
Expand Down Expand Up @@ -528,24 +560,44 @@ this.$ = this.jQuery = jQuery.noConflict(true);
}
if( words !== "" ) {
removeOldHighlighted();
$("#cattable td small").each(function() {
if( $(this).text().match(re) &&
($(this).parent("td").attr("class") + "").indexOf("GM_fcn_ng_") == -1 && // 「futaba catalog NG」NGスレ
($(this).parent("td").attr("style") + "").indexOf("display: none") == -1 && // NGスレ
($(this).attr("style") + "").indexOf("display: none") == -1 ) { // 「合間合間に」NGスレ
if ( !$(this).children(".GM_fth_matchedword").length ) {
$(this).html($(this).html().replace(re,
"<span class='GM_fth_matchedword'>" +
$(this).text().match(re)[0] +
"</span>"));
if (isNewLayout) {
$("#cattable .cu").each(function() {
var matches = $(this).get(0).innerText.match(/([^\n]+)\n/);
if( matches && matches[1].match(re) &&
($(this).parent(".cs").attr("class") + "").indexOf("GM_fcn_ng_") == -1 && // 「futaba catalog NG」NGスレ
($(this).parent(".cs").attr("style") + "").indexOf("display: none") == -1 && // NGスレ
($(this).children("small").attr("style") + "").indexOf("display: none") == -1 ) { // 「合間合間に」NGスレ
/* 新レイアウトでは検索ワードのハイライトは無効
if ( !$(this).children(".GM_fth_matchedword").length ) {
$(this).html($(this).html().replace(re,
"<span class='GM_fth_matchedword'>" +
$(this).text().match(re)[0] +
"</span>"));
}
*/
$(this).parent(".cs").addClass("GM_fth_highlighted");
}
if ( $(this).parent("a").length ) { // 文字スレ
$(this).parent().parent("td").addClass("GM_fth_highlighted");
} else {
$(this).parent("td").addClass("GM_fth_highlighted");
});
} else {
$("#cattable td small").each(function() {
if( $(this).text().match(re) &&
($(this).parent("td").attr("class") + "").indexOf("GM_fcn_ng_") == -1 && // 「futaba catalog NG」NGスレ
($(this).parent("td").attr("style") + "").indexOf("display: none") == -1 && // NGスレ
($(this).attr("style") + "").indexOf("display: none") == -1 ) { // 「合間合間に」NGスレ
if ( !$(this).children(".GM_fth_matchedword").length ) {
$(this).html($(this).html().replace(re,
"<span class='GM_fth_matchedword'>" +
$(this).text().match(re)[0] +
"</span>"));
}
if ( $(this).parent("a").length ) { // 文字スレ
$(this).parent().parent("td").addClass("GM_fth_highlighted");
} else {
$(this).parent("td").addClass("GM_fth_highlighted");
}
}
}
});
});
}
pickup_highlighted();
}
else {
Expand Down Expand Up @@ -650,6 +702,8 @@ this.$ = this.jQuery = jQuery.noConflict(true);
}
$("td:has('a.akahuku_visited')").css("background-color", AKAHUKU_VISITED_COLOR);
$("td:has('a:visited')").css("background-color", AKAHUKU_VISITED_COLOR);
$(".cs:has('a.akahuku_visited')").css("background-color", AKAHUKU_VISITED_COLOR);
$(".cs:has('a:visited')").css("background-color", AKAHUKU_VISITED_COLOR);
}

/*
Expand All @@ -670,14 +724,15 @@ this.$ = this.jQuery = jQuery.noConflict(true);
var filter =
"[style *= 'display: none']," + // NGスレ
"[style *= 'display:none']," + // ふたクロ 空td
"[style = '']," + // style未指定
"[class *= 'GM_fth_highlighted']," + // ピックアップ済み
"[class *= 'GM_fcn_ng_']"; // futaba catalog NG
if ($(".akahuku_markup_catalog_table").length) {
// 赤福の既読スレ
opened = $("#cattable td:has('a.akahuku_visited'):not(" + filter + ")");
opened = isNewLayout ? $("#cattable .cs:has('a.akahuku_visited'):not(" + filter + ")") : $("#cattable td:has('a.akahuku_visited'):not(" + filter + ")");
} else {
// 既読スレ
opened = $("#cattable td[style]:not(" + filter +")");
opened = isNewLayout ? $("#cattable .cs[style]:not(" + filter +")") : $("#cattable td[style]:not(" + filter +")");
}
// OPENED_THREAD_MARKER_STYLEが未設定でKOSHIANカタログマーカー改v2以外のマークならスタイルをコピー
if (opened.length && !openedThreadCssText && !opened.first().attr("opened")) {
Expand Down Expand Up @@ -795,6 +850,7 @@ this.$ = this.jQuery = jQuery.noConflict(true);
" background-color: #FFDFE9;" +
" border-radius: 5px;" +
" word-wrap: break-word;" +
" overflow: hidden;" +
"}" +
// ピックアップスレ本文
".GM_fth_pickuped_caption {" +
Expand All @@ -814,6 +870,7 @@ this.$ = this.jQuery = jQuery.noConflict(true);
" margin: 1px;" +
" border-radius: 5px;" +
" word-wrap: break-word;" +
" overflow: hidden;" +
openedThreadCssText +
"}" +
// ピックアップ既読スレ本文
Expand Down Expand Up @@ -877,11 +934,19 @@ this.$ = this.jQuery = jQuery.noConflict(true);
"td[__opened] {" +
" background-color: " + AKAHUKU_VISITED_COLOR + ";" +
"}" +
".cs[__opened] {" +
" background-color: " + AKAHUKU_VISITED_COLOR + ";" +
"}" +
// 赤福既読スレ レス数
"td:not(.GM_fth_highlighted) a.akahuku_visited font," +
"td:not(.GM_fth_highlighted) a:visited font," +
"td[__opened]:not(.GM_fth_highlighted) a font {" +
" background-color: transparent !important;" +
"}" +
".cs:not(.GM_fth_highlighted) a.akahuku_visited font," +
".cs:not(.GM_fth_highlighted) a:visited font," +
".cs[__opened]:not(.GM_fth_highlighted) a font {" +
" background-color: transparent !important;" +
"}";
}

Expand Down

0 comments on commit eb9f1fe

Please sign in to comment.