Merge branch 'jquery_190'

2 files changed, 4 insertions, 7 deletions

diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index ba2b9b3f..4e522702 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -73,14 +73,14 @@ class Admin_Server_Add_Controller extends Admin_Controller {
   public function autocomplete() {
     $directories = array();
 
-    $path_prefix = Input::instance()->get("q");
+    $path_prefix = Input::instance()->get("term");
     foreach (glob("{$path_prefix}*") as $file) {
       if (is_dir($file) && !is_link($file)) {
-        $directories[] = html::clean($file);
+        $directories[] = (string)html::clean($file);
       }
     }
 
-    ajax::response(implode("\n", $directories));
+    ajax::response(json_encode($directories));
   }
 
   private function _get_admin_form() {
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index f59e327f..b2421c7c 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -6,10 +6,7 @@
 $("document").ready(function() {
   $("#g-path").gallery_autocomplete(
     "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/server_add/autocomplete"),
-    {
-      max: 256,
-      loadingClass: "g-loading-small",
-    });
+    {multiple: true});
 });
 </script>