From b1ab5da7c783154a7ce22f4b34beb10b79f8768d Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 4 Dec 2011 17:32:25 +0000 Subject: fixed list type being sometimes undefined --- lib/scripts/media.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 7f5514f56..267e64a76 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -371,6 +371,10 @@ var dw_mediamanager = { if (typeof new_val === 'undefined') { new_val = jQuery('form.options li.' + opt[1] + ' input') .filter(':checked').val(); + // if new_val is still undefined (because form.options is not in active tab), set to most spacious option + if (typeof new_val === 'undefined') { + new_val = 'thumbs'; + } } if (new_val !== dw_mediamanager.view_opts[opt[0]]) { -- cgit v1.2.3 From eb2f7e5e56a00f69a13722cc4297a6d6a61bd00f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 27 Dec 2011 11:26:02 +0000 Subject: fixed no align option in media settings modal window (FS#2411) --- lib/scripts/media.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 267e64a76..c74633523 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -253,8 +253,10 @@ var dw_mediamanager = { } } } - alignleft = dw_mediamanager.align === '2' ? '' : ' '; - alignright = dw_mediamanager.align === '4' ? '' : ' '; + if (dw_mediamanager.align !== '1') { + alignleft = dw_mediamanager.align === '2' ? '' : ' '; + alignright = dw_mediamanager.align === '4' ? '' : ' '; + } } } edid = String.prototype.match.call(document.location, /&edid=([^&]+)/); -- cgit v1.2.3 From 2dba8df4d3a5c3e9d104bee5290766929f4cabee Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 13 Jan 2012 10:02:32 +0100 Subject: Fix sorting in media manager search (FS#2423) --- lib/scripts/media.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c74633523..841baa93f 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -135,7 +135,7 @@ var dw_mediamanager = { }); $sortBy.children('input').change(function (event) { dw_mediamanager.set_fileview_sort(); - dw_mediamanager.list.call(this, event); + dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event); }); }, -- cgit v1.2.3