diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/controls.js | 3 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/javascripts/effects.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/controls.js b/actionpack/lib/action_view/helpers/javascripts/controls.js index f13733d5f0..a8e7ec7452 100644 --- a/actionpack/lib/action_view/helpers/javascripts/controls.js +++ b/actionpack/lib/action_view/helpers/javascripts/controls.js @@ -221,13 +221,14 @@ Autocompleter.Base.prototype = { this.options.updateElement(selectedElement); return; } + var value = ''; if (this.options.select) { var nodes = document.getElementsByClassName(this.options.select, selectedElement) || []; if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select); } else value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal'); - + var lastTokenPos = this.findLastToken(); if (lastTokenPos != -1) { var newValue = this.element.value.substr(0, lastTokenPos + 1); diff --git a/actionpack/lib/action_view/helpers/javascripts/effects.js b/actionpack/lib/action_view/helpers/javascripts/effects.js index ebca0c490a..035a63e62f 100644 --- a/actionpack/lib/action_view/helpers/javascripts/effects.js +++ b/actionpack/lib/action_view/helpers/javascripts/effects.js @@ -22,7 +22,7 @@ String.prototype.parseColor = function() { } } return(color.length==7 ? color : (arguments[0] || this)); -} +} Element.collectTextNodes = function(element) { return $A($(element).childNodes).collect( function(node) { @@ -39,6 +39,7 @@ Element.collectTextNodesIgnoreClass = function(element, className) { }).flatten().join(''); } + Element.setStyle = function(element, style) { element = $(element); for(k in style) element.style[k.camelize()] = style[k]; |