mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
Added Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1032 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Added Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
|
||||
|
||||
* Fixed problem with page caching #958 [Rick Olson]
|
||||
|
||||
|
||||
|
||||
@@ -452,3 +452,33 @@ Effect.Highlight.prototype = {
|
||||
element.style.backgroundColor = "#ffff" + current.toColorPart();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Effect.Fade = Class.create();
|
||||
Effect.Fade.prototype = {
|
||||
initialize: function(element) {
|
||||
this.element = $(element);
|
||||
this.start = 100;
|
||||
this.finish = 0;
|
||||
this.current = this.start;
|
||||
this.fade();
|
||||
},
|
||||
|
||||
fade: function() {
|
||||
if (this.isFinished()) { this.element.style.display = 'none'; return; }
|
||||
if (this.timer) clearTimeout(this.timer);
|
||||
this.setOpacity(this.element, this.current);
|
||||
this.current -= 10;
|
||||
this.timer = setTimeout(this.fade.bind(this), 100);
|
||||
},
|
||||
|
||||
isFinished: function() {
|
||||
return this.current <= this.finish;
|
||||
},
|
||||
|
||||
setOpacity: function(element, opacity) {
|
||||
opacity = (opacity == 100) ? 99.999 : opacity;
|
||||
element.style.filter = "alpha(opacity:"+opacity+")";
|
||||
element.style.opacity = opacity/100;
|
||||
}
|
||||
}
|
||||
30
railties/html/javascripts/prototype.js
vendored
30
railties/html/javascripts/prototype.js
vendored
@@ -452,3 +452,33 @@ Effect.Highlight.prototype = {
|
||||
element.style.backgroundColor = "#ffff" + current.toColorPart();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Effect.Fade = Class.create();
|
||||
Effect.Fade.prototype = {
|
||||
initialize: function(element) {
|
||||
this.element = $(element);
|
||||
this.start = 100;
|
||||
this.finish = 0;
|
||||
this.current = this.start;
|
||||
this.fade();
|
||||
},
|
||||
|
||||
fade: function() {
|
||||
if (this.isFinished()) { this.element.style.display = 'none'; return; }
|
||||
if (this.timer) clearTimeout(this.timer);
|
||||
this.setOpacity(this.element, this.current);
|
||||
this.current -= 10;
|
||||
this.timer = setTimeout(this.fade.bind(this), 100);
|
||||
},
|
||||
|
||||
isFinished: function() {
|
||||
return this.current <= this.finish;
|
||||
},
|
||||
|
||||
setOpacity: function(element, opacity) {
|
||||
opacity = (opacity == 100) ? 99.999 : opacity;
|
||||
element.style.filter = "alpha(opacity:"+opacity+")";
|
||||
element.style.opacity = opacity/100;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user