Rename custom autocomplete module to avoid interference with original…

… jquery autocomplete, use original version to display datalists
galaxyproject · Jan 11, 2017 · bc51f6f · bc51f6f
1 parent dadd6ee
commit bc51f6f
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 35 deletions.
diff --git a/client/galaxy/scripts/libs/jquery/jquery.autocomplete.js b/client/galaxy/scripts/libs/jquery/jquery.autocomplete.js
@@ -14,7 +14,7 @@
      * @param {object|string} options
      * @returns (object} jQuery object
      */
-    $.fn.autocomplete = function(options) {
+    $.fn.autocomplete_verheul = function(options) {
         var url;
         if (arguments.length > 1) {
             url = options;
@@ -24,7 +24,7 @@
             url = options;
             options = { url: url };
         }
-        var opts = $.extend({}, $.fn.autocomplete.defaults, options);
+        var opts = $.extend({}, $.fn.autocomplete_verheul.defaults, options);
         return this.each(function() {
             var $this = $(this);
             $this.data('autocompleter', new $.Autocompleter(
@@ -38,7 +38,7 @@
      * Store default options
      * @type {object}
      */
-    $.fn.autocomplete.defaults = {
+    $.fn.autocomplete_verheul.defaults = {
         inputClass: 'acInput',
         loadingClass: 'acLoading',
         resultsClass: 'acResults',
@@ -289,10 +289,10 @@
         /**
          * Sanitize options
          */
-        this.options.minChars = sanitizeInteger(this.options.minChars, $.fn.autocomplete.defaults.minChars, { min: 0 });
-        this.options.maxItemsToShow = sanitizeInteger(this.options.maxItemsToShow, $.fn.autocomplete.defaults.maxItemsToShow, { min: 0 });
-        this.options.maxCacheLength = sanitizeInteger(this.options.maxCacheLength, $.fn.autocomplete.defaults.maxCacheLength, { min: 1 });
-        this.options.delay = sanitizeInteger(this.options.delay, $.fn.autocomplete.defaults.delay, { min: 0 });
+        this.options.minChars = sanitizeInteger(this.options.minChars, $.fn.autocomplete_verheul.defaults.minChars, { min: 0 });
+        this.options.maxItemsToShow = sanitizeInteger(this.options.maxItemsToShow, $.fn.autocomplete_verheul.defaults.maxItemsToShow, { min: 0 });
+        this.options.maxCacheLength = sanitizeInteger(this.options.maxCacheLength, $.fn.autocomplete_verheul.defaults.maxCacheLength, { min: 1 });
+        this.options.delay = sanitizeInteger(this.options.delay, $.fn.autocomplete_verheul.defaults.delay, { min: 0 });
         if (this.options.preventDefaultReturn != 2) {
             this.options.preventDefaultReturn = this.options.preventDefaultReturn ? 1 : 0;
         }

diff --git a/client/galaxy/scripts/mvc/ui/ui-misc.js b/client/galaxy/scripts/mvc/ui/ui-misc.js
@@ -114,7 +114,8 @@ define(['utils/utils',
                     .attr( 'type', this.model.get( 'type' ) )
                     .attr( 'placeholder', this.model.get( 'placeholder' ) )
                     .css( 'color', this.model.get( 'color' ) || '' )
-                    .css( 'border-color', this.model.get( 'color' ) || '' );
+                    .css( 'border-color', this.model.get( 'color' ) || '' )
+                    .autocomplete( { source : this.model.get( 'datalist' ) } );
             if ( this.model.get( 'value' ) !== this.$el.val() ) {
                 this.$el.val( this.model.get( 'value' ) );
             }

diff --git a/client/galaxy/scripts/ui/autocom_tagging.js b/client/galaxy/scripts/ui/autocom_tagging.js
@@ -194,7 +194,7 @@ jQuery.fn.autocomplete_tagging = function(options) {
     };
     var autocomplete_options = { selectFirst: false, formatItem: format_item_func,
             autoFill: false, highlight: false };
-    tag_input_field.autocomplete(settings.ajax_autocomplete_tag_url, autocomplete_options);
+    tag_input_field.autocomplete_verheul(settings.ajax_autocomplete_tag_url, autocomplete_options);
 
 
     // Initialize delete tag images for current tags.

diff --git a/static/maps/libs/jquery/jquery.autocomplete.js.map b/static/maps/libs/jquery/jquery.autocomplete.js.map
diff --git a/static/maps/mvc/ui/ui-misc.js.map b/static/maps/mvc/ui/ui-misc.js.map