tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed CMS panel expansion after changing links in the CMS (needed to retain the layout settings of the old panel to keep the preview expanded)

Browse Source
This commit is contained in:
Ingo Schommer 2011-12-14 22:18:19 +01:00
parent 2777637d82
commit d3477cc13c
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/javascript/LeftAndMain.js
View File

@ -152,13 +152,29 @@
// Update panels // Update panels
var newContentEl = $(data); var newContentEl = $(data);
if(newContentEl.find('.cms-container').length) { if(newContentEl.find('.cms-container').length) {
throw 'Content loaded via ajax is not allowed to contain tags matching the ".cms-container" selector to avoid infinite loops'; throw 'Content loaded via ajax is not allowed to contain tags matching the ".cms-container" selector to avoid infinite loops';
} }
// Set loading state and store element state
newContentEl.addClass('loading'); newContentEl.addClass('loading');
var origStyle = contentEl.attr('style'),
layoutClasses = ['east', 'west', 'center', 'north', 'south'],
origLayoutClasses = $.grep(
contentEl.attr('class').split(' '),
function(val) {
return ($.inArray(val, layoutClasses) >= 0);
}
);
newContentEl
.removeClass(layoutClasses.join(' '))
.addClass(origLayoutClasses.join(' '))
.attr('style', origStyle);
// Replace panel completely (we need to override the "layout" attribute, so can't replace the child instead)
contentEl.replaceWith(newContentEl); contentEl.replaceWith(newContentEl);
// Unset loading and restore element state (to avoid breaking existing panel visibility, e.g. with preview expanded)
self.redraw(); self.redraw();
newContentEl.removeClass('loading'); newContentEl.removeClass('loading');