github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed references to element

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1034 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-03-28 23:57:43 +00:00
parent ce2fe88d53
commit c73a414a9a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
actionpack/lib/action_view/helpers/javascripts/prototype.js vendored
View File

@@ -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';

18
railties/html/javascripts/prototype.js vendored
View File

@@ -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';