tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r594319 [26/40] - in /tapestry/tapestry5/trunk: ./ tapestry-annotations/ tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/ tapestry-annotations/src/site/ tapestry-component-report/ tapestry-component-report/src/main/java/or...
Date Mon, 12 Nov 2007 22:23:28 GMT
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/scriptaculous.js Mon Nov 12 14:22:31 2007
@@ -24,35 +24,43 @@
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
 var Scriptaculous = {
-  Version: '1.8.0',
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
-  },
-  REQUIRED_PROTOTYPE: '1.6.0',
-  load: function() {
-    function convertVersionString(versionString){
-      var r = versionString.split('.');
-      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
+    Version: '1.8.0',
+    require: function(libraryName)
+    {
+        // inserting via DOM fails in Safari 2.0, so brute force approach
+        document.write('<script type="text/javascript" src="' + libraryName + '"><\/script>');
+    },
+    REQUIRED_PROTOTYPE: '1.6.0',
+    load: function()
+    {
+        function convertVersionString(versionString)
+        {
+            var r = versionString.split('.');
+            return parseInt(r[0]) * 100000 + parseInt(r[1]) * 1000 + parseInt(r[2]);
+        }
+
+        if ((typeof Prototype == 'undefined') ||
+            (typeof Element == 'undefined') ||
+            (typeof Element.Methods == 'undefined') ||
+            (convertVersionString(Prototype.Version) <
+             convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+            throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+                  Scriptaculous.REQUIRED_PROTOTYPE);
+
+        $A(document.getElementsByTagName("script")).findAll(function(s)
+        {
+            return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
+        }).each(function(s)
+        {
+            var path = s.src.replace(/scriptaculous\.js(\?.*)?$/, '');
+            var includes = s.src.match(/\?.*load=([a-z,]*)/);
+            (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+                    function(include)
+                    {
+                        Scriptaculous.require(path + include + '.js')
+                    });
+        });
     }
- 
-    if((typeof Prototype=='undefined') || 
-       (typeof Element == 'undefined') || 
-       (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) < 
-        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
-       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
-        Scriptaculous.REQUIRED_PROTOTYPE);
-    
-    $A(document.getElementsByTagName("script")).findAll( function(s) {
-      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
-    }).each( function(s) {
-      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
-      var includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
-       function(include) { Scriptaculous.require(path+include+'.js') });
-    });
-  }
 }
 
 Scriptaculous.load();

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/slider.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/slider.js?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/slider.js (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/slider.js Mon Nov 12 14:22:31 2007
@@ -14,262 +14,321 @@
 //  onChange(value)
 //  onSlide(value)
 Control.Slider = Class.create({
-  initialize: function(handle, track, options) {
-    var slider = this;
-    
-    if (Object.isArray(handle)) {
-      this.handles = handle.collect( function(e) { return $(e) });
-    } else {
-      this.handles = [$(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.range     = this.options.range || $R(0,1);
-    
-    this.value     = 0; // assure backwards compat
-    this.values    = this.handles.map( function() { return 0 });
-    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
-    this.options.startSpan = $(this.options.startSpan || null);
-    this.options.endSpan   = $(this.options.endSpan || null);
+    initialize: function(handle, track, options)
+    {
+        var slider = this;
+
+        if (Object.isArray(handle))
+        {
+            this.handles = handle.collect(function(e)
+            {
+                return $(e)
+            });
+        }
+        else
+        {
+            this.handles = [$(handle)];
+        }
 
-    this.restricted = this.options.restricted || false;
+        this.track = $(track);
+        this.options = options || { };
 
-    this.maximum   = this.options.maximum || this.range.end;
-    this.minimum   = this.options.minimum || this.range.start;
+        this.axis = this.options.axis || 'horizontal';
+        this.increment = this.options.increment || 1;
+        this.step = parseInt(this.options.step || '1');
+        this.range = this.options.range || $R(0, 1);
+
+        this.value = 0; // assure backwards compat
+        this.values = this.handles.map(function()
+        {
+            return 0
+        });
+        this.spans = this.options.spans ? this.options.spans.map(function(s)
+        {
+            return $(s)
+        }) : false;
+        this.options.startSpan = $(this.options.startSpan || null);
+        this.options.endSpan = $(this.options.endSpan || null);
+
+        this.restricted = this.options.restricted || false;
+
+        this.maximum = this.options.maximum || this.range.end;
+        this.minimum = this.options.minimum || this.range.start;
 
     // 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');
-    
-    this.trackLength = this.maximumOffset() - this.minimumOffset();
-
-    this.handleLength = this.isVertical() ? 
-      (this.handles[0].offsetHeight != 0 ? 
-        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
-      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
-        this.handles[0].style.width.replace(/px$/,""));
-
-    this.active   = false;
-    this.dragging = false;
-    this.disabled = false;
+        this.alignX = parseInt(this.options.alignX || '0');
+        this.alignY = parseInt(this.options.alignY || '0');
+
+        this.trackLength = this.maximumOffset() - this.minimumOffset();
 
-    if (this.options.disabled) this.setDisabled();
+        this.handleLength = this.isVertical() ?
+                            (this.handles[0].offsetHeight != 0 ?
+                             this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/, "")) :
+                            (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
+                             this.handles[0].style.width.replace(/px$/, ""));
+
+        this.active = false;
+        this.dragging = false;
+        this.disabled = false;
+
+        if (this.options.disabled) this.setDisabled();
 
     // Allowed values array
-    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
-    if (this.allowedValues) {
-      this.minimum = this.allowedValues.min();
-      this.maximum = this.allowedValues.max();
-    }
+        this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
+        if (this.allowedValues)
+        {
+            this.minimum = this.allowedValues.min();
+            this.maximum = this.allowedValues.max();
+        }
 
-    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
-    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-    this.eventMouseMove = this.update.bindAsEventListener(this);
+        this.eventMouseDown = this.startDrag.bindAsEventListener(this);
+        this.eventMouseUp = this.endDrag.bindAsEventListener(this);
+        this.eventMouseMove = this.update.bindAsEventListener(this);
 
     // Initialize handles in reverse (make sure first handle is active)
-    this.handles.each( function(h,i) {
-      i = slider.handles.length-1-i;
-      slider.setValue(parseFloat(
-        (Object.isArray(slider.options.sliderValue) ? 
-          slider.options.sliderValue[i] : slider.options.sliderValue) || 
-         slider.range.start), i);
-      h.makePositioned().observe("mousedown", slider.eventMouseDown);
-    });
-    
-    this.track.observe("mousedown", this.eventMouseDown);
-    document.observe("mouseup", this.eventMouseUp);
-    document.observe("mousemove", this.eventMouseMove);
-    
-    this.initialized = true;
-  },
-  dispose: function() {
-    var slider = this;    
-    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
-    Event.stopObserving(document, "mouseup", this.eventMouseUp);
-    Event.stopObserving(document, "mousemove", this.eventMouseMove);
-    this.handles.each( function(h) {
-      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
-    });
-  },
-  setDisabled: function(){
-    this.disabled = true;
-  },
-  setEnabled: function(){
-    this.disabled = false;
-  },  
-  getNearestValue: function(value){
-    if (this.allowedValues){
-      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
-      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
-      
-      var offset = Math.abs(this.allowedValues[0] - value);
-      var newValue = this.allowedValues[0];
-      this.allowedValues.each( function(v) {
-        var currentOffset = Math.abs(v - value);
-        if (currentOffset <= offset){
-          newValue = v;
-          offset = currentOffset;
-        } 
-      });
-      return newValue;
-    }
-    if (value > this.range.end) return this.range.end;
-    if (value < this.range.start) return this.range.start;
-    return value;
-  },
-  setValue: function(sliderValue, handleIdx){
-    if (!this.active) {
-      this.activeHandleIdx = handleIdx || 0;
-      this.activeHandle    = this.handles[this.activeHandleIdx];
-      this.updateStyles();
-    }
-    handleIdx = handleIdx || this.activeHandleIdx || 0;
-    if (this.initialized && this.restricted) {
-      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
-        sliderValue = this.values[handleIdx-1];
-      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
-        sliderValue = this.values[handleIdx+1];
-    }
-    sliderValue = this.getNearestValue(sliderValue);
-    this.values[handleIdx] = sliderValue;
-    this.value = this.values[0]; // assure backwards compat
-    
-    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
-      this.translateToPx(sliderValue);
-    
-    this.drawSpans();
-    if (!this.dragging || !this.event) this.updateFinished();
-  },
-  setValueBy: function(delta, handleIdx) {
-    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
-      handleIdx || this.activeHandleIdx || 0);
-  },
-  translateToPx: function(value) {
-    return Math.round(
-      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
-      (value - this.range.start)) + "px";
-  },
-  translateToValue: function(offset) {
-    return ((offset/(this.trackLength-this.handleLength) * 
-      (this.range.end-this.range.start)) + this.range.start);
-  },
-  getRange: function(range) {
-    var v = this.values.sortBy(Prototype.K); 
-    range = range || 0;
-    return $R(v[range],v[range+1]);
-  },
-  minimumOffset: function(){
-    return(this.isVertical() ? this.alignY : this.alignX);
-  },
-  maximumOffset: function(){
-    return(this.isVertical() ? 
-      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
-        this.track.style.height.replace(/px$/,"")) - this.alignY : 
-      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
-        this.track.style.width.replace(/px$/,"")) - this.alignX);
-  },  
-  isVertical:  function(){
-    return (this.axis == 'vertical');
-  },
-  drawSpans: function() {
-    var slider = this;
-    if (this.spans)
-      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
-    if (this.options.startSpan)
-      this.setSpan(this.options.startSpan,
-        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
-    if (this.options.endSpan)
-      this.setSpan(this.options.endSpan, 
-        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
-  },
-  setSpan: function(span, range) {
-    if (this.isVertical()) {
-      span.style.top = this.translateToPx(range.start);
-      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
-    } else {
-      span.style.left = this.translateToPx(range.start);
-      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
-    }
-  },
-  updateStyles: function() {
-    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
-    Element.addClassName(this.activeHandle, 'selected');
-  },
-  startDrag: function(event) {
-    if (Event.isLeftClick(event)) {
-      if (!this.disabled){
-        this.active = true;
-        
-        var handle = Event.element(event);
-        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
-        var track = handle;
-        if (track==this.track) {
-          var offsets  = Position.cumulativeOffset(this.track); 
-          this.event = event;
-          this.setValue(this.translateToValue( 
-           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
-          ));
-          var offsets  = Position.cumulativeOffset(this.activeHandle);
-          this.offsetX = (pointer[0] - offsets[0]);
-          this.offsetY = (pointer[1] - offsets[1]);
-        } else {
-          // find the handle (prevents issues with Safari)
-          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
-            handle = handle.parentNode;
-            
-          if (this.handles.indexOf(handle)!=-1) {
-            this.activeHandle    = handle;
-            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+        this.handles.each(function(h, i)
+        {
+            i = slider.handles.length - 1 - i;
+            slider.setValue(parseFloat(
+                    (Object.isArray(slider.options.sliderValue) ?
+                     slider.options.sliderValue[i] : slider.options.sliderValue) ||
+                    slider.range.start), i);
+            h.makePositioned().observe("mousedown", slider.eventMouseDown);
+        });
+
+        this.track.observe("mousedown", this.eventMouseDown);
+        document.observe("mouseup", this.eventMouseUp);
+        document.observe("mousemove", this.eventMouseMove);
+
+        this.initialized = true;
+    },
+    dispose: function()
+    {
+        var slider = this;
+        Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
+        Event.stopObserving(document, "mouseup", this.eventMouseUp);
+        Event.stopObserving(document, "mousemove", this.eventMouseMove);
+        this.handles.each(function(h)
+        {
+            Event.stopObserving(h, "mousedown", slider.eventMouseDown);
+        });
+    },
+    setDisabled: function()
+    {
+        this.disabled = true;
+    },
+    setEnabled: function()
+    {
+        this.disabled = false;
+    },
+    getNearestValue: function(value)
+    {
+        if (this.allowedValues)
+        {
+            if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+            if (value <= this.allowedValues.min()) return(this.allowedValues.min());
+
+            var offset = Math.abs(this.allowedValues[0] - value);
+            var newValue = this.allowedValues[0];
+            this.allowedValues.each(function(v)
+            {
+                var currentOffset = Math.abs(v - value);
+                if (currentOffset <= offset)
+                {
+                    newValue = v;
+                    offset = currentOffset;
+                }
+            });
+            return newValue;
+        }
+        if (value > this.range.end) return this.range.end;
+        if (value < this.range.start) return this.range.start;
+        return value;
+    },
+    setValue: function(sliderValue, handleIdx)
+    {
+        if (!this.active)
+        {
+            this.activeHandleIdx = handleIdx || 0;
+            this.activeHandle = this.handles[this.activeHandleIdx];
             this.updateStyles();
-            
-            var offsets  = Position.cumulativeOffset(this.activeHandle);
-            this.offsetX = (pointer[0] - offsets[0]);
-            this.offsetY = (pointer[1] - offsets[1]);
-          }
         }
-      }
-      Event.stop(event);
-    }
-  },
-  update: function(event) {
-   if (this.active) {
-      if (!this.dragging) this.dragging = true;
-      this.draw(event);
-      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-      Event.stop(event);
-   }
-  },
-  draw: function(event) {
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    var offsets = Position.cumulativeOffset(this.track);
-    pointer[0] -= this.offsetX + offsets[0];
-    pointer[1] -= this.offsetY + offsets[1];
-    this.event = event;
-    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
-    if (this.initialized && this.options.onSlide)
-      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
-  },
-  endDrag: function(event) {
-    if (this.active && this.dragging) {
-      this.finishDrag(event, true);
-      Event.stop(event);
+        handleIdx = handleIdx || this.activeHandleIdx || 0;
+        if (this.initialized && this.restricted)
+        {
+            if ((handleIdx > 0) && (sliderValue < this.values[handleIdx - 1]))
+                sliderValue = this.values[handleIdx - 1];
+            if ((handleIdx < (this.handles.length - 1)) && (sliderValue > this.values[handleIdx + 1]))
+                sliderValue = this.values[handleIdx + 1];
+        }
+        sliderValue = this.getNearestValue(sliderValue);
+        this.values[handleIdx] = sliderValue;
+        this.value = this.values[0]; // assure backwards compat
+
+        this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
+        this.translateToPx(sliderValue);
+
+        this.drawSpans();
+        if (!this.dragging || !this.event) this.updateFinished();
+    },
+    setValueBy: function(delta, handleIdx)
+    {
+        this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
+                handleIdx || this.activeHandleIdx || 0);
+    },
+    translateToPx: function(value)
+    {
+        return Math.round(
+                ((this.trackLength - this.handleLength) / (this.range.end - this.range.start)) *
+                (value - this.range.start)) + "px";
+    },
+    translateToValue: function(offset)
+    {
+        return ((offset / (this.trackLength - this.handleLength) *
+                 (this.range.end - this.range.start)) + this.range.start);
+    },
+    getRange: function(range)
+    {
+        var v = this.values.sortBy(Prototype.K);
+        range = range || 0;
+        return $R(v[range], v[range + 1]);
+    },
+    minimumOffset: function()
+    {
+        return(this.isVertical() ? this.alignY : this.alignX);
+    },
+    maximumOffset: function()
+    {
+        return(this.isVertical() ?
+               (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+                this.track.style.height.replace(/px$/, "")) - this.alignY :
+               (this.track.offsetWidth != 0 ? this.track.offsetWidth :
+                this.track.style.width.replace(/px$/, "")) - this.alignX);
+    },
+    isVertical:  function()
+    {
+        return (this.axis == 'vertical');
+    },
+    drawSpans: function()
+    {
+        var slider = this;
+        if (this.spans)
+            $R(0, this.spans.length - 1).each(function(r)
+            {
+                slider.setSpan(slider.spans[r], slider.getRange(r))
+            });
+        if (this.options.startSpan)
+            this.setSpan(this.options.startSpan,
+                    $R(0, this.values.length > 1 ? this.getRange(0).min() : this.value));
+        if (this.options.endSpan)
+            this.setSpan(this.options.endSpan,
+                    $R(this.values.length > 1 ? this.getRange(this.spans.length - 1).max() : this.value, this.maximum));
+    },
+    setSpan: function(span, range)
+    {
+        if (this.isVertical())
+        {
+            span.style.top = this.translateToPx(range.start);
+            span.style.height = this.translateToPx(range.end - range.start + this.range.start);
+        }
+        else
+        {
+            span.style.left = this.translateToPx(range.start);
+            span.style.width = this.translateToPx(range.end - range.start + this.range.start);
+        }
+    },
+    updateStyles: function()
+    {
+        this.handles.each(function(h)
+        {
+            Element.removeClassName(h, 'selected')
+        });
+        Element.addClassName(this.activeHandle, 'selected');
+    },
+    startDrag: function(event)
+    {
+        if (Event.isLeftClick(event))
+        {
+            if (!this.disabled)
+            {
+                this.active = true;
+
+                var handle = Event.element(event);
+                var pointer = [Event.pointerX(event), Event.pointerY(event)];
+                var track = handle;
+                if (track == this.track)
+                {
+                    var offsets = Position.cumulativeOffset(this.track);
+                    this.event = event;
+                    this.setValue(this.translateToValue(
+                            (this.isVertical() ? pointer[1] - offsets[1] : pointer[0] - offsets[0]) - (this.handleLength / 2)
+                            ));
+                    var offsets = Position.cumulativeOffset(this.activeHandle);
+                    this.offsetX = (pointer[0] - offsets[0]);
+                    this.offsetY = (pointer[1] - offsets[1]);
+                }
+                else
+                {
+                    // find the handle (prevents issues with Safari)
+                    while ((this.handles.indexOf(handle) == -1) && handle.parentNode)
+                        handle = handle.parentNode;
+
+                    if (this.handles.indexOf(handle) != -1)
+                    {
+                        this.activeHandle = handle;
+                        this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+                        this.updateStyles();
+
+                        var offsets = Position.cumulativeOffset(this.activeHandle);
+                        this.offsetX = (pointer[0] - offsets[0]);
+                        this.offsetY = (pointer[1] - offsets[1]);
+                    }
+                }
+            }
+            Event.stop(event);
+        }
+    },
+    update: function(event)
+    {
+        if (this.active)
+        {
+            if (!this.dragging) this.dragging = true;
+            this.draw(event);
+            if (Prototype.Browser.WebKit) window.scrollBy(0, 0);
+            Event.stop(event);
+        }
+    },
+    draw: function(event)
+    {
+        var pointer = [Event.pointerX(event), Event.pointerY(event)];
+        var offsets = Position.cumulativeOffset(this.track);
+        pointer[0] -= this.offsetX + offsets[0];
+        pointer[1] -= this.offsetY + offsets[1];
+        this.event = event;
+        this.setValue(this.translateToValue(this.isVertical() ? pointer[1] : pointer[0]));
+        if (this.initialized && this.options.onSlide)
+            this.options.onSlide(this.values.length > 1 ? this.values : this.value, this);
+    },
+    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.updateFinished();
+    },
+    updateFinished: function()
+    {
+        if (this.initialized && this.options.onChange)
+            this.options.onChange(this.values.length > 1 ? this.values : this.value, this);
+        this.event = null;
     }
-    this.active = false;
-    this.dragging = false;
-  },  
-  finishDrag: function(event, success) {
-    this.active = false;
-    this.dragging = false;
-    this.updateFinished();
-  },
-  updateFinished: function() {
-    if (this.initialized && this.options.onChange) 
-      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
-    this.event = null;
-  }
 });

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/sound.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/sound.js?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/sound.js (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/sound.js Mon Nov 12 14:22:31 2007
@@ -8,48 +8,59 @@
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
 Sound = {
-  tracks: {},
-  _enabled: true,
-  template:
-    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
-  enable: function(){
-    Sound._enabled = true;
-  },
-  disable: function(){
-    Sound._enabled = false;
-  },
-  play: function(url){
-    if(!Sound._enabled) return;
-    var options = Object.extend({
-      track: 'global', url: url, replace: false
-    }, arguments[1] || {});
-    
-    if(options.replace && this.tracks[options.track]) {
-      $R(0, this.tracks[options.track].id).each(function(id){
-        var sound = $('sound_'+options.track+'_'+id);
-        sound.Stop && sound.Stop();
-        sound.remove();
-      })
-      this.tracks[options.track] = null;
+    tracks: {},
+    _enabled: true,
+    template:
+            new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
+    enable: function()
+    {
+        Sound._enabled = true;
+    },
+    disable: function()
+    {
+        Sound._enabled = false;
+    },
+    play: function(url)
+    {
+        if (!Sound._enabled) return;
+        var options = Object.extend({
+            track: 'global', url: url, replace: false
+        }, arguments[1] || {});
+
+        if (options.replace && this.tracks[options.track])
+        {
+            $R(0, this.tracks[options.track].id).each(function(id)
+            {
+                var sound = $('sound_' + options.track + '_' + id);
+                sound.Stop && sound.Stop();
+                sound.remove();
+            })
+            this.tracks[options.track] = null;
+        }
+
+        if (!this.tracks[options.track])
+            this.tracks[options.track] = { id: 0 }
+        else
+            this.tracks[options.track].id++;
+
+        options.id = this.tracks[options.track].id;
+        $$('body')[0].insert(
+                Prototype.Browser.IE ? new Element('bgsound', {
+                    id: 'sound_' + options.track + '_' + options.id,
+                    src: options.url, loop: 1, autostart: true
+                }) : Sound.template.evaluate(options));
     }
-      
-    if(!this.tracks[options.track])
-      this.tracks[options.track] = { id: 0 }
-    else
-      this.tracks[options.track].id++;
-      
-    options.id = this.tracks[options.track].id;
-    $$('body')[0].insert( 
-      Prototype.Browser.IE ? new Element('bgsound',{
-        id: 'sound_'+options.track+'_'+options.id,
-        src: options.url, loop: 1, autostart: true
-      }) : Sound.template.evaluate(options));
-  }
 };
 
-if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
-  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
-    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>')
-  else
-    Sound.play = function(){}
+if (Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0)
+{
+    if (navigator.plugins && $A(navigator.plugins).detect(function(p)
+    {
+        return p.name.indexOf('QuickTime') != -1
+    }))
+        Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>')
+    else
+        Sound.play = function()
+        {
+        }
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js Mon Nov 12 14:22:31 2007
@@ -8,63 +8,67 @@
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
 // experimental, Firefox-only
-Event.simulateMouse = function(element, eventName) {
-  var options = Object.extend({
-    pointerX: 0,
-    pointerY: 0,
-    buttons:  0,
-    ctrlKey:  false,
-    altKey:   false,
-    shiftKey: false,
-    metaKey:  false
-  }, arguments[2] || {});
-  var oEvent = document.createEvent("MouseEvents");
-  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
-    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
-  
-  if(this.mark) Element.remove(this.mark);
-  this.mark = document.createElement('div');
-  this.mark.appendChild(document.createTextNode(" "));
-  document.body.appendChild(this.mark);
-  this.mark.style.position = 'absolute';
-  this.mark.style.top = options.pointerY + "px";
-  this.mark.style.left = options.pointerX + "px";
-  this.mark.style.width = "5px";
-  this.mark.style.height = "5px;";
-  this.mark.style.borderTop = "1px solid red;"
-  this.mark.style.borderLeft = "1px solid red;"
-  
-  if(this.step)
-    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
-  
-  $(element).dispatchEvent(oEvent);
+Event.simulateMouse = function(element, eventName)
+{
+    var options = Object.extend({
+        pointerX: 0,
+        pointerY: 0,
+        buttons:  0,
+        ctrlKey:  false,
+        altKey:   false,
+        shiftKey: false,
+        metaKey:  false
+    }, arguments[2] || {});
+    var oEvent = document.createEvent("MouseEvents");
+    oEvent.initMouseEvent(eventName, true, true, document.defaultView,
+            options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY,
+            options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
+
+    if (this.mark) Element.remove(this.mark);
+    this.mark = document.createElement('div');
+    this.mark.appendChild(document.createTextNode(" "));
+    document.body.appendChild(this.mark);
+    this.mark.style.position = 'absolute';
+    this.mark.style.top = options.pointerY + "px";
+    this.mark.style.left = options.pointerX + "px";
+    this.mark.style.width = "5px";
+    this.mark.style.height = "5px;";
+    this.mark.style.borderTop = "1px solid red;"
+    this.mark.style.borderLeft = "1px solid red;"
+
+    if (this.step)
+        alert('[' + new Date().getTime().toString() + '] ' + eventName + '/' + Test.Unit.inspect(options));
+
+    $(element).dispatchEvent(oEvent);
 };
 
 // Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
 // You need to downgrade to 1.0.4 for now to get this working
 // See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
-Event.simulateKey = function(element, eventName) {
-  var options = Object.extend({
-    ctrlKey: false,
-    altKey: false,
-    shiftKey: false,
-    metaKey: false,
-    keyCode: 0,
-    charCode: 0
-  }, arguments[2] || {});
-
-  var oEvent = document.createEvent("KeyEvents");
-  oEvent.initKeyEvent(eventName, true, true, window, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-    options.keyCode, options.charCode );
-  $(element).dispatchEvent(oEvent);
+Event.simulateKey = function(element, eventName)
+{
+    var options = Object.extend({
+        ctrlKey: false,
+        altKey: false,
+        shiftKey: false,
+        metaKey: false,
+        keyCode: 0,
+        charCode: 0
+    }, arguments[2] || {});
+
+    var oEvent = document.createEvent("KeyEvents");
+    oEvent.initKeyEvent(eventName, true, true, window,
+            options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
+            options.keyCode, options.charCode);
+    $(element).dispatchEvent(oEvent);
 };
 
-Event.simulateKeys = function(element, command) {
-  for(var i=0; i<command.length; i++) {
-    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
-  }
+Event.simulateKeys = function(element, command)
+{
+    for (var i = 0; i < command.length; i++)
+    {
+        Event.simulateKey(element, 'keypress', {charCode:command.charCodeAt(i)});
+    }
 };
 
 var Test = {}
@@ -75,494 +79,707 @@
 
 Test.Unit.Logger = Class.create();
 Test.Unit.Logger.prototype = {
-  initialize: function(log) {
-    this.log = $(log);
-    if (this.log) {
-      this._createLogTable();
+    initialize: function(log)
+    {
+        this.log = $(log);
+        if (this.log)
+        {
+            this._createLogTable();
+        }
+    },
+    start: function(testName)
+    {
+        if (!this.log) return;
+        this.testName = testName;
+        this.lastLogLine = document.createElement('tr');
+        this.statusCell = document.createElement('td');
+        this.nameCell = document.createElement('td');
+        this.nameCell.className = "nameCell";
+        this.nameCell.appendChild(document.createTextNode(testName));
+        this.messageCell = document.createElement('td');
+        this.lastLogLine.appendChild(this.statusCell);
+        this.lastLogLine.appendChild(this.nameCell);
+        this.lastLogLine.appendChild(this.messageCell);
+        this.loglines.appendChild(this.lastLogLine);
+    },
+    finish: function(status, summary)
+    {
+        if (!this.log) return;
+        this.lastLogLine.className = status;
+        this.statusCell.innerHTML = status;
+        this.messageCell.innerHTML = this._toHTML(summary);
+        this.addLinksToResults();
+    },
+    message: function(message)
+    {
+        if (!this.log) return;
+        this.messageCell.innerHTML = this._toHTML(message);
+    },
+    summary: function(summary)
+    {
+        if (!this.log) return;
+        this.logsummary.innerHTML = this._toHTML(summary);
+    },
+    _createLogTable: function()
+    {
+        this.log.innerHTML =
+        '<div id="logsummary"></div>' +
+        '<table id="logtable">' +
+        '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
+        '<tbody id="loglines"></tbody>' +
+        '</table>';
+        this.logsummary = $('logsummary')
+        this.loglines = $('loglines');
+    },
+    _toHTML: function(txt)
+    {
+        return txt.escapeHTML().replace(/\n/g, "<br/>");
+    },
+    addLinksToResults: function()
+    {
+        $$("tr.failed .nameCell").each(function(td)
+        { // todo: limit to children of this.log
+            td.title = "Run only this test"
+            Event.observe(td, 'click', function()
+            {
+                window.location.search = "?tests=" + td.innerHTML;
+            });
+        });
+        $$("tr.passed .nameCell").each(function(td)
+        { // todo: limit to children of this.log
+            td.title = "Run all tests"
+            Event.observe(td, 'click', function()
+            {
+                window.location.search = "";
+            });
+        });
     }
-  },
-  start: function(testName) {
-    if (!this.log) return;
-    this.testName = testName;
-    this.lastLogLine = document.createElement('tr');
-    this.statusCell = document.createElement('td');
-    this.nameCell = document.createElement('td');
-    this.nameCell.className = "nameCell";
-    this.nameCell.appendChild(document.createTextNode(testName));
-    this.messageCell = document.createElement('td');
-    this.lastLogLine.appendChild(this.statusCell);
-    this.lastLogLine.appendChild(this.nameCell);
-    this.lastLogLine.appendChild(this.messageCell);
-    this.loglines.appendChild(this.lastLogLine);
-  },
-  finish: function(status, summary) {
-    if (!this.log) return;
-    this.lastLogLine.className = status;
-    this.statusCell.innerHTML = status;
-    this.messageCell.innerHTML = this._toHTML(summary);
-    this.addLinksToResults();
-  },
-  message: function(message) {
-    if (!this.log) return;
-    this.messageCell.innerHTML = this._toHTML(message);
-  },
-  summary: function(summary) {
-    if (!this.log) return;
-    this.logsummary.innerHTML = this._toHTML(summary);
-  },
-  _createLogTable: function() {
-    this.log.innerHTML =
-    '<div id="logsummary"></div>' +
-    '<table id="logtable">' +
-    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
-    '<tbody id="loglines"></tbody>' +
-    '</table>';
-    this.logsummary = $('logsummary')
-    this.loglines = $('loglines');
-  },
-  _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"<br/>");
-  },
-  addLinksToResults: function(){ 
-    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
-      td.title = "Run only this test"
-      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
-    });
-    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
-      td.title = "Run all tests"
-      Event.observe(td, 'click', function(){ window.location.search = "";});
-    });
-  }
 }
 
 Test.Unit.Runner = Class.create();
 Test.Unit.Runner.prototype = {
-  initialize: function(testcases) {
-    this.options = Object.extend({
-      testLog: 'testlog'
-    }, arguments[1] || {});
-    this.options.resultsURL = this.parseResultsURLQueryParameter();
-    this.options.tests      = this.parseTestsQueryParameter();
-    if (this.options.testLog) {
-      this.options.testLog = $(this.options.testLog) || null;
-    }
-    if(this.options.tests) {
-      this.tests = [];
-      for(var i = 0; i < this.options.tests.length; i++) {
-        if(/^test/.test(this.options.tests[i])) {
-          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
-        }
-      }
-    } else {
-      if (this.options.test) {
-        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
-      } else {
-        this.tests = [];
-        for(var testcase in testcases) {
-          if(/^test/.test(testcase)) {
-            this.tests.push(
-               new Test.Unit.Testcase(
-                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
-                 testcases[testcase], testcases["setup"], testcases["teardown"]
-               ));
-          }
+    initialize: function(testcases)
+    {
+        this.options = Object.extend({
+            testLog: 'testlog'
+        }, arguments[1] || {});
+        this.options.resultsURL = this.parseResultsURLQueryParameter();
+        this.options.tests = this.parseTestsQueryParameter();
+        if (this.options.testLog)
+        {
+            this.options.testLog = $(this.options.testLog) || null;
         }
-      }
-    }
-    this.currentTest = 0;
-    this.logger = new Test.Unit.Logger(this.options.testLog);
-    setTimeout(this.runTests.bind(this), 1000);
-  },
-  parseResultsURLQueryParameter: function() {
-    return window.location.search.parseQuery()["resultsURL"];
-  },
-  parseTestsQueryParameter: function(){
-    if (window.location.search.parseQuery()["tests"]){
-        return window.location.search.parseQuery()["tests"].split(',');
-    };
-  },
-  // Returns:
-  //  "ERROR" if there was an error,
-  //  "FAILURE" if there was a failure, or
-  //  "SUCCESS" if there was neither
-  getResult: function() {
-    var hasFailure = false;
-    for(var i=0;i<this.tests.length;i++) {
-      if (this.tests[i].errors > 0) {
-        return "ERROR";
-      }
-      if (this.tests[i].failures > 0) {
-        hasFailure = true;
-      }
-    }
-    if (hasFailure) {
-      return "FAILURE";
-    } else {
-      return "SUCCESS";
-    }
-  },
-  postResults: function() {
-    if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
-        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
-    }
-  },
-  runTests: function() {
-    var test = this.tests[this.currentTest];
-    if (!test) {
-      // finished!
-      this.postResults();
-      this.logger.summary(this.summary());
-      return;
-    }
-    if(!test.isWaiting) {
-      this.logger.start(test.name);
-    }
-    test.run();
-    if(test.isWaiting) {
-      this.logger.message("Waiting for " + test.timeToWait + "ms");
-      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
-    } else {
-      this.logger.finish(test.status(), test.summary());
-      this.currentTest++;
+        if (this.options.tests)
+        {
+            this.tests = [];
+            for (var i = 0; i < this.options.tests.length; i++)
+            {
+                if (/^test/.test(this.options.tests[i]))
+                {
+                    this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
+                }
+            }
+        }
+        else
+        {
+            if (this.options.test)
+            {
+                this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
+            }
+            else
+            {
+                this.tests = [];
+                for (var testcase in testcases)
+                {
+                    if (/^test/.test(testcase))
+                    {
+                        this.tests.push(
+                                new Test.Unit.Testcase(
+                                        this.options.context ? ' -> ' + this.options.titles[testcase] : testcase,
+                                        testcases[testcase], testcases["setup"], testcases["teardown"]
+                                        ));
+                    }
+                }
+            }
+        }
+        this.currentTest = 0;
+        this.logger = new Test.Unit.Logger(this.options.testLog);
+        setTimeout(this.runTests.bind(this), 1000);
+    },
+    parseResultsURLQueryParameter: function()
+    {
+        return window.location.search.parseQuery()["resultsURL"];
+    },
+    parseTestsQueryParameter: function()
+    {
+        if (window.location.search.parseQuery()["tests"])
+        {
+            return window.location.search.parseQuery()["tests"].split(',');
+        }
+        ;
+    },
+// Returns:
+//  "ERROR" if there was an error,
+//  "FAILURE" if there was a failure, or
+//  "SUCCESS" if there was neither
+    getResult: function()
+    {
+        var hasFailure = false;
+        for (var i = 0; i < this.tests.length; i++)
+        {
+            if (this.tests[i].errors > 0)
+            {
+                return "ERROR";
+            }
+            if (this.tests[i].failures > 0)
+            {
+                hasFailure = true;
+            }
+        }
+        if (hasFailure)
+        {
+            return "FAILURE";
+        }
+        else
+        {
+            return "SUCCESS";
+        }
+    },
+    postResults: function()
+    {
+        if (this.options.resultsURL)
+        {
+            new Ajax.Request(this.options.resultsURL,
+            { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
+        }
+    },
+    runTests: function()
+    {
+        var test = this.tests[this.currentTest];
+        if (!test)
+        {
+            // finished!
+            this.postResults();
+            this.logger.summary(this.summary());
+            return;
+        }
+        if (!test.isWaiting)
+        {
+            this.logger.start(test.name);
+        }
+        test.run();
+        if (test.isWaiting)
+        {
+            this.logger.message("Waiting for " + test.timeToWait + "ms");
+            setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
+        }
+        else
+        {
+            this.logger.finish(test.status(), test.summary());
+            this.currentTest++;
       // tail recursive, hopefully the browser will skip the stackframe
-      this.runTests();
-    }
-  },
-  summary: function() {
-    var assertions = 0;
-    var failures = 0;
-    var errors = 0;
-    var messages = [];
-    for(var i=0;i<this.tests.length;i++) {
-      assertions +=   this.tests[i].assertions;
-      failures   +=   this.tests[i].failures;
-      errors     +=   this.tests[i].errors;
+            this.runTests();
+        }
+    },
+    summary: function()
+    {
+        var assertions = 0;
+        var failures = 0;
+        var errors = 0;
+        var messages = [];
+        for (var i = 0; i < this.tests.length; i++)
+        {
+            assertions += this.tests[i].assertions;
+            failures += this.tests[i].failures;
+            errors += this.tests[i].errors;
+        }
+        return (
+                (this.options.context ? this.options.context + ': ' : '') +
+                this.tests.length + " tests, " +
+                assertions + " assertions, " +
+                failures + " failures, " +
+                errors + " errors");
     }
-    return (
-      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
-      failures   + " failures, " +
-      errors     + " errors");
-  }
 }
 
 Test.Unit.Assertions = Class.create();
 Test.Unit.Assertions.prototype = {
-  initialize: function() {
-    this.assertions = 0;
-    this.failures   = 0;
-    this.errors     = 0;
-    this.messages   = [];
-  },
-  summary: function() {
-    return (
-      this.assertions + " assertions, " + 
-      this.failures   + " failures, " +
-      this.errors     + " errors" + "\n" +
-      this.messages.join("\n"));
-  },
-  pass: function() {
-    this.assertions++;
-  },
-  fail: function(message) {
-    this.failures++;
-    this.messages.push("Failure: " + message);
-  },
-  info: function(message) {
-    this.messages.push("Info: " + message);
-  },
-  error: function(error) {
-    this.errors++;
-    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
-  },
-  status: function() {
-    if (this.failures > 0) return 'failed';
-    if (this.errors > 0) return 'error';
-    return 'passed';
-  },
-  assert: function(expression) {
-    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
-    try { expression ? this.pass() : 
-      this.fail(message); }
-    catch(e) { this.error(e); }
-  },
-  assertEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEqual";
-    try { (expected == actual) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInspect: function(expected, actual) {
-    var message = arguments[2] || "assertInspect";
-    try { (expected == actual.inspect()) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertEnumEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEnumEqual";
-    try { $A(expected).length == $A(actual).length && 
-      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
-          ', actual ' + Test.Unit.inspect(actual)); }
-    catch(e) { this.error(e); }
-  },
-  assertNotEqual: function(expected, actual) {
-    var message = arguments[2] || "assertNotEqual";
-    try { (expected != actual) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertIdentical"; 
-    try { (expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNotIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertNotIdentical"; 
-    try { !(expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNull: function(obj) {
-    var message = arguments[1] || 'assertNull'
-    try { (obj==null) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertMatch: function(expected, actual) {
-    var message = arguments[2] || 'assertMatch';
-    var regex = new RegExp(expected);
-    try { (regex.exec(actual)) ? this.pass() :
-      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertHidden: function(element) {
-    var message = arguments[1] || 'assertHidden';
-    this.assertEqual("none", element.style.display, message);
-  },
-  assertNotNull: function(object) {
-    var message = arguments[1] || 'assertNotNull';
-    this.assert(object != null, message);
-  },
-  assertType: function(expected, actual) {
-    var message = arguments[2] || 'assertType';
-    try { 
-      (actual.constructor == expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertNotOfType: function(expected, actual) {
-    var message = arguments[2] || 'assertNotOfType';
-    try { 
-      (actual.constructor != expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertInstanceOf';
-    try { 
-      (actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was not an instance of the expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertNotInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertNotInstanceOf';
-    try { 
-      !(actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertRespondsTo: function(method, obj) {
-    var message = arguments[2] || 'assertRespondsTo';
-    try {
-      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
-      this.fail(message + ": object doesn't respond to [" + method + "]"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsTrue: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsTrue';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      m() ? this.pass() : 
-      this.fail(message + ": method returned false"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsFalse: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsFalse';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      !m() ? this.pass() : 
-      this.fail(message + ": method returned true"); }
-    catch(e) { this.error(e); }
-  },
-  assertRaise: function(exceptionName, method) {
-    var message = arguments[2] || 'assertRaise';
-    try { 
-      method();
-      this.fail(message + ": exception expected but none was raised"); }
-    catch(e) {
-      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
-    }
-  },
-  assertElementsMatch: function() {
-    var expressions = $A(arguments), elements = $A(expressions.shift());
-    if (elements.length != expressions.length) {
-      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
-      return false;
+    initialize: function()
+    {
+        this.assertions = 0;
+        this.failures = 0;
+        this.errors = 0;
+        this.messages = [];
+    },
+    summary: function()
+    {
+        return (
+                this.assertions + " assertions, " +
+                this.failures + " failures, " +
+                this.errors + " errors" + "\n" +
+                this.messages.join("\n"));
+    },
+    pass: function()
+    {
+        this.assertions++;
+    },
+    fail: function(message)
+    {
+        this.failures++;
+        this.messages.push("Failure: " + message);
+    },
+    info: function(message)
+    {
+        this.messages.push("Info: " + message);
+    },
+    error: function(error)
+    {
+        this.errors++;
+        this.messages.push(error.name + ": " + error.message + "(" + Test.Unit.inspect(error) + ")");
+    },
+    status: function()
+    {
+        if (this.failures > 0) return 'failed';
+        if (this.errors > 0) return 'error';
+        return 'passed';
+    },
+    assert: function(expression)
+    {
+        var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
+        try
+        {
+            expression ? this.pass() :
+            this.fail(message);
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertEqual: function(expected, actual)
+    {
+        var message = arguments[2] || "assertEqual";
+        try
+        {
+            (expected == actual) ? this.pass() :
+            this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+                      '", actual "' + Test.Unit.inspect(actual) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertInspect: function(expected, actual)
+    {
+        var message = arguments[2] || "assertInspect";
+        try
+        {
+            (expected == actual.inspect()) ? this.pass() :
+            this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+                      '", actual "' + Test.Unit.inspect(actual) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertEnumEqual: function(expected, actual)
+    {
+        var message = arguments[2] || "assertEnumEqual";
+        try
+        {
+            $A(expected).length == $A(actual).length &&
+            expected.zip(actual).all(function(pair)
+            {
+                return pair[0] == pair[1]
+            }) ?
+            this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) +
+                                    ', actual ' + Test.Unit.inspect(actual));
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertNotEqual: function(expected, actual)
+    {
+        var message = arguments[2] || "assertNotEqual";
+        try
+        {
+            (expected != actual) ? this.pass() :
+            this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertIdentical: function(expected, actual)
+    {
+        var message = arguments[2] || "assertIdentical";
+        try
+        {
+            (expected === actual) ? this.pass() :
+            this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+                      '", actual "' + Test.Unit.inspect(actual) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertNotIdentical: function(expected, actual)
+    {
+        var message = arguments[2] || "assertNotIdentical";
+        try
+        {
+            !(expected === actual) ? this.pass() :
+            this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+                      '", actual "' + Test.Unit.inspect(actual) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertNull: function(obj)
+    {
+        var message = arguments[1] || 'assertNull'
+        try
+        {
+            (obj == null) ? this.pass() :
+            this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertMatch: function(expected, actual)
+    {
+        var message = arguments[2] || 'assertMatch';
+        var regex = new RegExp(expected);
+        try
+        {
+            (regex.exec(actual)) ? this.pass() :
+            this.fail(message + ' : regex: "' + Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertHidden: function(element)
+    {
+        var message = arguments[1] || 'assertHidden';
+        this.assertEqual("none", element.style.display, message);
+    },
+    assertNotNull: function(object)
+    {
+        var message = arguments[1] || 'assertNotNull';
+        this.assert(object != null, message);
+    },
+    assertType: function(expected, actual)
+    {
+        var message = arguments[2] || 'assertType';
+        try
+        {
+            (actual.constructor == expected) ? this.pass() :
+            this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+                      '", actual "' + (actual.constructor) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertNotOfType: function(expected, actual)
+    {
+        var message = arguments[2] || 'assertNotOfType';
+        try
+        {
+            (actual.constructor != expected) ? this.pass() :
+            this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+                      '", actual "' + (actual.constructor) + '"');
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertInstanceOf: function(expected, actual)
+    {
+        var message = arguments[2] || 'assertInstanceOf';
+        try
+        {
+            (actual instanceof expected) ? this.pass() :
+            this.fail(message + ": object was not an instance of the expected type");
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertNotInstanceOf: function(expected, actual)
+    {
+        var message = arguments[2] || 'assertNotInstanceOf';
+        try
+        {
+            !(actual instanceof expected) ? this.pass() :
+            this.fail(message + ": object was an instance of the not expected type");
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertRespondsTo: function(method, obj)
+    {
+        var message = arguments[2] || 'assertRespondsTo';
+        try
+        {
+            (obj[method] && typeof obj[method] == 'function') ? this.pass() :
+            this.fail(message + ": object doesn't respond to [" + method + "]");
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertReturnsTrue: function(method, obj)
+    {
+        var message = arguments[2] || 'assertReturnsTrue';
+        try
+        {
+            var m = obj[method];
+            if (!m) m = obj['is' + method.charAt(0).toUpperCase() + method.slice(1)];
+            m() ? this.pass() :
+            this.fail(message + ": method returned false");
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertReturnsFalse: function(method, obj)
+    {
+        var message = arguments[2] || 'assertReturnsFalse';
+        try
+        {
+            var m = obj[method];
+            if (!m) m = obj['is' + method.charAt(0).toUpperCase() + method.slice(1)];
+            !m() ? this.pass() :
+            this.fail(message + ": method returned true");
+        }
+        catch(e)
+        {
+            this.error(e);
+        }
+    },
+    assertRaise: function(exceptionName, method)
+    {
+        var message = arguments[2] || 'assertRaise';
+        try
+        {
+            method();
+            this.fail(message + ": exception expected but none was raised");
+        }
+        catch(e)
+        {
+            ((exceptionName == null) || (e.name == exceptionName)) ? this.pass() : this.error(e);
+        }
+    },
+    assertElementsMatch: function()
+    {
+        var expressions = $A(arguments), elements = $A(expressions.shift());
+        if (elements.length != expressions.length)
+        {
+            this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
+            return false;
+        }
+        elements.zip(expressions).all(function(pair, index)
+        {
+            var element = $(pair.first()), expression = pair.last();
+            if (element.match(expression)) return true;
+            this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
+        }.bind(this)) && this.pass();
+    },
+    assertElementMatches: function(element, expression)
+    {
+        this.assertElementsMatch([element], expression);
+    },
+    benchmark: function(operation, iterations)
+    {
+        var startAt = new Date();
+        (iterations || 1).times(operation);
+        var timeTaken = ((new Date()) - startAt);
+        this.info((arguments[2] || 'Operation') + ' finished ' +
+                  iterations + ' iterations in ' + (timeTaken / 1000) + 's');
+        return timeTaken;
+    },
+    _isVisible: function(element)
+    {
+        element = $(element);
+        if (!element.parentNode) return true;
+        this.assertNotNull(element);
+        if (element.style && Element.getStyle(element, 'display') == 'none')
+            return false;
+
+        return this._isVisible(element.parentNode);
+    },
+    assertNotVisible: function(element)
+    {
+        this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
+    },
+    assertVisible: function(element)
+    {
+        this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
+    },
+    benchmark: function(operation, iterations)
+    {
+        var startAt = new Date();
+        (iterations || 1).times(operation);
+        var timeTaken = ((new Date()) - startAt);
+        this.info((arguments[2] || 'Operation') + ' finished ' +
+                  iterations + ' iterations in ' + (timeTaken / 1000) + 's');
+        return timeTaken;
     }
-    elements.zip(expressions).all(function(pair, index) {
-      var element = $(pair.first()), expression = pair.last();
-      if (element.match(expression)) return true;
-      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
-    }.bind(this)) && this.pass();
-  },
-  assertElementMatches: function(element, expression) {
-    this.assertElementsMatch([element], expression);
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  },
-  _isVisible: function(element) {
-    element = $(element);
-    if(!element.parentNode) return true;
-    this.assertNotNull(element);
-    if(element.style && Element.getStyle(element, 'display') == 'none')
-      return false;
-    
-    return this._isVisible(element.parentNode);
-  },
-  assertNotVisible: function(element) {
-    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
-  },
-  assertVisible: function(element) {
-    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  }
 }
 
 Test.Unit.Testcase = Class.create();
 Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
-  initialize: function(name, test, setup, teardown) {
-    Test.Unit.Assertions.prototype.initialize.bind(this)();
-    this.name           = name;
-    
-    if(typeof test == 'string') {
-      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
-      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
-      this.test = function() {
-        eval('with(this){'+test+'}');
-      }
-    } else {
-      this.test = test || function() {};
-    }
-    
-    this.setup          = setup || function() {};
-    this.teardown       = teardown || function() {};
-    this.isWaiting      = false;
-    this.timeToWait     = 1000;
-  },
-  wait: function(time, nextPart) {
-    this.isWaiting = true;
-    this.test = nextPart;
-    this.timeToWait = time;
-  },
-  run: function() {
-    try {
-      try {
-        if (!this.isWaiting) this.setup.bind(this)();
+    initialize: function(name, test, setup, teardown)
+    {
+        Test.Unit.Assertions.prototype.initialize.bind(this)();
+        this.name = name;
+
+        if (typeof test == 'string')
+        {
+            test = test.gsub(/(\.should[^\(]+\()/, '#{0}this,');
+            test = test.gsub(/(\.should[^\(]+)\(this,\)/, '#{1}(this)');
+            this.test = function()
+            {
+                eval('with(this){' + test + '}');
+            }
+        }
+        else
+        {
+            this.test = test || function()
+            {
+            };
+        }
+
+        this.setup = setup || function()
+        {
+        };
+        this.teardown = teardown || function()
+        {
+        };
         this.isWaiting = false;
-        this.test.bind(this)();
-      } finally {
-        if(!this.isWaiting) {
-          this.teardown.bind(this)();
+        this.timeToWait = 1000;
+    },
+    wait: function(time, nextPart)
+    {
+        this.isWaiting = true;
+        this.test = nextPart;
+        this.timeToWait = time;
+    },
+    run: function()
+    {
+        try
+        {
+            try
+            {
+                if (!this.isWaiting) this.setup.bind(this)();
+                this.isWaiting = false;
+                this.test.bind(this)();
+            }
+            finally
+            {
+                if (!this.isWaiting)
+                {
+                    this.teardown.bind(this)();
+                }
+            }
+        }
+        catch(e)
+        {
+            this.error(e);
         }
-      }
     }
-    catch(e) { this.error(e); }
-  }
 });
 
 // *EXPERIMENTAL* BDD-style testing to please non-technical folk
 // This draws many ideas from RSpec http://rspec.rubyforge.org/
 
-Test.setupBDDExtensionMethods = function(){
-  var METHODMAP = {
-    shouldEqual:     'assertEqual',
-    shouldNotEqual:  'assertNotEqual',
-    shouldEqualEnum: 'assertEnumEqual',
-    shouldBeA:       'assertType',
-    shouldNotBeA:    'assertNotOfType',
-    shouldBeAn:      'assertType',
-    shouldNotBeAn:   'assertNotOfType',
-    shouldBeNull:    'assertNull',
-    shouldNotBeNull: 'assertNotNull',
-    
-    shouldBe:        'assertReturnsTrue',
-    shouldNotBe:     'assertReturnsFalse',
-    shouldRespondTo: 'assertRespondsTo'
-  };
-  var makeAssertion = function(assertion, args, object) { 
-   	this[assertion].apply(this,(args || []).concat([object]));
-  }
-  
-  Test.BDDMethods = {};   
-  $H(METHODMAP).each(function(pair) { 
-    Test.BDDMethods[pair.key] = function() { 
-       var args = $A(arguments); 
-       var scope = args.shift(); 
-       makeAssertion.apply(scope, [pair.value, args, this]); }; 
-  });
-  
-  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
-    function(p){ Object.extend(p, Test.BDDMethods) }
-  );
+Test.setupBDDExtensionMethods = function()
+{
+    var METHODMAP = {
+        shouldEqual:     'assertEqual',
+        shouldNotEqual:  'assertNotEqual',
+        shouldEqualEnum: 'assertEnumEqual',
+        shouldBeA:       'assertType',
+        shouldNotBeA:    'assertNotOfType',
+        shouldBeAn:      'assertType',
+        shouldNotBeAn:   'assertNotOfType',
+        shouldBeNull:    'assertNull',
+        shouldNotBeNull: 'assertNotNull',
+
+        shouldBe:        'assertReturnsTrue',
+        shouldNotBe:     'assertReturnsFalse',
+        shouldRespondTo: 'assertRespondsTo'
+    };
+    var makeAssertion = function(assertion, args, object)
+    {
+        this[assertion].apply(this, (args || []).concat([object]));
+    }
+
+    Test.BDDMethods = {};
+    $H(METHODMAP).each(function(pair)
+    {
+        Test.BDDMethods[pair.key] = function()
+        {
+            var args = $A(arguments);
+            var scope = args.shift();
+            makeAssertion.apply(scope, [pair.value, args, this]);
+        };
+    });
+
+    [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
+            function(p)
+            {
+                Object.extend(p, Test.BDDMethods)
+            }
+            );
 }
 
-Test.context = function(name, spec, log){
-  Test.setupBDDExtensionMethods();
-  
-  var compiledSpec = {};
-  var titles = {};
-  for(specName in spec) {
-    switch(specName){
-      case "setup":
-      case "teardown":
-        compiledSpec[specName] = spec[specName];
-        break;
-      default:
-        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
-        var body = spec[specName].toString().split('\n').slice(1);
-        if(/^\{/.test(body[0])) body = body.slice(1);
-        body.pop();
-        body = body.map(function(statement){ 
-          return statement.strip()
-        });
-        compiledSpec[testName] = body.join('\n');
-        titles[testName] = specName;
+Test.context = function(name, spec, log)
+{
+    Test.setupBDDExtensionMethods();
+
+    var compiledSpec = {};
+    var titles = {};
+    for (specName in spec)
+    {
+        switch (specName)
+                {
+            case "setup":
+            case "teardown":
+                compiledSpec[specName] = spec[specName];
+                break;
+            default:
+                var testName = 'test' + specName.gsub(/\s+/, '-').camelize();
+                var body = spec[specName].toString().split('\n').slice(1);
+                if (/^\{/.test(body[0])) body = body.slice(1);
+                body.pop();
+                body = body.map(function(statement)
+                {
+                    return statement.strip()
+                });
+                compiledSpec[testName] = body.join('\n');
+                titles[testName] = specName;
+        }
     }
-  }
-  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
+    new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
 };



Mime
View raw message