mootools-rails 0.4 → 1.0.0

data/Gemfile

@@ -1,4 +1,9 @@
 source :gemcutter
 
-# Specify your gem's dependencies in mootols-rails.gemspec
+# Specify your gem's dependencies in mootools-rails.gemspec
 gemspec
+# Rails is already being pulled in through gemspec
+# gem "rails", :git => "git://github.com/rails/rails.git"
+gem "rack", :git => "git://github.com/rack/rack.git"
+gem "sprockets", :git => "git://github.com/sstephenson/sprockets.git"
+gem "i18n", "0.6.0beta1"

data/Gemfile.lock

@@ -1,7 +1,22 @@
+GIT
+  remote: git://github.com/rack/rack.git
+  revision: a9beb476b27914794743d0677b327d5bafb5e8a3
+  specs:
+    rack (1.2.1)
+
+GIT
+  remote: git://github.com/sstephenson/sprockets.git
+  revision: c4800417792744c11eb1fb888bbe9a3a82859952
+  specs:
+    sprockets (2.0.0.beta.2)
+      hike (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.0)
+
 PATH
   remote: .
   specs:
-    mootools-rails (0.4)
+    mootools-rails (1.0.0)
       railties (~> 3.0)
       thor (~> 0.14)
 
@@ -9,72 +24,77 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
       mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
+      rack-mount (~> 0.6.13)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
     arel (2.0.10)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.5.0)
+    hike (1.0.0)
+    i18n (0.6.0beta1)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
+    mime-types (1.17.2)
+    polyglot (0.3.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.0)
+    rake (0.9.2.2)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  i18n (= 0.6.0beta1)
   mootools-rails!
+  rack!
   rails (~> 3.0)
+  sprockets!

data/README.md

@@ -1,15 +1,19 @@
-# MooTools-rails
+# Mootools-rails
+
+MooTools! For Rails! So great.
+
+Also provided is Sam Ruby's modified assert_select_jquery function for MooTools, which is automatically included for use in tests.
 
 ## Rails 3.1
 
-This gem vendors MooTools 1.3.2 and the latest MooTools UJS adapter for Rails 3.1 and greater. The files will be added to the asset pipeline and available for you to use. These two lines will be added to the file `app/assets/javascripts/application.js` by default:
+This gem vendors MooTools 1.4.1 and the latest MooTools UJS adapter for Rails 3.1 and greater. The files will be added to the asset pipeline and available for you to use. These two lines will be added to the file `app/assets/javascripts/application.js` by default:
 
     //= require mootools
     //= require mootools_ujs
 
 If you wish to use MooTools More as well, you can add this line to `application.js`:
 
-    //= require mootools-more
+    //= require mootools-ui
 
 ### Installation
 
@@ -17,11 +21,11 @@ When you generate a new Rails 3.1 app, pass the `-j mootools` option, like this:
 
     rails new myapp -j mootools
 
-Then run `bundle install`. You're done!
+You're done!
 
 ## Rails 3.0
 
-This gem adds a single generator to Rails 3, mootools:install. Running the generator will remove any Prototype JS files you may happen to have, fetch MooTools and the MooTools UJS driver for Rails, and (optionally) fetch MooTools More.
+This gem adds a single generator to Rails 3, mootools:install. Running the generator will remove any Prototype JS files you may happen to have, fetch MooTools and the MooTools-ujs driver for Rails, and (optionally) fetch MooTools More.
 
 The gem will also hook into the Rails configuration process, removing Prototype and adding MooTools to the javascript files included by the `javascript_include_tag(:defaults)` call. While the plugin downloads minified and un-minified versions of MooTools and MooTools More, only the minified versions are included in :default.
 
@@ -29,7 +33,7 @@ The gem will also hook into the Rails configuration process, removing Prototype
 
 In your Gemfile, add this line:
 
-    gem 'mootools-rails'
+    gem "mootools-rails"
 
 Then, run `bundle install`. To invoke the generator, run:
 

data/Rakefile

@@ -1,2 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+# require "spec/rake/spectask"
+# desc "Run all examples"
+# Spec::Rake::SpecTask.new(:spec) do |t|
+#   t.ruby_opts  = ['-r test/unit']
+#   t.spec_opts = %w[--color]
+# end
+task :default => :spec

data/lib/generators/mootools/install/install_generator.rb

@@ -1,42 +1,56 @@
 require 'rails'
 
-module Mootools
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      @@mootools_version      = "1.3.2"
-      @@mootools_more_version = '1.3.2.1'
-      @@mootools_ujs_version  = "2c1e98715bc0fc74afa3c79e5d125e55450ba74a"
-
-      desc "This generator installs MooTools #{@@mootools_version}, MooTools-ujs, and (optionally) MooTools More #{@@mootools_more_version}"
-      class_option :more, :type => :boolean, :default => false, :desc => "Include MooTools More"
-      source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
-
-      def remove_prototype
-        PROTOTYPE_JS.each do |name|
-          remove_file "public/javascripts/#{name}.js"
+if ::Rails.version < "3.1"
+  module Mootools
+    module Generators
+      class InstallGenerator < ::Rails::Generators::Base
+
+        desc "This generator installs MooTools #{Mootools::Rails::MOOTOOLS_VERSION}, MooTools-ujs, and (optionally) MooTools More #{Mootools::Rails::MOOTOOLS_MORE_VERSION}"
+        class_option :more, :type => :boolean, :default => false, :desc => "Include MooTools More"
+        source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
+
+        def remove_prototype
+          Rails::PROTOTYPE_JS.each do |name|
+            remove_file "public/javascripts/#{name}.js"
+          end
         end
-      end
 
-      def copy_mootools
-        say_status("copying", "MooTools (#{@@mootools_version})", :green)
-        copy_file "mootools.js", "public/javascripts/mootools.js"
-        copy_file "mootools.min.js", "public/javascripts/mootools.min.js"
-      end
+        def copy_mootools
+          say_status("copying", "MooTools (#{Mootools::Rails::MOOTOOLS_VERSION})", :green)
+          copy_file "mootools.js", "public/javascripts/mootools.js"
+          copy_file "mootools.min.js", "public/javascripts/mootools.min.js"
+        end
 
-      def copy_mootools_more
-        if options.more?
-          say_status("copying", "MooTools More (#{@@mootools_more_version})", :green)
-          copy_file "mootools-more.js", "public/javascripts/mootools-more.js"
-          copy_file "mootools-more.min.js", "public/javascripts/mootools-more.min.js"
+        def copy_mootools_more
+          if options.ui?
+            say_status("copying", "MooTools More (#{Mootools::Rails::MOOTOOLS_MORE_VERSION})", :green)
+            copy_file "mootools-more.js", "public/javascripts/mootools-more.js"
+            copy_file "mootools-mootools.min.js", "public/javascripts/mootools-more.min.js"
+          end
+        end
+
+        def copy_ujs_driver
+          say_status("copying", "MooTools UJS adapter (#{Mootools::Rails::MOOTOOLS_UJS_VERSION[0..5]})", :green)
+          remove_file "public/javascripts/rails.js"
+          copy_file "mootools_ujs.js", "public/javascripts/mootools_ujs.js"
         end
-      end
 
-      def copy_ujs_driver
-        say_status("copying", "MooTools UJS adapter (#{@@mootools_ujs_version[0..5]})", :green)
-        remove_file "public/javascripts/rails.js"
-        copy_file "mootools_ujs.js", "public/javascripts/mootools_ujs.js"
       end
+    end
+  end
+else
+  module Mootools
+    module Generators
+      class InstallGenerator < ::Rails::Generators::Base
+        desc "Just show instructions so people will know what to do when mistakenly using generator for Rails 3.1 apps"
 
+        def do_nothing
+          say_status("deprecated", "You are using Rails 3.1, so this generator is no longer needed. The necessary files are already in your asset pipeline.")
+          say_status("", "Just add `//= require mootools` and `//= require mootools_ujs` to your app/assets/javascripts/application.js")
+          say_status("", "If you upgraded your app from Rails 3.0 and still have mootools.js, rails.js, or mootools-more.js in your javascripts, be sure to remove them.")
+          # ok, nothing
+        end
+      end
     end
   end
-end if ::Rails.version < "3.1"
+end

data/lib/mootools-rails.rb

@@ -1,12 +1 @@
-module Mootools
-  PROTOTYPE_JS = %w{prototype effects dragdrop controls}
-
-  module Rails
-    if ::Rails.version < "3.1"
-      require 'mootools-rails/railtie'
-    else
-      require 'mootools-rails/engine'
-    end
-  end
-
-end
+require 'mootools/rails'

data/lib/{mootools-rails/assert_select_mootools.rb → mootools/assert_select.rb}

@@ -20,11 +20,11 @@ module ActionDispatch
       #
       # === Using blocks
       #
-      # Without a block, +assert_select_jquery_ merely asserts that the
+      # Without a block, +assert_select_mootools_ merely asserts that the
       # response contains one or more statements that match the conditions
       # specified above
       #
-      # With a block +assert_select_jquery_ also asserts that the method call
+      # With a block +assert_select_mootools_ also asserts that the method call
       # passes a javascript escaped string containing HTML.  All such HTML
       # fragments are selected and passed to the block.  Nested assertions are
       # supported.
@@ -52,7 +52,7 @@ module ActionDispatch
 
         pattern = "\\.#{mootools_method || '\\w+'}\\("
         pattern = "#{pattern}['\"]#{mootools_opt}['\"],?\\s*" if mootools_opt
-        pattern = "#{pattern}#{PATTERN_HTML}" if block
+        pattern = "#{pattern}#{PATTERN_HTML}"
         pattern = "(?:MooTools|\\$)\\(['\"]#{id}['\"]\\)#{pattern}" if id
 
         fragments = []
@@ -84,6 +84,7 @@ module ActionDispatch
       def unescape_js(js_string)
         # js encodes double quotes and line breaks.
         unescaped= js_string.gsub('\"', '"')
+        unescaped.gsub!('\\\'', "'")
         unescaped.gsub!(/\\\//, '/')
         unescaped.gsub!('\n', "\n")
         unescaped.gsub!('\076', '>')

data/lib/mootools/rails.rb

@@ -0,0 +1,12 @@
+module Mootools
+  module Rails
+    PROTOTYPE_JS = %w{prototype effects dragdrop controls}
+
+    if ::Rails.version < "3.1"
+      require 'mootools/rails/railtie'
+    else
+      require 'mootools/rails/engine'
+    end
+    require 'mootools/rails/version'
+  end
+end

data/lib/{mootools-rails → mootools/rails}/engine.rb

@@ -1,10 +1,10 @@
-# Configure Rails 3.1 to have assert_select_mootools
+# Configure Rails 3.1 to have assert_select_mootools() in tests
 module Mootools
   module Rails
 
     class Engine < ::Rails::Engine
       config.before_configuration do
-        require "mootools-rails/assert_select_mootools" if ::Rails.env.test?
+        require "mootools/assert_select" if ::Rails.env.test?
       end
     end
 

data/lib/{mootools-rails → mootools/rails}/railtie.rb

@@ -4,7 +4,7 @@ module Mootools
 
     class Railtie < ::Rails::Railtie
       config.before_configuration do
-        require "mootools-rails/assert_select_mootools" if ::Rails.env.test?
+        require "mootools/assert_select" if ::Rails.env.test?
 
         if ::Rails.root.join("public/javascripts/mootools-more.min.js").exist?
           jq_defaults = %w(mootools mootools-more)
@@ -13,7 +13,7 @@ module Mootools
           jq_defaults = ::Rails.env.production? ? %w(mootools.min) : %w(mootools)
         end
 
-        # Merge the MooTools scripts, remove the Prototype defaults and finally add 'rails'
+        # Merge the MooTools scripts, remove the Prototype defaults and finally add 'mootools_ujs'
         # at the end, because load order is important
         config.action_view.javascript_expansions[:defaults] -= PROTOTYPE_JS + ['rails']
         config.action_view.javascript_expansions[:defaults] |= jq_defaults

data/lib/mootools/rails/version.rb

@@ -0,0 +1,8 @@
+module Mootools
+  module Rails
+    VERSION = "1.0.0"
+    MOOTOOLS_VERSION = "1.4.1"
+    MOOTOOLS_MORE_VERSION  = "1.4.0.1"
+    MOOTOOLS_UJS_VERSION = "2c1e98715bc0fc74afa3c79e5d125e55450ba74a"
+  end
+end

data/mootools-rails.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/mootools-rails/version', __FILE__)
+require File.expand_path('../lib/mootools/rails/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "mootools-rails"
@@ -22,4 +22,4 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}
   s.require_path = 'lib'
-end
+end

data/spec/lib/mootools-rails_spec.rb

@@ -0,0 +1,3 @@
+require 'spec_helper'
+
+it "should probably test something, but I'm damned if I know what"

data/spec/spec_helper.rb

@@ -0,0 +1,27 @@
+# Set up RSpec
+require 'webmock/rspec'
+
+Spec::Runner.configure do |config|
+  config.include WebMock::API
+end
+
+# Set up generator tests
+require 'rails/all'
+require 'rails/generators'
+require 'rails/generators/test_case'
+
+class TestApp < Rails::Application
+  config.root = File.dirname(__FILE__)
+end
+Rails.application = TestApp
+
+module Rails
+  def self.root
+    @root ||= File.expand_path("../../tmp/rails", __FILE__)
+  end
+end
+Rails.application.config.root = Rails.root
+
+# Call configure to load the settings from
+# Rails.application.config.generators to Rails::Generators
+Rails::Generators.configure!

data/vendor/assets/javascripts/mootools-more.js

@@ -1,6 +1,6 @@
 // MooTools: the javascript framework.
-// Load this file's selection again by visiting: http://mootools.net/more/9cc6f160bc261365539063600b3d6bfe 
-// Or build this file again with packager using: packager build More/More More/Events.Pseudos More/Class.Refactor More/Class.Binds More/Class.Occlude More/Chain.Wait More/Array.Extras More/Date More/Date.Extras More/Number.Format More/Object.Extras More/String.Extras More/String.QueryString More/URI More/URI.Relative More/Hash More/Hash.Extras More/Element.Forms More/Elements.From More/Element.Event.Pseudos More/Element.Event.Pseudos.Keys More/Element.Delegation More/Element.Measure More/Element.Pin More/Element.Position More/Element.Shortcuts More/Form.Request More/Form.Request.Append More/Form.Validator More/Form.Validator.Inline More/Form.Validator.Extras More/OverText More/Fx.Elements More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Scroll More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag More/Drag.Move More/Slider More/Sortables More/Request.JSONP More/Request.Queue More/Request.Periodical More/Assets More/Color More/Group More/Hash.Cookie More/IframeShim More/Table More/HtmlTable More/HtmlTable.Zebra More/HtmlTable.Sort More/HtmlTable.Select More/Keyboard More/Keyboard.Extras More/Mask More/Scroller More/Tips More/Spinner More/Locale More/Locale.Set.From More/Locale.en-US.Date More/Locale.en-US.Form.Validator More/Locale.en-US.Number More/Locale.ar.Date More/Locale.ar.Form.Validator More/Locale.ca-CA.Date More/Locale.ca-CA.Form.Validator More/Locale.cs-CZ.Date More/Locale.cs-CZ.Form.Validator More/Locale.da-DK.Date More/Locale.da-DK.Form.Validator More/Locale.de-CH.Date More/Locale.de-CH.Form.Validator More/Locale.de-DE.Date More/Locale.de-DE.Form.Validator More/Locale.de-DE.Number More/Locale.en-GB.Date More/Locale.es-AR.Date More/Locale.es-AR.Form.Validator More/Locale.es-ES.Date More/Locale.es-ES.Form.Validator More/Locale.et-EE.Date More/Locale.et-EE.Form.Validator More/Locale.EU.Number More/Locale.fa.Date More/Locale.fa.Form.Validator More/Locale.fi-FI.Date More/Locale.fi-FI.Form.Validator More/Locale.fi-FI.Number More/Locale.fr-FR.Date More/Locale.fr-FR.Form.Validator More/Locale.fr-FR.Number More/Locale.he-IL.Date More/Locale.he-IL.Form.Validator More/Locale.he-IL.Number More/Locale.hu-HU.Date More/Locale.hu-HU.Form.Validator More/Locale.it-IT.Date More/Locale.it-IT.Form.Validator More/Locale.ja-JP.Date More/Locale.ja-JP.Form.Validator More/Locale.ja-JP.Number More/Locale.nl-NL.Date More/Locale.nl-NL.Form.Validator More/Locale.nl-NL.Number More/Locale.no-NO.Date More/Locale.no-NO.Form.Validator More/Locale.pl-PL.Date More/Locale.pl-PL.Form.Validator More/Locale.pt-BR.Date More/Locale.pt-BR.Form.Validator More/Locale.pt-PT.Date More/Locale.pt-PT.Form.Validator More/Locale.ru-RU-unicode.Date More/Locale.ru-RU-unicode.Form.Validator More/Locale.si-SI.Date More/Locale.si-SI.Form.Validator More/Locale.sv-SE.Date More/Locale.sv-SE.Form.Validator More/Locale.uk-UA.Date More/Locale.uk-UA.Form.Validator More/Locale.zh-CH.Date More/Locale.zh-CH.Form.Validator
+// Load this file's selection again by visiting: http://mootools.net/more/065f2f092ece4e3b32bb5214464cf926 
+// Or build this file again with packager using: packager build More/More More/Events.Pseudos More/Class.Refactor More/Class.Binds More/Class.Occlude More/Chain.Wait More/Array.Extras More/Date More/Date.Extras More/Number.Format More/Object.Extras More/String.Extras More/String.QueryString More/URI More/URI.Relative More/Hash More/Hash.Extras More/Element.Forms More/Elements.From More/Element.Event.Pseudos More/Element.Event.Pseudos.Keys More/Element.Measure More/Element.Pin More/Element.Position More/Element.Shortcuts More/Form.Request More/Form.Request.Append More/Form.Validator More/Form.Validator.Inline More/Form.Validator.Extras More/OverText More/Fx.Elements More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Scroll More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag More/Drag.Move More/Slider More/Sortables More/Request.JSONP More/Request.Queue More/Request.Periodical More/Assets More/Color More/Group More/Hash.Cookie More/IframeShim More/Table More/HtmlTable More/HtmlTable.Zebra More/HtmlTable.Sort More/HtmlTable.Select More/Keyboard More/Keyboard.Extras More/Mask More/Scroller More/Tips More/Spinner More/Locale More/Locale.Set.From More/Locale.en-US.Date More/Locale.en-US.Form.Validator More/Locale.en-US.Number More/Locale.ar.Date More/Locale.ar.Form.Validator More/Locale.ca-CA.Date More/Locale.ca-CA.Form.Validator More/Locale.cs-CZ.Date More/Locale.cs-CZ.Form.Validator More/Locale.da-DK.Date More/Locale.da-DK.Form.Validator More/Locale.de-CH.Date More/Locale.de-CH.Form.Validator More/Locale.de-DE.Date More/Locale.de-DE.Form.Validator More/Locale.de-DE.Number More/Locale.en-GB.Date More/Locale.es-AR.Date More/Locale.es-AR.Form.Validator More/Locale.es-ES.Date More/Locale.es-ES.Form.Validator More/Locale.et-EE.Date More/Locale.et-EE.Form.Validator More/Locale.EU.Number More/Locale.fa.Date More/Locale.fa.Form.Validator More/Locale.fi-FI.Date More/Locale.fi-FI.Form.Validator More/Locale.fi-FI.Number More/Locale.fr-FR.Date More/Locale.fr-FR.Form.Validator More/Locale.fr-FR.Number More/Locale.he-IL.Date More/Locale.he-IL.Form.Validator More/Locale.he-IL.Number More/Locale.hu-HU.Date More/Locale.hu-HU.Form.Validator More/Locale.it-IT.Date More/Locale.it-IT.Form.Validator More/Locale.ja-JP.Date More/Locale.ja-JP.Form.Validator More/Locale.ja-JP.Number More/Locale.nl-NL.Date More/Locale.nl-NL.Form.Validator More/Locale.nl-NL.Number More/Locale.no-NO.Date More/Locale.no-NO.Form.Validator More/Locale.pl-PL.Date More/Locale.pl-PL.Form.Validator More/Locale.pt-BR.Date More/Locale.pt-BR.Form.Validator More/Locale.pt-PT.Date More/Locale.pt-PT.Form.Validator More/Locale.ru-RU-unicode.Date More/Locale.ru-RU-unicode.Form.Validator More/Locale.si-SI.Date More/Locale.si-SI.Form.Validator More/Locale.sv-SE.Date More/Locale.sv-SE.Form.Validator More/Locale.uk-UA.Date More/Locale.uk-UA.Form.Validator More/Locale.zh-CH.Date More/Locale.zh-CH.Form.Validator
 /*
 ---
 
@@ -31,8 +31,8 @@ provides: [MooTools.More]
 */
 
 MooTools.More = {
-	'version': '1.3.2.1',
-	'build': 'e586bcd2496e9b22acfde32e12f84d49ce09e59d'
+	'version': '1.4.0.1',
+	'build': 'a4244edf2aa97ac8a196fc96082dd35af1abab87'
 };
 
 
@@ -55,22 +55,24 @@ provides: [Events.Pseudos]
 ...
 */
 
+(function(){
+
 Events.Pseudos = function(pseudos, addEvent, removeEvent){
 
-	var storeKey = 'monitorEvents:';
+	var storeKey = '_monitorEvents:';
 
 	var storageOf = function(object){
 		return {
 			store: object.store ? function(key, value){
 				object.store(storeKey + key, value);
 			} : function(key, value){
-				(object.$monitorEvents || (object.$monitorEvents = {}))[key] = value;
+				(object._monitorEvents || (object._monitorEvents = {}))[key] = value;
 			},
 			retrieve: object.retrieve ? function(key, dflt){
 				return object.retrieve(storeKey + key, dflt);
 			} : function(key, dflt){
-				if (!object.$monitorEvents) return dflt;
-				return object.$monitorEvents[key] || dflt;
+				if (!object._monitorEvents) return dflt;
+				return object._monitorEvents[key] || dflt;
 			}
 		};
 	};
@@ -83,24 +85,20 @@ Events.Pseudos = function(pseudos, addEvent, removeEvent){
 			l = parsedPseudos.length,
 			splits = [];
 
-		while (l--) if (pseudos[parsedPseudos[l].key]){
-			splits.push({
+		while (l--){
+			var pseudo = parsedPseudos[l].key,
+				listener = pseudos[pseudo];
+			if (listener != null) splits.push({
 				event: parsed.tag,
 				value: parsedPseudos[l].value,
-				pseudo: parsedPseudos[l].key,
-				original: type
+				pseudo: pseudo,
+				original: type,
+				listener: listener
 			});
 		}
-
 		return splits.length ? splits : null;
 	};
 
-	var mergePseudoOptions = function(split){
-		return Object.merge.apply(this, split.map(function(item){
-			return pseudos[item.pseudo].options || {};
-		}));
-	};
-
 	return {
 
 		addEvent: function(type, fn, internal){
@@ -110,30 +108,24 @@ Events.Pseudos = function(pseudos, addEvent, removeEvent){
 			var storage = storageOf(this),
 				events = storage.retrieve(type, []),
 				eventType = split[0].event,
-				options = mergePseudoOptions(split),
-				stack = fn,
-				eventOptions = options[eventType] || {},
 				args = Array.slice(arguments, 2),
-				self = this,
-				monitor;
-
-			if (eventOptions.args) args.append(Array.from(eventOptions.args));
-			if (eventOptions.base) eventType = eventOptions.base;
-			if (eventOptions.onAdd) eventOptions.onAdd(this);
+				stack = fn,
+				self = this;
 
 			split.each(function(item){
-				var stackFn = stack;
-				stack = function(){
-					(eventOptions.listener || pseudos[item.pseudo].listener).call(self, item, stackFn, arguments, monitor, options);
+				var listener = item.listener,
+					stackFn = stack;
+				if (listener == false) eventType += ':' + item.pseudo + '(' + item.value + ')';
+				else stack = function(){
+					listener.call(self, item, stackFn, arguments, stack);
 				};
 			});
-			monitor = stack.bind(this);
 
-			events.include({event: fn, monitor: monitor});
+			events.include({type: eventType, event: fn, monitor: stack});
 			storage.store(type, events);
 
-			addEvent.apply(this, [type, fn].concat(args));
-			return addEvent.apply(this, [eventType, monitor].concat(args));
+			if (type != eventType) addEvent.apply(this, [type, fn].concat(args));
+			return addEvent.apply(this, [eventType, stack].concat(args));
 		},
 
 		removeEvent: function(type, fn){
@@ -144,18 +136,11 @@ Events.Pseudos = function(pseudos, addEvent, removeEvent){
 				events = storage.retrieve(type);
 			if (!events) return this;
 
-			var eventType = split[0].event,
-				options = mergePseudoOptions(split),
-				eventOptions = options[eventType] || {},
-				args = Array.slice(arguments, 2);
-
-			if (eventOptions.args) args.append(Array.from(eventOptions.args));
-			if (eventOptions.base) eventType = eventOptions.base;
-			if (eventOptions.onRemove) eventOptions.onRemove(this);
+			var args = Array.slice(arguments, 2);
 
 			removeEvent.apply(this, [type, fn].concat(args));
 			events.each(function(monitor, i){
-				if (!fn || monitor.event == fn) removeEvent.apply(this, [eventType, monitor.monitor].concat(args));
+				if (!fn || monitor.event == fn) removeEvent.apply(this, [monitor.type, monitor.monitor].concat(args));
 				delete events[i];
 			}, this);
 
@@ -167,40 +152,32 @@ Events.Pseudos = function(pseudos, addEvent, removeEvent){
 
 };
 
-(function(){
-
 var pseudos = {
 
-	once: {
-		listener: function(split, fn, args, monitor){
-			fn.apply(this, args);
-			this.removeEvent(split.event, monitor)
-				.removeEvent(split.original, fn);
-		}
+	once: function(split, fn, args, monitor){
+		fn.apply(this, args);
+		this.removeEvent(split.event, monitor)
+			.removeEvent(split.original, fn);
 	},
 
-	throttle: {
-		listener: function(split, fn, args){
-			if (!fn._throttled){
-				fn.apply(this, args);
-				fn._throttled = setTimeout(function(){
-					fn._throttled = false;
-				}, split.value || 250);
-			}
+	throttle: function(split, fn, args){
+		if (!fn._throttled){
+			fn.apply(this, args);
+			fn._throttled = setTimeout(function(){
+				fn._throttled = false;
+			}, split.value || 250);
 		}
 	},
 
-	pause: {
-		listener: function(split, fn, args){
-			clearTimeout(fn._pause);
-			fn._pause = fn.delay(split.value || 250, this, args);
-		}
+	pause: function(split, fn, args){
+		clearTimeout(fn._pause);
+		fn._pause = fn.delay(split.value || 250, this, args);
 	}
 
 };
 
 Events.definePseudo = function(key, listener){
-	pseudos[key] = Type.isFunction(listener) ? {listener: listener} : listener;
+	pseudos[key] = listener;
 	return this;
 };
 
@@ -1001,19 +978,19 @@ Date.implement({
 	},
 
 	isValid: function(date){
-		return !isNaN((date || this).valueOf());
+		if (!date) date = this;
+		return typeOf(date) == 'date' && !isNaN(date.valueOf());
 	},
 
-	format: function(f){
+	format: function(format){
 		if (!this.isValid()) return 'invalid date';
-		if (!f) f = '%x %X';
 
-		var formatLower = f.toLowerCase();
-		if (formatters[formatLower]) return formatters[formatLower](this); // it's a formatter!
-		f = formats[formatLower] || f; // replace short-hand with actual format
+		if (!format) format = '%x %X';
+		if (typeof format == 'string') format = formats[format.toLowerCase()] || format;
+		if (typeof format == 'function') return format(this);
 
 		var d = this;
-		return f.replace(/%([a-z%])/gi,
+		return format.replace(/%([a-z%])/gi,
 			function($0, $1){
 				switch ($1){
 					case 'a': return Date.getMsg('days_abbr')[d.get('day')];
@@ -1060,18 +1037,15 @@ Date.implement({
 	strftime: 'format'
 });
 
-var formats = {
-	db: '%Y-%m-%d %H:%M:%S',
-	compact: '%Y%m%dT%H%M%S',
-	'short': '%d %b %H:%M',
-	'long': '%B %d, %Y %H:%M'
-};
-
 // The day and month abbreviations are standardized, so we cannot use simply %a and %b because they will get localized
 var rfcDayAbbr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
 	rfcMonthAbbr = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
-var formatters = {
+var formats = {
+	db: '%Y-%m-%d %H:%M:%S',
+	compact: '%Y%m%dT%H%M%S',
+	'short': '%d %b %H:%M',
+	'long': '%B %d, %Y %H:%M',
 	rfc822: function(date){
 		return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %Z');
 	},
@@ -1091,7 +1065,6 @@ var formatters = {
 	}
 };
 
-
 var parsePatterns = [],
 	nativeParse = Date.parse;
 
@@ -1203,11 +1176,6 @@ Date.extend({
 		return this;
 	},
 
-	defineFormats: function(formats){
-		for (var name in formats) Date.defineFormat(name, formats[name]);
-		return this;
-	},
-
 	
 
 	defineParser: function(pattern){
@@ -1226,6 +1194,8 @@ Date.extend({
 		return this;
 	}
 
+}).extend({
+	defineFormats: Date.defineFormat.overloadSetter()
 });
 
 var regexOf = function(type){
@@ -1621,18 +1591,20 @@ Number.implement({
 		return value;
 	},
 
-	formatCurrency: function(){
+	formatCurrency: function(decimals){
 		var locale = Locale.get('Number.currency') || {};
 		if (locale.scientific == null) locale.scientific = false;
-		if (locale.decimals == null) locale.decimals = 2;
+		locale.decimals = decimals != null ? decimals
+			: (locale.decimals == null ? 2 : locale.decimals);
 
 		return this.format(locale);
 	},
 
-	formatPercentage: function(){
+	formatPercentage: function(decimals){
 		var locale = Locale.get('Number.percentage') || {};
 		if (locale.suffix == null) locale.suffix = '%';
-		if (locale.decimals == null) locale.decimals = 2;
+		locale.decimals = decimals != null ? decimals
+			: (locale.decimals == null ? 2 : locale.decimals);
 
 		return this.format(locale);
 	}
@@ -2473,23 +2445,23 @@ license: MIT-style license
 authors:
   - Arian Stolwijk
 
-requires: [Core/Element.Event, Events.Pseudos]
+requires: [Core/Element.Event, Core/Element.Delegation, Events.Pseudos]
 
-provides: [Element.Event.Pseudos]
+provides: [Element.Event.Pseudos, Element.Delegation]
 
 ...
 */
 
 (function(){
 
-var pseudos = {},
+var pseudos = {relay: false},
 	copyFromEvents = ['once', 'throttle', 'pause'],
 	count = copyFromEvents.length;
 
 while (count--) pseudos[copyFromEvents[count]] = Events.lookupPseudo(copyFromEvents[count]);
 
-Event.definePseudo = function(key, listener){
-	pseudos[key] = Type.isFunction(listener) ? {listener: listener} : listener;
+DOMEvent.definePseudo = function(key, listener){
+	pseudos[key] = listener;
 	return this;
 };
 
@@ -2524,7 +2496,7 @@ var keysStoreKey = '$moo:keys-pressed',
 	keysKeyupStoreKey = '$moo:keys-keyup';
 
 
-Event.definePseudo('keys', function(split, fn, args){
+DOMEvent.definePseudo('keys', function(split, fn, args){
 
 	var event = args[0],
 		keys = [],
@@ -2555,172 +2527,29 @@ Event.definePseudo('keys', function(split, fn, args){
 
 });
 
-Object.append(Event.Keys, {
-	'shift': 16,
-	'control': 17,
-	'alt': 18,
-	'capslock': 20,
-	'pageup': 33,
-	'pagedown': 34,
-	'end': 35,
-	'home': 36,
-	'numlock': 144,
-	'scrolllock': 145,
-	';': 186,
-	'=': 187,
-	',': 188,
-	'-': Browser.firefox ? 109 : 189,
-	'.': 190,
-	'/': 191,
-	'`': 192,
-	'[': 219,
-	'\\': 220,
-	']': 221,
-	"'": 222,
-	'+': 107
-});
-
-})();
-
-
-/*
----
-
-script: Element.Delegation.js
-
-name: Element.Delegation
-
-description: Extends the Element native object to include the delegate method for more efficient event management.
-
-credits:
-  - "Event checking based on the work of Daniel Steigerwald. License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz"
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Daniel Steigerwald
-
-requires: [/MooTools.More, Element.Event.Pseudos]
-
-provides: [Element.Delegation]
-
-...
-*/
-
-(function(){
-
-var eventListenerSupport = !(window.attachEvent && !window.addEventListener),
-	nativeEvents = Element.NativeEvents;
-
-nativeEvents.focusin = 2;
-nativeEvents.focusout = 2;
-
-var check = function(split, target, event){
-	var elementEvent = Element.Events[split.event], condition;
-	if (elementEvent) condition = elementEvent.condition;
-	return Slick.match(target, split.value) && (!condition || condition.call(target, event));
-};
-
-var bubbleUp = function(split, event, fn){
-	for (var target = event.target; target && target != this; target = document.id(target.parentNode)){
-		if (target && check(split, target, event)) return fn.call(target, event, target);
-	}
-};
-
-var formObserver = function(eventName){
-
-	var $delegationKey = '$delegation:';
-
-	return {
-		base: 'focusin',
-
-		onRemove: function(element){
-			element.retrieve($delegationKey + 'forms', []).each(function(el){
-				el.retrieve($delegationKey + 'listeners', []).each(function(listener){
-					el.removeEvent(eventName, listener);
-				});
-				el.eliminate($delegationKey + eventName + 'listeners')
-					.eliminate($delegationKey + eventName + 'originalFn');
-			});
-		},
-
-		listener: function(split, fn, args, monitor, options){
-			var event = args[0],
-				forms = this.retrieve($delegationKey + 'forms', []),
-				target = event.target,
-				form = (target.get('tag') == 'form') ? target : event.target.getParent('form');
-				
-			if (!form) return;
-				
-			var formEvents = form.retrieve($delegationKey + 'originalFn', []),
-				formListeners = form.retrieve($delegationKey + 'listeners', []),
-				self = this;
-
-			forms.include(form);
-			this.store($delegationKey + 'forms', forms);
-
-			if (!formEvents.contains(fn)){
-				var formListener = function(event){
-					bubbleUp.call(self, split, event, fn);
-				};
-				form.addEvent(eventName, formListener);
-
-				formEvents.push(fn);
-				formListeners.push(formListener);
-
-				form.store($delegationKey + eventName + 'originalFn', formEvents)
-					.store($delegationKey + eventName + 'listeners', formListeners);
-			}
-		}
-	};
-};
-
-var inputObserver = function(eventName){
-	return {
-		base: 'focusin',
-		listener: function(split, fn, args){
-			var events = {blur: function(){
-				this.removeEvents(events);
-			}}, self = this;
-			events[eventName] = function(event){
-				bubbleUp.call(self, split, event, fn);
-			};
-			args[0].target.addEvents(events);
-		}
-	};
-};
-
-var eventOptions = {
-	mouseenter: {
-		base: 'mouseover'
-	},
-	mouseleave: {
-		base: 'mouseout'
-	},
-	focus: {
-		base: 'focus' + (eventListenerSupport ? '' : 'in'),
-		args: [true]
-	},
-	blur: {
-		base: eventListenerSupport ? 'blur' : 'focusout',
-		args: [true]
-	}
-};
-
-if (!eventListenerSupport) Object.append(eventOptions, {
-	submit: formObserver('submit'),
-	reset: formObserver('reset'),
-	change: inputObserver('change'),
-	select: inputObserver('select')
-});
-
-Event.definePseudo('relay', {
-	listener: function(split, fn, args){
-		bubbleUp.call(this, split, args[0], fn);
-	},
-	options: eventOptions
-});
+DOMEvent.defineKeys({
+	'16': 'shift',
+	'17': 'control',
+	'18': 'alt',
+	'20': 'capslock',
+	'33': 'pageup',
+	'34': 'pagedown',
+	'35': 'end',
+	'36': 'home',
+	'144': 'numlock',
+	'145': 'scrolllock',
+	'186': ';',
+	'187': '=',
+	'188': ',',
+	'190': '.',
+	'191': '/',
+	'192': '`',
+	'219': '[',
+	'220': '\\',
+	'221': ']',
+	'222': "'",
+	'107': '+'
+}).defineKey(Browser.firefox ? 109 : 189, '-');
 
 })();
 
@@ -3245,7 +3074,7 @@ var local = Element.Position = {
 Element.implement({
 
 	position: function(options){
-		if (options && (options.x != null || options.y != null)) {
+		if (options && (options.x != null || options.y != null)){
 			return (original ? original.apply(this, arguments) : this);
 		}
 		var position = this.setStyle('position', 'absolute').calculatePosition(options);
@@ -4094,7 +3923,7 @@ if (!window.Form) window.Form = {};
 
 	Element.implement('formUpdate', function(update, options){
 		var fq = this.retrieve('form.request');
-		if (!fq) {
+		if (!fq){
 			fq = new Form.Request(this, update, options);
 		} else {
 			if (update) fq.setTarget(update);
@@ -4457,6 +4286,7 @@ provides: [Locale.en-US.Form.Validator]
 Locale.define('en-US', 'FormValidator', {
 
 	required: 'This field is required.',
+	length: 'Please enter {length} characters (you entered {elLength} characters)',
 	minLength: 'Please enter at least {minLength} characters (you entered {length} characters).',
 	maxLength: 'Please enter no more than {maxLength} characters (you entered {length} characters).',
 	integer: 'Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.',
@@ -4846,10 +4676,22 @@ Form.Validator.addAllThese([
 		}
 	}],
 
+	['length', {
+		errorMsg: function(element, props){
+			if (typeOf(props.length) != 'null')
+				return Form.Validator.getMsg('length').substitute({length: props.length, elLength: element.get('value').length});
+			else return '';
+		},
+		test: function(element, props){
+			if (typeOf(props.length) != 'null') return (element.get('value').length == props.length || element.get('value').length == 0);
+			else return true;
+		}
+	}],	
+
 	['minLength', {
 		errorMsg: function(element, props){
 			if (typeOf(props.minLength) != 'null')
-				return Form.Validator.getMsg('minLength').substitute({minLength:props.minLength,length:element.get('value').length });
+				return Form.Validator.getMsg('minLength').substitute({minLength: props.minLength, length: element.get('value').length});
 			else return '';
 		},
 		test: function(element, props){
@@ -4862,7 +4704,7 @@ Form.Validator.addAllThese([
 		errorMsg: function(element, props){
 			//props is {maxLength:10}
 			if (typeOf(props.maxLength) != 'null')
-				return Form.Validator.getMsg('maxLength').substitute({maxLength:props.maxLength,length:element.get('value').length });
+				return Form.Validator.getMsg('maxLength').substitute({maxLength: props.maxLength, length: element.get('value').length});
 			else return '';
 		},
 		test: function(element, props){
@@ -5573,7 +5415,6 @@ var OverText = new Class({
 			change: this.assert
 		});
 		window.addEvent('resize', this.reposition);
-		this.assert(true);
 		this.reposition();
 		return this;
 	},
@@ -7456,12 +7297,12 @@ var Sortables = new Class({
 		if (
 			!this.idle ||
 			event.rightClick ||
-			['button', 'input', 'a'].contains(event.target.get('tag'))
+			['button', 'input', 'a', 'textarea'].contains(event.target.get('tag'))
 		) return;
 
 		this.idle = false;
 		this.element = element;
-		this.opacity = element.get('opacity');
+		this.opacity = element.getStyle('opacity');
 		this.list = element.getParent();
 		this.clone = this.getClone(event, element);
 
@@ -7472,7 +7313,7 @@ var Sortables = new Class({
 			onSnap: function(){
 				event.stop();
 				this.clone.setStyle('visibility', 'visible');
-				this.element.set('opacity', this.options.opacity || 0);
+				this.element.setStyle('opacity', this.options.opacity || 0);
 				this.fireEvent('start', [this.element, this.clone]);
 			}.bind(this),
 			onEnter: this.insert.bind(this),
@@ -7486,7 +7327,7 @@ var Sortables = new Class({
 
 	end: function(){
 		this.drag.detach();
-		this.element.set('opacity', this.opacity);
+		this.element.setStyle('opacity', this.opacity);
 		if (this.effect){
 			var dim = this.element.getStyles('width', 'height'),
 				clone = this.clone,
@@ -7978,23 +7819,23 @@ var Asset = {
 
 		var script = new Element('script', {src: source, type: 'text/javascript'}),
 			doc = properties.document || document,
-			loaded = 0,
-			loadEvent = properties.onload || properties.onLoad;
-
-		var load = loadEvent ? function(){ // make sure we only call the event once
-			if (++loaded == 1) loadEvent.call(this);
-		} : function(){};
+			load = properties.onload || properties.onLoad;
 
 		delete properties.onload;
 		delete properties.onLoad;
 		delete properties.document;
 
-		return script.addEvents({
-			load: load,
-			readystatechange: function(){
-				if (['loaded', 'complete'].contains(this.readyState)) load.call(this);
+		if (load){
+			if (typeof script.onreadystatechange != 'undefined'){
+				script.addEvent('readystatechange', function(){
+					if (['loaded', 'complete'].contains(this.readyState)) load.call(this);
+				});
+			} else {
+				script.addEvent('load', load);
 			}
-		}).set(properties).inject(doc.head);
+		}
+
+		return script.set(properties).inject(doc.head);
 	},
 
 	css: function(source, properties){
@@ -8274,31 +8115,26 @@ this.Group = new Class({
 
 	initialize: function(){
 		this.instances = Array.flatten(arguments);
-		this.events = {};
-		this.checker = {};
 	},
 
 	addEvent: function(type, fn){
-		this.checker[type] = this.checker[type] || {};
-		this.events[type] = this.events[type] || [];
-		if (this.events[type].contains(fn)) return false;
-		else this.events[type].push(fn);
-		this.instances.each(function(instance, i){
-			instance.addEvent(type, this.check.pass([type, instance, i], this));
-		}, this);
-		return this;
-	},
-
-	check: function(type, instance, i){
-		this.checker[type][i] = true;
-		var every = this.instances.every(function(current, j){
-			return this.checker[type][j] || false;
-		}, this);
-		if (!every) return;
-		this.checker[type] = {};
-		this.events[type].each(function(event){
-			event.call(this, this.instances, instance);
-		}, this);
+		var instances = this.instances,
+			len = instances.length,
+			togo = len,
+			args = new Array(len),
+			self = this;
+
+		instances.each(function(instance, i){
+			instance.addEvent(type, function(){
+				if (!args[i]) togo--;
+				args[i] = arguments;
+				if (!togo){
+					fn.call(self, instances, instance, args);
+					togo = len;
+					args = new Array(len);
+				}
+			});
+		});
 	}
 
 });
@@ -8306,7 +8142,6 @@ this.Group = new Class({
 })();
 
 
-
 /*
 ---
 
@@ -8536,30 +8371,43 @@ var HtmlTable = new Class({
 		return this;
 	},
 
-	push: function(row, rowProperties, target, tag, where){
-		if (typeOf(row) == 'element' && row.get('tag') == 'tr'){
-			row.inject(target || this.body, where);
-			return {
-				tr: row,
-				tds: row.getChildren('td')
-			};
-		}
+	update: function(tr, row, tag){
+		var tds = tr.getChildren(tag || 'td'), last = tds.length - 1;
 
-		var tds = row.map(function(data){
-			var td = new Element(tag || 'td', data ? data.properties : {}),
+		row.each(function(data, index){
+			var td = tds[index] || new Element(tag || 'td').inject(tr),
 				content = (data ? data.content : '') || data,
 				type = typeOf(content);
 
-			if (['element', 'array', 'collection', 'elements'].contains(type)) td.adopt(content);
+			if (data && data.properties) td.set(data.properties);
+			if (/(element(s?)|array|collection)/.test(type)) td.empty().adopt(content);
 			else td.set('html', content);
 
-			return td;
+			if (index > last) tds.push(td);
+			else tds[index] = td;
 		});
 
 		return {
-			tr: new Element('tr', rowProperties).inject(target || this.body, where).adopt(tds),
+			tr: tr,
 			tds: tds
 		};
+	},
+
+	push: function(row, rowProperties, target, tag, where){
+		if (typeOf(row) == 'element' && row.get('tag') == 'tr'){
+			row.inject(target || this.body, where);
+			return {
+				tr: row,
+				tds: row.getChildren('td')
+			};
+		}
+		return this.update(new Element('tr', rowProperties).inject(target || this.body, where), row, tag);
+	},
+
+	pushMany: function(rows, rowProperties, target, tag, where){
+		return rows.map(function(row){
+			return this.push(row, rowProperties, target, tag, where);
+		}, this);
 	}
 
 });
@@ -8592,6 +8440,7 @@ authors:
 
 requires:
   - /HtmlTable
+  - /Element.Shortcuts
   - /Class.refactor
 
 provides: [HtmlTable.Zebra]
@@ -8603,7 +8452,8 @@ HtmlTable = Class.refactor(HtmlTable, {
 
 	options: {
 		classZebra: 'table-tr-odd',
-		zebra: true
+		zebra: true,
+		zebraOnlyVisibleRows: true
 	},
 
 	initialize: function(){
@@ -8613,7 +8463,12 @@ HtmlTable = Class.refactor(HtmlTable, {
 	},
 
 	updateZebras: function(){
-		Array.each(this.body.rows, this.zebra, this);
+		var index = 0;
+		Array.each(this.body.rows, function(row){
+			if (!this.options.zebraOnlyVisibleRows || row.isDisplayed()){
+				this.zebra(row, index++);
+			}
+		}, this);
 	},
 
 	setRowStyle: function(row, i){
@@ -8687,9 +8542,8 @@ HtmlTable = Class.refactor(HtmlTable, {
 		this.previous.apply(this, arguments);
 		if (this.occluded) return this.occluded;
 		this.sorted = {index: null, dir: 1};
-		this.bound = {
-			headClick: this.headClick.bind(this)
-		};
+		if (!this.bound) this.bound = {};
+		this.bound.headClick = this.headClick.bind(this);
 		this.sortSpans = new Elements();
 		if (this.options.sortable){
 			this.enableSort();
@@ -8757,17 +8611,17 @@ HtmlTable = Class.refactor(HtmlTable, {
 		return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(), el) % this.body.rows[0].cells.length);
 	},
 
-	serialize: function() {
+	serialize: function(){
 		var previousSerialization = this.previous.apply(this, arguments) || {};
-		if (this.options.sortable) {
+		if (this.options.sortable){
 			previousSerialization.sortIndex = this.sorted.index;
 			previousSerialization.sortReverse = this.sorted.reverse;
 		}
 		return previousSerialization;
 	},
 
-	restore: function(tableState) {
-		if(this.options.sortable && tableState.sortIndex) {
+	restore: function(tableState){
+		if(this.options.sortable && tableState.sortIndex){
 			this.sort(tableState.sortIndex, tableState.sortReverse);
 		}
 		this.previous.apply(this, arguments);
@@ -9378,7 +9232,8 @@ HtmlTable = Class.refactor(HtmlTable, {
 		classSelectable: 'table-selectable',
 		shiftForMultiSelect: true,
 		allowMultiSelect: true,
-		selectable: false
+		selectable: false,
+		selectHiddenRows: false
 	},
 
 	initialize: function(){
@@ -9387,13 +9242,12 @@ HtmlTable = Class.refactor(HtmlTable, {
 
 		this.selectedRows = new Elements();
 
-		this.bound = {
-			mouseleave: this.mouseleave.bind(this),
-			clickRow: this.clickRow.bind(this),
-			activateKeyboard: function() {
-				if (this.keyboard && this.selectEnabled) this.keyboard.activate();
-			}.bind(this)
-		};
+		if (!this.bound) this.bound = {};
+		this.bound.mouseleave = this.mouseleave.bind(this);
+		this.bound.clickRow = this.clickRow.bind(this);
+		this.bound.activateKeyboard = function(){
+			if (this.keyboard && this.selectEnabled) this.keyboard.activate();
+		}.bind(this);
 
 		if (this.options.selectable) this.enableSelect();
 	},
@@ -9423,10 +9277,6 @@ HtmlTable = Class.refactor(HtmlTable, {
 		return ret;
 	},
 
-	isSelected: function(row){
-		return this.selectedRows.contains(row);
-	},
-
 	toggleRow: function(row){
 		return this[(this.isSelected(row) ? 'de' : '') + 'selectRow'](row);
 	},
@@ -9450,23 +9300,31 @@ HtmlTable = Class.refactor(HtmlTable, {
 		return this;
 	},
 
+	isSelected: function(row){
+		return this.selectedRows.contains(row);
+	},
+
+	getSelected: function(){
+		return this.selectedRows;
+	},
+
 	getSelected: function(){
 		return this.selectedRows;
 	},
 
-	serialize: function() {
+	serialize: function(){
 		var previousSerialization = this.previous.apply(this, arguments) || {};
-		if (this.options.selectable) {
-			previousSerialization.selectedRows = this.selectedRows.map(function(row) {
+		if (this.options.selectable){
+			previousSerialization.selectedRows = this.selectedRows.map(function(row){
 				return Array.indexOf(this.body.rows, row);
 			}.bind(this));
 		}
 		return previousSerialization;
 	},
 
-	restore: function(tableState) {
-		if(this.options.selectable && tableState.selectedRows) {
-			tableState.selectedRows.each(function(index) {
+	restore: function(tableState){
+		if(this.options.selectable && tableState.selectedRows){
+			tableState.selectedRows.each(function(index){
 				this.selectRow(this.body.rows[index]);
 			}.bind(this));
 		}
@@ -9508,7 +9366,9 @@ HtmlTable = Class.refactor(HtmlTable, {
 			endRow = tmp;
 		}
 
-		for (var i = startRow; i <= endRow; i++) this[method](rows[i], true);
+		for (var i = startRow; i <= endRow; i++){
+			if (this.options.selectHiddenRows || rows[i].isDisplayed()) this[method](rows[i], true);
+		}
 
 		return this;
 	},
@@ -9552,7 +9412,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 
 	shiftFocus: function(offset, event){
 		if (!this.focused) return this.selectRow(this.body.rows[0], event);
-		var to = this.getRowByOffset(offset);
+		var to = this.getRowByOffset(offset, this.options.selectHiddenRows);
 		if (to === null || this.focused == this.body.rows[to]) return this;
 		this.toggleRow(this.body.rows[to], event);
 	},
@@ -9571,14 +9431,25 @@ HtmlTable = Class.refactor(HtmlTable, {
 		this.rangeStart = row;
 	},
 
-	getRowByOffset: function(offset){
+	getRowByOffset: function(offset, includeHiddenRows){
 		if (!this.focused) return 0;
-		var rows = Array.clone(this.body.rows),
-			index = rows.indexOf(this.focused) + offset;
-
-		if (index < 0) index = null;
-		if (index >= rows.length) index = null;
-
+		var index = Array.indexOf(this.body.rows, this.focused);
+		if ((index == 0 && offset < 0) || (index == this.body.rows.length -1 && offset > 0)) return null;
+		if (includeHiddenRows){
+			index += offset;
+		} else {
+			var limit = 0,
+			    count = 0;
+			if (offset > 0){
+				while (count < offset && index < this.body.rows.length -1){
+					if (this.body.rows[++index].isDisplayed()) count++;
+				}
+			} else {
+				while (count > offset && index > 0){
+					if (this.body.rows[--index].isDisplayed()) count--;
+				}
+			}
+		}
 		return index;
 	},
 
@@ -9598,7 +9469,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 
 		if (this.options.useKeyboard || this.keyboard){
 			if (!this.keyboard) this.keyboard = new Keyboard();
-			if (!this.selectKeysDefined) {
+			if (!this.selectKeysDefined){
 				this.selectKeysDefined = true;
 				var timer, held;
 
@@ -9606,8 +9477,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 					var mover = function(e){
 						clearTimeout(timer);
 						e.preventDefault();
-
-						var to = this.body.rows[this.getRowByOffset(offset)];
+						var to = this.body.rows[this.getRowByOffset(offset, this.options.selectHiddenRows)];
 						if (e.shift && to && this.isSelected(to)){
 							this.deselectRow(this.focused);
 							this.focused = to;
@@ -9634,7 +9504,7 @@ HtmlTable = Class.refactor(HtmlTable, {
 					clearTimeout(timer);
 					held = false;
 				};
-				
+
 				this.keyboard.addEvents({
 					'keydown:shift+up': move(-1),
 					'keydown:shift+down': move(1),
@@ -9823,6 +9693,7 @@ this.Tips = new Class({
 	Implements: [Events, Options],
 
 	options: {/*
+		id: null,
 		onAttach: function(element){},
 		onDetach: function(element){},
 		onBound: function(coords){},*/
@@ -9841,7 +9712,8 @@ this.Tips = new Class({
 		className: 'tip-wrap',
 		offset: {x: 16, y: 16},
 		windowPadding: {x:0, y:0},
-		fixed: false
+		fixed: false,
+		waiAria: true
 	},
 
 	initialize: function(){
@@ -9854,6 +9726,11 @@ this.Tips = new Class({
 		this.setOptions(params.options);
 		if (params.elements) this.attach(params.elements);
 		this.container = new Element('div', {'class': 'tip'});
+
+		if (this.options.id){
+			this.container.set('id', this.options.id);
+			if (this.options.waiAria) this.attachWaiAria();
+		}
 	},
 
 	toElement: function(){
@@ -9875,6 +9752,33 @@ this.Tips = new Class({
 		return this.tip;
 	},
 
+	attachWaiAria: function(){
+		var id = this.options.id;
+		this.container.set('role', 'tooltip');
+
+		if (!this.waiAria){
+			this.waiAria = {
+				show: function(element){
+					if (id) element.set('aria-describedby', id);
+					this.container.set('aria-hidden', 'false');
+				},
+				hide: function(element){
+					if (id) element.erase('aria-describedby');
+					this.container.set('aria-hidden', 'true');
+				}
+			};
+		}
+		this.addEvents(this.waiAria);
+	},
+
+	detachWaiAria: function(){
+		if (this.waiAria){
+			this.container.erase('role');
+			this.container.erase('aria-hidden');
+			this.removeEvents(this.waiAria);
+		}
+	},
+
 	attach: function(elements){
 		$$(elements).each(function(element){
 			var title = read(this.options.title, element),
@@ -11525,6 +11429,7 @@ provides: [Locale.fr-FR.Form.Validator]
 Locale.define('fr-FR', 'FormValidator', {
 
 	required: 'Ce champ est obligatoire.',
+	length: 'Veuillez saisir {length} caract&egrave;re(s) (vous avez saisi {elLength} caract&egrave;re(s)',
 	minLength: 'Veuillez saisir un minimum de {minLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
 	maxLength: 'Veuillez saisir un maximum de {maxLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
 	integer: 'Veuillez saisir un nombre entier dans ce champ. Les nombres d&eacute;cimaux (ex : "1,25") ne sont pas autoris&eacute;s.',
@@ -11918,6 +11823,12 @@ Locale.define('it-IT', 'Date', {
 	hoursAgo: 'circa {delta} ore fa',
 	dayAgo: 'circa 1 giorno fa',
 	daysAgo: 'circa {delta} giorni fa',
+	weekAgo: 'una settimana fa',
+	weeksAgo: '{delta} settimane fa',
+	monthAgo: 'un mese fa',
+	monthsAgo: '{delta} mesi fa',
+	yearAgo: 'un anno fa',
+	yearsAgo: '{delta} anni fa',
 
 	lessThanMinuteUntil: 'tra meno di un minuto',
 	minuteUntil: 'tra circa un minuto',
@@ -11925,7 +11836,13 @@ Locale.define('it-IT', 'Date', {
 	hourUntil: "tra circa un'ora",
 	hoursUntil: 'tra circa {delta} ore',
 	dayUntil: 'tra circa un giorno',
-	daysUntil: 'tra circa {delta} giorni'
+	daysUntil: 'tra circa {delta} giorni',
+	weekUntil: 'tra una settimana',
+	weeksUntil: 'tra {delta} settimane',
+	monthUntil: 'tra un mese',
+	monthsUntil: 'tra {delta} mesi',
+	yearUntil: 'tra un anno',
+	yearsUntil: 'tra {delta} anni'
 
 });
 
@@ -12240,6 +12157,7 @@ provides: [Locale.nl-NL.Form.Validator]
 Locale.define('nl-NL', 'FormValidator', {
 
 	required: 'Dit veld is verplicht.',
+	length: 'Vul precies {length} karakters in (je hebt {elLength} karakters ingevoerd).',
 	minLength: 'Vul minimaal {minLength} karakters in (je hebt {length} karakters ingevoerd).',
 	maxLength: 'Vul niet meer dan {maxLength} karakters in (je hebt {length} karakters ingevoerd).',
 	integer: 'Vul een getal in. Getallen met decimalen (bijvoorbeeld 1.25) zijn niet toegestaan.',