Merge branch 'release/1.7.3'

chaika · Jan 1, 2015 · 09eb507 · 09eb507
2 parents 6a1e6a7 + 5aa2336
commit 09eb507
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 60 deletions.
diff --git a/chaika/chrome/content/chaika/releasenotes.html b/chaika/chrome/content/chaika/releasenotes.html
@@ -178,6 +178,31 @@ <h1>chaika が新しいバージョンへと更新されました。</h1>
         </p>
     </section>
 
+
+    <section>
+        <h1>1.7.3 - 2014/12/31</h1>
+        <ul>
+            <li class="new">
+                コンテキストメニューの区切り線を非表示にすることができるようになりました
+                (<a href="https://github.com/chaika/chaika/issues/197">#197</a>)
+            </li>
+
+            <li class="changed">
+                AA 判定の処理が向上しました
+                (<a href="https://github.com/chaika/chaika/pull/226">#226</a>)
+            </li>
+
+            <li class="fixed">
+                Linux においてスレッド一覧の日にち表示が正しく行われない問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/221">#221</a>)
+            </li>
+            <li class="fixed">
+                一部の環境でスキンの受信に失敗しスレッドが正常に表示できない問題を修正しました
+                (<a href="https://github.com/chaika/chaika/issues/224">#224</a>)
+            </li>
+        </ul>
+    </section>
+
     <section>
         <h1>1.7.2 - 2014/12/27</h1>
         <ul>

diff --git a/chaika/chrome/content/chaika/settings/contextmenu-pane.xul b/chaika/chrome/content/chaika/settings/contextmenu-pane.xul
@@ -10,58 +10,72 @@
 
     <preferences>
         <preference id="extensions.chaika.contextmenu.abone.enabled"
-                name="extensions.chaika.contextmenu.abone.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.abone.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.copy.enabled"
-                name="extensions.chaika.contextmenu.copy.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.copy.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.search.enabled"
-                name="extensions.chaika.contextmenu.search.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.search.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.history.enabled"
-                name="extensions.chaika.contextmenu.history.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.history.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.skin.enabled"
-                name="extensions.chaika.contextmenu.skin.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.skin.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.skin-sep.enabled"
+                    name="extensions.chaika.contextmenu.skin-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.write.enabled"
-                name="extensions.chaika.contextmenu.write.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.write.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.delete-log.enabled"
-                name="extensions.chaika.contextmenu.delete-log.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.delete-log.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.thread-sep.enabled"
+                    name="extensions.chaika.contextmenu.thread-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.view-in-chaika.enabled"
-                name="extensions.chaika.contextmenu.view-in-chaika.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.view-in-chaika.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.view-in-browser.enabled"
-                name="extensions.chaika.contextmenu.view-in-browser.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.view-in-browser.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.view-in-sep.enabled"
+                    name="extensions.chaika.contextmenu.view-in-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.open-link-in-chaika.enabled"
-                name="extensions.chaika.contextmenu.open-link-in-chaika.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.open-link-in-chaika.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.open-link-in-browser.enabled"
-                name="extensions.chaika.contextmenu.open-link-in-browser.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.open-link-in-browser.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.open-link-in-sep.enabled"
+                    name="extensions.chaika.contextmenu.open-link-in-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.change-limit-all.enabled"
-                name="extensions.chaika.contextmenu.change-limit-all.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.change-limit-all.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.change-limit-l50.enabled"
-                name="extensions.chaika.contextmenu.change-limit-l50.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.change-limit-l50.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.go-to-board.enabled"
-                name="extensions.chaika.contextmenu.go-to-board.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.go-to-board.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.find-next-thread.enabled"
-                name="extensions.chaika.contextmenu.find-next-thread.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.find-next-thread.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.thread-utils-sep.enabled"
+                    name="extensions.chaika.contextmenu.thread-utils-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.register-selection-as-aa.enabled"
-                name="extensions.chaika.contextmenu.register-selection-as-aa.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.register-selection-as-aa.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.open-replacement-manager.enabled"
-                name="extensions.chaika.contextmenu.open-replacement-manager.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.open-replacement-manager.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.extra-utils-sep.enabled"
+                    name="extensions.chaika.contextmenu.extra-utils-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.toggle-sidebar.enabled"
-                name="extensions.chaika.contextmenu.toggle-sidebar.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.toggle-sidebar.enabled" type="bool" />
+        <preference id="extensions.chaika.contextmenu.sidebar-sep.enabled"
+                    name="extensions.chaika.contextmenu.sidebar-sep.enabled" type="bool" />
         <preference id="extensions.chaika.contextmenu.open-settings.enabled"
-                name="extensions.chaika.contextmenu.open-settings.enabled" type="bool" />
+                    name="extensions.chaika.contextmenu.open-settings.enabled" type="bool" />
 
         <preference id="extensions.chaika.contextmenu.enabled"
-                name="extensions.chaika.contextmenu.enabled" type="bool"
-                onchange="setContainerDisabled(this.name, 'subprefs_contextmenu', true)"/>
+                    name="extensions.chaika.contextmenu.enabled" type="bool"
+                    onchange="setContainerDisabled(this.name, 'subprefs_contextmenu', true)"/>
         <preference id="extensions.chaika.contextmenu.show_only_on_bbs"
-                name="extensions.chaika.contextmenu.show_only_on_bbs" type="bool"
-                onchange="setContainerDisabled(this.name, 'subprefs_only_bbs', true)" />
+                    name="extensions.chaika.contextmenu.show_only_on_bbs" type="bool"
+                    onchange="setContainerDisabled(this.name, 'subprefs_only_bbs', true)" />
         <preference id="extensions.chaika.contextmenu.always_show_open_link"
-                name="extensions.chaika.contextmenu.always_show_open_link" type="bool" />
+                    name="extensions.chaika.contextmenu.always_show_open_link" type="bool" />
         <preference id="extensions.chaika.contextmenu.flattened"
-                name="extensions.chaika.contextmenu.flattened" type="bool" />
+                    name="extensions.chaika.contextmenu.flattened" type="bool" />
     </preferences>
 
     <checkbox label="コンテキストメニューに chaika の項目を追加する *"
-            preference="extensions.chaika.contextmenu.enabled" />
+              preference="extensions.chaika.contextmenu.enabled" />
     <vbox id="subprefs_contextmenu" class="indent">
         <groupbox>
             <caption label="項目" />
@@ -72,21 +86,28 @@
                     <checkbox label="検索" preference="extensions.chaika.contextmenu.search.enabled" />
                     <checkbox label="履歴" preference="extensions.chaika.contextmenu.history.enabled" />
                     <checkbox label="スキン" preference="extensions.chaika.contextmenu.skin.enabled" />
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.skin-sep.enabled" />
                     <checkbox label="このスレッドに書き込む" preference="extensions.chaika.contextmenu.write.enabled" />
                     <checkbox label="このスレッドのログを削除" preference="extensions.chaika.contextmenu.delete-log.enabled" />
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.thread-sep.enabled" />
                     <checkbox label="chaika で開く" preference="extensions.chaika.contextmenu.view-in-chaika.enabled" />
                     <checkbox label="ブラウザで開く" preference="extensions.chaika.contextmenu.view-in-browser.enabled" />
-                </vbox>
-                <vbox>
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.view-in-sep.enabled" />
                     <checkbox label="リンク先を chaika で開く" preference="extensions.chaika.contextmenu.open-link-in-chaika.enabled" />
                     <checkbox label="リンク先をブラウザで開く" preference="extensions.chaika.contextmenu.open-link-in-browser.enabled" />
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.open-link-in-sep.enabled" />
+                </vbox>
+                <vbox>
                     <checkbox label="すべてのレスを表示" preference="extensions.chaika.contextmenu.change-limit-all.enabled" />
                     <checkbox label="新着50件を表示" preference="extensions.chaika.contextmenu.change-limit-l50.enabled" />
                     <checkbox label="スレッド一覧を開く" preference="extensions.chaika.contextmenu.go-to-board.enabled" />
                     <checkbox label="次スレを検索する" preference="extensions.chaika.contextmenu.find-next-thread.enabled" />
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.thread-utils-sep.enabled" />
                     <checkbox label="選択部分を AA として登録する" preference="extensions.chaika.contextmenu.register-selection-as-aa.enabled" />
                     <checkbox label="置換マネージャ..." preference="extensions.chaika.contextmenu.open-replacement-manager.enabled" />
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.extra-utils-sep.enabled" />
                     <checkbox label="サイドバーを表示" preference="extensions.chaika.contextmenu.toggle-sidebar.enabled" />
+                    <checkbox label="─────" preference="extensions.chaika.contextmenu.sidebar-sep.enabled" />
                     <checkbox label="オプション..." preference="extensions.chaika.contextmenu.open-settings.enabled" />
                 </vbox>
             </hbox>
@@ -95,13 +116,13 @@
         <groupbox>
             <caption label="表示" />
             <checkbox label="chaika および掲示板上でのみ表示する"
-                    preference="extensions.chaika.contextmenu.show_only_on_bbs" />
+                      preference="extensions.chaika.contextmenu.show_only_on_bbs" />
                 <vbox class="indent" id="subprefs_only_bbs">
                     <checkbox label="リンク先についての項目は一般サイトでも表示する"
-                        preference="extensions.chaika.contextmenu.always_show_open_link" />
+                              preference="extensions.chaika.contextmenu.always_show_open_link" />
                 </vbox>
             <checkbox label="コンテキストメニューをフラットにする *"
-                    preference="extensions.chaika.contextmenu.flattened" />
+                      preference="extensions.chaika.contextmenu.flattened" />
         </groupbox>
     </vbox>
 

diff --git a/chaika/defaults/preferences/chaika-pref.js b/chaika/defaults/preferences/chaika-pref.js
@@ -39,19 +39,26 @@ pref("extensions.chaika.contextmenu.copy.enabled", true);
 pref("extensions.chaika.contextmenu.search.enabled", true);
 pref("extensions.chaika.contextmenu.history.enabled", true);
 pref("extensions.chaika.contextmenu.skin.enabled", true);
+pref("extensions.chaika.contextmenu.skin-sep.enabled", true);
 pref("extensions.chaika.contextmenu.write.enabled", true);
 pref("extensions.chaika.contextmenu.delete-log.enabled", true);
+pref("extensions.chaika.contextmenu.thread-sep.enabled", true);
 pref("extensions.chaika.contextmenu.view-in-chaika.enabled", true);
 pref("extensions.chaika.contextmenu.view-in-browser.enabled", true);
+pref("extensions.chaika.contextmenu.view-in-sep.enabled", true);
 pref("extensions.chaika.contextmenu.open-link-in-chaika.enabled", true);
 pref("extensions.chaika.contextmenu.open-link-in-browser.enabled", true);
+pref("extensions.chaika.contextmenu.open-link-in-sep.enabled", true);
 pref("extensions.chaika.contextmenu.change-limit-all.enabled", true);
 pref("extensions.chaika.contextmenu.change-limit-l50.enabled", true);
 pref("extensions.chaika.contextmenu.go-to-board.enabled", true);
 pref("extensions.chaika.contextmenu.find-next-thread.enabled", true);
+pref("extensions.chaika.contextmenu.thread-utils-sep.enabled", true);
 pref("extensions.chaika.contextmenu.register-selection-as-aa.enabled", true);
 pref("extensions.chaika.contextmenu.open-replacement-manager.enabled", true);
+pref("extensions.chaika.contextmenu.extra-utils-sep.enabled", true);
 pref("extensions.chaika.contextmenu.toggle-sidebar.enabled", true);
+pref("extensions.chaika.contextmenu.sidebar-sep.enabled", true);
 pref("extensions.chaika.contextmenu.open-settings.enabled", true);
 
 pref("extensions.chaika.refController.enabled", true);

diff --git a/chaika/install.rdf b/chaika/install.rdf
@@ -4,7 +4,7 @@
 
     <Description about="urn:mozilla:install-manifest"
                  em:name="chaika"
-                 em:version="1.7.2"
+                 em:version="1.7.3"
                  em:description="Dedicated browser for 2ch.net (the most popular textboard in Japan)"
                  em:id="chaika@chaika.xrea.jp"
                  em:type="2"

diff --git a/chaika/modules/ChaikaBoard.js b/chaika/modules/ChaikaBoard.js
@@ -346,7 +346,17 @@ ChaikaBoard.prototype = {
         var boardID = this.id;
         var database = ChaikaCore.storage;
 
-        var today = Date.parse((new Date()).toLocaleFormat("%b %d %Y")) / 1000
+        // Get the `Date#time` value for the midnight of today, tomorrow and yesterday.
+        // We shouldn't use Date#toLocaleFormat, because it has not been standardized. (cf. #221)
+        // Also, we can't use Date#parse, because:
+        // - For the ISO-8601 format string, its time zone is ambiguous:
+        //      ES5 defines the string as UTC time string,
+        //      while ES6 specifies it is to treated as local time.
+        // - For the RFC2822 format string, we can't get it easily, i.e.,
+        //   it is difficult to apply the local time-zone correctly.
+        // - For other formats (e.g. Dec 25, 2014), the results are undefined and may be unexpected.
+        var now = new Date();
+        var today = new Date(now.getFullYear(), now.getMonth(), now.getDate()).getTime() / 1000;
         var yesterday = today - 86400;
         var tomorrow = today + 86400;