From cde44c60f020f5c3fe1bd1ea0d10b522a5a44a33 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Sat, 22 Aug 2015 17:50:09 +0200
Subject: [PATCH] little cleanup media.js
---
lib/scripts/media.js | 44 +++++++++++++++++++++++---------------------
1 file changed, 23 insertions(+), 21 deletions(-)
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 2995addfd..d2616c00f 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -485,12 +485,13 @@ var dw_mediamanager = {
$resizables.resizable({
handles: 'e',
resize: function(event, ui){
- var widthFull = jQuery('#mediamanager__page').width();
+ var $page = jQuery('#mediamanager__page');
+ var widthFull = $page.width();
var widthResizables = 0;
$resizables.each(function() {
widthResizables += jQuery(this).width();
});
- var $filePanel = jQuery('#mediamanager__page div.panel.file');
+ var $filePanel = $page.find('div.panel.file');
// set max width of resizable column
var widthOtherResizable = widthResizables - jQuery(this).width();
@@ -507,7 +508,7 @@ var dw_mediamanager = {
// FIXME: please fix without browser sniffing
if (!jQuery.browser.webkit) {
$resizables.each(function() {
- w = jQuery(this).width();
+ var w = jQuery(this).width();
w = (99.99 * w / widthFull);
w += "%";
jQuery(this).width(w);
@@ -552,12 +553,12 @@ var dw_mediamanager = {
image_diff: function () {
if (jQuery('#mediamanager__difftype').length) return;
- $form = jQuery('#mediamanager__form_diffview');
+ var $form = jQuery('#mediamanager__form_diffview');
if (!$form.length) return;
- $label = jQuery(document.createElement('label'));
+ var $label = jQuery(document.createElement('label'));
$label.append('<span>'+LANG.media_diff+'</span> ');
- $select = jQuery(document.createElement('select'))
+ var $select = jQuery(document.createElement('select'))
.attr('id', 'mediamanager__difftype')
.attr('name', 'difftype')
.change(dw_mediamanager.change_diff_type);
@@ -580,10 +581,10 @@ var dw_mediamanager = {
* @author Kate Arzamastseva <pshns@ukr.net>
*/
change_diff_type: function () {
- $select = jQuery('#mediamanager__difftype');
- $content = jQuery('#mediamanager__diff');
+ var $select = jQuery('#mediamanager__difftype');
+ var $content = jQuery('#mediamanager__diff');
- params = dw_mediamanager.form_params($select.closest('form'))+'&call=mediadiff';
+ var params = dw_mediamanager.form_params($select.closest('form'))+'&call=mediadiff';
jQuery.post(
DOKU_BASE + 'lib/exe/ajax.php',
params,
@@ -602,10 +603,11 @@ var dw_mediamanager = {
* @author Kate Arzamastseva <pshns@ukr.net>
*/
opacity_slider: function () {
- var $slider = jQuery( "#mediamanager__diff div.slider" );
+ var $diff = jQuery("#mediamanager__diff");
+ var $slider = $diff.find("div.slider");
if (!$slider.length) return;
- var $image = jQuery('#mediamanager__diff div.imageDiff.opacity div.image1 img');
+ var $image = $diff.find('div.imageDiff.opacity div.image1 img');
if (!$image.length) return;
$slider.width($image.width()-20);
@@ -625,27 +627,27 @@ var dw_mediamanager = {
* @author Kate Arzamastseva <pshns@ukr.net>
*/
portions_slider: function () {
- var $image1 = jQuery('#mediamanager__diff div.imageDiff.portions div.image1 img');
- var $image2 = jQuery('#mediamanager__diff div.imageDiff.portions div.image2 img');
- if (!$image1.length || !$image2.length) return;
+ var $diff = jQuery("#mediamanager__diff");
+ if (!$diff.length) return;
- var $div = jQuery("#mediamanager__diff");
- if (!$div.length) return;
+ var $image1 = $diff.find('div.imageDiff.portions div.image1 img');
+ var $image2 = $diff.find('div.imageDiff.portions div.image2 img');
+ if (!$image1.length || !$image2.length) return;
- $div.width('100%');
+ $diff.width('100%');
$image2.parent().width('97%');
$image1.width('100%');
$image2.width('100%');
- if ($image1.width() < $div.width()) {
- $div.width($image1.width());
+ if ($image1.width() < $diff.width()) {
+ $diff.width($image1.width());
}
$image2.parent().width('50%');
$image2.width($image1.width());
$image1.width($image1.width());
- var $slider = jQuery("#mediamanager__diff div.slider");
+ var $slider = $diff.find("div.slider");
if (!$slider.length) return;
$slider.width($image1.width()-20);
@@ -836,7 +838,7 @@ var dw_mediamanager = {
* @author Andreas Gohr <andi@splitbrain.org>
*/
updatehide: function(){
- jQuery('#media__content div.detail').dw_toggle(!dw_mediamanager.hide);
+ jQuery('#media__content').find('div.detail').dw_toggle(!dw_mediamanager.hide);
},
/**
--
GitLab