| 1 | Index: /home/lrbabe/workspace/jQuery-ui/ui/effects.scale.js |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- /home/lrbabe/workspace/jQuery-ui/ui/effects.scale.js (revision 463) |
|---|
| 4 | +++ /home/lrbabe/workspace/jQuery-ui/ui/effects.scale.js (working copy) |
|---|
| 5 | @@ -116,7 +116,7 @@ |
|---|
| 6 | from: {y: el.from.height / original.height, x: el.from.width / original.width}, |
|---|
| 7 | to: {y: el.to.height / original.height, x: el.to.width / original.width} |
|---|
| 8 | }; |
|---|
| 9 | - if (scale == 'box' || scale == 'both') { // Scale the css box |
|---|
| 10 | + if (scale != 'content') { // Scale the css box |
|---|
| 11 | if (factor.from.y != factor.to.y) { // Vertical props scaling |
|---|
| 12 | props = props.concat(vProps); |
|---|
| 13 | el.from = $.effects.setTransition(el, vProps, factor.from.y, el.from); |
|---|
| 14 | @@ -128,7 +128,7 @@ |
|---|
| 15 | el.to = $.effects.setTransition(el, hProps, factor.to.x, el.to); |
|---|
| 16 | }; |
|---|
| 17 | }; |
|---|
| 18 | - if (scale == 'content' || scale == 'both') { // Scale the content |
|---|
| 19 | + if (scale != 'box') { // Scale the content |
|---|
| 20 | if (factor.from.y != factor.to.y) { // Vertical props scaling |
|---|
| 21 | props = props.concat(cProps); |
|---|
| 22 | el.from = $.effects.setTransition(el, cProps, factor.from.y, el.from); |
|---|