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

BUGFIX: Closing TinyMCE image, link or flash panel when loading form (ticket #4907) (from r98690)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111599 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-04 05:21:04 +00:00
parent 0d66807586
commit b7b0e1ab0b
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
javascript/ModelAdmin.js
View File

@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Search form // Search form
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
/** /**
* Class: #ModelClassSelector select * Class: #ModelClassSelector select
* *
@ -63,6 +63,8 @@
onsubmit: function(e) { onsubmit: function(e) {
// Import forms are processed without ajax // Import forms are processed without ajax
if(this.is('#Form_ImportForm')) return true; if(this.is('#Form_ImportForm')) return true;
$('#contentPanel').closeRightPanel();
this.trigger('beforeSubmit'); this.trigger('beforeSubmit');
@ -119,7 +121,8 @@
return false; return false;
} }
}); });
/** /**
* Class: .resultsTable tbody td * Class: .resultsTable tbody td
* *
@ -193,6 +196,21 @@
this._super(); this._super();
} }
}); });
$('#contentPanel').entwine({
/**
* Close TinyMCE image, link or flash panel.
* this function is called everytime a new search, back or add new DataObject are clicked
**/
closeRightPanel: function(){
if($('#contentPanel').is(':visible')) {
$('#contentPanel').hide();
$('#Form_EditorToolbarImageForm').hide();
$('#Form_EditorToolbarFlashForm').hide();
$('#Form_EditorToolbarLinkForm').hide();
}
}
});
}); });
})(jQuery); })(jQuery);