aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-28 23:57:43 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-28 23:57:43 +0000
commitc73a414a9abdb9943f18f6a60ed9f805e97e2ea1 (patch)
tree8725f2349561ed2a566b6c8cac4e593a4a2af373 /actionpack
parentce2fe88d533e43f25779a2284c74cebf8a472ec4 (diff)
downloadrails-c73a414a9abdb9943f18f6a60ed9f805e97e2ea1.tar.gz
rails-c73a414a9abdb9943f18f6a60ed9f805e97e2ea1.tar.bz2
rails-c73a414a9abdb9943f18f6a60ed9f805e97e2ea1.zip
Fixed references to element
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1034 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/prototype.js18
1 files changed, 9 insertions, 9 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/prototype.js b/actionpack/lib/action_view/helpers/javascripts/prototype.js
index 031149619e..6081ab191a 100644
--- a/actionpack/lib/action_view/helpers/javascripts/prototype.js
+++ b/actionpack/lib/action_view/helpers/javascripts/prototype.js
@@ -493,16 +493,16 @@ Effect.Scale.prototype = {
this.currentHeight = this.startHeight;
this.currentWidth = this.startWidth;
this.finishScale = (percent/100);
- if (element.style.fontSize=="") this.sizeEm = 1.0;
- if (element.style.fontSize && element.style.fontSize.indexOf("em")>0)
- this.sizeEm = parseFloat(element.style.fontSize);
+ if (this.element.style.fontSize=="") this.sizeEm = 1.0;
+ if (this.element.style.fontSize && this.element.style.fontSize.indexOf("em")>0)
+ this.sizeEm = parseFloat(this.element.style.fontSize);
if(this.element.effect_scale) {
clearTimeout(this.element.effect_scale.timer);
- this.startScale = element.effect_scale.currentScale;
- this.startHeight = element.effect_scale.startHeight;
- this.startWidth = element.effect_scale.startWidth;
- if(element.effect_scale.sizeEm)
- this.sizeEm = element.effect_scale.sizeEm;
+ this.startScale = this.element.effect_scale.currentScale;
+ this.startHeight = this.element.effect_scale.startHeight;
+ this.startWidth = this.element.effect_scale.startWidth;
+ if(this.element.effect_scale.sizeEm)
+ this.sizeEm = this.element.effect_scale.sizeEm;
}
this.element.effect_scale = this;
this.currentScale = this.startScale;
@@ -542,7 +542,7 @@ Effect.Squish = Class.create();
Effect.Squish.prototype = {
initialize: function(element) {
this.element = $(element);
- new Effect.Scale(element, 1, { complete: this.hide.bind(this) } );
+ new Effect.Scale(this.element, 1, { complete: this.hide.bind(this) } );
},
hide: function() {
this.element.style.display = 'none';