Refactor the server add javascript into a ui.gallery_server_add widget.

2 files changed, 6 insertions, 20 deletions

diff --git a/modules/server_add/views/server_add_tree.html.php b/modules/server_add/views/server_add_tree.html.php
index 918fbdc7..4e5bf601 100644
--- a/modules/server_add/views/server_add_tree.html.php
+++ b/modules/server_add/views/server_add_tree.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <li class="ui-icon-left">
   <span class="ui-icon ui-icon-folder-open"></span>
-  <span ondblclick="open_dir('')">
+  <span class="gDirectory" ref="">
     <?= t("All") ?>
   </span>
   <ul>
@@ -9,7 +9,7 @@
     <? foreach ($parents as $dir): ?>
     <li class="ui-icon-left">
       <span class="ui-icon ui-icon-folder-open"></span>
-      <span ondblclick='open_dir(<?= html::js_string($dir) ?>)'>
+      <span class="gDirectory" ref="<?= html::clean_attribute($dir) ?>">
         <?= html::clean(basename($dir)) ?>
       </span>
       <ul>
@@ -18,12 +18,8 @@
         <? foreach ($files as $file): ?>
         <li class="ui-icon-left">
           <span class="ui-icon <?= is_dir($file) ? "ui-icon-folder-collapsed" : "ui-icon-document" ?>"></span>
-          <span onclick="select_file(this)"
-                <? if (is_dir($file)): ?>
-                ondblclick="open_dir($(this).attr('file'))"
-                <? endif ?>
-                file="<?= html::clean_attribute($file) ?>"
-                >
+          <span class="<?= is_dir($file) ? "gDirectory" : "gFile" ?>"
+                ref="<?= html::clean_attribute($file) ?>" >
             <?= html::clean(basename($file)) ?>
           </span>
         </li>
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 dd4efd06..354659bc 100644
--- a/modules/server_add/views/server_add_tree_dialog.html.php
+++ b/modules/server_add/views/server_add_tree_dialog.html.php
@@ -40,18 +40,8 @@
   </span>
 
   <script type="text/javascript">
-    $("#gServerAddAddButton").ready(function() {
-      $("#gServerAddAddButton").click(function(event) {
-         event.preventDefault();
-         $("#gServerAdd .gProgressBar").
-           progressbar().
-           progressbar("value", 0);
-         $("#gServerAddProgress").slideDown("fast", function() { start_add() });
-      });
-      $("#gServerCloseButton").click(function(event) {
-        $("#gDialog").dialog("close");
-        window.location.reload();
-      });
+    $("#gServerAdd").ready(function() {
+      $("#gServerAdd").gallery_server_add();
     });
   </script>