From f0b3d37d18c19a170dc737dc01e002d26535a9b3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 5 Aug 2009 22:17:03 -0700
Subject: Chain some jQuery calls together to reduce lines of code.

---
 modules/server_add/js/server_add.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'modules/server_add/js')

diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 989555cc..3348de4b 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -4,11 +4,9 @@
 function select_file(li) {
   $(li).toggleClass("selected");
   if ($("#gServerAdd span.selected").length) {
-    $("#gServerAddAddButton").enable(true);
-    $("#gServerAddAddButton").removeClass("ui-state-disabled");
+    $("#gServerAddAddButton").enable(true).removeClass("ui-state-disabled");
   } else {
-    $("#gServerAddAddButton").enable(false);
-    $("#gServerAddAddButton").addClass("ui-state-disabled");
+    $("#gServerAddAddButton").enable(false).addClass("ui-state-disabled");
   }
 }
 
-- 
cgit v1.2.3


From afa8cade7fc948b064636d4e9ecfb03e4c2c67d7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 18 Aug 2009 05:16:11 +0800
Subject: Fix for ticket #590. The gallery.dialog.js looks for an element
 "#dialog #gProgress" and if it finds it assumes that it is a progress dialog
 and removes the title.  This pathc changes the name of the div containing the
 progress bar to gServerAddProgress and avoids the issue.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/server_add/js/server_add.js                      | 2 +-
 modules/server_add/views/server_add_tree_dialog.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/server_add/js')

diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 3348de4b..fbd61dcc 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -52,7 +52,7 @@ function run_add(url) {
       $("#gStatus").html(data.status);
       $("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete);
       if (data.done) {
-	$("#gProgress").slideUp();
+	$("#gServerAddProgress").slideUp();
       } else {
 	setTimeout(function() { run_add(url); }, 0);
       }
diff --git a/modules/server_add/views/server_add_tree_dialog.html.php b/modules/server_add/views/server_add_tree_dialog.html.php
index 5c5dfd0f..431635f8 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -23,7 +23,7 @@
     <?= $tree ?>
   </ul>
 
-  <div id="gProgress" style="display: none">
+  <div id="gServerAddProgress" style="display: none">
     <div class="gProgressBar"></div>
     <div id="gStatus"></div>
   </div>
@@ -46,7 +46,7 @@
          $("#gServerAdd .gProgressBar").
            progressbar().
            progressbar("value", 0);
-         $("#gProgress").slideDown("fast", function() { start_add() });
+         $("#gServerAddProgress").slideDown("fast", function() { start_add() });
       });
       $("#gServerCloseButton").click(function(event) {
         $("#gDialog").dialog("close");
-- 
cgit v1.2.3


From ac8c9d6670b5dc0b56e1acf7cb468d5fa846fc28 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 6 Sep 2009 11:26:20 -0700
Subject: Fix indentation.

---
 modules/server_add/js/server_add.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/server_add/js')

diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index fbd61dcc..51ef41a7 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -24,9 +24,11 @@ function open_dir(path) {
 
 function start_add() {
   var paths = [];
-  $.each($("#gServerAdd span.selected"), function () {
-    paths.push($(this).attr("file"));
-  });
+  $.each($("#gServerAdd span.selected"),
+	 function () {
+	   paths.push($(this).attr("file"));
+	 }
+  );
 
   $.ajax({
     url: START_URL,
-- 
cgit v1.2.3