Conflict resolution

Author: bigtunacan

lib/assets/javascripts/autocomplete-rails-uncompressed.js

@@ -57,6 +57,7 @@
       jQuery(e).autocomplete({
         appendTo: e.append_to,
         autoFocus: e.autoFocus,
+        delay: jQuery(e).attr('delay') || 0,
         source: function( request, response ) {
           var firedFrom = this.element[0];
           var params = {term: extractLast( request.term )};
@@ -135,21 +136,26 @@
               jQuery(jQuery(this).attr('data-id-element')).val(ui.item.id);
             }
             if (jQuery(this).attr('data-update-elements')) {
-              var data = jQuery(this).data(ui.item.id.toString());
+              var data = ui.item;
+              var new_record = ui.item.value.indexOf('Create New') != -1 ? true : false;
               var update_elements = jQuery.parseJSON(jQuery(this).attr("data-update-elements"));
               for (var key in update_elements) {
-                  var element = jQuery(update_elements[key]);
-                  if (element.is(':checkbox')) {
-                      if (data[key] != null) {
-                          element.prop('checked', data[key]);
-                      }
-                  } else {
-                      element.val(data[key]);
+                if(jQuery(update_elements[key]).attr("type") === "checkbox"){
+                   if(data[key] === true || data[key] === 1) {
+                       jQuery(update_elements[key]).attr("checked","checked");
+                   }
+                   else {
+                       jQuery(update_elements[key]).removeAttr("checked");
+                   }
+                }
+                else{
+                  if((new_record && data[key] && data[key].indexOf('Create New') == -1) || !new_record){
+                    jQuery(update_elements[key]).val(data[key]);
+                  }else{
+                    jQuery(update_elements[key]).val('');
                   }
-              }
-              if(jQuery(update_elements[key]).attr("type") === "checkbox"){
-                jQuery(update_elements[key]).attr("checked","checked");
-              }
+                }
+               }
             }
           }
           var remember_string = this.value;
@@ -160,6 +166,7 @@
             }
           });
           jQuery(e).trigger('railsAutocomplete.select', ui);
+
           return false;
         }
       });