tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix for 'Create' page dropdown not always updating when selecting a new page in the SiteTree

Browse Source 
This was only updated when the 'Create' page options was open, so if you selected a different page and then clicked the 'Create' button it would have the original options
This commit is contained in:
Lee Bradley 2013-11-12 11:59:03 +00:00 committed by Ingo Schommer
parent 4ec85a412f
commit f4b7fe05fa
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
javascript/CMSMain_left.js
View File

@ -32,6 +32,7 @@ addpageclass.prototype = {
var selectedNode = $('sitetree').firstSelected(); var selectedNode = $('sitetree').firstSelected();
if(selectedNode) this.showApplicableChildrenPageTypes(selectedNode.hints); if(selectedNode) this.showApplicableChildrenPageTypes(selectedNode.hints);
} }
$('sitetree').observeMethod('SelectionChanged', this.treeSelectionChanged.bind(this));
}, },
onclick : function() { onclick : function() {
@ -46,9 +47,6 @@ addpageclass.prototype = {
if( selectedNode.hints && selectedNode.hints.defaultChild ) if( selectedNode.hints && selectedNode.hints.defaultChild )
$(_HANDLER_FORMS.addpage).elements.PageType.value = selectedNode.hints.defaultChild; $(_HANDLER_FORMS.addpage).elements.PageType.value = selectedNode.hints.defaultChild;
} }
this.o1 = $('sitetree').observeMethod('SelectionChanged', this.treeSelectionChanged.bind(this));
this.o2 = $(_HANDLER_FORMS[this.id]).observeMethod('Close', this.popupClosed.bind(this));
$(_HANDLER_FORMS[this.id]).elements.PageType.onchange = this.typeDropdown_change; $(_HANDLER_FORMS[this.id]).elements.PageType.onchange = this.typeDropdown_change;
} }
@ -73,7 +71,7 @@ addpageclass.prototype = {
this.resetPageTypeOptions(); this.resetPageTypeOptions();
if (typeof hints.allowedChildren != 'undefined') { if (typeof hints.allowedChildren != 'undefined') {
var select = $(_HANDLER_FORMS.addpage).elements.PageType; var select = $(_HANDLER_FORMS.addpage).elements.PageType;
var toRemove = new Array(); var toRemove = new Array();
for(var i = 0; i < select.options.length; i++) { for(var i = 0; i < select.options.length; i++) {
var itemFound = false; var itemFound = false;
@ -91,11 +89,6 @@ addpageclass.prototype = {
$(_HANDLER_FORMS.addpage).elements.PageType.value = selectedNode.hints.defaultChild; $(_HANDLER_FORMS.addpage).elements.PageType.value = selectedNode.hints.defaultChild;
}, },
popupClosed : function() {
$('sitetree').stopObserving(this.o1);
$(_HANDLER_FORMS.addpage).stopObserving(this.o2);
},
typeDropdown_change : function() { typeDropdown_change : function() {
// Don't do anything if we're already on an appropriate node // Don't do anything if we're already on an appropriate node
var sel = $('sitetree').firstSelected(); var sel = $('sitetree').firstSelected();