From a7559e669f4f131ccec74b585973492665a21daa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 18 Nov 2014 22:14:34 +0000
Subject: [PATCH] Moved select_list_move.js content to application.js.

git-svn-id: http://svn.redmine.org/redmine/trunk@13618 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/queries/_columns.html.erb    |  8 +++++--
 public/javascripts/application.js      | 25 ++++++++++++++++++++++
 public/javascripts/select_list_move.js | 29 --------------------------
 3 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 public/javascripts/select_list_move.js

diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index 595a96b14..d102341c1 100644
--- a/app/views/queries/_columns.html.erb
+++ b/app/views/queries/_columns.html.erb
@@ -31,6 +31,10 @@
   </tr>
 </table>
 
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'select_list_move' %>
+<%= javascript_tag do %>
+$(document).ready(function(){
+  $('.query-columns').closest('form').submit(function(){
+    $('#selected_columns option').prop('selected', true);
+  });
+});
 <% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 19104fdc2..e598bbcaf 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -74,6 +74,31 @@ function hideFieldset(el) {
   fieldset.children('div').hide();
 }
 
+// columns selection
+function moveOptions(theSelFrom, theSelTo) {
+  $(theSelFrom).find('option:selected').detach().prop("selected", false).appendTo($(theSelTo));
+}
+
+function moveOptionUp(theSel) {
+  $(theSel).find('option:selected').each(function(){
+    $(this).prev(':not(:selected)').detach().insertAfter($(this));
+  });
+}
+
+function moveOptionTop(theSel) {
+  $(theSel).find('option:selected').detach().prependTo($(theSel));
+}
+
+function moveOptionDown(theSel) {
+  $($(theSel).find('option:selected').get().reverse()).each(function(){
+    $(this).next(':not(:selected)').detach().insertBefore($(this));
+  });
+}
+
+function moveOptionBottom(theSel) {
+  $(theSel).find('option:selected').detach().appendTo($(theSel));
+}
+
 function initFilters() {
   $('#add_filter_select').change(function() {
     addFilter($(this).val(), '', []);
diff --git a/public/javascripts/select_list_move.js b/public/javascripts/select_list_move.js
deleted file mode 100644
index db0585424..000000000
--- a/public/javascripts/select_list_move.js
+++ /dev/null
@@ -1,29 +0,0 @@
-function moveOptions(theSelFrom, theSelTo) {
-  $(theSelFrom).find('option:selected').detach().prop("selected", false).appendTo($(theSelTo));
-}
-
-function moveOptionUp(theSel) {
-  $(theSel).find('option:selected').each(function(){
-    $(this).prev(':not(:selected)').detach().insertAfter($(this));
-  });
-}
-
-function moveOptionTop(theSel) {
-  $(theSel).find('option:selected').detach().prependTo($(theSel));
-}
-
-function moveOptionDown(theSel) {
-  $($(theSel).find('option:selected').get().reverse()).each(function(){
-    $(this).next(':not(:selected)').detach().insertBefore($(this));
-  });
-}
-
-function moveOptionBottom(theSel) {
-  $(theSel).find('option:selected').detach().appendTo($(theSel));
-}
-
-$(document).ready(function(){
-  $('.query-columns').closest('form').submit(function(){
-    $('#selected_columns option').prop('selected', true);
-  });
-});
-- 
2.39.5