Merge branch 'master' of git@github.com:gallery/gallery3

2 files changed, 25 insertions, 0 deletions

diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php
index 55a75a3b..cf68d911 100644
--- a/modules/g2_import/controllers/admin_g2_import.php
+++ b/modules/g2_import/controllers/admin_g2_import.php
@@ -94,6 +94,18 @@ class Admin_g2_import_Controller extends Admin_Controller {
     print $view;
   }
 
+  public function autocomplete() {
+    $directories = array();
+    $path_prefix = Input::instance()->get("q");
+    foreach (glob("{$path_prefix}*") as $file) {
+      if (is_dir($file) && !is_link($file)) {
+        $directories[] = $file;
+      }
+    }
+
+    print implode("\n", $directories);
+  }
+
   private function _get_import_form() {
     $embed_path = module::get_var("g2_import", "embed_path", "");
     $form = new Forge(
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 20b243d5..1094524f 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,4 +1,17 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<?= $theme->css("jquery.autocomplete.css") ?>
+<?= $theme->script("jquery.autocomplete.js") ?>
+<script type="text/javascript">
+$("document").ready(function() {
+  $("form input[name=embed_path]").autocomplete(
+    "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/g2_import/autocomplete"),
+    {
+      max: 256,
+      loadingClass: "g-loading-small",
+    });
+});
+</script>
+
 <div id="g-admin-g2-import" class="g-block">
   <h1> <?= t("Gallery 2 import") ?> </h1>
   <p>