mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
MINOR Removed javascript debug call in ModelAdmin.js
ENHANCEMENT Calling tinymce callbacks for destroying previous instances and triggering saves in ModelAdmin.js. No full support for TinyMCE in ModelAdmin yet though. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79352 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
09128f09b2
commit
0b7572abd5
@ -89,6 +89,9 @@ $(document).ready(function() {
|
||||
$('#SearchForm_holder .tab form:not(#Form_ImportForm)').submit(function () {
|
||||
var $form = $(this);
|
||||
|
||||
// @todo TinyMCE coupling
|
||||
tinymce_removeAll();
|
||||
|
||||
$('#ModelAdminPanel').fn('startHistory', $(this).attr('action'), $(this).formToArray());
|
||||
$('#ModelAdminPanel').load($(this).attr('action'), $(this).formToArray(), standardStatusHandler(function(result) {
|
||||
if(!this.future || !this.future.length) {
|
||||
@ -100,7 +103,7 @@ $(document).ready(function() {
|
||||
|
||||
$('#form_actions_right').remove();
|
||||
Behaviour.apply();
|
||||
console.log(window.onresize);
|
||||
|
||||
if(window.onresize) window.onresize();
|
||||
// Remove the loading indicators from the buttons
|
||||
$('input[type=submit]', $form).removeClass('loading');
|
||||
@ -195,8 +198,14 @@ $(document).ready(function() {
|
||||
var form = $('#right form');
|
||||
var formAction = form.attr('action') + '?' + $(this).fieldSerialize();
|
||||
|
||||
// @todo TinyMCE coupling
|
||||
if(typeof tinyMCE != 'undefined') tinyMCE.triggerSave();
|
||||
|
||||
// Post the data to save
|
||||
$.post(formAction, form.formToArray(), function(result){
|
||||
// @todo TinyMCE coupling
|
||||
tinymce_removeAll();
|
||||
|
||||
$('#right #ModelAdminPanel').html(result);
|
||||
|
||||
if($('#right #ModelAdminPanel form').hasClass('validationerror')) {
|
||||
@ -285,6 +294,9 @@ $(document).ready(function() {
|
||||
* @todo Convert everything to jQuery so that the built-in load method can be used with this instead
|
||||
*/
|
||||
loadForm: function(url, successCallback) {
|
||||
// @todo TinyMCE coupling
|
||||
tinymce_removeAll();
|
||||
|
||||
$('#right #ModelAdminPanel').load(url, standardStatusHandler(function(result) {
|
||||
if(typeof(successCallback) == 'function') successCallback.apply();
|
||||
if(!this.future || !this.future.length) {
|
||||
|
Loading…
Reference in New Issue
Block a user