From cd561dce1894f7cb98e698e892c0f0220fc17b67 Mon Sep 17 00:00:00 2001
From: Akira Saito <akrstjp@users.sourceforge.jp>
Date: Sat, 11 Apr 2015 12:39:42 +0900
Subject: [PATCH] bugfix refs #35058

---
 app/views/hooks/_quick_edit_base_bottom.html.erb   | 109 +++++++++++++++------
 app/views/quick_edit_issues/_input_dialog.html.erb |   5 +-
 2 files changed, 83 insertions(+), 31 deletions(-)

diff --git a/app/views/hooks/_quick_edit_base_bottom.html.erb b/app/views/hooks/_quick_edit_base_bottom.html.erb
index 5196148..15fe02d 100644
--- a/app/views/hooks/_quick_edit_base_bottom.html.erb
+++ b/app/views/hooks/_quick_edit_base_bottom.html.erb
@@ -4,45 +4,83 @@
 </div>
 <script>
 //<![CDATA[
+function quick_edit_log(message){
+  if(typeof console !== "undefined" && typeof console.log !=="undefined")
+    console.log("quick_edit: "+message);
+}
+
+
 var offsetY = /[?&]offsetY=(\d+).*/g.exec(location.href);
 if (offsetY) {
   window.scrollTo(0, offsetY[1]);
 }
 
-if ($("body").hasClass("controller-issues action-index")) {
-  $("tr.issue").draggable({
-    cursor: "move",
-    start: function (event, ui) {
-      drag_element = $(this);
-      if (!drag_element.hasClass("context-menu-selection")) {
-        drag_element.addClass("context-menu-selection");
-      }
+quick_edit_drag_and_drop_init();
+
+function quick_edit_drag_and_drop_init() {
+  if ($("body").hasClass("controller-issues action-index")) {
+    $("tr.issue").draggable({
+      cursor: "move",
+      start: function (event, ui) {
+        drag_element = $(this);
+        if (!drag_element.hasClass("context-menu-selection")) {
+          drag_element.addClass("context-menu-selection");
+        }
+    
+        $("#cursor").css( {
+          "top": drag_element.css("top"),
+          "left": $("#content").css("padding-left"),
+          "width": drag_element.css("width"),
+          "height": drag_element.css("height"),
+          "background-color": drag_element.css("background-color"),
+          "display": "block"});
+      },
+      stop: function (event, ui) { $("#cursor").css({"display": "none"}); },
+      drag: function (event, ui) { $("#cursor").css({"top": event.pageY}); }
+    });
   
-      $("#cursor").css( {
-        "top": drag_element.css("top"),
-        "left": $("#content").css("padding-left"),
-        "width": drag_element.css("width"),
-        "height": drag_element.css("height"),
-        "background-color": drag_element.css("background-color"),
-        "display": "block"});
-    },
-    stop: function (event, ui) { $("#cursor").css({"display": "none"}); },
-    drag: function (event, ui) { $("#cursor").css({"top": event.pageY}); }
+    $("tr.issue").droppable({
+      drop: function (event, ui) {
+        var update_ids = quick_edit_get_selections();
+        var new_parent_id = quick_edit_get_issue_id_from_element(this);
+        if (!new_parent_id) return;
+
+        $.ajax({
+          url: '<%= quick_edit_issues_edit_path() %>?' + update_ids.join("&") + '&target_specifier=issue[parent_issue_id]&default_value='+new_parent_id,
+          dataType: "script",
+          success : function (html) { $("#quick_edit_dialogs").html(html); }
+        });
+      }
+    });
+  }
+}
+
+function quick_edit_drag_and_drop_enable(){
+  $("tr.issue").each( function () {
+    var issue = $(this);
+    if (issue.draggable) {
+      issue.draggable("enable");
+    }
+    if (issue.droppable) {
+      issue.droppable("enable");
+    }
   });
 
-  $("tr.issue").droppable({
-    drop: function (event, ui) {
-      var update_ids = quick_edit_get_selections();
-      var new_parent_id = quick_edit_get_issue_id_from_element(this);
-      if (!new_parent_id) return;
-  
-      $.ajax({
-        url: '<%= quick_edit_issues_edit_path() %>?' + update_ids.join("&") + '&target_specifier=issue[parent_issue_id]&default_value='+new_parent_id,
-        dataType: "script",
-        success : function (html) { $("#quick_edit_dialogs").html(html); }
-      });
+  quick_edit_log("issue d&d enabled.");
+}
+
+function quick_edit_drag_and_drop_disable(){
+  $("tr.issue").each( function () {
+    var issue = $(this);
+    if (issue.draggable) {
+      issue.draggable("disable");
+    }
+    if (issue.droppable) {
+      issue.droppable("disable");
     }
   });
+  
+  quick_edit_log("issue d&d disabled.");
 }
 
 function quick_edit_get_selections() {
@@ -60,7 +98,12 @@ function quick_edit_get_issue_id_from_element(element) {
   return m[1];
 }
 
+function quick_edit_input_dialog_open(){
+  quick_edit_drag_and_drop_disable();
+}
+
 function quick_edit_input_dialog_close(){
+  quick_edit_drag_and_drop_enable();
   $("#quick_edit_input_dialog").remove();
 }
 
@@ -115,15 +158,23 @@ function quick_edit_show_new_relation_dialog(first_issue_id, second_issue_id, ba
      closeOnEscape: false,
      width: 450,
      height: 150,
+     open: quick_edit_new_relation_dialog_open,
      close: quick_edit_new_relation_dialog_close
   });
+
+  quick_edit_log("new_relation dialog open.");
 }
 
 function quick_edit_new_relation_dialog_cancel(){
    $('#quick_edit_new_relation_dialog').dialog("close");
 }
 
+function quick_edit_new_relation_dialog_open(){
+  quick_edit_drag_and_drop_disable();
+}
+
 function quick_edit_new_relation_dialog_close(){
+  quick_edit_drag_and_drop_enable();
 }
 
 //]]>
diff --git a/app/views/quick_edit_issues/_input_dialog.html.erb b/app/views/quick_edit_issues/_input_dialog.html.erb
index d6541f0..010acf5 100644
--- a/app/views/quick_edit_issues/_input_dialog.html.erb
+++ b/app/views/quick_edit_issues/_input_dialog.html.erb
@@ -58,8 +58,6 @@
 
 <script>
 //<![CDATA[
-  <%
-  %>
   $(".ui-autocomplete").css("z-index",200);
   var width = <%= (@dialog_params[:field_type] == :int || @dialog_params[:field_type] == :date) ? 480 : 707 %>;
   var height = <%= ((@dialog_params[:field_type] == :text) ? 414 : 280) + ((@dialog_params[:description].nil?) ? 0 : 50) + ((@dialog_params[:attribute_name]==:description)?31:0)%>;
@@ -72,7 +70,10 @@
         "Submit" : quick_edit_input_dialog_submit,
         "Cancel" : quick_edit_input_dialog_cancel
      },
+     open: quick_edit_input_dialog_open,
      close: quick_edit_input_dialog_close
   });
+
+  quick_edit_log("input_dialog open.");
 //]]>
 </script>
-- 
2.11.0