cleanup

diff --git a/app/views/hooks/_quick_edit_base_bottom.html.erb b/app/views/hooks/_quick_edit_base_bottom.html.erb
index 980c48d..844a0e5 100644 (file)
--- a/app/views/hooks/_quick_edit_base_bottom.html.erb
+++ b/app/views/hooks/_quick_edit_base_bottom.html.erb
@@ -119,7 +119,7 @@ function quick_edit_input_dialog_switch_page() {
 }
 
 function quick_edit_input_dialog_preview_replace() {
-  var replace_page = $("#quick_edit_input_dialog #replace");
+  var replace_page = $("#quick_edit_input_dialog #replace-page");
 
   var target_specifier = replace_page.find("#target_specifier").val();
   var find = replace_page.find("#find").val();
@@ -140,7 +140,7 @@ function quick_edit_input_dialog_preview_replace() {
 }
 
 function quick_edit_input_dialog_replace_submit() {
-  var replace_page = $("#quick_edit_input_dialog #replace");
+  var replace_page = $("#quick_edit_input_dialog #replace-page");
 
   var find = replace_page.find("#find").val();
   if(find == "") {
@@ -168,11 +168,13 @@ function quick_edit_clear(){
 }
 
 function quick_edit_input_dialog_edit_submit(){
-  var target_specifier = $("#quick_edit_input_dialog #edit #target_specifier").val();
-  var new_value_element = $("#quick_edit_input_dialog #edit #new_value");
-  var clr_value_element = $("#quick_edit_input_dialog #edit #clear");
+  var edit_page = $("#quick_edit_input_dialog #edit-page");
 
-  if ($("#quick_edit_input_dialog #edit #clear:checked").length > 0){
+  var target_specifier = edit_page.find("#target_specifier").val();
+  var new_value_element = edit_page.find("#new_value");
+  var clr_value_element = edit_page.find("#clear");
+
+  if (edit_page.find("#clear:checked").length > 0){
     new_value_element.attr("name", "_quick_edit_tmp");
     clr_value_element.attr("name", target_specifier);
 
@@ -180,10 +182,10 @@ function quick_edit_input_dialog_edit_submit(){
     new_value_element.attr("name", target_specifier);
     clr_value_element.attr("name", "_quick_edit_tmp");
 
-    var new_value = $("#quick_edit_input_dialog #new_value").val();
+    var new_value = edit_page.find("#new_value").val();
     if(new_value === null) return;
 
-    var pattern = new RegExp($("#quick_edit_input_dialog #edit #validation_pattern").val());
+    var pattern = new RegExp(edit_page.find("#validation_pattern").val());
 
     if(new_value == "") {
       alert('<%=l(:text_is_required)%>');
@@ -199,7 +201,7 @@ function quick_edit_input_dialog_edit_submit(){
   }
 
   var issue_ids = [];
-  $("#quick_edit_input_dialog #edit #ids").each(function (index,element) {
+  edit_page.find("#ids").each(function (index,element) {
     issue_ids.push($(this).val());
   });
   if(issue_ids.length>1){
@@ -207,15 +209,15 @@ function quick_edit_input_dialog_edit_submit(){
   }
 
   var offsetY = (window.pageYOffset !== undefined) ? window.pageYOffset : (document.documentElement || document.body.parentNode || document.body).scrollTop;
-  var back_url = $("#quick_edit_input_dialog #edit #back_url").val();
+  var back_url = edit_page.find("#back_url").val();
   if (back_url.indexOf("?") == -1) {
     back_url = back_url + "?offsetY=" + offsetY;
   } else {
     back_url = back_url + "&offsetY=" + offsetY;
   }
-  $("#quick_edit_input_dialog #edit #back_url").val(back_url);
+  edit_page.find("#back_url").val(back_url);
 
-  $("#quick_edit_input_dialog #edit form").submit();
+  edit_page.find("form").submit();
 }
 
 function quick_edit_show_new_relation_dialog(first_issue_id, second_issue_id, back_url){

diff --git a/app/views/quick_edit_issues/_input_dialog.html.erb b/app/views/quick_edit_issues/_input_dialog.html.erb
index f581550..2970d5d 100644 (file)
--- a/app/views/quick_edit_issues/_input_dialog.html.erb
+++ b/app/views/quick_edit_issues/_input_dialog.html.erb
@@ -7,15 +7,15 @@
 
   textarea_size = parse_size(Setting.plugin_quick_edit['textarea_size'], 10...256, 80, 10...256, 10)
 %>
-<div id="quick_edit_input_dialog" title="Quick Edit - <%= @dialog_params[:caption] %>" style="background-color: white;">
+<div id="quick_edit_input_dialog" title="Quick Edit - <%= @dialog_params[:caption] %>">
   <!-- main begin -->
   <div>
     <!-- page switcher -->
     <% if @dialog_params[:replacable] %>
     <div style="float: right;">
       <ul>
-        <li id="edit_switcher" class="page-switcher" style="display:none;"><a href="#edit">EDIT</a></li>
-        <li id="replace_switcher" class="page-switcher"><a href="#replace">REPLACE</a></li>
+        <li id="edit_switcher" class="page-switcher" style="display:none;"><a>EDIT</a></li>
+        <li id="replace_switcher" class="page-switcher"><a>REPLACE</a></li>
       </ul>
     </div>
     <% end %>
@@ -26,7 +26,7 @@
     </div>
 
     <!-- pages  -->
-    <div id="edit" class="page">
+    <div id="edit-page" class="page">
 
       <%= form_tag({:controller=>'issues', :action=>:bulk_update}) do %>
       <div class="box">
@@ -77,7 +77,7 @@
       <% end %>
     </div>
 
-    <div id="replace" class="page" style="display: none;">
+    <div id="replace-page" class="page" style="display: none;">
       <%= form_tag({:controller=>'quick_edit_issues', :action=>:replace}) do %>
       <div class="box">
         <span>Find what:</span><br/>
@@ -85,13 +85,13 @@
                name="find"
                type="text"
                size="80"
-               value="first"></input><br/>
+               value=""></input><br/>
         <span>Replace with:</span><br/>
         <input id="replace"
                name="replace"
                type="text"
                size="80"
-               value="new"></input><br/>
+               value=""></input><br/>
         <span>Preview:</span>
         <div id="preview_area" class="ui-corner-all box">&nbsp;</div>
       </div>