an attempt to fix FS#2851, but still broken

see comment on above bug for more details
This commit is contained in:
Andreas Gohr 2013-10-12 11:44:02 +02:00
parent 6540219fb5
commit 8f341ad3f8
1 changed files with 18 additions and 9 deletions

View File

@ -128,15 +128,18 @@ var dw_mediamanager = {
});
// Init buttonset
$both.buttonset();
$both.buttonset({
// attach change handlers when the buttonset was created
create: function(event, ui){
$listType.children('input').change(function (event) {
dw_mediamanager.set_fileview_list();
});
// Change handlers
$listType.children('input').change(function (event) {
dw_mediamanager.set_fileview_list();
});
$sortBy.children('input').change(function (event) {
dw_mediamanager.set_fileview_sort();
dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this, event);
$sortBy.children('input').change(function (event) {
dw_mediamanager.set_fileview_sort();
dw_mediamanager.list.call(jQuery('#dw__mediasearch')[0] || this.form, event);
});
}
});
},
@ -336,6 +339,8 @@ var dw_mediamanager = {
params += dw_mediamanager.form_params($link.closest('form'));
}
console.log(params);
// fetch the subtree
dw_mediamanager.update_content($content, params);
},
@ -387,6 +392,7 @@ var dw_mediamanager = {
dw_mediamanager.view_opts[opt[0]] = new_val;
}
},
/**
@ -428,6 +434,10 @@ var dw_mediamanager = {
update_content: function ($content, params, update_list) {
var $container;
// destroy buttonsets, they don't get cleaned up correctly and we reload them here
jQuery('div.filelist div.panelHeader form.options li.listType').buttonset('destroy');
jQuery('div.filelist div.panelHeader form.options li.sortBy').buttonset('destroy');
jQuery.post(
DOKU_BASE + 'lib/exe/ajax.php',
params,
@ -452,7 +462,6 @@ var dw_mediamanager = {
dw_mediamanager.image_diff();
dw_mediamanager.init_ajax_uploader();
dw_mediamanager.init_options();
},
'html'
);