rails 0.14.2 → 0.14.3

data/lib/tasks/databases.rake

@@ -44,7 +44,9 @@ task :db_structure_dump => :environment do
       ENV['PGHOST']     = abcs[RAILS_ENV]["host"] if abcs[RAILS_ENV]["host"]
       ENV['PGPORT']     = abcs[RAILS_ENV]["port"].to_s if abcs[RAILS_ENV]["port"]
       ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"]
-      `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}`
+      search_path = abcs[RAILS_ENV]["schema_search_path"]
+      search_path = "--schema=#{search_path}" if search_path
+      `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}`
     when "sqlite", "sqlite3"
       `#{abcs[RAILS_ENV]["adapter"]} #{abcs[RAILS_ENV]["dbfile"]} .schema > db/#{RAILS_ENV}_structure.sql`
     when "sqlserver"
@@ -53,7 +55,7 @@ task :db_structure_dump => :environment do
     else 
       raise "Task not supported by '#{abcs["test"]["adapter"]}'"
   end
-  
+
   if ActiveRecord::Base.connection.supports_migrations?
     File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
   end
@@ -63,7 +65,7 @@ desc "Recreate the test databases from the development structure"
 task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
   abcs = ActiveRecord::Base.configurations
   case abcs["test"]["adapter"]
-    when  "mysql"
+    when "mysql"
       ActiveRecord::Base.establish_connection(:test)
       ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
       IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
@@ -78,7 +80,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
       `#{abcs["test"]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
     when "sqlserver"
       `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-    when "oci", 
+    when "oci"
       ActiveRecord::Base.establish_connection(:test)
       IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
         ActiveRecord::Base.connection.execute(ddl)
@@ -99,8 +101,9 @@ task :purge_test_database => :environment do
       ENV['PGHOST']     = abcs["test"]["host"] if abcs["test"]["host"]
       ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
       ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
+      enc_option = "-E #{abcs["test"]["encoding"]}" if abcs["test"]["encoding"]
       `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
-      `createdb -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
+      `createdb #{enc_option} -T template0 -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
     when "sqlite","sqlite3"
       File.delete(abcs["test"]["dbfile"]) if File.exist?(abcs["test"]["dbfile"])
     when "sqlserver"

data/lib/tasks/documentation.rake

@@ -7,6 +7,39 @@ Rake::RDocTask.new("appdoc") { |rdoc|
   rdoc.rdoc_files.include('app/**/*.rb')
 }
 
+Plugins = FileList['vendor/plugins/**'].map {|plugin| File.basename(plugin)}
+# Define doc tasks for each plugin
+Plugins.each do |plugin|
+  task :"#{plugin}_plugindoc" => :environment do
+    plugin_base   = "vendor/plugins/#{plugin}"
+    options       = []
+    files         = Rake::FileList.new
+    options << "-o doc/plugins/#{plugin}"
+    options << "--title '#{plugin.titlecase} Plugin Documentation'"
+    options << '--line-numbers --inline-source'
+    options << '-T html'
+
+    files.include("#{plugin_base}/lib/**/*.rb")
+    if File.exists?("#{plugin_base}/README")
+      files.include("#{plugin_base}/README")    
+      options << "--main '#{plugin_base}/README'"
+    end
+    files.include("#{plugin_base}/CHANGELOG") if File.exists?("#{plugin_base}/CHANGELOG")
+
+    options << files.to_s
+
+    sh %(rdoc #{options * ' '})
+  end
+end
+
+desc "Generate documation for all installed plugins"
+task :plugindoc => Plugins.map {|plugin| :"#{plugin}_plugindoc"}
+
+desc "Remove plugin documentation"
+task :clobber_plugindoc do 
+  rm_rf 'doc/plugins' rescue nil
+end
+
 desc "Generate documentation for the Rails framework"
 Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.rdoc_dir = 'doc/api'
@@ -41,4 +74,4 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.rdoc_files.include('vendor/rails/activesupport/README')
   rdoc.rdoc_files.include('vendor/rails/activesupport/CHANGELOG')
   rdoc.rdoc_files.include('vendor/rails/activesupport/lib/active_support/**/*.rb')
-}
+}

data/lib/tasks/framework.rake

@@ -2,32 +2,70 @@ desc "Lock this application to the current gems (by unpacking them into vendor/r
 task :freeze_gems do
   rm_rf   "vendor/rails"
   mkdir_p "vendor/rails"
-  
-  for gem in %w( actionpack activerecord actionmailer activesupport actionwebservice )
-    system "cd vendor/rails; gem unpack #{gem}"
-    FileUtils.mv(Dir.glob("vendor/rails/#{gem}*").first, "vendor/rails/#{gem}")
+
+  deps = %w( actionpack activerecord actionmailer activesupport actionwebservice )
+  if version = ENV['VERSION']
+    puts "Freezing to the gems for Rails #{version}"
+    require 'rubygems'
+    if rails = Gem.cache.search('rails', "= #{version}")
+      rails.dependencies.select { |g| deps.include? g.name }.each do |g|
+        system "cd vendor/rails; gem unpack -v '#{g.version_requirements}' #{g.name}; mv #{g.name}* #{g.name}"
+      end
+      system "cd vendor/rails; gem unpack -v '= #{version}' rails"
+    else
+      puts "No rails gem version #{version} is installed.  Do 'gem list rails' to see which versions you have available."
+      exit
+    end
+  else
+    puts "Freezing to your latest Rails gems"
+    for gem in deps
+      system "cd vendor/rails; gem unpack #{gem}"
+      FileUtils.mv(Dir.glob("vendor/rails/#{gem}*").first, "vendor/rails/#{gem}")
+    end
+    system "cd vendor/rails; gem unpack rails"
   end
-  
-  system "cd vendor/rails; gem unpack rails"
   FileUtils.mv(Dir.glob("vendor/rails/rails*").first, "vendor/rails/railties")
 end
 
-desc "Lock this application to the Edge Rails (by exporting from Subversion)"
+desc "Lock this application to the Edge Rails (by exporting from Subversion).  Defaults to svn HEAD; do 'rake freeze_edge REVISION=1234' to lock to a specific revision."
 task :freeze_edge do
-  $stderr.close
-  svn_available = `svn --version`.size > 0
-  raise "Subversion is not installed" unless svn_available
+  $verbose = false
+  `svn --version` rescue nil
+  unless !$?.nil? && $?.success?
+    $stderr.puts "ERROR: Must have subversion (svn) available in the PATH to lock this application to Edge Rails"
+    exit 1
+  end
 
   rm_rf   "vendor/rails"
   mkdir_p "vendor/rails"
-  
+
+  revision_switch = ENV['REVISION'] ? " -r #{ENV['REVISION']}" : ''
   for framework in %w( railties actionpack activerecord actionmailer activesupport actionwebservice )
     mkdir_p "vendor/rails/#{framework}"
-    system  "svn export http://dev.rubyonrails.org/svn/rails/trunk/#{framework}/lib vendor/rails/#{framework}/lib"
+    system  "svn export http://dev.rubyonrails.org/svn/rails/trunk/#{framework}/lib vendor/rails/#{framework}/lib #{revision_switch}"
   end
 end
 
 desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
 task :unfreeze_rails do
   rm_rf "vendor/rails"
+end
+
+desc "Add new scripts to the application script/ directory"
+task :add_new_scripts do
+  local_base = "script"
+  edge_base  = "#{File.dirname(__FILE__)}/../../bin"
+
+  local = Dir["#{local_base}/**/*"].reject { |path| File.directory?(path) }
+  edge  = Dir["#{edge_base}/**/*"].reject { |path| File.directory?(path) }
+  
+  edge.each do |script|
+    base_name = script[(edge_base.length+1)..-1]
+    next if base_name == "rails"
+    next if local.detect { |path| base_name == path[(local_base.length+1)..-1] }
+    if !File.directory?("#{local_base}/#{File.dirname(base_name)}")
+      mkdir_p "#{local_base}/#{File.dirname(base_name)}"
+    end
+    install script, "#{local_base}/#{base_name}", :mode => 0655
+  end
 end

data/lib/tasks/misc.rake

@@ -1,5 +1,9 @@
 desc "Run all the tests on a fresh test database"
-task :default => [ :test_units, :test_functional ]
+task :default do
+  Rake::Task[:test_units].invoke      rescue got_error = true
+  Rake::Task[:test_functional].invoke rescue got_error = true
+  raise "Test failures" if got_error
+end
 
 task :environment do
   require(File.join(RAILS_ROOT, 'config', 'environment'))

data/lib/tasks/rails.rb

@@ -4,5 +4,5 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["./lib/tasks/**/*.rake"].each { |ext| load ext }
-Dir["./vendor/plugins/*/tasks/**/*.rake"].each { |ext| load ext }
+Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["./vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext }

data/lib/tasks/testing.rake

@@ -34,4 +34,17 @@ Rake::TestTask.new(:test_functional => [ :prepare_test_database ]) do |t|
   t.libs << "test"
   t.pattern = 'test/functional/**/*_test.rb'
   t.verbose = true
-end
+end
+
+desc "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
+Rake::TestTask.new(:test_plugins => :environment) do |t|
+  t.libs << "test"
+  
+  if ENV['PLUGIN']
+    t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
+  else
+    t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
+  end
+
+  t.verbose = true
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.14.2
-date: 2005-10-26 00:00:00 +02:00
+  version: 0.14.3
+date: 2005-11-07 00:00:00 +01:00
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -45,11 +45,13 @@ files:
   - Rakefile
   - README
   - test
+  - bin/about
   - bin/breakpointer
   - bin/console
   - bin/destroy
   - bin/generate
   - bin/performance
+  - bin/plugin
   - bin/process
   - bin/rails
   - bin/runner
@@ -62,6 +64,7 @@ files:
   - configs/apache.conf
   - configs/database.yml
   - configs/empty.log
+  - configs/lighttpd.conf
   - configs/routes.rb
   - doc/README_FOR_APP
   - dispatches/dispatch.fcgi
@@ -85,8 +88,6 @@ files:
   - html/javascripts/dragdrop.js
   - html/javascripts/effects.js
   - html/javascripts/prototype.js
-  - html/javascripts/scriptaculous.js
-  - html/javascripts/slider.js
   - lib/binding_of_caller.rb
   - lib/breakpoint.rb
   - lib/breakpoint_client.rb
@@ -99,21 +100,25 @@ files:
   - lib/initializer.rb
   - lib/rails_generator
   - lib/rails_generator.rb
+  - lib/rails_info.rb
   - lib/rails_version.rb
   - lib/railties_path.rb
   - lib/rubyprof_ext.rb
   - lib/tasks
   - lib/test_help.rb
   - lib/webrick_server.rb
+  - lib/commands/about.rb
   - lib/commands/breakpointer.rb
   - lib/commands/console.rb
   - lib/commands/destroy.rb
   - lib/commands/generate.rb
   - lib/commands/ncgi
   - lib/commands/performance
+  - lib/commands/plugin.rb
   - lib/commands/process
   - lib/commands/runner.rb
   - lib/commands/server.rb
+  - lib/commands/servers
   - lib/commands/update.rb
   - lib/commands/ncgi/listener
   - lib/commands/ncgi/tracker
@@ -122,6 +127,8 @@ files:
   - lib/commands/process/reaper.rb
   - lib/commands/process/spawner.rb
   - lib/commands/process/spinner.rb
+  - lib/commands/servers/lighttpd.rb
+  - lib/commands/servers/webrick.rb
   - lib/rails_generator/base.rb
   - lib/rails_generator/commands.rb
   - lib/rails_generator/generators
@@ -141,6 +148,7 @@ files:
   - lib/rails_generator/generators/components/mailer
   - lib/rails_generator/generators/components/migration
   - lib/rails_generator/generators/components/model
+  - lib/rails_generator/generators/components/plugin
   - lib/rails_generator/generators/components/scaffold
   - lib/rails_generator/generators/components/web_service
   - lib/rails_generator/generators/components/controller/controller_generator.rb
@@ -167,6 +175,17 @@ files:
   - lib/rails_generator/generators/components/model/templates/fixtures.yml
   - lib/rails_generator/generators/components/model/templates/model.rb
   - lib/rails_generator/generators/components/model/templates/unit_test.rb
+  - lib/rails_generator/generators/components/plugin/plugin_generator.rb
+  - lib/rails_generator/generators/components/plugin/templates
+  - lib/rails_generator/generators/components/plugin/USAGE
+  - lib/rails_generator/generators/components/plugin/templates/generator.rb
+  - lib/rails_generator/generators/components/plugin/templates/init.rb
+  - lib/rails_generator/generators/components/plugin/templates/plugin.rb
+  - lib/rails_generator/generators/components/plugin/templates/Rakefile
+  - lib/rails_generator/generators/components/plugin/templates/README
+  - lib/rails_generator/generators/components/plugin/templates/tasks.rake
+  - lib/rails_generator/generators/components/plugin/templates/unit_test.rb
+  - lib/rails_generator/generators/components/plugin/templates/USAGE
   - lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
   - lib/rails_generator/generators/components/scaffold/templates
   - lib/rails_generator/generators/components/scaffold/USAGE
@@ -226,7 +245,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.2.2
+            version: 1.2.3
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -236,7 +255,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.12.2
+            version: 1.13.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -246,7 +265,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.10.2
+            version: 1.11.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer
@@ -256,7 +275,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.1.2
+            version: 1.1.3
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionwebservice
@@ -266,5 +285,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.9.2
+            version: 0.9.3
       version: 

data/html/javascripts/scriptaculous.js

@@ -1,47 +0,0 @@
-// Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// 
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-var Scriptaculous = {
-  Version: '1.5_rc3',
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
-  },
-  load: function() {
-    if((typeof Prototype=='undefined') ||
-      parseFloat(Prototype.Version.split(".")[0] + "." +
-                 Prototype.Version.split(".")[1]) < 1.4)
-      throw("script.aculo.us requires the Prototype JavaScript framework >= 1.4.0");
-    var scriptTags = document.getElementsByTagName("script");
-    for(var i=0;i<scriptTags.length;i++) {
-      if(scriptTags[i].src && scriptTags[i].src.match(/scriptaculous\.js(\?.*)?$/)) {
-        var path = scriptTags[i].src.replace(/scriptaculous\.js(\?.*)?$/,'');
-        this.require(path + 'effects.js');
-        this.require(path + 'dragdrop.js');
-        this.require(path + 'controls.js');
-        this.require(path + 'slider.js');
-        break;
-      }
-    }
-  }
-}
-
-Scriptaculous.load();

data/html/javascripts/slider.js

@@ -1,258 +0,0 @@
-// Copyright (c) 2005 Marty Haught
-// 
-// See scriptaculous.js for full license.
-
-if(!Control) var Control = {};
-Control.Slider = Class.create();
-
-// options:
-//  axis: 'vertical', or 'horizontal' (default)
-//  increment: (default: 1)
-//  step: (default: 1)
-//
-// callbacks:
-//  onChange(value)
-//  onSlide(value)
-Control.Slider.prototype = {
-  initialize: function(handle, track, options) {
-    this.handle  = $(handle);
-    this.track   = $(track);
-
-    this.options = options || {};
-
-    this.axis      = this.options.axis || 'horizontal';
-    this.increment = this.options.increment || 1;
-    this.step      = parseInt(this.options.step) || 1;
-    this.value     = 0;
-
-    var defaultMaximum = Math.round(this.track.offsetWidth / this.increment);
-    if(this.isVertical()) defaultMaximum = Math.round(this.track.offsetHeight / this.increment);   
-    
-    this.maximum = this.options.maximum || defaultMaximum;
-    this.minimum = this.options.minimum || 0;
-
-    // Will be used to align the handle onto the track, if necessary
-    this.alignX = parseInt (this.options.alignX) || 0;
-    this.alignY = parseInt (this.options.alignY) || 0;
-
-    // Zero out the slider position	
-    this.setCurrentLeft(Position.cumulativeOffset(this.track)[0] - Position.cumulativeOffset(this.handle)[0] + this.alignX);
-    this.setCurrentTop(this.trackTop() - Position.cumulativeOffset(this.handle)[1] + this.alignY);
-
-    this.offsetX = 0;
-    this.offsetY = 0;
-
-    this.originalLeft = this.currentLeft();
-    this.originalTop  = this.currentTop();
-    this.originalZ    = parseInt(this.handle.style.zIndex || "0");
-
-    // Prepopulate Slider value
-    this.setSliderValue(parseInt(this.options.sliderValue) || 0);
-
-    this.active   = false;
-    this.dragging = false;
-    this.disabled = false;
-
-    // FIXME: use css
-    this.handleImage    = $(this.options.handleImage) || false; 
-    this.handleDisabled = this.options.handleDisabled || false;
-    this.handleEnabled  = false;
-    if(this.handleImage)
-      this.handleEnabled  = this.handleImage.src || false;
-
-    if(this.options.disabled)
-      this.setDisabled();
-
-    // Value Array
-    this.values = this.options.values || false;  // Add method to validate and sort??
-
-    Element.makePositioned(this.handle); // fix IE
-
-    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
-    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-    this.eventMouseMove = this.update.bindAsEventListener(this);
-    this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-
-    Event.observe(this.handle, "mousedown", this.eventMouseDown);
-    Event.observe(document, "mouseup", this.eventMouseUp);
-    Event.observe(document, "mousemove", this.eventMouseMove);
-    Event.observe(document, "keypress", this.eventKeypress);
-  },
-  dispose: function() {
-    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
-    Event.stopObserving(document, "mouseup", this.eventMouseUp);
-    Event.stopObserving(document, "mousemove", this.eventMouseMove);
-    Event.stopObserving(document, "keypress", this.eventKeypress);
-  },
-  setDisabled: function(){
-    this.disabled = true;
-    if(this.handleDisabled)
-      this.handleImage.src = this.handleDisabled;
-  },
-  setEnabled: function(){
-    this.disabled = false;
-    if(this.handleEnabled)
-      this.handleImage.src = this.handleEnabled;
-  },  
-  currentLeft: function() {
-    return parseInt(this.handle.style.left || '0');
-  },
-  currentTop: function() {
-    return parseInt(this.handle.style.top || '0');
-  },
-  setCurrentLeft: function(left) {
-    this.handle.style.left = left +"px";
-  },
-  setCurrentTop: function(top) {
-    this.handle.style.top = top +"px";
-  },
-  trackLeft: function(){
-    return Position.cumulativeOffset(this.track)[0];
-  },
-  trackTop: function(){
-    return Position.cumulativeOffset(this.track)[1];
-  }, 
-  getNearestValue: function(value){
-    if(this.values){
-      var i = 0;
-      var offset = Math.abs(this.values[0] - value);
-      var newValue = this.values[0];
-
-      for(i=0; i < this.values.length; i++){
-        var currentOffset = Math.abs(this.values[i] - value);
-        if(currentOffset < offset){
-          newValue = this.values[i];
-          offset = currentOffset;
-        }
-      }
-      return newValue;
-    }
-    return value;
-  },
-  setSliderValue:  function(sliderValue){
-    // First check our max and minimum and nearest values
-    sliderValue = this.getNearestValue(sliderValue);	
-    if(sliderValue > this.maximum) sliderValue = this.maximum;
-    if(sliderValue < this.minimum) sliderValue = this.minimum;
-    var offsetDiff = (sliderValue - (this.value||this.minimum)) * this.increment;
-    
-    if(this.isVertical()){
-      this.setCurrentTop(offsetDiff + this.currentTop());
-    } else {
-      this.setCurrentLeft(offsetDiff + this.currentLeft());
-    }
-    this.value = sliderValue;
-    this.updateFinished();
-  },  
-  minimumOffset: function(){
-    return(this.isVertical() ? 
-      this.trackTop() + this.alignY :
-      this.trackLeft() + this.alignX);
-  },
-  maximumOffset: function(){
-    return(this.isVertical() ?
-      this.trackTop() + this.alignY + (this.maximum - this.minimum) * this.increment :
-      this.trackLeft() + this.alignX + (this.maximum - this.minimum) * this.increment);
-  },  
-  isVertical:  function(){
-    return (this.axis == 'vertical');
-  },
-  startDrag: function(event) {
-    if(Event.isLeftClick(event)) {
-      if(!this.disabled){
-        this.active = true;
-        var pointer = [Event.pointerX(event), Event.pointerY(event)];
-        var offsets = Position.cumulativeOffset(this.handle);
-        this.offsetX =  (pointer[0] - offsets[0]);
-        this.offsetY =  (pointer[1] - offsets[1]);
-        this.originalLeft = this.currentLeft();
-        this.originalTop = this.currentTop();
-      }
-      Event.stop(event);
-    }
-  },
-  update: function(event) {
-   if(this.active) {
-      if(!this.dragging) {
-        var style = this.handle.style;
-        this.dragging = true;
-        if(style.position=="") style.position = "relative";
-        style.zIndex = this.options.zindex;
-      }
-      this.draw(event);
-      // fix AppleWebKit rendering
-      if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
-      Event.stop(event);
-   }
-  },
-  draw: function(event) {
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    var offsets = Position.cumulativeOffset(this.handle);
-
-    offsets[0] -= this.currentLeft();
-    offsets[1] -= this.currentTop();
-        
-    // Adjust for the pointer's position on the handle
-    pointer[0] -= this.offsetX;
-    pointer[1] -= this.offsetY;
-    var style = this.handle.style;
-
-    if(this.isVertical()){
-      if(pointer[1] > this.maximumOffset())
-        pointer[1] = this.maximumOffset();
-      if(pointer[1] < this.minimumOffset())
-        pointer[1] =  this.minimumOffset();
-
-    // Increment by values
-    if(this.values){
-      this.value = this.getNearestValue(Math.round((pointer[1] - this.minimumOffset()) / this.increment) + this.minimum);
-      pointer[1] = this.trackTop() + this.alignY + (this.value - this.minimum) * this.increment;
-    } else {
-      this.value = Math.round((pointer[1] - this.minimumOffset()) / this.increment) + this.minimum;
-    }
-    style.top  = pointer[1] - offsets[1] + "px";
-    } else {
-      if(pointer[0] > this.maximumOffset()) pointer[0] = this.maximumOffset();
-      if(pointer[0] < this.minimumOffset())	pointer[0] =  this.minimumOffset();
-      // Increment by values
-      if(this.values){
-        this.value = this.getNearestValue(Math.round((pointer[0] - this.minimumOffset()) / this.increment) + this.minimum);
-        pointer[0] = this.trackLeft() + this.alignX + (this.value - this.minimum) * this.increment;
-      } else {
-        this.value = Math.round((pointer[0] - this.minimumOffset()) / this.increment) + this.minimum;
-      }
-      style.left = (pointer[0] - offsets[0]) + "px";
-    }
-    if(this.options.onSlide) this.options.onSlide(this.value);
-  },
-  endDrag: function(event) {
-    if(this.active && this.dragging) {
-      this.finishDrag(event, true);
-      Event.stop(event);
-    }
-    this.active = false;
-    this.dragging = false;
-  },  
-  finishDrag: function(event, success) {
-    this.active = false;
-    this.dragging = false;
-    this.handle.style.zIndex = this.originalZ;
-    this.originalLeft = this.currentLeft();
-    this.originalTop  = this.currentTop();
-    this.updateFinished();
-  },
-  updateFinished: function() {
-    if(this.options.onChange) this.options.onChange(this.value);
-  },
-  keyPress: function(event) {
-    if(this.active && !this.disabled) {
-      switch(event.keyCode) {
-        case Event.KEY_ESC:
-          this.finishDrag(event, false);
-          Event.stop(event); 
-          break;
-      }
-      if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event);
-    }
-  }
-}