From 0494244e8068198707bf602199413cd216b0d515 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 3 Feb 2013 18:48:30 -0500
Subject: Super first pass: - jQuery 1.90 - jQuery UI 1.10 - Superfish 1.5.1
 (minus all plugins) - jQuery Form 3.26.0-2013.01.28

Deleted all other jQuery plugins for now.

- Reworked autocomplete to use the latest jQuery code.
- Deleted references to $.browser.msie, no longer supported
- Basic CSS support for autocomplete - lots more work needed there
---
 modules/tag/controllers/tags.php     |  9 ++++-----
 modules/tag/helpers/tag_event.php    |  3 +--
 modules/tag/views/tag_block.html.php | 16 +++++++---------
 3 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'modules/tag')

diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 77d45a95..32e857c6 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -48,18 +48,17 @@ class Tags_Controller extends Controller {
 
   public function autocomplete() {
     $tags = array();
-    $tag_parts = explode(",", Input::instance()->get("q"));
-    $limit = Input::instance()->get("limit");
+    $tag_parts = explode(",", Input::instance()->get("term"));
     $tag_part = ltrim(end($tag_parts));
     $tag_list = ORM::factory("tag")
       ->where("name", "LIKE", Database::escape_for_like($tag_part) . "%")
       ->order_by("name", "ASC")
-      ->limit($limit)
+      ->limit(100)
       ->find_all();
     foreach ($tag_list as $tag) {
-      $tags[] = html::clean($tag->name);
+      $tags[] = (string)html::clean($tag->name);
     }
 
-    ajax::response(implode("\n", $tags));
+    ajax::response(json_encode($tags));
   }
 }
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index d62ae36e..79d6e0bc 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -72,8 +72,7 @@ class tag_event_Core {
     $url = url::site("tags/autocomplete");
     $form->script("")
       ->text("$('form input[name=tags]').ready(function() {
-                $('form input[name=tags]').gallery_autocomplete(
-                  '$url', {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1});
+                $('form input[name=tags]').gallery_autocomplete('$url', {multiple: true});
               });");
 
     $tag_names = array();
diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index d25b8dcb..afa61b15 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -2,15 +2,13 @@
 <script type="text/javascript">
   $("#g-add-tag-form").ready(function() {
     var url = $("#g-tag-cloud-autocomplete-url").attr("href");
-    $("#g-add-tag-form input:text").gallery_autocomplete(
-      url, {
-        max: 30,
-        multiple: true,
-        multipleSeparator: ',',
-        cacheLength: 1,
-        selectFirst: false
-      }
-    );
+    function split(val) {
+      return val.split(/,\s*/);
+    }
+    function extract_last(term) {
+      return split(term).pop();
+    }
+    $("#g-add-tag-form input:text").gallery_autocomplete(url, {multiple: true});
     $("#g-add-tag-form").ajaxForm({
       dataType: "json",
       success: function(data) {
-- 
cgit v1.2.3


From d632ef3e50252d388c272cacd29e8cc6e4949cec Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 17 Feb 2013 00:23:50 -0500
Subject: Fix up autocomplete for admin_server_add - found and fixed some bugs
 in gallery_autocomplete when "multiple" isn't set.  Fixed some harmless
 syntax issues that js2-mode helpfully pointed out.

---
 lib/gallery.common.js                              | 26 ++++++++++++----------
 .../server_add/controllers/admin_server_add.php    |  6 ++---
 modules/server_add/views/admin_server_add.html.php |  5 +----
 modules/tag/helpers/tag_event.php                  |  2 +-
 4 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'modules/tag')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 95988573..548aa29a 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -229,11 +229,11 @@
       source: function(request, response) {
         var split = function(val) {
           return val.split(/,\s*/);
-        }
+        };
 
         var extract_last = function(term) {
           return split(term).pop();
-        }
+        };
 
         var ajax_options = {
           dataType: "json",
@@ -241,15 +241,17 @@
           success: function(data) {
             response(data);
           },
+          data: {
+            term: request.term
+          },
+          dataFilter: function(data, dataType) {
+            // Drop the <meta> tag
+            return data.substring(data.indexOf("\n") + 1);
+          }
         };
 
-        if (options.multiple) {
-
+        if ("multiple" in options) {
           $.extend(ajax_options, {
-            dataFilter: function(data, dataType) {
-              // Drop the <meta> tag
-              return data.substring(data.indexOf("\n") + 1);
-            },
             data: {
               term: extract_last(request.term)
             }
@@ -258,12 +260,12 @@
 
         $.ajax(ajax_options, response);
       }
-    }
+    };
 
-    if (options.multiple) {
+    if ("multiple" in options) {
       var split = function(val) {
         return val.split(/,\s*/);
-      }
+      };
       $.extend(autocomplete_options, {
         focus: function(event, ui) {
           var terms = split(this.value);
@@ -280,7 +282,7 @@
           this.value = terms.join(", ");
           return false;
         }
-      })
+      });
     }
 
     $(this).autocomplete(autocomplete_options);
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>
 
diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 79d6e0bc..08d5d53a 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -124,7 +124,7 @@ class tag_event_Core {
       ->text("$('input[name=tags]')
                 .gallery_autocomplete(
                   '$autocomplete_url',
-                  {max: 30, multiple: true, multipleSeparator: ',', cacheLength: 1}
+                  {multiple: true}
                 );
               $('input[name=tags]')
                 .change(function (event) {
-- 
cgit v1.2.3