Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
akoya-tomo committed Feb 24, 2018
2 parents 878fc45 + b29bbc5 commit 52d3187
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ Chromeの場合、[Tampermonkey](https://chrome.google.com/webstore/detail/tampe
* Firefoxアドオン[ねないこ](http://nenaiko.sakura.ne.jp/nenaiko/)と併用する場合は、ねないこの設定より「カタログ2」→「カタログ本文のスタイルを指定する」のチェックを外してください。

## 更新履歴
* v1.6.6rev7 2018-02-24
- 既読スレのピックアップ条件を修正
* v1.6.6rev6 2018-01-30
- futaba catalog NGとの連携機能追加
* v1.6.6rev5 2018-01-02
Expand Down
4 changes: 2 additions & 2 deletions futaba_thread_highlighter.user.js
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.6rev6
// @version 1.6.6rev7
// @require http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js
// @grant GM_registerMenuCommand
// @grant GM_getValue
Expand Down Expand Up @@ -579,7 +579,7 @@ this.$ = this.jQuery = jQuery.noConflict(true);
$("#GM_fth_highlighted_threads .GM_fth_opened").remove();
}
//NGスレとピックアップ済みは除外
var opened = $("body > table td[style]:not([style *= 'display: none'],[style *= 'display:none'],[class *= 'GM_fth_highlighted'],[class *= 'GM_fcn_ng_'])").clone();
var opened = $("body > table td[style]:not([style *= 'display: none'],[style *= 'display:none'],[style = ''],[class *= 'GM_fth_highlighted'],[class *= 'GM_fcn_ng_'])").clone();
//OPENED_THREAD_MARKER_STYLEが未設定ならマークされたスタイルをコピー
if (opened.length && !openedThreadCssText) {
openedThreadCssText = opened.get(0).style.cssText;
Expand Down

0 comments on commit 52d3187

Please sign in to comment.