Permalink
Browse files

Added Element.toggle, Element.show, and Element.hide to the prototype…

… javascript library. Toggle.display has been deprecated, but will still work #992 [Lucas Carlson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1181 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 6acda70 commit c3ca5ab7a80702b63dc77748043f8a72ff1529a5 @dhh dhh committed Apr 17, 2005
@@ -1,5 +1,7 @@
*SVN*
+* Added Element.toggle, Element.show, and Element.hide to the prototype javascript library. Toggle.display has been deprecated, but will still work #992 [Lucas Carlson]
+
* Added that deleting a cookie should not just set it to an empty string but also instantly expire it #1118 [todd@robotcoop.com]
* Added AssetTagHelper#image_path, AssetTagHelper#javascript_path, and AssetTagHelper#stylesheet_path #1110 [Larry Halff]
@@ -95,16 +95,16 @@ def form_remote_tag(options = {})
# Returns a button input tag that will submit form using XMLHttpRequest in tghe background instead of regular
# reloading POST arrangement. <tt>options</tt> argument is the same as in <tt>form_remote_tag</tt>
- def submit_to_remote(name,value,options = {})
- options[:with] = 'Form.serialize(this.form)'
+ def submit_to_remote(name, value, options = {})
+ options[:with] = 'Form.serialize(this.form)'
- options[:html] ||= {}
- options[:html][:type] = 'button'
- options[:html][:onclick] = "#{remote_function(options)}; return false;"
- options[:html][:name] = name
- options[:html][:value] = value
-
- tag("input", options[:html], false)
+ options[:html] ||= {}
+ options[:html][:type] = 'button'
+ options[:html][:onclick] = "#{remote_function(options)}; return false;"
+ options[:html][:name] = name
+ options[:html][:value] = value
+
+ tag("input", options[:html], false)
end
def remote_function(options) #:nodoc: for now
@@ -134,9 +134,7 @@ def remote_function(options) #:nodoc: for now
# create remote <script> links.
def define_javascript_functions
javascript = '<script type="text/javascript">'
- Dir.glob(File.join(JAVASCRIPT_PATH, '*')).each do |filename|
- javascript << "\n" << IO.read(filename)
- end
+ Dir.glob(File.join(JAVASCRIPT_PATH, '*')).each { |filename| javascript << "\n" << IO.read(filename) }
javascript << '</script>'
end
@@ -1,4 +1,4 @@
-/* Prototype: an object-oriented Javascript library, version 1.0.1
+/* Prototype: an object-oriented Javascript library, version 1.1.0
* (c) 2005 Sam Stephenson <sam@conio.net>
*
* Prototype is freely distributable under the terms of an MIT-style license.
@@ -62,14 +62,29 @@ var Try = {
}
}
-var Toggle = {
- display: function() {
+// Deprecated accessor for Element.toggle
+var Toggle = { display: function() { Element.toggle(arguments); } }
+
+var Element = {
+ toggle: function() {
for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]);
element.style.display =
(element.style.display == 'none' ? '' : 'none');
}
}
+ hide: function() {
+ for (var i = 0; i < arguments.length; i++) {
+ var element = $(arguments[i]);
+ element.style.display = 'none';
+ }
+ }
+ show: function() {
+ for (var i = 0; i < arguments.length; i++) {
+ var element = $(arguments[i]);
+ element.style.display = '';
+ }
+ }
}
/*--------------------------------------------------------------------------*/
@@ -1,4 +1,4 @@
-/* Prototype: an object-oriented Javascript library, version 1.0.1
+/* Prototype: an object-oriented Javascript library, version 1.1.0
* (c) 2005 Sam Stephenson <sam@conio.net>
*
* Prototype is freely distributable under the terms of an MIT-style license.
@@ -62,14 +62,29 @@ var Try = {
}
}
-var Toggle = {
- display: function() {
+// Deprecated accessor for Element.toggle
+var Toggle = { display: function() { Element.toggle(arguments); } }
+
+var Element = {
+ toggle: function() {
for (var i = 0; i < arguments.length; i++) {
var element = $(arguments[i]);
element.style.display =
(element.style.display == 'none' ? '' : 'none');
}
}
+ hide: function() {
+ for (var i = 0; i < arguments.length; i++) {
+ var element = $(arguments[i]);
+ element.style.display = 'none';
+ }
+ }
+ show: function() {
+ for (var i = 0; i < arguments.length; i++) {
+ var element = $(arguments[i]);
+ element.style.display = '';
+ }
+ }
}
/*--------------------------------------------------------------------------*/

0 comments on commit c3ca5ab

Please sign in to comment.