narou 2.6.1 → 2.7.0

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

@@ -0,0 +1,51 @@
+/* -*- coding: utf-8 -*-
+ *
+ * Copyright 2013 whiteleaf. All rights reserved.
+ */
+
+/*
+ * キュー関係のコード
+ */
+$(document).ready(function() {
+  "use strict";
+
+  /*
+   * キューに積まれた数を表示
+   */
+  var notification = Narou.Notification.instance();
+  var $queue = $("#queue");
+  function highlightQueuBoxIcon(size) {
+    if (size > 0) {
+      $("#queue-text").addClass("active");
+    }
+    else {
+      $("#queue-text").removeClass("active");
+    }
+  }
+  notification.on("notification.queue", function(data) {
+    var before_size = $queue.text();
+    $queue.text(data);
+    highlightQueuBoxIcon(data);
+    // キューのスタック数の横に +1 が浮かび上がって消えるアニメーション
+    var diff = data - before_size;
+    if (diff <= 0) return;
+    var $plus = $("<span>+" + diff + "</span>");
+    $plus.addClass("queue-plus").css({
+      position: "absolute",
+      left: $queue.offset().left + $queue.outerWidth() + 1 - $(document).scrollLeft(),
+      top: $queue.offset().top - 3 - $(document).scrollTop(),
+    });
+    $(".navbar").append($plus);
+    $plus.delay(100).animate({
+      top: - $plus.outerHeight(),
+      opacity: 0,
+    }, 3000, function() {
+      $(this).remove();
+    });
+  });
+  $.get("/api/get_queue_size", function(json) {
+    $queue.text(json.size);
+    highlightQueuBoxIcon(json.size);
+  });
+});
+

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

@@ -20,7 +20,7 @@ $(document).ready(function() {
       {
         id: false, last_update: false, title: true, author: false, sitename: false,
         toc_url: false, novel_type: false, tags: false, status: false, menu: true,
-        download: false, folder: false, general_lastup: false,
+        download: true, folder: false, general_lastup: false,
       }
       // PC
     : {
@@ -71,6 +71,20 @@ $(document).ready(function() {
     return Narou.formatDate(dateobj, "YYYYMMDD") === today();
   }
 
+  // initComplete や ajax.reload した時に再設定するために呼ばれる
+  function resettingTableState() {
+    table.$("[data-toggle=tooltip]").tooltip({
+      animation: false,
+      container: "body",
+    });
+    // バッジを更新しておく(.selectedの復元が終わってから呼ぶ)
+    table.fireChangeSelect();
+    // タグのイベントを反映
+    tag.registerEvents(table);
+
+    table.draw(false);
+  }
+
   var table = t = $("#novel-list").DataTable({
     ajax: "/api/list",
     dom: (touchable_device ? 'lprtpi' : 'Rlprtpi'),
@@ -248,29 +262,31 @@ $(document).ready(function() {
       }
     },
     initComplete: function(_settings, _json) {
-      table.$("[data-toggle=tooltip]").tooltip({
-        animation: false,
-        container: "body",
-      });
-      // バッジを更新しておく
-      table.fireChangeSelect();
+      // タグ検索を復元
+      $tag_search.val(storage.get("tag_search"));
       // 範囲選択モードでもリンクとボタンが使えるように
-      table.$("a, button").on("mousedown", function(e) {
+      table.on("mousedown", "a, button", function(e) {
         e.stopPropagation();
       });
-      // タグのイベントを反映
-      tag.registerEvents(table);
-      // タグ検索を復元
-      $tag_search.val(storage.get("tag_search"));
+      // リンククリックした時点でツールチップは消す
+      table.on("click", "a", function(e) {
+        $(this).tooltip("hide");
+      });
+      resettingTableState();
+
       table.draw(false);
     },
     language: {
       //lengthMenu: "_MENU_ 件分表示　<span id='icon-refresh-table' class='glyphicon glyphicon-repeat'></span>",
       lengthMenu: "_MENU_ 件分表示",
-      zeroRecords: "データがひとつもないか、処理中です",
+      emptyTable: "データが登録されていません",
+      zeroRecords: "ひとつも見つかりませんでした",
+      infoPostFix: "",
       info: "Page _PAGE_ of _PAGES_",
       infoEmpty: "該当なし",
       infoFiltered: "(全_MAX_件から検索しました)",
+      loadingRecords: "ロード中です",
+      processing: "処理中...",
       paginate: {
         first: "&laquo;",
         previous: "前へ",
@@ -292,6 +308,7 @@ $(document).ready(function() {
   var stream_console = new Narou.Console(notification);
   var tag = new Narou.Tag(table);
   var context_menu = new Narou.ContextMenu(action, notification, tag);
+  var select_color_menu = new Narou.SelectColorMenu;
 
   /*
    * 凍結の表示状態制御
@@ -351,17 +368,12 @@ $(document).ready(function() {
     });
     table.ajax.reload(function() {
       // リロードしたら状態は解除されているので復元
-      table.$("[data-toggle=tooltip]").tooltip({
-        animation: false,
-        container: "body",
-      });
       table.eachRow(function(row, data) {
         if ($.inArray(data.id, selected_ids) !== -1) {
           $(row.node()).addClass("selected");
         }
       });
-      table.fireChangeSelect();
-      table.draw(false);
+      resettingTableState();
     }, false);
   });
 
@@ -369,8 +381,6 @@ $(document).ready(function() {
     tag.updateCanvas();
   });
 
-  tag.registerEvents($(".tag-field"));
-
   var action_select_view = $("#action-select-view");
   var myfilter_clear = $("#myFilter-clear");
 
@@ -432,23 +442,17 @@ $(document).ready(function() {
   };
 
   function get_event_position(e) {
-    if (e.type !== "touchstart") {
-      return { x: e.pageX, y: e.pageY };
-    }
-    else {
-      return { x: e.originalEvent.touches[0].pageX,
-               y: e.originalEvent.touches[0].pageY };
-    }
+    return Narou.get_event_position(e);
   }
 
-  var select_mode = storage.get("select_mode") || "single";
+  var select_mode = storage.get("select_mode") || "hybrid";
   var enable_rect_select_mode = function() {};
   var disable_rect_select_mode = function() {};
 
   $("#action-select-mode-single").on(click_event_name, function(e) {
     if (select_mode != "single") {
       $(this).addClass("active");
-      $("#action-select-mode-rect").removeClass("active");
+      $("#action-select-mode-" + select_mode).removeClass("active");
       select_mode = "single";
       storage.set("select_mode", select_mode).save();
       disable_rect_select_mode();
@@ -485,15 +489,27 @@ $(document).ready(function() {
     $("#action-select-mode-rect").addClass("disabled");
   }
   else {
-    $("#action-select-mode-rect").on(click_event_name, function(e) {
-      if (select_mode != "rect") {
-        $(this).addClass("active");
-        $("#action-select-mode-single").removeClass("active");
-        select_mode = "rect";
-        storage.set("select_mode", select_mode).save();
-        disable_single_select_mode();
-        enable_rect_select_mode();
+    var initMode = function(mode) {
+      if (select_mode != mode) {
+        $("#action-select-mode-" + mode).addClass("active");
+        $("#action-select-mode-" + select_mode).removeClass("active");
+        if (select_mode == "single") {
+          disable_single_select_mode();
+          enable_rect_select_mode();
+        }
+        select_mode = mode;
+        storage.set("select_mode", mode).save();
+        $("#novel-list tbody, #rect-select-area")
+          .css("cursor", mode == "rect" ? "crosshair" : "pointer");
       }
+    };
+    $("#action-select-mode-rect").on(click_event_name, function(e) {
+      initMode("rect");
+      slideNavbar.close();
+      e.preventDefault();
+    });
+    $("#action-select-mode-hybrid").on(click_event_name, function(e) {
+      initMode("hybrid");
       slideNavbar.close();
       e.preventDefault();
     });
@@ -557,6 +573,7 @@ $(document).ready(function() {
         table.fireChangeSelect();
         menu.hide();
         selected_rect_element.hide();
+        $(this).children("a").blur();
       });
       // 解除
       $("#rect-select-menu-clear").on("click", function(e) {
@@ -568,6 +585,7 @@ $(document).ready(function() {
         table.fireChangeSelect();
         menu.hide();
         selected_rect_element.hide();
+        $(this).children("a").blur();
       });
       // 反転
       $("#rect-select-menu-reverse").on("click", function(e) {
@@ -579,12 +597,15 @@ $(document).ready(function() {
         table.fireChangeSelect();
         menu.hide();
         selected_rect_element.hide();
+        $(this).children("a").blur();
       });
       // キャンセル
       $("#rect-select-menu-cancel").on("click", function(e) {
         e.preventDefault();
+        e.stopPropagation();
         menu.hide();
         selected_rect_element.hide();
+        $(this).children("a").blur();
       });
     };
     rect_select_menu_initialize();
@@ -594,7 +615,11 @@ $(document).ready(function() {
       var is_moved = false;
       var start_position = null;
       var end_position = null;
-      $("#novel-list tbody, #rect-select-area").css("cursor", "crosshair");
+      var resetCursor = function() {
+        $("#novel-list tbody, #rect-select-area")
+          .css("cursor", select_mode == "rect" ? "crosshair" : "pointer");
+      };
+      resetCursor();
       $("body").on("mousedown", function(e) {
         var _pos = get_event_position(e);
         var mousedowned_element = $.elementFromPoint(_pos);
@@ -603,11 +628,22 @@ $(document).ready(function() {
         e.preventDefault();
         e.stopPropagation();
         var self = this;
+        var moving_count = 0;
         var finish_selecting_proc = function() {
           $(self).off("mousemove mouseup");
           not_clicked_yet = true;
           is_moved = false;
           Narou.popupMenu("#rect-select-menu", end_position, close_rect_select_menu_handler);
+          resetCursor();
+        };
+        var mouse_up_when_mode_hybrid_proc = function() {
+          mousedowned_element.parents("tr").toggleClass("selected");
+          $(self).off("mousemove mouseup");
+          not_clicked_yet = true;
+          is_moved = false;
+          table.fireChangeSelect();
+          $("#rect-select-menu").hide();
+          selected_rect_element.hide();
         };
         if (not_clicked_yet) {
           // 範囲選択開始
@@ -617,7 +653,14 @@ $(document).ready(function() {
           start_position = _pos;
           start_element = mousedowned_element;
           $(self).on("mousemove", function(e) {
+            moving_count++;
+            if (select_mode == "hybrid" && moving_count < 10) {
+              // 範囲選択化への遊び。多少動かした程度はクリックとみなす
+              return;
+            }
             is_moved = true;
+            selected_rect_element.show();
+            $("#novel-list tbody, #rect-select-area").css("cursor", "crosshair");
             var pos = get_event_position(e);
             if ($.elementFromPoint(pos).closest("#novel-list tbody").length === 0)
               return;
@@ -638,12 +681,15 @@ $(document).ready(function() {
             if (is_moved) {
               finish_selecting_proc();
             }
+            else if (select_mode == "hybrid") {
+              mouse_up_when_mode_hybrid_proc();
+            }
           });
           selected_rect_element.css({
             left: start_position.x,
             top: start_position.y,
             width: 1, height: 1
-          }).show();
+          });
         }
         else {
           finish_selecting_proc();
@@ -653,14 +699,11 @@ $(document).ready(function() {
   }
 
   function restore_select_mode() {
-    if (select_mode === "single") {
+    if (select_mode === "single")
       enable_single_select_mode();
-      $("#action-select-mode-single").addClass("active");
-    }
-    else {
+    else
       enable_rect_select_mode();
-      $("#action-select-mode-rect").addClass("active");
-    }
+    $("#action-select-mode-" + select_mode).addClass("active");
   }
   restore_select_mode();
 
@@ -786,6 +829,37 @@ $(document).ready(function() {
     tag.openEditor();
   });
 
+  /*
+   * メニュー
+   *   ツール > D&Dウィンドウを開く
+   */
+  $("#action-tool-open-dnd-window").on(click_event_name, function(e) {
+    e.preventDefault();
+    slideNavbar.slide();
+    window.open("/widget/drag_and_drop", "widget_window",
+                "width=400,height=350,menubar=no,toolbar=no,scrollbars=no,resizable=yes");
+  });
+
+  /*
+   * メニュー
+   *   ツール > CSV形式でリストをダウンロード
+   */
+  $("#action-tool-csv-download").on(click_event_name, function(e) {
+    e.preventDefault();
+    slideNavbar.slide();
+    location.href = "/api/csv/download"
+  });
+
+  /*
+   * メニュー
+   *   ツール > CSVファイルからインポート
+   */
+  $("#action-tool-csv-import").on(click_event_name, function(e) {
+    e.preventDefault();
+    slideNavbar.slide();
+    action.csvImport();
+  });
+
   /*
    * メニュー
    *   オプション＞環境設定
@@ -895,14 +969,20 @@ $(document).ready(function() {
     container: "body",
   });
 
+  $("button").on("mouseleave", function() {
+    $(this).tooltip("hide");
+  });
+
   /*
    * ボタンを一時的に非アクティブ化
    */
   function disableButtonMoment($button) {
-    $button.addClass("disabled");
+    $button.blur();
+    $button.tooltip("hide");
+    $button.prop("disabled", true);
     // 少したったらアクティブに戻す
     setTimeout(function() {
-      $button.removeClass("disabled");
+      $button.prop("disabled", false);
     }, 1000);
   }
 
@@ -971,6 +1051,15 @@ $(document).ready(function() {
     action.send();
   });
 
+  /*
+   * ボタン
+   *   Send > hotnentry を送信
+   */
+  $("#button-send-hotentry").on("click", function(e) {
+    e.preventDefault();
+    action.send("hotentry");
+  });
+
   /*
    * ボタン
    *   Freeze > 選択した小説を凍結
@@ -1102,12 +1191,9 @@ $(document).ready(function() {
         action.selectClear();
       }
     });
-    add("S", function() {
-      $("#action-select-mode-single").trigger("click");
-    });
-    add("R", function() {
-      $("#action-select-mode-rect").trigger("click");
-    });
+    add("S", function() { $("#action-select-mode-single").trigger("click"); });
+    add("R", function() { $("#action-select-mode-rect").trigger("click"); });
+    add("H", function() { $("#action-select-mode-hybrid").trigger("click"); });
   };
   if (!touchable_device) {
     initialize_shortcut();
@@ -1116,13 +1202,24 @@ $(document).ready(function() {
   /*
    * disabled なメニューは何もしないように
    */
-  var nothing_to_do = function() { return false };
-  function disable_menu_item(id) {
-    $(id).addClass("disabled").on(click_event_name, nothing_to_do);
+  function disable_menu_item(selector) {
+    var $element = $(selector);
+    $element.each(function(i, dom) {
+      if (dom.tagName.toLowerCase() == "button")
+        $(dom).prop("disabled", true);
+      else
+        $(dom).addClass("disabled");
+    });
   }
 
-  function enable_menu_item(id) {
-    $(id).removeClass("disabled").off(click_event_name, nothing_to_do);
+  function enable_menu_item(selector) {
+    var $element = $(selector);
+    $element.each(function(i, dom) {
+      if (dom.tagName.toLowerCase() == "button")
+        $(dom).prop("disabled", false);
+      else
+        $(dom).removeClass("disabled");
+    });
   }
 
   disable_menu_item(".navbar li.disabled");