From 80af9f0f17ce5ac10ceefc9d3d0736b3d4c1c2aa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 07:05:15 -0700
Subject: Inline admin JS into admin_server_add.html.php.  Fixes #1686.

---
 modules/server_add/js/admin.js      |   8 ---
 modules/server_add/js/server_add.js | 125 ------------------------------------
 2 files changed, 133 deletions(-)
 delete mode 100644 modules/server_add/js/admin.js
 delete mode 100644 modules/server_add/js/server_add.js

(limited to 'modules/server_add/js')

diff --git a/modules/server_add/js/admin.js b/modules/server_add/js/admin.js
deleted file mode 100644
index 9d7bd181..00000000
--- a/modules/server_add/js/admin.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Set up autocomplete on the server path list
- *
- */
-$("document").ready(function() {
-  $("#g-path").autocomplete(
-    base_url.replace("__ARGS__", "admin/server_add/autocomplete"), {max: 256});
-});
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
deleted file mode 100644
index 02dda4c0..00000000
--- a/modules/server_add/js/server_add.js
+++ /dev/null
@@ -1,125 +0,0 @@
-(function($) {
-   $.widget("ui.gallery_server_add",  {
-     _init: function() {
-       var self = this;
-       $("#g-server-add-add-button", this.element).click(function(event) {
-         event.preventDefault();
-         $(".g-progress-bar", this.element).
-           progressbar().
-           progressbar("value", 0);
-         $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); });
-       });
-       $("#g-server-add-pause-button", this.element).click(function(event) {
-         self.pause = true;
-         $("#g-server-add-pause-button", this.element).hide();
-         $("#g-server-add-continue-button", this.element).show();
-       });
-       $("#g-server-add-continue-button", this.element).click(function(event) {
-         self.pause = false;
-         $("#g-server-add-pause-button", this.element).show();
-         $("#g-server-add-continue-button", this.element).hide();
-         self.run_add();
-       });
-       $("#g-server-add-close-button", this.element).click(function(event) {
-         $("#g-dialog").dialog("close");
-         window.location.reload();
-       });
-       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
-         self.open_dir(event);
-       });
-       $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
-         self.select_file(event);
-       });
-       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
-         self.open_dir(event);
-       });
-       $("#g-dialog").bind("dialogclose", function(event, ui) {
-         window.location.reload();
-       });
-     },
-
-     taskURL: null,
-     pause: false,
-
-     start_add: function() {
-       var self = this;
-       var paths = [];
-       $.each($("span.selected", self.element), function () {
-	 paths.push($(this).attr("ref"));
-       });
-
-       $("#g-server-add-add-button", this.element).hide();
-       $("#g-server-add-pause-button", this.element).show();
-
-       $.ajax({
-         url: START_URL,
-         type: "POST",
-         async: false,
-         data: { "paths[]": paths },
-         dataType: "json",
-         success: function(data, textStatus) {
-           $("#g-status").html(data.status);
-           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
-           self.taskURL = data.url;
-           setTimeout(function() { self.run_add(); }, 25);
-         }
-       });
-       return false;
-     },
-
-     run_add: function () {
-       var self = this;
-       $.ajax({
-         url: self.taskURL,
-         async: false,
-         dataType: "json",
-         success: function(data, textStatus) {
-           $("#g-status").html(data.status);
-           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
-           if (data.done) {
-	     $("#g-server-add-progress", this.element).slideUp();
-             $("#g-server-add-add-button", this.element).show();
-             $("#g-server-add-pause-button", this.element).hide();
-             $("#g-server-add-continue-button", this.element).hide();
-           } else {
-             if (!self.pause) {
-               setTimeout(function() { self.run_add(); }, 25);
-             }
-           }
-         }
-       });
-     },
-
-     /**
-      * Load a new directory
-      */
-     open_dir: function(event) {
-       var self = this;
-       var path = $(event.target).attr("ref");
-       $.ajax({
-         url: GET_CHILDREN_URL.replace("__PATH__", path),
-         success: function(data, textStatus) {
-           $("#g-server-add-tree", self.element).html(data);
-           $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) {
-             self.open_dir(event);
-           });
-           $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
-             self.select_file(event);
-           });
-         }
-       });
-     },
-
-     /**
-      * Manage file selection state.
-      */
-     select_file:  function (event) {
-       $(event.target).toggleClass("selected");
-       if ($("#g-server-add span.selected").length) {
-         $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled");
-       } else {
-         $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled");
-       }
-     }
-  });
-})(jQuery);
-- 
cgit v1.2.3


From 3312009319d69dc834e705166ac08ad8bdc4c18e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 23 Apr 2011 08:07:58 -0700
Subject: Revive server_add.js which I accidentally removed in
 80af9f0f17ce5ac10ceefc9d3d0736b3d4c1c2aa as part of #1686.

---
 modules/server_add/js/server_add.js | 125 ++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)
 create mode 100644 modules/server_add/js/server_add.js

(limited to 'modules/server_add/js')

diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
new file mode 100644
index 00000000..02dda4c0
--- /dev/null
+++ b/modules/server_add/js/server_add.js
@@ -0,0 +1,125 @@
+(function($) {
+   $.widget("ui.gallery_server_add",  {
+     _init: function() {
+       var self = this;
+       $("#g-server-add-add-button", this.element).click(function(event) {
+         event.preventDefault();
+         $(".g-progress-bar", this.element).
+           progressbar().
+           progressbar("value", 0);
+         $("#g-server-add-progress", this.element).slideDown("fast", function() { self.start_add(); });
+       });
+       $("#g-server-add-pause-button", this.element).click(function(event) {
+         self.pause = true;
+         $("#g-server-add-pause-button", this.element).hide();
+         $("#g-server-add-continue-button", this.element).show();
+       });
+       $("#g-server-add-continue-button", this.element).click(function(event) {
+         self.pause = false;
+         $("#g-server-add-pause-button", this.element).show();
+         $("#g-server-add-continue-button", this.element).hide();
+         self.run_add();
+       });
+       $("#g-server-add-close-button", this.element).click(function(event) {
+         $("#g-dialog").dialog("close");
+         window.location.reload();
+       });
+       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
+         self.open_dir(event);
+       });
+       $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
+         self.select_file(event);
+       });
+       $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
+         self.open_dir(event);
+       });
+       $("#g-dialog").bind("dialogclose", function(event, ui) {
+         window.location.reload();
+       });
+     },
+
+     taskURL: null,
+     pause: false,
+
+     start_add: function() {
+       var self = this;
+       var paths = [];
+       $.each($("span.selected", self.element), function () {
+	 paths.push($(this).attr("ref"));
+       });
+
+       $("#g-server-add-add-button", this.element).hide();
+       $("#g-server-add-pause-button", this.element).show();
+
+       $.ajax({
+         url: START_URL,
+         type: "POST",
+         async: false,
+         data: { "paths[]": paths },
+         dataType: "json",
+         success: function(data, textStatus) {
+           $("#g-status").html(data.status);
+           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
+           self.taskURL = data.url;
+           setTimeout(function() { self.run_add(); }, 25);
+         }
+       });
+       return false;
+     },
+
+     run_add: function () {
+       var self = this;
+       $.ajax({
+         url: self.taskURL,
+         async: false,
+         dataType: "json",
+         success: function(data, textStatus) {
+           $("#g-status").html(data.status);
+           $(".g-progress-bar", self.element).progressbar("value", data.percent_complete);
+           if (data.done) {
+	     $("#g-server-add-progress", this.element).slideUp();
+             $("#g-server-add-add-button", this.element).show();
+             $("#g-server-add-pause-button", this.element).hide();
+             $("#g-server-add-continue-button", this.element).hide();
+           } else {
+             if (!self.pause) {
+               setTimeout(function() { self.run_add(); }, 25);
+             }
+           }
+         }
+       });
+     },
+
+     /**
+      * Load a new directory
+      */
+     open_dir: function(event) {
+       var self = this;
+       var path = $(event.target).attr("ref");
+       $.ajax({
+         url: GET_CHILDREN_URL.replace("__PATH__", path),
+         success: function(data, textStatus) {
+           $("#g-server-add-tree", self.element).html(data);
+           $("#g-server-add-tree span.g-directory", self.element).dblclick(function(event) {
+             self.open_dir(event);
+           });
+           $("#g-server-add-tree span.g-file, #g-server-add-tree span.g-directory", this.element).click(function(event) {
+             self.select_file(event);
+           });
+         }
+       });
+     },
+
+     /**
+      * Manage file selection state.
+      */
+     select_file:  function (event) {
+       $(event.target).toggleClass("selected");
+       if ($("#g-server-add span.selected").length) {
+         $("#g-server-add-add-button").enable(true).removeClass("ui-state-disabled");
+       } else {
+         $("#g-server-add-add-button").enable(false).addClass("ui-state-disabled");
+       }
+     }
+  });
+})(jQuery);
-- 
cgit v1.2.3