mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Implemented a jQuery based version of documents.getElementsBySelector
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64339 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d66ee2f738
commit
365622c0c9
@ -121,6 +121,7 @@ class LeftAndMain extends Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/prototype.js');
|
||||||
|
Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js');
|
||||||
Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
|
Requirements::javascript(THIRDPARTY_DIR . '/loader.js');
|
||||||
|
@ -252,7 +252,7 @@ function ajaxActionsAtTop(formName, actionHolderName, tabName) {
|
|||||||
var actions = document.getElementsBySelector('#' + formName + ' .Actions')[0];
|
var actions = document.getElementsBySelector('#' + formName + ' .Actions')[0];
|
||||||
var holder;
|
var holder;
|
||||||
|
|
||||||
if((holder = $(actionHolderName)) && holder != actions && holder.className != 'ajaxActions') {
|
if((holder = $(actionHolderName)) && holder != actions) {
|
||||||
holder.parentNode.removeChild(holder);
|
holder.parentNode.removeChild(holder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -129,9 +129,12 @@ CMSForm.prototype = {
|
|||||||
tinyMCE.onLoad();
|
tinyMCE.onLoad();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this.prepareForm) this.prepareForm();
|
// We assume that an evaluated response is generated by FormResponse
|
||||||
|
// which takes care of calling these method it
|
||||||
Behaviour.apply(this);
|
if (!evalResponse) {
|
||||||
|
if (this.prepareForm) this.prepareForm();
|
||||||
|
Behaviour.apply(this);
|
||||||
|
}
|
||||||
|
|
||||||
if(this.resetElements) this.resetElements();
|
if(this.resetElements) this.resetElements();
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
Behaviour.register({
|
Behaviour.register({
|
||||||
'#Form_EditForm' : {
|
'#Form_EditForm' : {
|
||||||
initialise : function() {
|
initialise : function() {
|
||||||
this.openTab = null;
|
this.openTab = null;
|
||||||
this.prepareForm();
|
this.prepareForm();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user