From 23846a98488bec2aaade6d983b4c0b0db13af80c Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 3 Jul 2011 19:00:54 +0300 Subject: ajax mediamanager --- lib/scripts/media.js | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index ebbee5a78..e03d1cf7b 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -328,7 +328,17 @@ jQuery('div.success, div.info, div.error, div.notify').remove(); - content = $('#media__content'); + if (document.getElementById('media__content')) { + content = $('#media__content'); + } else { + content = $('#mediamanager__files'); + if (link.hasClass('idx_dir')) { + change_tab($('.files'), '#mediamanager__tabs_files'); + $('#mediamanager__layout_detail').empty(); + } else { + change_tab(link, '#mediamanager__tabs_files'); + } + } content.html('...'); // fetch the subtree @@ -345,6 +355,77 @@ }; + /** + * Changes selected tab + * + * @author Kate Arzamastseva + */ + change_tab = function (tab, tab_menu_id) { + $(tab_menu_id + ' a').each(function (i) { + $(this).removeClass('selected'); + }); + tab.addClass('selected'); + }; + + /** + * Changes view of media files list + * + * @author Kate Arzamastseva + */ + list_view = function (event) { + var link, content; + link = $(this); + + event.preventDefault(); + + content = $('#mediamanager__file_list'); + if (link.hasClass('mediamanager-link-thumbnails')) { + content.removeClass('mediamanager-list'); + content.addClass('mediamanager-thumbs'); + } else if (link.hasClass('mediamanager-link-list')) { + content.removeClass('mediamanager-thumbs'); + content.addClass('mediamanager-list'); + } + }; + + /** + * Lists the content of the right column (image details) using AJAX + * + * @author Kate Arzamastseva + */ + details = function (event) { + var link, content, call, full; + link = $(this); + + event.preventDefault(); + + jQuery('div.success, div.info, div.error, div.notify').remove(); + + full=''; + if (document.getElementById('mediamanager__details')) { + content = $('#mediamanager__details'); + } else { + content = $('#mediamanager__layout_detail'); + full = '&full=true'; + } + + if (link.hasClass('name')) { + change_tab($('.view'), '#mediamanager__tabs_details'); + } else { + change_tab(link, '#mediamanager__tabs_details'); + } + content.html('...'); + + $.post( + DOKU_BASE + 'lib/exe/ajax.php', + link[0].search.substr(1)+'&call=mediadetails'+full, + function (data) { + content.html(data); + }, + 'html' + ); + }; + prepare_content = function (content) { // hide syntax example content.find('div.example:visible').hide(); @@ -748,5 +829,12 @@ $('#media__tree').delegate('img', 'click', toggle) .delegate('a', 'click', list); + + $('#mediamanager__tabs_files').delegate('a', 'click', list); + + $('#mediamanager__files').delegate('#mediamanager__tabs_list a', 'click', list_view) + .delegate('#mediamanager__file_list a', 'click', details); + + $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details); }); }(jQuery)); -- cgit v1.2.3 From ed69a2ae06c0707fdd5634e18d569c25f0cda6d5 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 3 Jul 2011 23:56:26 +0300 Subject: ajax mediamanager fix --- lib/scripts/media.js | 68 ++++++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index e03d1cf7b..a7574b804 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -11,7 +11,7 @@ * @author Pierre Spring */ (function ($) { - var toggle, list, prepare_content, insert, confirmattach, attachoptions, initpopup, updatehide, setalign, setsize, inSet, outSet, media_manager, hasFlash; + var toggle, list, prepare_content, insert, confirmattach, attachoptions, initpopup, updatehide, setalign, setsize, inSet, outSet, media_manager, hasFlash, form_params, list_view, details; var media_manager = { keepopen: false, @@ -321,7 +321,7 @@ * @author Pierre Spring */ list = function (event) { - var link, content; + var link, content, params; link = $(this); event.preventDefault(); @@ -329,22 +329,33 @@ jQuery('div.success, div.info, div.error, div.notify').remove(); if (document.getElementById('media__content')) { + //popup content = $('#media__content'); + } else { - content = $('#mediamanager__files'); + //fullscreen media manager + content = $('#mediamanager__layout_list'); + if (link.hasClass('idx_dir')) { - change_tab($('.files'), '#mediamanager__tabs_files'); + //changing namespace $('#mediamanager__layout_detail').empty(); - } else { - change_tab(link, '#mediamanager__tabs_files'); } } - content.html('...'); + + params = ''; + + if (link[0].search) { + params = link[0].search.substr(1)+'&call=medialist'; + } else if (link[0].action) { + params = form_params(link)+'&call=medialist'; + } + + $('.scroll-container', content).html('...'); // fetch the subtree $.post( DOKU_BASE + 'lib/exe/ajax.php', - link[0].search.substr(1)+'&call=medialist', + params, function (data) { content.html(data); prepare_content(content); @@ -356,15 +367,16 @@ }; /** - * Changes selected tab + * Returns form parameters * * @author Kate Arzamastseva */ - change_tab = function (tab, tab_menu_id) { - $(tab_menu_id + ' a').each(function (i) { - $(this).removeClass('selected'); - }); - tab.addClass('selected'); + form_params = function (form) { + var elements = form.serialize(); + var action = ''; + var i = form[0].action.indexOf('?'); + if (i >= 0) action = form[0].action.substr(i+1); + return elements+'&'+action; }; /** @@ -394,31 +406,19 @@ * @author Kate Arzamastseva */ details = function (event) { - var link, content, call, full; + var link, content; link = $(this); event.preventDefault(); jQuery('div.success, div.info, div.error, div.notify').remove(); - full=''; - if (document.getElementById('mediamanager__details')) { - content = $('#mediamanager__details'); - } else { - content = $('#mediamanager__layout_detail'); - full = '&full=true'; - } - - if (link.hasClass('name')) { - change_tab($('.view'), '#mediamanager__tabs_details'); - } else { - change_tab(link, '#mediamanager__tabs_details'); - } - content.html('...'); + content = $('#mediamanager__layout_detail'); + $('.scroll-container', content).html('...'); $.post( DOKU_BASE + 'lib/exe/ajax.php', - link[0].search.substr(1)+'&call=mediadetails'+full, + link[0].search.substr(1)+'&call=mediadetails', function (data) { content.html(data); }, @@ -830,11 +830,11 @@ $('#media__tree').delegate('img', 'click', toggle) .delegate('a', 'click', list); - $('#mediamanager__tabs_files').delegate('a', 'click', list); - - $('#mediamanager__files').delegate('#mediamanager__tabs_list a', 'click', list_view) + $('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list) + .delegate('#mediamanager__tabs_list a', 'click', list_view) .delegate('#mediamanager__file_list a', 'click', details); - $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details); + $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details) + .delegate('#mediamanager__btn_update', 'submit', list); }); }(jQuery)); -- cgit v1.2.3 From 7d7ab775ac0252d50835987b276a95b790cd1434 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Mon, 4 Jul 2011 22:35:44 +0300 Subject: mediamanager ajax forms --- lib/scripts/media.js | 55 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 17 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index a7574b804..245519cbc 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -11,7 +11,7 @@ * @author Pierre Spring */ (function ($) { - var toggle, list, prepare_content, insert, confirmattach, attachoptions, initpopup, updatehide, setalign, setsize, inSet, outSet, media_manager, hasFlash, form_params, list_view, details; + var toggle, list, prepare_content, insert, confirmattach, attachoptions, initpopup, updatehide, setalign, setsize, inSet, outSet, media_manager, hasFlash, form_params, list_view, details, update_content; var media_manager = { keepopen: false, @@ -331,6 +331,7 @@ if (document.getElementById('media__content')) { //popup content = $('#media__content'); + content.html('...'); } else { //fullscreen media manager @@ -340,6 +341,8 @@ //changing namespace $('#mediamanager__layout_detail').empty(); } + + $('.scroll-container', content).html('...'); } params = ''; @@ -350,19 +353,8 @@ params = form_params(link)+'&call=medialist'; } - $('.scroll-container', content).html('...'); - // fetch the subtree - $.post( - DOKU_BASE + 'lib/exe/ajax.php', - params, - function (data) { - content.html(data); - prepare_content(content); - updatehide(); - }, - 'html' - ); + update_content(content, params); }; @@ -406,7 +398,7 @@ * @author Kate Arzamastseva */ details = function (event) { - var link, content; + var link, content, params, update_list; link = $(this); event.preventDefault(); @@ -416,9 +408,32 @@ content = $('#mediamanager__layout_detail'); $('.scroll-container', content).html('...'); + params = ''; + + if (link[0].search) { + params = link[0].search.substr(1)+'&call=mediadetails'; + } else { + params = form_params(link)+'&call=mediadetails'; + } + + update_content(content, params); + + update_list = (link[0].id == 'mediamanager__btn_delete' || link[0].id == 'mediamanager__btn_restore'); + if (update_list) { + var link1, content1, params1; + link1 = $('a.files'); + params1 = link1[0].search.substr(1)+'&call=medialist'; + content1 = $('#mediamanager__layout_list'); + $('.scroll-container', content1).html('...'); + + update_content(content1, params1); + } + }; + + update_content = function (content, params) { $.post( DOKU_BASE + 'lib/exe/ajax.php', - link[0].search.substr(1)+'&call=mediadetails', + params, function (data) { content.html(data); }, @@ -832,9 +847,15 @@ $('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list) .delegate('#mediamanager__tabs_list a', 'click', list_view) - .delegate('#mediamanager__file_list a', 'click', details); + .delegate('#mediamanager__file_list a', 'click', details) + .delegate('#dw__mediasearch', 'submit', list); $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details) - .delegate('#mediamanager__btn_update', 'submit', list); + .delegate('#mediamanager__btn_update', 'submit', list) + .delegate('#page__revisions', 'submit', details) + .delegate('#page__revisions a', 'click', details) + .delegate('#mediamanager__save_meta', 'submit', details) + .delegate('#mediamanager__btn_delete', 'submit', details) + .delegate('#mediamanager__btn_restore', 'submit', details); }); }(jQuery)); -- cgit v1.2.3 From 6183fb05112cd318d9a6885d9405cff9917ee82f Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Fri, 8 Jul 2011 13:54:15 +0300 Subject: mediamanager fix --- lib/scripts/media.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 245519cbc..4eb1e7b63 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -405,6 +405,9 @@ jQuery('div.success, div.info, div.error, div.notify').remove(); + if (link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false; + if (link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; + content = $('#mediamanager__layout_detail'); $('.scroll-container', content).html('...'); -- cgit v1.2.3 From f6f771ca288974ca7d259cf35f0d416fef44ef6e Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sat, 9 Jul 2011 21:04:18 +0300 Subject: media.js fix --- lib/scripts/media.js | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 4eb1e7b63..8c68fa569 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -321,8 +321,8 @@ * @author Pierre Spring */ list = function (event) { - var link, content, params; - link = $(this); + var $link, $content, params; + $link = jQuery(this); event.preventDefault(); @@ -330,31 +330,31 @@ if (document.getElementById('media__content')) { //popup - content = $('#media__content'); - content.html('...'); + $content = jQuery('#media__content'); + $content.html('...'); } else { //fullscreen media manager - content = $('#mediamanager__layout_list'); + $content = jQuery('#mediamanager__layout_list'); - if (link.hasClass('idx_dir')) { + if ($link.hasClass('idx_dir')) { //changing namespace - $('#mediamanager__layout_detail').empty(); + jQuery('#mediamanager__layout_detail').empty(); } - $('.scroll-container', content).html('...'); + jQuery('.scroll-container', $content).html('...'); } params = ''; - if (link[0].search) { - params = link[0].search.substr(1)+'&call=medialist'; - } else if (link[0].action) { - params = form_params(link)+'&call=medialist'; + if ($link[0].search) { + params = $link[0].search.substr(1)+'&call=medialist'; + } else if ($link[0].action) { + params = form_params($link)+'&call=medialist'; } // fetch the subtree - update_content(content, params); + update_content($content, params); }; @@ -363,11 +363,11 @@ * * @author Kate Arzamastseva */ - form_params = function (form) { - var elements = form.serialize(); + form_params = function ($form) { + var elements = $form.serialize(); var action = ''; - var i = form[0].action.indexOf('?'); - if (i >= 0) action = form[0].action.substr(i+1); + var i = $form[0].action.indexOf('?'); + if (i >= 0) action = $form[0].action.substr(i+1); return elements+'&'+action; }; @@ -377,18 +377,18 @@ * @author Kate Arzamastseva */ list_view = function (event) { - var link, content; - link = $(this); + var $link, $content; + $link = jQuery(this); event.preventDefault(); - content = $('#mediamanager__file_list'); - if (link.hasClass('mediamanager-link-thumbnails')) { - content.removeClass('mediamanager-list'); - content.addClass('mediamanager-thumbs'); - } else if (link.hasClass('mediamanager-link-list')) { - content.removeClass('mediamanager-thumbs'); - content.addClass('mediamanager-list'); + $content = jQuery('#mediamanager__file_list'); + if ($link.hasClass('mediamanager-link-thumbnails')) { + $content.removeClass('mediamanager-list'); + $content.addClass('mediamanager-thumbs'); + } else if ($link.hasClass('mediamanager-link-list')) { + $content.removeClass('mediamanager-thumbs'); + $content.addClass('mediamanager-list'); } }; @@ -398,43 +398,43 @@ * @author Kate Arzamastseva */ details = function (event) { - var link, content, params, update_list; - link = $(this); + var $link, $content, params, update_list; + $link = jQuery(this); event.preventDefault(); jQuery('div.success, div.info, div.error, div.notify').remove(); - if (link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false; - if (link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; + if ($link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false; + if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; - content = $('#mediamanager__layout_detail'); - $('.scroll-container', content).html('...'); + $content = $('#mediamanager__layout_detail'); + jQuery('.scroll-container', $content).html('...'); params = ''; - if (link[0].search) { - params = link[0].search.substr(1)+'&call=mediadetails'; + if ($link[0].search) { + params = $link[0].search.substr(1)+'&call=mediadetails'; } else { - params = form_params(link)+'&call=mediadetails'; + params = form_params($link)+'&call=mediadetails'; } - update_content(content, params); + update_content($content, params); - update_list = (link[0].id == 'mediamanager__btn_delete' || link[0].id == 'mediamanager__btn_restore'); + update_list = ($link[0].id == 'mediamanager__btn_delete' || $link[0].id == 'mediamanager__btn_restore'); if (update_list) { - var link1, content1, params1; - link1 = $('a.files'); - params1 = link1[0].search.substr(1)+'&call=medialist'; - content1 = $('#mediamanager__layout_list'); - $('.scroll-container', content1).html('...'); + var $link1, $content1, params1; + $link1 = jQuery('a.files'); + params1 = $link1[0].search.substr(1)+'&call=medialist'; + $content1 = jQuery('#mediamanager__layout_list'); + jQuery('.scroll-container', $content1).html('...'); - update_content(content1, params1); + update_content($content1, params1); } }; - update_content = function (content, params) { - $.post( + update_content = function ($content, params) { + jQuery.post( DOKU_BASE + 'lib/exe/ajax.php', params, function (data) { @@ -831,29 +831,29 @@ }; $(function () { - var content = $('#media__content'); - prepare_content(content); + var $content = jQuery('#media__content'); + prepare_content($content); attachoptions(); initpopup(); // add the action to autofill the "upload as" field - content.delegate('#upload__file', 'change', suggest) + $content.delegate('#upload__file', 'change', suggest) // Attach the image selector action to all links .delegate('a.select', 'click', select) // Attach deletion confirmation dialog to the delete buttons .delegate('#media__content a.btn_media_delete', 'click', confirmattach); - $('#media__tree').delegate('img', 'click', toggle) + jQuery('#media__tree').delegate('img', 'click', toggle) .delegate('a', 'click', list); - $('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list) + jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', list) .delegate('#mediamanager__tabs_list a', 'click', list_view) .delegate('#mediamanager__file_list a', 'click', details) .delegate('#dw__mediasearch', 'submit', list); - $('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details) + jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', details) .delegate('#mediamanager__btn_update', 'submit', list) .delegate('#page__revisions', 'submit', details) .delegate('#page__revisions a', 'click', details) -- cgit v1.2.3 From de11c42f80968ac41dc4164829845c1e5dae25c2 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sat, 9 Jul 2011 23:21:50 +0300 Subject: media-manager fixes --- 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 8c68fa569..f261bd2d5 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -340,6 +340,10 @@ if ($link.hasClass('idx_dir')) { //changing namespace jQuery('#mediamanager__layout_detail').empty(); + jQuery('#media__tree .selected').each(function(){ + $(this).removeClass('selected'); + }); + $link.addClass('selected'); } jQuery('.scroll-container', $content).html('...'); -- cgit v1.2.3 From e1dc10a4aab705171d34c7bde642ed77032c95c7 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 10 Jul 2011 15:36:01 +0300 Subject: media.js fixes --- lib/scripts/media.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 3f263f42a..36c06a3aa 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -253,7 +253,7 @@ var dw_mediamanager = { //changing namespace jQuery('#mediamanager__layout_detail').empty(); jQuery('#media__tree .selected').each(function(){ - $(this).removeClass('selected'); + jQuery(this).removeClass('selected'); }); $link.addClass('selected'); } @@ -272,7 +272,7 @@ var dw_mediamanager = { // fetch the subtree dw_mediamanager.update_content($content, params); - }; + }, /** * Returns form parameters @@ -324,7 +324,7 @@ var dw_mediamanager = { if ($link[0].id == 'mediamanager__btn_delete' && !confirm(LANG['del_confirm'])) return false; if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; - $content = $('#mediamanager__layout_detail'); + $content = jQuery('#mediamanager__layout_detail'); jQuery('.scroll-container', $content).html('...'); params = ''; @@ -354,7 +354,7 @@ var dw_mediamanager = { DOKU_BASE + 'lib/exe/ajax.php', params, function (data) { - content.html(data); + $content.html(data); dw_mediamanager.prepare_content($content); dw_mediamanager.updatehide(); }, @@ -604,7 +604,7 @@ var dw_mediamanager = { var allowed = bind(dw_mediamanager.allowedOpt, opt); // Current value - if (dw_mediamanager[opt] !== false && allowed(dw_mediamanager[opt]) { + if (dw_mediamanager[opt] !== false && allowed(dw_mediamanager[opt])) { return dw_mediamanager[opt]; } -- cgit v1.2.3 From 4928b6eb7137cb1e8727ca7a7fc99db614b0df88 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 10 Jul 2011 16:38:04 +0300 Subject: mediamanager resizable --- lib/scripts/media.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 36c06a3aa..af5346cbe 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -354,14 +354,43 @@ var dw_mediamanager = { DOKU_BASE + 'lib/exe/ajax.php', params, function (data) { + jQuery('.ui-resizable').each(function(){ + jQuery(this).resizable('destroy'); + }); + $content.html(data); dw_mediamanager.prepare_content($content); dw_mediamanager.updatehide(); + dw_mediamanager.update_resizable(0); }, 'html' ); }, + update_resizable: function (count_width) { + jQuery(".layout").resizable({ handles: 'e' }); + jQuery(".layout").bind("resize", function(event, ui) { + var w = 0; + jQuery(".layout").each(function() { + w += jQuery(this).width(); + }); + jQuery('#id-mediamanager-layout').width(w+30); + }); + + var w = 0; + jQuery(".layout").each(function() { + if (count_width) jQuery(this).width(jQuery(this).width()); + w += jQuery(this).width(); + }); + jQuery('#id-mediamanager-layout').width(w+30); + + var windowHeight = jQuery(window).height(); + var height = windowHeight - 300; + jQuery('.scroll-container').each(function (i) { + jQuery(this).height(height); + }); + }, + prepare_content: function ($content) { // hide syntax example $content.find('div.example:visible').hide(); @@ -642,4 +671,8 @@ function hasFlash(version){ return ver >= version; } +jQuery(document).ready(function() { + dw_mediamanager.update_resizable(1); +}); + jQuery(dw_mediamanager.init); -- cgit v1.2.3 From dd9ba38e965cfc3c06fbb80fed65556dbfbfda1c Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Thu, 14 Jul 2011 11:36:48 +0300 Subject: mediamanager tabs, upload form fix --- lib/scripts/media.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index af5346cbe..de3d03dfe 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -64,7 +64,8 @@ var dw_mediamanager = { jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) .delegate('#mediamanager__tabs_list a', 'click', dw_mediamanager.list_view) .delegate('#mediamanager__file_list a', 'click', dw_mediamanager.details) - .delegate('#dw__mediasearch', 'submit', dw_mediamanager.list); + .delegate('#dw__mediasearch', 'submit', dw_mediamanager.list) + .delegate('#upload__file', 'change', dw_mediamanager.suggest); jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list) @@ -216,6 +217,9 @@ var dw_mediamanager = { $file = jQuery(this); $name = jQuery('#upload__name'); + + if ($name.val() != '') return; + if(!$file.length || !$name.length) { return; } -- cgit v1.2.3 From 23786fd7ff0ff9c41ba627bc43ba6a45d3b779cc Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Thu, 14 Jul 2011 23:37:38 +0300 Subject: mediamanager icons --- lib/scripts/media.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index de3d03dfe..62cc1e7bb 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -329,7 +329,11 @@ var dw_mediamanager = { if ($link[0].id == 'mediamanager__btn_restore' && !confirm(LANG['restore_confirm'])) return false; $content = jQuery('#mediamanager__layout_detail'); - jQuery('.scroll-container', $content).html('...'); + if (jQuery('.scroll-container', $content).length) { + jQuery('.scroll-container', $content).html('...'); + } else { + jQuery($content).html('...'); + } params = ''; -- cgit v1.2.3 From e136d6cc09a2c32050ecc37d7b0deebd0979c15d Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sat, 16 Jul 2011 23:48:48 +0300 Subject: mediamanager image diff --- lib/scripts/media.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 777eb4825..8500166dc 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -369,6 +369,9 @@ var dw_mediamanager = { dw_mediamanager.prepare_content($content); dw_mediamanager.updatehide(); dw_mediamanager.update_resizable(0); + dw_mediamanager.opacity_slider(); + dw_mediamanager.portions_slider(); + }, 'html' ); @@ -398,6 +401,30 @@ var dw_mediamanager = { }); }, + opacity_slider: function () { + var $slider = jQuery( "#mediamanager__opacity_slider" ); + $slider.slider(); + $slider.slider("option", "min", 0); + $slider.slider("option", "max", 0.999); + $slider.slider("option", "step", 0.001); + $slider.slider("option", "value", 0.5); + $slider.bind("slide", function(event, ui) { + jQuery('#mediamanager__diff_opacity_image2').css({ opacity: $slider.slider("option", "value")}); + }); + }, + + 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")+'%'}); + }); + }, + prepare_content: function ($content) { // hide syntax example $content.find('div.example:visible').hide(); @@ -680,6 +707,8 @@ function hasFlash(version){ jQuery(document).ready(function() { dw_mediamanager.update_resizable(1); + dw_mediamanager.opacity_slider(); + dw_mediamanager.portions_slider(); }); jQuery(dw_mediamanager.init); -- cgit v1.2.3 From fa8e5c7713944541c907aea2b81c6a44382a15f0 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 17 Jul 2011 18:42:43 +0300 Subject: mediamanager html, css reworking --- 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 8500166dc..c5e6afc9b 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -302,10 +302,12 @@ var dw_mediamanager = { event.preventDefault(); $content = jQuery('#mediamanager__file_list'); - if ($link.hasClass('mediamanager-link-thumbnails')) { + + if ($link[0].id == 'mediamanager__link_thumbs') { $content.removeClass('mediamanager-list'); $content.addClass('mediamanager-thumbs'); - } else if ($link.hasClass('mediamanager-link-list')) { + + } else if ($link[0].id == 'mediamanager__link_list') { $content.removeClass('mediamanager-thumbs'); $content.addClass('mediamanager-list'); } -- cgit v1.2.3 From 80291f9e4256d8bd01f0b0a0589aab2ea402ab64 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Mon, 18 Jul 2011 16:51:47 +0300 Subject: mediamanager resize --- lib/scripts/media.js | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c5e6afc9b..00a4821d0 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -380,27 +380,38 @@ var dw_mediamanager = { }, update_resizable: function (count_width) { - jQuery(".layout").resizable({ handles: 'e' }); - jQuery(".layout").bind("resize", function(event, ui) { - var w = 0; - jQuery(".layout").each(function() { - w += jQuery(this).width(); - }); - jQuery('#id-mediamanager-layout').width(w+30); - }); + $resizable = jQuery("#mediamanager__layout .layout-resizable"); + + $resizable.resizable({ handles: 'e' , + resize: function(event, ui){ + var w = 0; + $resizable.each(function() { + w += jQuery(this).width(); + }); + wSum = w + parseFloat(jQuery('#mediamanager__layout_detail').css("min-width")); - var w = 0; - jQuery(".layout").each(function() { - if (count_width) jQuery(this).width(jQuery(this).width()); - w += jQuery(this).width(); + // max width of resizable column + var maxWidth = 0.95 * jQuery('#mediamanager__layout').width() - wSum + jQuery(this).width() - 30; + $resizable.resizable( "option", "maxWidth", maxWidth ); + + // percentage width of the first two columns + var wLeft = ( 100*(w+30) / jQuery('#mediamanager__layout').width() ); + + // width of the third column + var wRight = 95-wLeft; + wRight += "%"; + jQuery('#mediamanager__layout_detail').width(wRight); + } }); - jQuery('#id-mediamanager-layout').width(w+30); var windowHeight = jQuery(window).height(); var height = windowHeight - 300; - jQuery('.scroll-container').each(function (i) { + jQuery('#mediamanager__layout .scroll-container').each(function (i) { jQuery(this).height(height); }); + $resizable.each(function() { + jQuery(this).height(height+100); + }); }, opacity_slider: function () { @@ -711,6 +722,7 @@ jQuery(document).ready(function() { dw_mediamanager.update_resizable(1); dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); + jQuery(window).resize(dw_mediamanager.update_resizable); }); jQuery(dw_mediamanager.init); -- cgit v1.2.3 From 67c8cda19c0bf26a746d5c5cf9c82ee7ae5f23ca Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Tue, 19 Jul 2011 18:36:15 +0300 Subject: mediamanager revisions form --- 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 00a4821d0..a6f6c25d4 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -373,7 +373,7 @@ var dw_mediamanager = { dw_mediamanager.update_resizable(0); dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); - + addInitEvent(revisionsForm); }, 'html' ); -- cgit v1.2.3 From abc306f45f2ace038967bf7c51abd6ea53f56170 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Mon, 25 Jul 2011 16:23:24 +0300 Subject: mediamanager sort button --- lib/scripts/media.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index a6f6c25d4..44928417f 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -60,18 +60,33 @@ var dw_mediamanager = { }}); $tree.delegate('a', 'click', dw_mediamanager.list); + jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); + + // changing opened tab in the file list panel jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) + // changing type of the file list view .delegate('#mediamanager__tabs_list a', 'click', dw_mediamanager.list_view) + // loading file details .delegate('#mediamanager__file_list a', 'click', dw_mediamanager.details) + // search form .delegate('#dw__mediasearch', 'submit', dw_mediamanager.list) - .delegate('#upload__file', 'change', dw_mediamanager.suggest); + // "upload as" field autofill + .delegate('#upload__file', 'change', dw_mediamanager.suggest) + // sort type selection + .delegate('#mediamanager__form_sort select', 'change', dw_mediamanager.list); + // changing opened tab in the file details panel jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) + // "update new version" button .delegate('#mediamanager__btn_update', 'submit', dw_mediamanager.list) + // revisions form .delegate('#page__revisions', 'submit', dw_mediamanager.details) .delegate('#page__revisions a', 'click', dw_mediamanager.details) + // meta edit form .delegate('#mediamanager__save_meta', 'submit', dw_mediamanager.details) + // delete button .delegate('#mediamanager__btn_delete', 'submit', dw_mediamanager.details) + // "restore this version" button .delegate('#mediamanager__btn_restore', 'submit', dw_mediamanager.details); }, @@ -270,6 +285,8 @@ var dw_mediamanager = { params = $link[0].search.substr(1)+'&call=medialist'; } else if ($link[0].action) { params = dw_mediamanager.form_params($link)+'&call=medialist'; + } else if ($link.parents('form')) { + params = dw_mediamanager.form_params($link.parents('form'))+'&call=medialist'; } // fetch the subtree -- cgit v1.2.3 From 4ee1558545059fa73700709a9ef4c0ab22ce8f92 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Tue, 26 Jul 2011 11:55:38 +0300 Subject: image diffs fixes --- lib/scripts/media.js | 72 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 67 insertions(+), 5 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 44928417f..42035a595 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -61,6 +61,7 @@ var dw_mediamanager = { $tree.delegate('a', 'click', dw_mediamanager.list); jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); + dw_mediamanager.image_diff(); // changing opened tab in the file list panel jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) @@ -357,8 +358,10 @@ var dw_mediamanager = { if ($link[0].search) { params = $link[0].search.substr(1)+'&call=mediadetails'; - } else { + } else if ($link[0].action) { params = dw_mediamanager.form_params($link)+'&call=mediadetails'; + } else if ($link.parents('form')) { + params = dw_mediamanager.form_params($link.parents('form'))+'&call=mediadetails'; } dw_mediamanager.update_content($content, params); @@ -385,17 +388,24 @@ var dw_mediamanager = { }); $content.html(data); + dw_mediamanager.prepare_content($content); dw_mediamanager.updatehide(); + dw_mediamanager.update_resizable(0); - dw_mediamanager.opacity_slider(); - dw_mediamanager.portions_slider(); addInitEvent(revisionsForm); + jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); + dw_mediamanager.image_diff(); }, 'html' ); }, + /** + * Updates mediamanager layout + * + * @author Kate Arzamastseva + */ update_resizable: function (count_width) { $resizable = jQuery("#mediamanager__layout .layout-resizable"); @@ -431,6 +441,55 @@ var dw_mediamanager = { }); }, + /** + * Prints 'select' for image difference representation type + * + * @author Kate Arzamastseva + */ + image_diff: function () { + if (jQuery('#mediamanager__difftype').length) return; + + $form = jQuery('#mediamanager__form_diffview'); + $label = jQuery(document.createElement('label')); + $label.append(''+LANG.media_diff+''); + $select = jQuery(document.createElement('select')) + .attr('id', 'mediamanager__difftype') + .attr('name', 'difftype') + .change(dw_mediamanager.change_diff_type); + $select.append(new Option(LANG.media_diff_both, "both")); + $select.append(new Option(LANG.media_diff_opacity, "opacity")); + $select.append(new Option(LANG.media_diff_portions, "portions")); + $label.append($select); + $form.append($label); + }, + + /** + * Handles selection of image difference representation type + * + * @author Kate Arzamastseva + */ + change_diff_type: function () { + $select = jQuery('#mediamanager__difftype'); + $content = jQuery('#mediamanager__diff'); + + params = dw_mediamanager.form_params($select.parents('form'))+'&call=mediadiff'; + jQuery.post( + DOKU_BASE + 'lib/exe/ajax.php', + params, + function (data) { + $content.html(data); + dw_mediamanager.opacity_slider(); + dw_mediamanager.portions_slider(); + }, + 'html' + ); + }, + + /** + * Sets options for opacity diff slider + * + * @author Kate Arzamastseva + */ opacity_slider: function () { var $slider = jQuery( "#mediamanager__opacity_slider" ); $slider.slider(); @@ -443,6 +502,11 @@ var dw_mediamanager = { }); }, + /** + * Sets options for red line diff slider + * + * @author Kate Arzamastseva + */ portions_slider: function () { var $slider = jQuery( "#mediamanager__portions_slider" ); $slider.slider(); @@ -737,8 +801,6 @@ function hasFlash(version){ jQuery(document).ready(function() { dw_mediamanager.update_resizable(1); - dw_mediamanager.opacity_slider(); - dw_mediamanager.portions_slider(); jQuery(window).resize(dw_mediamanager.update_resizable); }); -- cgit v1.2.3 From 676706d3b056c9ad075c09b3bed23a4c2b248f52 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Tue, 26 Jul 2011 11:59:39 +0300 Subject: mediamanager files view state persisted --- lib/scripts/media.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 42035a595..ebd9da2f8 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -22,6 +22,9 @@ var dw_mediamanager = { size: false, forbidden_opts: {}, + // File list view type + view: false, + init: function () { var $content, $tree; $content = jQuery('#media__content'); @@ -60,6 +63,7 @@ var dw_mediamanager = { }}); $tree.delegate('a', 'click', dw_mediamanager.list); + dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); dw_mediamanager.image_diff(); @@ -322,12 +326,28 @@ var dw_mediamanager = { $content = jQuery('#mediamanager__file_list'); if ($link[0].id == 'mediamanager__link_thumbs') { + dw_mediamanager.set_filelist_view('thumbs', true); + + } else if ($link[0].id == 'mediamanager__link_list') { + dw_mediamanager.set_filelist_view('list', true); + } + }, + + set_filelist_view: function (type, cookies) { + var $content = jQuery('#mediamanager__file_list'); + if (!type) type = DokuCookie.getValue('view'); + + if (type == 'thumbs') { $content.removeClass('mediamanager-list'); $content.addClass('mediamanager-thumbs'); + if (cookies) DokuCookie.setValue('view', 'thumbs'); + dw_mediamanager.view = 'thumbs'; - } else if ($link[0].id == 'mediamanager__link_list') { + } else if (type == 'list') { $content.removeClass('mediamanager-thumbs'); $content.addClass('mediamanager-list'); + if (cookies) DokuCookie.setValue('view', 'list'); + dw_mediamanager.view = 'list'; } }, @@ -395,6 +415,7 @@ var dw_mediamanager = { dw_mediamanager.update_resizable(0); addInitEvent(revisionsForm); jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); + dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); dw_mediamanager.image_diff(); }, 'html' -- cgit v1.2.3 From d971ea8b02ccca4dd879a5db966670e0f3b4f102 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sat, 30 Jul 2011 20:50:49 +0300 Subject: issue #39 sort by date desc, saved in cookie --- lib/scripts/media.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index ebd9da2f8..ff87299cf 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -292,6 +292,10 @@ var dw_mediamanager = { params = dw_mediamanager.form_params($link)+'&call=medialist'; } else if ($link.parents('form')) { params = dw_mediamanager.form_params($link.parents('form'))+'&call=medialist'; + + if ($link.parents('form')[0].id == 'mediamanager__form_sort') { + DokuCookie.setValue('sort', $link[0].value); + } } // fetch the subtree @@ -305,6 +309,7 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ form_params: function ($form) { + if (!$form.length) return; var elements = $form.serialize(); var action = ''; var i = $form[0].action.indexOf('?'); @@ -471,6 +476,8 @@ var dw_mediamanager = { if (jQuery('#mediamanager__difftype').length) return; $form = jQuery('#mediamanager__form_diffview'); + if (!$form.length) return; + $label = jQuery(document.createElement('label')); $label.append(''+LANG.media_diff+''); $select = jQuery(document.createElement('select')) -- cgit v1.2.3 From 9bd9c4373f31bb381fd80564decd8671d942fdc8 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 31 Jul 2011 22:47:47 +0300 Subject: issue #32 calculation of the panels width is redone when browser window is resized --- lib/scripts/media.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index ff87299cf..17006e289 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -25,6 +25,8 @@ var dw_mediamanager = { // File list view type view: false, + layout_width: 0, + init: function () { var $content, $tree; $content = jQuery('#media__content'); @@ -417,7 +419,7 @@ var dw_mediamanager = { dw_mediamanager.prepare_content($content); dw_mediamanager.updatehide(); - dw_mediamanager.update_resizable(0); + dw_mediamanager.update_resizable(); addInitEvent(revisionsForm); jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); @@ -427,12 +429,53 @@ var dw_mediamanager = { ); }, + window_resize: function () { + if (jQuery('#mediamanager__layout').width() == dw_mediamanager.layout_width) { + return; + } + + dw_mediamanager.layout_width = jQuery('#mediamanager__layout').width(); + + $r = jQuery("#mediamanager__layout .layout-resizable, #mediamanager__layout .layout"); + + var w = 0, wSum = 0, mCount = 0, mArray = []; + $r.each(function() { + w = jQuery(this).width(); + if (w == parseFloat(jQuery(this).css("min-width"))) { + wSum += w; + } else { + mArray[mCount] = jQuery(this); + mCount++; + } + }); + + if (mCount > 0) { + var width = (0.95 * jQuery('#mediamanager__layout').width() - wSum - 30); + wSum = 0; + for(var i = 0; i < mArray.length; i++) { + wSum += mArray[i].width(); + } + for(var i = 0; i < mArray.length; i++) { + w = mArray[i].width(); + w = 100*w / wSum; + mArray[i].width(width*w/100); + } + } + + $r.each(function() { + w = jQuery(this).width(); + w = (100 * w / jQuery('#mediamanager__layout').width()); + w += "%"; + jQuery(this).width(w); + }); + }, + /** * Updates mediamanager layout * * @author Kate Arzamastseva */ - update_resizable: function (count_width) { + update_resizable: function () { $resizable = jQuery("#mediamanager__layout .layout-resizable"); $resizable.resizable({ handles: 'e' , @@ -454,6 +497,13 @@ var dw_mediamanager = { var wRight = 95-wLeft; wRight += "%"; jQuery('#mediamanager__layout_detail').width(wRight); + + $resizable.each(function() { + w = jQuery(this).width(); + w = (100 * w / jQuery('#mediamanager__layout').width()); + w += "%"; + jQuery(this).width(w); + }); } }); @@ -828,8 +878,9 @@ function hasFlash(version){ } jQuery(document).ready(function() { - dw_mediamanager.update_resizable(1); - jQuery(window).resize(dw_mediamanager.update_resizable); + dw_mediamanager.update_resizable(); + dw_mediamanager.layout_width = jQuery("#mediamanager__layout").width(); + jQuery(window).resize(dw_mediamanager.window_resize); }); jQuery(dw_mediamanager.init); -- cgit v1.2.3 From 69143ff27bdf2a979818367613e604f8ee4aef88 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Mon, 1 Aug 2011 01:21:21 +0300 Subject: issue #40 image resized in all diff views --- lib/scripts/media.js | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) (limited to 'lib/scripts/media.js') 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 */ 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) { -- cgit v1.2.3 From a1a02ef6d327f2de7ffc7db57a7907465761b407 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Wed, 3 Aug 2011 19:10:16 +0300 Subject: issue #43 diff slider --- lib/scripts/media.js | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index e8c492f5f..f0c4c679c 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -560,8 +560,8 @@ var dw_mediamanager = { params, function (data) { $content.html(data); - dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); + dw_mediamanager.opacity_slider(); }, 'html' ); @@ -574,6 +574,7 @@ var dw_mediamanager = { */ opacity_slider: function () { var $slider = jQuery( "#mediamanager__opacity_slider" ); + if (!$slider.length) return; $slider.slider(); $slider.slider("option", "min", 0); $slider.slider("option", "max", 0.999); @@ -590,39 +591,31 @@ var dw_mediamanager = { * @author Kate Arzamastseva */ portions_slider: function () { + var $image1 = jQuery('#mediamanager__diff_portions_image1 img'); var $image2 = jQuery('#mediamanager__diff_portions_image2 img'); - if ($image2) { - $image2 = jQuery($image2[0]); + if (!$image1.length || !$image2.length) return; - $image2.parent().css({ - width: '100%' - }); + var $div = jQuery("#mediamanager__diff_layout"); + if (!$div.length) return; - $image2.css({ - width: '100%', - height: 'auto' - }); + if ($image1.width() < $div.width()) { + $div.width($image1.width()); + } - $image2.css({ - width: $image2.width() + 'px', - height: $image2.height() + 'px' - }); + $image2.parent().width('50%'); + $image2.width($image1.width()); - var $div = jQuery("#mediamanager__diff_layout"); - if ($image2.width() < $div.width()) { - $div.width($image2.width()); - } + var $slider = jQuery("#mediamanager__portions_slider"); + if (!$slider.length) return; + $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 $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) { -- cgit v1.2.3 From 09063cc66339d6e5daa12af4896a2457c03cfaf3 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Thu, 4 Aug 2011 20:32:16 +0300 Subject: issue #44 multi file uploader --- lib/scripts/media.js | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index f0c4c679c..6c5c2611e 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -68,6 +68,8 @@ var dw_mediamanager = { dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); dw_mediamanager.image_diff(); + dw_mediamanager.init_ajax_uploader(); + createUploader(); // changing opened tab in the file list panel jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) @@ -424,6 +426,8 @@ var dw_mediamanager = { jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); dw_mediamanager.image_diff(); + dw_mediamanager.init_ajax_uploader(); + createUploader(); }, 'html' ); @@ -615,7 +619,25 @@ var dw_mediamanager = { $slider.bind("slide", function(event, ui) { jQuery('#mediamanager__diff_portions_image2').css({ width: $slider.slider("option", "value")+'%'}); }); + }, + + init_ajax_uploader: function () { + var $form = jQuery('#dw__upload'); + if(!$form.length) return; + jQuery(document.createElement('img')) + .attr('src', DOKU_BASE+'lib/images/multiupload.png') + .attr('title', LANG.mu_btn) + .attr('alt', LANG.mu_btn) + .css('cursor', 'pointer') + .click( + function () { + //$form.html('
'); + $form.hide(); + jQuery('#mediamanager__uploader').show(); + } + ) + .appendTo($form); }, prepare_content: function ($content) { @@ -898,6 +920,29 @@ function hasFlash(version){ return ver >= version; } +function getUrlVars(str) { + var vars = [], hash; + var hashes = str.split('&'); + for(var i = 0; i < hashes.length; i++) { + hash = hashes[i].split('='); + vars[hash[0]] = hash[1]; + } + return vars; +} + +function createUploader(){ + if (!jQuery('#dw__upload').length || !jQuery('#mediamanager__uploader').length) return; + + var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload'; + params = getUrlVars(params); + + var uploader = new qq.FileUploader({ + element: document.getElementById('mediamanager__uploader'), + action: DOKU_BASE + 'lib/exe/ajax.php', + params: params + }); +} + jQuery(document).ready(function() { dw_mediamanager.update_resizable(); dw_mediamanager.layout_width = jQuery("#mediamanager__layout").width(); -- cgit v1.2.3 From b4b31bac3276c93277a8b70368aee135b7fdde09 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sat, 6 Aug 2011 16:21:06 +0300 Subject: issue #43 images align --- lib/scripts/media.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 6c5c2611e..26eb43fc3 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -439,11 +439,6 @@ 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 = []; @@ -476,6 +471,9 @@ var dw_mediamanager = { w += "%"; jQuery(this).width(w); }); + + dw_mediamanager.opacity_slider(); + dw_mediamanager.portions_slider(); }, /** @@ -512,6 +510,9 @@ var dw_mediamanager = { w += "%"; jQuery(this).width(w); }); + + dw_mediamanager.opacity_slider(); + dw_mediamanager.portions_slider(); } }); @@ -579,6 +580,11 @@ var dw_mediamanager = { opacity_slider: function () { var $slider = jQuery( "#mediamanager__opacity_slider" ); if (!$slider.length) return; + + var $image = jQuery('#mediamanager__diff_opacity_image1 img'); + if (!$image.length) return; + $slider.width($image.width()-20); + $slider.slider(); $slider.slider("option", "min", 0); $slider.slider("option", "max", 0.999); @@ -602,18 +608,26 @@ var dw_mediamanager = { var $div = jQuery("#mediamanager__diff_layout"); if (!$div.length) return; + $div.width('100%'); + $image2.parent().width('97%'); + $image1.width('100%'); + $image2.width('100%'); + if ($image1.width() < $div.width()) { $div.width($image1.width()); } $image2.parent().width('50%'); $image2.width($image1.width()); + $image1.width($image1.width()); var $slider = jQuery("#mediamanager__portions_slider"); if (!$slider.length) return; + $slider.width($image1.width()-20); + $slider.slider(); $slider.slider("option", "min", 0); - $slider.slider("option", "max", 100); + $slider.slider("option", "max", 97); $slider.slider("option", "step", 1); $slider.slider("option", "value", 50); $slider.bind("slide", function(event, ui) { -- cgit v1.2.3 From 8d7448594cb00e995bed9b6e6db6e7f9280da24d Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 7 Aug 2011 13:54:36 +0300 Subject: issue #44 fileuploader specific changes made in inheriting class --- 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 26eb43fc3..5ba3b38be 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -950,7 +950,7 @@ function createUploader(){ var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload'; params = getUrlVars(params); - var uploader = new qq.FileUploader({ + var uploader = new qq.FileUploaderExtended({ element: document.getElementById('mediamanager__uploader'), action: DOKU_BASE + 'lib/exe/ajax.php', params: params -- cgit v1.2.3 From 92c93223d0fce2c5de1f4d3d134be56d1d9f3bc0 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 7 Aug 2011 15:12:12 +0300 Subject: issue #44 new fileuploader completely replaces the old one --- lib/scripts/media.js | 59 +++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 5ba3b38be..b4f1c0322 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -69,7 +69,6 @@ var dw_mediamanager = { jQuery('#mediamanager__form_sort').find('input[type=submit]').hide(); dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); - createUploader(); // changing opened tab in the file list panel jQuery('#mediamanager__layout_list').delegate('#mediamanager__tabs_files a', 'click', dw_mediamanager.list) @@ -427,7 +426,6 @@ var dw_mediamanager = { dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); - createUploader(); }, 'html' ); @@ -635,23 +633,27 @@ var dw_mediamanager = { }); }, + params_toarray: function (str) { + var vars = [], hash; + var hashes = str.split('&'); + for(var i = 0; i < hashes.length; i++) { + hash = hashes[i].split('='); + vars[hash[0]] = hash[1]; + } + return vars; + }, + init_ajax_uploader: function () { - var $form = jQuery('#dw__upload'); - if(!$form.length) return; + if (!jQuery('#mediamanager__uploader').length) return; - jQuery(document.createElement('img')) - .attr('src', DOKU_BASE+'lib/images/multiupload.png') - .attr('title', LANG.mu_btn) - .attr('alt', LANG.mu_btn) - .css('cursor', 'pointer') - .click( - function () { - //$form.html('
'); - $form.hide(); - jQuery('#mediamanager__uploader').show(); - } - ) - .appendTo($form); + var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload'; + params = dw_mediamanager.params_toarray(params); + + var uploader = new qq.FileUploaderExtended({ + element: document.getElementById('mediamanager__uploader'), + action: DOKU_BASE + 'lib/exe/ajax.php', + params: params + }); }, prepare_content: function ($content) { @@ -934,29 +936,6 @@ function hasFlash(version){ return ver >= version; } -function getUrlVars(str) { - var vars = [], hash; - var hashes = str.split('&'); - for(var i = 0; i < hashes.length; i++) { - hash = hashes[i].split('='); - vars[hash[0]] = hash[1]; - } - return vars; -} - -function createUploader(){ - if (!jQuery('#dw__upload').length || !jQuery('#mediamanager__uploader').length) return; - - var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload'; - params = getUrlVars(params); - - var uploader = new qq.FileUploaderExtended({ - element: document.getElementById('mediamanager__uploader'), - action: DOKU_BASE + 'lib/exe/ajax.php', - params: params - }); -} - jQuery(document).ready(function() { dw_mediamanager.update_resizable(); dw_mediamanager.layout_width = jQuery("#mediamanager__layout").width(); -- cgit v1.2.3 From f517998ad64483b6394211a971db2d3a660518c6 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 7 Aug 2011 22:14:10 +0300 Subject: issue #45 browser testing --- lib/scripts/media.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index b4f1c0322..4fc4155b2 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -546,6 +546,12 @@ var dw_mediamanager = { $select.append(new Option(LANG.media_diff_portions, "portions")); $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; }, /** -- cgit v1.2.3 From 873cd06e1bda38e0decce16d6ec7d3bdaece612e Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Mon, 15 Aug 2011 14:22:19 +0300 Subject: issue #50 styling the new uploader --- lib/scripts/media.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 4fc4155b2..c1ff1f451 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -81,7 +81,9 @@ var dw_mediamanager = { // "upload as" field autofill .delegate('#upload__file', 'change', dw_mediamanager.suggest) // sort type selection - .delegate('#mediamanager__form_sort select', 'change', dw_mediamanager.list); + .delegate('#mediamanager__form_sort select', 'change', dw_mediamanager.list) + // uploaded images + .delegate('.qq-upload-file a', 'click', dw_mediamanager.details); // changing opened tab in the file details panel jQuery('#mediamanager__layout_detail').delegate('#mediamanager__tabs_details a', 'click', dw_mediamanager.details) @@ -651,6 +653,7 @@ var dw_mediamanager = { init_ajax_uploader: function () { if (!jQuery('#mediamanager__uploader').length) return; + if (jQuery('.qq-upload-list').length) return; var params = dw_mediamanager.form_params(jQuery('#dw__upload'))+'&call=mediaupload'; params = dw_mediamanager.params_toarray(params); -- cgit v1.2.3 From 7e6b49bbbfd05509233484c1cddc2352e9246b94 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Mon, 15 Aug 2011 19:30:48 +0300 Subject: media revisions form less/more recent buttons fix --- lib/scripts/media.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index c1ff1f451..d5fdf1fdb 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -97,7 +97,9 @@ var dw_mediamanager = { // delete button .delegate('#mediamanager__btn_delete', 'submit', dw_mediamanager.details) // "restore this version" button - .delegate('#mediamanager__btn_restore', 'submit', dw_mediamanager.details); + .delegate('#mediamanager__btn_restore', 'submit', dw_mediamanager.details) + // less/more recent buttons in media revisions form + .delegate('.btn_newer, .btn_older', 'submit', dw_mediamanager.details); }, -- cgit v1.2.3 From 96a7ba82ad21ad7bd7cd5f677d85042da7733605 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Fri, 19 Aug 2011 18:48:19 +0300 Subject: issue #56 ajax deleting images --- lib/scripts/media.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index d5fdf1fdb..36dadf232 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -396,21 +396,11 @@ var dw_mediamanager = { params = dw_mediamanager.form_params($link.parents('form'))+'&call=mediadetails'; } - dw_mediamanager.update_content($content, params); - update_list = ($link[0].id == 'mediamanager__btn_delete' || $link[0].id == 'mediamanager__btn_restore'); - if (update_list) { - var $link1, $content1, params1; - $link1 = jQuery('a.files'); - params1 = $link1[0].search.substr(1)+'&call=medialist'; - $content1 = jQuery('#mediamanager__layout_list'); - jQuery('.scroll-container', $content1).html('...'); - - dw_mediamanager.update_content($content1, params1); - } + dw_mediamanager.update_content($content, params, update_list); }, - update_content: function ($content, params) { + update_content: function ($content, params, update_list) { jQuery.post( DOKU_BASE + 'lib/exe/ajax.php', params, @@ -430,6 +420,16 @@ var dw_mediamanager = { dw_mediamanager.set_filelist_view(dw_mediamanager.view, false); dw_mediamanager.image_diff(); dw_mediamanager.init_ajax_uploader(); + + if (update_list) { + var $link1, $content1, params1; + $link1 = jQuery('a.files'); + params1 = $link1[0].search.substr(1)+'&call=medialist'; + $content1 = jQuery('#mediamanager__layout_list'); + jQuery('.scroll-container', $content1).html('...'); + + dw_mediamanager.update_content($content1, params1); + } }, 'html' ); -- cgit v1.2.3 From c472bad9de398442c30ec1410d07284f0db8b821 Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Fri, 19 Aug 2011 20:56:43 +0300 Subject: issue #44 new uploader in the media popup --- lib/scripts/media.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 36dadf232..997321a65 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -43,7 +43,8 @@ var dw_mediamanager = { .delegate('a.select', 'click', dw_mediamanager.select) // Attach deletion confirmation dialog to the delete buttons .delegate('#media__content a.btn_media_delete', 'click', - dw_mediamanager.confirmattach); + dw_mediamanager.confirmattach) + .delegate('#mediamanager__done_form', 'submit', dw_mediamanager.list); $tree.dw_tree({toggle_selector: 'img', load_data: function (show_sublist, $clicky) { @@ -670,7 +671,6 @@ var dw_mediamanager = { prepare_content: function ($content) { // hide syntax example $content.find('div.example:visible').hide(); - dw_mediamanager.initFlashUpload(); }, /** -- cgit v1.2.3 From 9de3b5710719658ef75740c0bd930423cc7c209c Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sun, 21 Aug 2011 02:16:39 +0300 Subject: issue #44 uploader fixes, #45 browser testing --- lib/scripts/media.js | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'lib/scripts/media.js') 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('...'); - } else { //fullscreen media manager $content = jQuery('#mediamanager__layout_list'); @@ -288,8 +286,6 @@ var dw_mediamanager = { }); $link.addClass('selected'); } - - jQuery('.scroll-container', $content).html('...'); } 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('...'); + } else { + //fullscreen media manager + jQuery('.scroll-container', $content).html('...'); + } }, /** @@ -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('...'); - } else { - jQuery($content).html('...'); - } - 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('...'); + } else { + jQuery($content).html('...'); + } }, 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('...'); - dw_mediamanager.update_content($content1, params1); + jQuery('.scroll-container', $content1).html('...'); } }, '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; }, /** -- cgit v1.2.3 From 87deddfa454164964c2fb71481cf480b3d2d92df Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Sat, 27 Aug 2011 00:59:47 +0300 Subject: issue #54 listview switch/sorting on search --- lib/scripts/media.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index 7103727c5..e48c9c1b0 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -299,6 +299,8 @@ var dw_mediamanager = { if ($link.parents('form')[0].id == 'mediamanager__form_sort') { DokuCookie.setValue('sort', $link[0].value); + params += '&q=' + jQuery('#mediamanager__sort_textfield').val(); + params += '&mediado=searchlist'; } } -- cgit v1.2.3 From 69b29ddf0b274b494a4ded27e96cf57c8370876b Mon Sep 17 00:00:00 2001 From: Kate Arzamastseva Date: Fri, 2 Sep 2011 20:31:05 +0300 Subject: mediamanager window resize fix --- lib/scripts/media.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib/scripts/media.js') diff --git a/lib/scripts/media.js b/lib/scripts/media.js index e48c9c1b0..f4064efd5 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -26,6 +26,7 @@ var dw_mediamanager = { view: false, layout_width: 0, + layout_height: 0, init: function () { var $content, $tree; @@ -480,6 +481,18 @@ var dw_mediamanager = { jQuery(this).width(w); }); + var windowHeight = jQuery(window).height(); + var height = windowHeight - 300; + if (layout_height < height) { + layout_height = height; + jQuery('#mediamanager__layout .scroll-container').each(function (i) { + jQuery(this).height(height); + }); + $resizable.each(function() { + jQuery(this).height(height+100); + }); + } + dw_mediamanager.opacity_slider(); dw_mediamanager.portions_slider(); }, @@ -526,6 +539,7 @@ var dw_mediamanager = { var windowHeight = jQuery(window).height(); var height = windowHeight - 300; + layout_height = height; jQuery('#mediamanager__layout .scroll-container').each(function (i) { jQuery(this).height(height); }); -- cgit v1.2.3