Permalink
Browse files

Added :select option for JavaScriptMacroHelper#auto_complete_field th…

…at makes it easier to only use part of the auto-complete suggestion as the value for insertion [Thomas Fuchs]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3344 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent af60120 commit 96536bebaefccabcbfb5ce9e689dd40c4fb4e294 @dhh dhh committed Dec 24, 2005
View
@@ -1,5 +1,13 @@
*SVN*
+* Added :select option for JavaScriptMacroHelper#auto_complete_field that makes it easier to only use part of the auto-complete suggestion as the value for insertion [Thomas Fuchs]
+
+* Added delayed execution of Javascript from within RJS #3264 [devslashnull@gmail.com]. Example:
+
+ page.delay(20) do
+ page.visual_effect :fade, 'notice'
+ end
+
* Add session ID to default logging, but remove the verbose description of every step [DHH]
* Add the following RJS methods: [Sam Stephenson]
@@ -105,6 +105,9 @@ def in_place_editor_field(object, method, tag_options = {}, in_place_editor_opti
# innerHTML is replaced.
# <tt>:on_show</tt>:: Like on_hide, only now the expression is called
# then the div is shown.
+ # <tt>:select</tt>:: Pick the class of the element from which the value for
+ # insertion should be extracted. If this is not specified,
+ # the entire element is used.
def auto_complete_field(field_id, options = {})
function = "new Ajax.Autocompleter("
function << "'#{field_id}', "
@@ -115,9 +118,11 @@ def auto_complete_field(field_id, options = {})
js_options[:tokens] = array_or_string_for_javascript(options[:tokens]) if options[:tokens]
js_options[:callback] = "function(element, value) { return #{options[:with]} }" if options[:with]
js_options[:indicator] = "'#{options[:indicator]}'" if options[:indicator]
- {:on_show => :onShow, :on_hide => :onHide, :min_chars => :min_chars}.each do |k,v|
+
+ { :on_show => :onShow, :on_hide => :onHide, :min_chars => :min_chars, :select => :select }.each do |k,v|
js_options[v] = options[k] if options[k]
end
+
function << (', ' + options_for_javascript(js_options) + ')')
javascript_tag(function)
@@ -221,8 +221,13 @@ Autocompleter.Base.prototype = {
this.options.updateElement(selectedElement);
return;
}
-
- var value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+ 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);
@@ -22,23 +22,21 @@ String.prototype.parseColor = function() {
}
}
return(color.length==7 ? color : (arguments[0] || this));
-}
+}
-Element.collectTextNodesIgnoreClass = function(element, ignoreclass) {
- var children = $(element).childNodes;
- var text = '';
- var classtest = new RegExp('^([^ ]+ )*' + ignoreclass+ '( [^ ]+)*$','i');
-
- for (var i = 0; i < children.length; i++) {
- if(children[i].nodeType==3) {
- text+=children[i].nodeValue;
- } else {
- if((!children[i].className.match(classtest)) && children[i].hasChildNodes())
- text += Element.collectTextNodesIgnoreClass(children[i], ignoreclass);
- }
- }
-
- return text;
+Element.collectTextNodes = function(element) {
+ return $A($(element).childNodes).collect( function(node) {
+ return (node.nodeType==3 ? node.nodeValue :
+ (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
+ }).flatten().join('');
+}
+
+Element.collectTextNodesIgnoreClass = function(element, className) {
+ return $A($(element).childNodes).collect( function(node) {
+ return (node.nodeType==3 ? node.nodeValue :
+ ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
+ Element.collectTextNodes(node) : ''));
+ }).flatten().join('');
}
Element.setStyle = function(element, style) {
@@ -38,6 +38,23 @@ def visual_effect(name, element_id = false, js_options = {})
js_options[:queue] = "'#{js_options[:queue]}'" if js_options[:queue]
"new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});"
end
+
+ # Needs more work so + isn't required for concation of effects. Currently, you have to do:
+ #
+ # page.parallel_effects do
+ # page.visual_effect(:highlight, 'dom_id') +
+ # page.visual_effect(:fade, 'dom_id')
+ # end
+ #
+ # ...naturally, it would be better just to do
+ #
+ # page.parallel_effects do
+ # page.visual_effect :highlight, 'dom_id'
+ # page.visual_effect :fade, 'dom_id'
+ # end
+ def parallel_effects(js_options = {}) #:nodoc:
+ "new Effect.Parallel([" + yield + "], #{options_for_javascript(js_options)})"
+ end
# Makes the element with the DOM ID specified by +element_id+ sortable
# by drag-and-drop and make an Ajax call whenever the sort order has
@@ -29,6 +29,15 @@ def test_effect
assert_equal "new Effect.Shake(element,{});", visual_effect(:shake)
assert_equal "new Effect.DropOut('dropme',{queue:'end'});", visual_effect(:drop_out, 'dropme', :queue => :end)
end
+
+ def test_parallel_effects
+ actual = parallel_effects(:duration => 2) do
+ visual_effect(:highlight, "posts") +
+ visual_effect(:fade, "fademe", :duration => 4.0)
+ end
+
+ assert_equal "new Effect.Parallel([new Effect.Highlight('posts',{});new Effect.Fade('fademe',{duration:4.0});], {duration:2})", actual
+ end
def test_sortable_element
assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create('mylist', {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize('mylist')})}})\n//]]>\n</script>),

0 comments on commit 96536be

Please sign in to comment.