summaryrefslogtreecommitdiff
path: root/lib/scripts
diff options
context:
space:
mode:
authorKate Arzamastseva <pshns@ukr.net>2011-08-01 01:21:21 +0300
committerKate Arzamastseva <pshns@ukr.net>2011-08-01 01:21:21 +0300
commit69143ff27bdf2a979818367613e604f8ee4aef88 (patch)
tree45d9b6ba6324de369f2925d25fec9999f1622878 /lib/scripts
parentc17d1d0ed0fcdb8f0d4663a47bad8df069760b49 (diff)
downloadrpg-69143ff27bdf2a979818367613e604f8ee4aef88.tar.gz
rpg-69143ff27bdf2a979818367613e604f8ee4aef88.tar.bz2
issue #40 image resized in all diff views
Diffstat (limited to 'lib/scripts')
-rw-r--r--lib/scripts/media.js46
1 files changed, 37 insertions, 9 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 17006e289..e8c492f5f 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -436,6 +436,10 @@ var dw_mediamanager = {
dw_mediamanager.layout_width = jQuery('#mediamanager__layout').width();
+ // rebuild sliders if exists
+ dw_mediamanager.opacity_slider();
+ dw_mediamanager.portions_slider();
+
$r = jQuery("#mediamanager__layout .layout-resizable, #mediamanager__layout .layout");
var w = 0, wSum = 0, mCount = 0, mArray = [];
@@ -586,15 +590,39 @@ var dw_mediamanager = {
* @author Kate Arzamastseva <pshns@ukr.net>
*/
portions_slider: function () {
- var $slider = jQuery( "#mediamanager__portions_slider" );
- $slider.slider();
- $slider.slider("option", "min", 0);
- $slider.slider("option", "max", 100);
- $slider.slider("option", "step", 1);
- $slider.slider("option", "value", 50);
- $slider.bind("slide", function(event, ui) {
- jQuery('#mediamanager__diff_portions_image2').css({ width: $slider.slider("option", "value")+'%'});
- });
+ var $image2 = jQuery('#mediamanager__diff_portions_image2 img');
+ if ($image2) {
+ $image2 = jQuery($image2[0]);
+
+ $image2.parent().css({
+ width: '100%'
+ });
+
+ $image2.css({
+ width: '100%',
+ height: 'auto'
+ });
+
+ $image2.css({
+ width: $image2.width() + 'px',
+ height: $image2.height() + 'px'
+ });
+
+ var $div = jQuery("#mediamanager__diff_layout");
+ if ($image2.width() < $div.width()) {
+ $div.width($image2.width());
+ }
+
+ var $slider = jQuery("#mediamanager__portions_slider");
+ $slider.slider();
+ $slider.slider("option", "min", 0);
+ $slider.slider("option", "max", 100);
+ $slider.slider("option", "step", 1);
+ $slider.slider("option", "value", 50);
+ $slider.bind("slide", function(event, ui) {
+ jQuery('#mediamanager__diff_portions_image2').css({ width: $slider.slider("option", "value")+'%'});
+ });
+ }
},
prepare_content: function ($content) {