aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/javascripts/effects.js
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/helpers/javascripts/effects.js')
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/effects.js9
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/effects.js b/actionpack/lib/action_view/helpers/javascripts/effects.js
index 794c4b81a8..9a26c5d712 100644
--- a/actionpack/lib/action_view/helpers/javascripts/effects.js
+++ b/actionpack/lib/action_view/helpers/javascripts/effects.js
@@ -529,7 +529,7 @@ Effect.Pulsate = function(element) {
Effect.Fold = function(element) {
$(element).style.overflow = 'hidden';
- new Effect2.Scale(element, 5, {
+ new Effect.Scale(element, 5, {
scaleContent: false,
scaleTo: 100,
scaleX: false,
@@ -547,11 +547,6 @@ Effect.Fold = function(element) {
Element.setContentZoom = function(element, percent) {
var element = $(element);
-
- var sizeEm = 1.0;
- if (element.style.fontSize.indexOf("em")>0)
- sizeEm = parseFloat(element.style.fontSize);
-
- element.style.fontSize = sizeEm*(percent/100) + "em";
+ element.style.fontSize = (percent/100) + "em";
if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
}