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.

---
 modules/server_add/controllers/admin_server_add.php | 6 +++---
 modules/server_add/views/admin_server_add.html.php  | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'modules/server_add')

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>
 
-- 
cgit v1.2.3


From 62335da79177414094cc143c41901a7c0605b5d1 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Tue, 26 Feb 2013 13:07:00 +0100
Subject: Follow-on from autocomplete updates.
 (9345dde83e1f092a9309c45282dc21e3fd408875,
 d632ef3e50252d388c272cacd29e8cc6e4949cec) - gallery module: added
 loading-small.gif (so all themes have it by default) - gallery module: added
 css for .ui-autocomplete-loading (copied from .g-loading-small in wind, but
 without !important so other themes can override it) - gallery module: updated
 upgrader.html.php to use new image (removes theme dependence) - wind theme:
 removed outdated css for .ac_loading (not used in v3.0.5, either) -
 server_add module: removed multiple argument from autocomplete (doesn't work
 well with it)

---
 modules/gallery/css/gallery.css                    |   4 ++++
 modules/gallery/images/loading-small.gif           | Bin 0 -> 673 bytes
 modules/gallery/views/upgrader.html.php            |   2 +-
 modules/server_add/views/admin_server_add.html.php |   2 +-
 themes/wind/css/screen.css                         |   6 ------
 5 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 modules/gallery/images/loading-small.gif

(limited to 'modules/server_add')

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 73b8ab4e..323c2e83 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -164,6 +164,10 @@
   text-align: left;
 }
 
+.ui-autocomplete-loading {
+  background: #e8e8e8 url('../images/loading-small.gif') no-repeat center center;
+}
+
 /** *******************************************************************
  * 2) Admin
  **********************************************************************/
diff --git a/modules/gallery/images/loading-small.gif b/modules/gallery/images/loading-small.gif
new file mode 100644
index 00000000..d0bce154
Binary files /dev/null and b/modules/gallery/images/loading-small.gif differ
diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 4c611f7e..2e485c08 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -17,7 +17,7 @@
           <a id="dialog_close_link" style="display: none" onclick="$('#dialog').fadeOut(); return false;" href="#" class="close">[x]</a>
           <div id="busy" style="display: none">
             <h1>
-              <img width="16" height="16" src="<?= url::file("themes/wind/images/loading-small.gif") ?>"/>
+              <img width="16" height="16" src="<?= url::file("modules/gallery/images/loading-small.gif") ?>"/>
               <?= t("Upgrade in progress!") ?>
             </h1>
             <p>
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index b2421c7c..5ad142f3 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -6,7 +6,7 @@
 $("document").ready(function() {
   $("#g-path").gallery_autocomplete(
     "<?= url::site("__ARGS__") ?>".replace("__ARGS__", "admin/server_add/autocomplete"),
-    {multiple: true});
+    {});
 });
 </script>
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 0ece722e..41d0bd6e 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -1057,9 +1057,3 @@ div#g-action-status {
 .g-inline li.g-first {
   margin-left: 0;
 }
-
-/* Autocomplete  ~~~~~~~~~~ */
-
-.ac_loading {
-  background: white url('../images/loading-small.gif') right center no-repeat !important;
-}
-- 
cgit v1.2.3


From b43349f4de3612da1757a9293d205e081640e106 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sun, 10 Mar 2013 22:08:16 +0100
Subject: #2048 - Remove unneeded jquery.autocomplete.css/js inclusions. -
 removed autocomplete.css/js calls in server_add, tag, and g2_import. -
 revised xss_data.txt golden file (line number changes only).

---
 modules/g2_import/views/admin_g2_import.html.php   |  2 --
 modules/gallery/tests/xss_data.txt                 | 10 +++++-----
 modules/server_add/views/admin_server_add.html.php |  2 --
 modules/tag/helpers/tag_theme.php                  |  4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'modules/server_add')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index fd9487e4..adde83ce 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,6 +1,4 @@
 <?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]").gallery_autocomplete(
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 7e77a70b..5daaa371 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -41,8 +41,8 @@ modules/comment/views/user_profile_comments.html.php         10  DIRTY_JS $comme
 modules/comment/views/user_profile_comments.html.php         11  DIRTY    $comment->item()->thumb_img(array(),50)
 modules/exif/views/exif_dialog.html.php                      14  DIRTY    $details[$i]["caption"]
 modules/exif/views/exif_dialog.html.php                      21  DIRTY    $details[$i]["caption"]
-modules/g2_import/views/admin_g2_import.html.php             7   DIRTY_JS url::site("__ARGS__")
-modules/g2_import/views/admin_g2_import.html.php             49  DIRTY    $form
+modules/g2_import/views/admin_g2_import.html.php             5   DIRTY_JS url::site("__ARGS__")
+modules/g2_import/views/admin_g2_import.html.php             47  DIRTY    $form
 modules/gallery/views/admin_advanced_settings.html.php       21  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY_ATTR log::severity_class($entry->severity)
 modules/gallery/views/admin_block_log_entries.html.php       8   DIRTY_JS user_profile::url($entry->user->id)
@@ -350,9 +350,9 @@ modules/search/views/search.html.php                         45  DIRTY    $item-
 modules/search/views/search.html.php                         47  DIRTY_ATTR $item_class
 modules/search/views/search.html.php                         57  DIRTY    $theme->paginator()
 modules/search/views/search_link.html.php                    15  DIRTY_ATTR $album_id
-modules/server_add/views/admin_server_add.html.php           8   DIRTY_JS url::site("__ARGS__")
-modules/server_add/views/admin_server_add.html.php           16  DIRTY    $form
-modules/server_add/views/admin_server_add.html.php           27  DIRTY_ATTR $id
+modules/server_add/views/admin_server_add.html.php           6   DIRTY_JS url::site("__ARGS__")
+modules/server_add/views/admin_server_add.html.php           14  DIRTY    $form
+modules/server_add/views/admin_server_add.html.php           25  DIRTY_ATTR $id
 modules/server_add/views/server_add_tree.html.php            20  DIRTY_ATTR is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
 modules/server_add/views/server_add_tree.html.php            21  DIRTY_ATTR is_dir($file)?"g-directory":"g-file"
 modules/server_add/views/server_add_tree_dialog.html.php     3   DIRTY_JS url::site("server_add/children?path=__PATH__")
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index 5ad142f3..f7e596b4 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,7 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <?= $theme->css("server_add.css") ?>
-<?= $theme->css("jquery.autocomplete.css") ?>
-<?= $theme->script("jquery.autocomplete.js") ?>
 <script type="text/javascript">
 $("document").ready(function() {
   $("#g-path").gallery_autocomplete(
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 81d1352f..143af6c1 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -19,9 +19,7 @@
  */
 class tag_theme_Core {
   static function head($theme) {
-    return $theme->css("jquery.autocomplete.css")
-      . $theme->script("jquery.autocomplete.js")
-      . $theme->css("tag.css");
+    return $theme->css("tag.css");
   }
 
   static function admin_head($theme) {
-- 
cgit v1.2.3


From 2e94edab5396d53b1b09b6b1415d1f66d6f16de5 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 11 Mar 2013 17:16:20 +0100
Subject: #2053 - Change all .bind() to .on() for jQuery future-proofing. -
 on/off are preferred to bind/unbind, live/die, and delegate/undelegate in
 jQuery 1.7+ - they're likely on the road toward deprecation, so let's replace
 them now.

---
 lib/gallery.common.js               | 4 ++--
 modules/server_add/js/server_add.js | 2 +-
 themes/wind/js/ui.init.js           | 2 +-
 themes/wind/views/photo.html.php    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/server_add')

diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 5ff6b397..f5dee958 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -212,7 +212,7 @@
       }
 
       // Attach event listeners to the input
-      input.bind("focus", function(e) {
+      input.on("focus", function(e) {
         // Empty input value if it equals it's label
         if ($(this).val() == label.html()) {
           $(this).val("");
@@ -220,7 +220,7 @@
         button.attr("disabled", false);
       });
 
-      input.bind("blur", function(e){
+      input.on("blur", function(e) {
         // Reset the input value if it's empty
         if ($(this).val() == "") {
           $(this).val(label.html());
diff --git a/modules/server_add/js/server_add.js b/modules/server_add/js/server_add.js
index 02dda4c0..a2499896 100644
--- a/modules/server_add/js/server_add.js
+++ b/modules/server_add/js/server_add.js
@@ -33,7 +33,7 @@
        $("#g-server-add-tree span.g-directory", this.element).dblclick(function(event) {
          self.open_dir(event);
        });
-       $("#g-dialog").bind("dialogclose", function(event, ui) {
+       $("#g-dialog").on("dialogclose", function(event, ui) {
          window.location.reload();
        });
      },
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index fd75c210..4f901778 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -83,7 +83,7 @@ $(document).ready(function() {
     );
 
     // Realign any thumbnails that change so that when we rotate a thumb it stays centered.
-    $(".g-item").bind("gallery.change", function() {
+    $(".g-item").on("gallery.change", function() {
       $(".g-item").each(function() {
         $(this).height($(this).find("img").height() + 2);
       });
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index b42ab987..1fab71e1 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -12,7 +12,7 @@
 
     // After the image is rotated or replaced we have to reload the image dimensions
     // so that the full size view isn't distorted.
-    $("#g-photo").bind("gallery.change", function() {
+    $("#g-photo").on("gallery.change", function() {
       $.ajax({
         url: "<?= url::site("items/dimensions/" . $theme->item()->id) ?>",
         dataType: "json",
-- 
cgit v1.2.3