diff options
Diffstat (limited to 'lib/scripts/media.js')
| -rw-r--r-- | lib/scripts/media.js | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 997321a65..f345c3786 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -274,8 +274,6 @@ var dw_mediamanager = { if (document.getElementById('media__content')) { //popup $content = jQuery('#media__content'); - $content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); - } else { //fullscreen media manager $content = jQuery('#mediamanager__layout_list'); @@ -288,8 +286,6 @@ var dw_mediamanager = { }); $link.addClass('selected'); } - - jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); } params = ''; @@ -309,6 +305,14 @@ var dw_mediamanager = { // fetch the subtree dw_mediamanager.update_content($content, params); + if (document.getElementById('media__content')) { + //popup + $content = jQuery('#media__content'); + $content.html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); + } else { + //fullscreen media manager + jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); + } }, /** @@ -381,12 +385,6 @@ var dw_mediamanager = { if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; $content = jQuery('#mediamanager__layout_detail'); - if (jQuery('.scroll-container', $content).length) { - jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); - } else { - jQuery($content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); - } - params = ''; if ($link[0].search) { @@ -399,6 +397,12 @@ var dw_mediamanager = { update_list = ($link[0].id == 'mediamanager__btn_delete' || $link[0].id == 'mediamanager__btn_restore'); dw_mediamanager.update_content($content, params, update_list); + + if (jQuery('.scroll-container', $content).length) { + jQuery('.scroll-container', $content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); + } else { + jQuery($content).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); + } }, update_content: function ($content, params, update_list) { @@ -427,9 +431,8 @@ var dw_mediamanager = { $link1 = jQuery('a.files'); params1 = $link1[0].search.substr(1)+'&call=medialist'; $content1 = jQuery('#mediamanager__layout_list'); - jQuery('.scroll-container', $content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); - dw_mediamanager.update_content($content1, params1); + jQuery('.scroll-container', $content1).html('<img src="' + DOKU_BASE + 'lib/images/loading.gif" alt="..." class="load" />'); } }, 'html' @@ -552,11 +555,11 @@ var dw_mediamanager = { $label.append($select); $form.append($label); - // for IE - var select = document.getElementById('mediamanager__difftype'); - select.options[0].text = LANG.media_diff_both; - select.options[1].text = LANG.media_diff_opacity; - select.options[2].text = LANG.media_diff_portions; + // for IE + var select = document.getElementById('mediamanager__difftype'); + select.options[0].text = LANG.media_diff_both; + select.options[1].text = LANG.media_diff_opacity; + select.options[2].text = LANG.media_diff_portions; }, /** |