narou 2.5.2 → 2.6.0

data/lib/web/public/resources/default-style.css

@@ -0,0 +1,37 @@
+
+.navbar {
+  background-color: rgba(248,248,248,0.93);
+}
+@media (max-width:767px) {
+  .navbar.navbar-collapse {
+    background-color: rgba(248,248,248,0.93);
+  }
+}
+
+.navbar ul.dropdown-menu li.active a {
+  background-color: inherit !important;
+  color: inherit !important;
+}
+.navbar ul.dropdown-menu li.active a:hover {
+  background-color: #f5f5f5 !important;
+  color: inherit !important;
+}
+@media (max-width:767px) {
+  .navbar ul.dropdown-menu li.active a:hover {
+    background-color: inherit !important;
+  }
+}
+
+.queue-plus {
+  color: #d9534f;
+  font-weight: bold;
+}
+
+#queue-text.active {
+  color: #d9534f !important;
+}
+
+#queue-text.active #queue {
+  background-color: #d9534f !important;
+}
+

data/lib/web/public/resources/narou.library.js

@@ -20,7 +20,10 @@ var Narou = (function() {
   $.extend(Storage.prototype, {
     storage_name: "Narou.rb_WEB_UI_saved",
     initialize: function() {
-      this.objects = storage_cache ? storage_cache : this.load();
+      if (!storage_cache) {
+        storage_cache = this.load();
+      }
+      this.objects = storage_cache;
     },
 
     load: function() {
@@ -210,7 +213,7 @@ var Narou = (function() {
     openConsoleDialog: function(callback) {
       if (typeof callback !== "function") return;
       var $console_dialog = $("#console-dialog");
-      $console_dialog.one("show.bs.modal", callback);
+      $console_dialog.one("shown.bs.modal", callback);
       $(document).one("cancel.narou.remove", function() {
         $console_dialog.modal("hide");
       });
@@ -280,12 +283,6 @@ var Narou = (function() {
           self.action.remove(self.target_id);
         });
       });
-      $("#context-menu-remove-with-file").on("click", function(e) {
-        e.preventDefault();
-        self.openConsoleDialog(function() {
-          self.action.removeWithFile(self.target_id);
-        });
-      });
       $("#context-menu-edit-tag").on("click", function(e) {
         e.preventDefault();
         self.tag.openEditor(self.target_id);
@@ -354,10 +351,27 @@ var Narou = (function() {
     },
 
     download: function() {
-      bootbox.prompt("ダウンロードする小説のURL、もしくはNコードを入力", function(target) {
-        if (!target) return;
-        $.post("/api/download", { "target": target });
-        console.log("new downloading %o", target);
+      var download_modal = bootbox.dialog({
+        title: "ダウンロードする小説のURL、もしくはNコードを入力(複数可)",
+        message: '<textarea id="download-input" class="form-control" rows="3"></textarea>',
+        backdrop: true,
+        buttons: {
+          cancel: {
+            label: "キャンセル",
+            className: "btn-default"
+          },
+          main: {
+            label: "OK",
+            className: "btn-primary",
+            callback: function() {
+              var targets = $("#download-input").val();
+              $.post("/api/download", { targets: targets });
+            }
+          }
+        }
+      });
+      download_modal.one("shown.bs.modal", function () {
+        $("#download-input").focus();
       });
     },
 
@@ -365,19 +379,11 @@ var Narou = (function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/download_force", { "ids": ids });
-      console.log("force downloading " + ids.join(", "));
     },
 
     update: function() {
       var ids = this._getSelectedIds(arguments);
-      if (ids.length === 0) {
-        $.post("/api/update");
-        console.log("updating all");
-      }
-      else {
-        $.post("/api/update_select", { "ids": ids });
-        console.log("updating " + ids.join(", "));
-      }
+      $.post("/api/update", { "ids": ids });
     },
 
     updateView: function() {
@@ -390,8 +396,7 @@ var Narou = (function() {
         }
       });
       if (ids.length > 0) {
-        $.post("/api/update_select", { "ids": ids });
-        console.log("updating " + ids.join(", "));
+        $.post("/api/update", { "ids": ids });
       }
     },
 
@@ -412,44 +417,38 @@ var Narou = (function() {
             className: "btn-primary",
             callback: function() {
               $.post("/api/update_general_lastup");
-              console.log("updating general lastup");
             }
           },
         }
       });
     },
 
+    updateForce: function() {
+      var ids = this._getSelectedIds(arguments);
+      $.post("/api/update", { ids: ids, force: true });
+    },
+
     send: function() {
       var ids = this._getSelectedIds(arguments);
-      if (ids.length === 0) {
-        $.post("/api/send");
-        console.log("sending all");
-      }
-      else {
-        $.post("/api/send_select", { "ids": ids });
-        console.log("sending " + ids.join(", "));
-      }
+      $.post("/api/send", { "ids": ids });
     },
 
     freeze: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/freeze", { "ids": ids });
-      console.log("freezing(toggle) " + ids.join(", "));
     },
 
     freezeOn: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/freeze_on", { "ids": ids });
-      console.log("freezing " + ids.join(", "));
     },
 
     freezeOff: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/freeze_off", { "ids": ids });
-      console.log("thawing " + ids.join(", "));
     },
 
     _removeConfirmDialog: function(title, ids, callback) {
@@ -459,7 +458,9 @@ var Narou = (function() {
           message += "<li>" + data.title + "</li>";
         }
       });
-      message = '<div style="max-height:300px;overflow:auto"><ul>' + message + '</ul></div>';
+      message = '<div style="max-height:300px;overflow:auto"><ul>' + message + '</ul></div>' +
+                '<div class="checkbox pull-right"><label><input type="checkbox" id="check-remove-with-file">' +
+                '保存フォルダ・ファイルも一緒に削除する</label></div><div class="clearfix"></div>';
       bootbox.dialog({
         title: title,
         message: message,
@@ -468,7 +469,7 @@ var Narou = (function() {
             label: "削除する",
             className: "btn-danger",
             callback: function() {
-              callback(true);
+              callback(true, $("#check-remove-with-file").prop("checked"));
               $(document).trigger("ok.narou.remove");
             }
           },
@@ -476,7 +477,7 @@ var Narou = (function() {
             label: "キャンセル",
             className: "btn-default",
             callback: function() {
-              callback(false);
+              callback(false, false);
               $(document).trigger("cancel.narou.remove");
             }
           }
@@ -487,20 +488,9 @@ var Narou = (function() {
     remove: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
-      this._removeConfirmDialog("選択した小説を削除しますか？", ids, function(result) {
-        if (!result) return;
-        $.post("/api/remove", { "ids": ids });
-        console.log("removing " + ids.join(", "));
-      });
-    },
-
-    removeWithFile: function() {
-      var ids = this._getSelectedIds(arguments);
-      if (ids.length === 0) return;
-      this._removeConfirmDialog("選択した小説を“完全に”削除しますか？", ids, function(result) {
+      this._removeConfirmDialog("選択した小説を削除しますか？", ids, function(result, with_file) {
         if (!result) return;
-        $.post("/api/remove_with_file", { "ids": ids });
-        console.log("removing with file " + ids.join(", "));
+        $.post("/api/remove", { ids: ids, with_file: with_file });
       });
     },
 
@@ -508,35 +498,36 @@ var Narou = (function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/convert", { "ids": ids });
-      console.log("converting " + ids.join(", "));
     },
 
     diff: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/diff", { "ids": ids });
-      console.log("diffing " + ids.join(", "));
     },
 
     inspect: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/inspect", { "ids": ids });
-      console.log("inspecting " + ids.join(", "));
     },
 
     folder: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/folder", { "ids": ids });
-      console.log("opening folder " + ids.join(", "));
     },
 
     backup: function() {
       var ids = this._getSelectedIds(arguments);
       if (ids.length === 0) return;
       $.post("/api/backup", { "ids": ids });
-      console.log("backup " + ids.join(", "));
+    },
+
+    settingBurn: function() {
+      var ids = this._getSelectedIds(arguments);
+      if (ids.length === 0) return;
+      $.post("/api/setting_burn", { "ids": ids });
     },
   });
 
@@ -679,7 +670,7 @@ var Narou = (function() {
 
     position_is_bottom: function() {
       var con = this.console;
-      return (con.scrollTop() === con.prop("scrollHeight") - con.outerHeight());
+      return (con.scrollTop() >= con.prop("scrollHeight") - con.outerHeight() - 10);
     },
 
     print: function(str) {

data/lib/web/public/resources/narou.ui.js

@@ -52,7 +52,6 @@ $(document).ready(function() {
     return tags.match(new RegExp('data-tag="' + tag_name + '"'));
   });
 
-
   var ANNOTATION_COLOR_TIME_LIMIT = 6 * 60 * 60;   // 6時間(秒)
   var GENERAL_LASTUP_CLASSES = [
     [60 * 60, "gl-60minutes"],
@@ -287,11 +286,6 @@ $(document).ready(function() {
     },
   });
 
-  $.fn.dataTableExt.afnFiltering.push(function(oSettings, aData, iDataIndex) {
-    var row = table.row(iDataIndex);
-    return !$(row.node()).hasClass("exclude");
-  });
-
   var storage = new Narou.Storage();
   var action = new Narou.Action(table);
   var notification = Narou.Notification.instance();
@@ -299,17 +293,61 @@ $(document).ready(function() {
   var tag = new Narou.Tag(table);
   var context_menu = new Narou.ContextMenu(action, notification, tag);
 
+  /*
+   * 凍結の表示状態制御
+   */
+  var visibility_frozen_novel, visibility_nonfrozen_novel;
+
+  $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
+    var state_frozen = table.row(dataIndex).data().frozen;
+    if (state_frozen) {
+      return visibility_frozen_novel;
+    }
+    else {
+      return visibility_nonfrozen_novel;
+    }
+  });
+
+  function restoreVisibilityForFrozen() {
+    visibility_frozen_novel = storage.get("visibility_frozen_novel");
+    visibility_nonfrozen_novel = storage.get("visibility_nonfrozen_novel");
+    if (typeof visibility_frozen_novel === "undefined")
+      visibility_frozen_novel = true;
+    if (typeof visibility_nonfrozen_novel === "undefined")
+      visibility_nonfrozen_novel = true;
+    // メニューのチェック状態も復元
+    var method = ["removeClass", "addClass"];
+    $("#action-view-frozen")[method[visibility_frozen_novel | 0]]("active");
+    $("#action-view-nonfrozen")[method[visibility_nonfrozen_novel | 0]]("active");
+  }
+
+  restoreVisibilityForFrozen();
+
+  function saveVisibilityFrozen() {
+    storage.set("visibility_frozen_novel", visibility_frozen_novel);
+    storage.set("visibility_nonfrozen_novel", visibility_nonfrozen_novel);
+    storage.save();
+  }
+
+  function toggleVisibilityFrozen() {
+    visibility_frozen_novel = visibility_frozen_novel ? false : true;
+  }
+
+  function toggleVisibilityNonFrozen() {
+    visibility_nonfrozen_novel = visibility_nonfrozen_novel ? false : true;
+  }
+
+  /*
+   * テーブルリロードイベント定義
+   */
   notification.on("table.reload", function() {
     // リロードする前に現在の状態を保存
-    var selected_ids = [], excluded_ids = [];
+    var selected_ids = [];
     table.eachRow(function(row, data) {
       var $node = $(row.node());
       if ($node.hasClass("selected")) {
         selected_ids.push(data.id);
       }
-      if ($node.hasClass("exclude")) {
-        excluded_ids.push(data.id);
-      }
     });
     table.ajax.reload(function() {
       // リロードしたら状態は解除されているので復元
@@ -321,9 +359,6 @@ $(document).ready(function() {
         if ($.inArray(data.id, selected_ids) !== -1) {
           $(row.node()).addClass("selected");
         }
-        if ($.inArray(data.id, excluded_ids) !== -1) {
-          $(row.node()).addClass("exclude");
-        }
       });
       table.fireChangeSelect();
       table.draw(false);
@@ -680,18 +715,12 @@ $(document).ready(function() {
    * メニュー
    *   表示＞凍結中以外を表示
    */
-  var nonfrozen_rows = [];
-  $("#action-view-without-frozen").on(click_event_name, function(e) {
+  $("#action-view-nonfrozen").on(click_event_name, function(e) {
     e.preventDefault();
     slideNavbar.slide();
     $(this).toggleClass("active");
-    table.rows().eq(0).each(function(idx) {
-      var row = table.row(idx);
-      var data = row.data();
-      if (!data.frozen) {
-        $(row.node()).toggleClass("exclude");
-      }
-    });
+    toggleVisibilityNonFrozen();
+    saveVisibilityFrozen();
     table.draw();
   });
 
@@ -699,18 +728,12 @@ $(document).ready(function() {
    * メニュー
    *   表示＞凍結中を表示
    */
-  var frozen_list = [];
   $("#action-view-frozen").on(click_event_name, function(e) {
     e.preventDefault();
     slideNavbar.slide();
     $(this).toggleClass("active");
-    table.rows().eq(0).each(function(idx) {
-      var row = table.row(idx);
-      var data = row.data();
-      if (data.frozen) {
-        $(row.node()).toggleClass("exclude");
-      }
-    });
+    toggleVisibilityFrozen();
+    saveVisibilityFrozen();
     table.draw();
   });
 
@@ -929,6 +952,15 @@ $(document).ready(function() {
     action.updateGeneralLastup();
   });
 
+  /*
+   * ボタン
+   *   Update > 凍結済みも更新
+   */
+  $("#button-update-force").on("click", function(e) {
+    e.preventDefault();
+    action.updateForce();
+  });
+
   /*
    * ボタン
    *   Send
@@ -966,15 +998,6 @@ $(document).ready(function() {
     action.remove();
   });
 
-  /*
-   * ボタン
-   *   Remove > 選択した小説をファイルも含めて削除
-   */
-  $("#button-remove-with-file").on("click", function(e) {
-    e.preventDefault();
-    action.removeWithFile();
-  });
-
   /*
    * ボタン
    *   Convert
@@ -1021,6 +1044,15 @@ $(document).ready(function() {
     action.backup();
   });
 
+  /*
+   * ボタン
+   *   Other > 選択した小説の設定の未設定項目に共通設定を焼付ける
+   */
+  $("#button-setting-burn").on("click", function(e) {
+    e.preventDefault();
+    action.settingBurn();
+  });
+
   /*
    * アイコン
    *   ○件表示の横のリロードアイコン