Merge branch 'jquery_190'

3 files changed, 13 insertions, 17 deletions

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..08d5d53a 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();
@@ -125,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) {
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) {