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

MINOR Moved redundant toggleLooks() logic in HtmlEditorField.js to existing redraw() logic

Browse Source
This commit is contained in:
Ingo Schommer 2012-05-20 12:53:54 +02:00
parent 02505247d5
commit 7ab47b6493
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
javascript/HtmlEditorField.js
View File

@ -655,17 +655,6 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
* of remove files as well. * of remove files as well.
*/ */
$('form.htmleditorfield-mediaform').entwine({ $('form.htmleditorfield-mediaform').entwine({
onmatch: function() {
this.toggleLooks();
this._super();
},
toggleLooks: function(){
var updateExisting = Boolean(this.find('.ss-htmleditorfield-file').length);
this.find('.htmleditorfield-mediaform-heading.insert')[updateExisting ? 'hide' : 'show']();
this.find('.Actions .image-insert')[updateExisting ? 'hide' : 'show']();
this.find('.htmleditorfield-mediaform-heading.update')[updateExisting ? 'show' : 'hide']();
this.find('.Actions .image-update')[updateExisting ? 'show' : 'hide']();
},
toggleCloseButton: function(){ toggleCloseButton: function(){
var updateExisting = Boolean(this.find('.ss-htmleditorfield-file').length); var updateExisting = Boolean(this.find('.ss-htmleditorfield-file').length);
this.find('.overview .action-delete')[updateExisting ? 'hide' : 'show'](); this.find('.overview .action-delete')[updateExisting ? 'hide' : 'show']();
@ -695,17 +684,17 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
self.redraw(); self.redraw();
}); });
} }
this.toggleLooks();
this.redraw(); this.redraw();
}, },
redraw: function() { redraw: function() {
this._super(); this._super();
var ed = this.getEditor(), node = $(ed.getSelectedNode()), var ed = this.getEditor(), node = $(ed.getSelectedNode()),
hasItems = Boolean(this.find('.ss-htmleditorfield-file').length), hasItems = Boolean(this.find('.ss-htmleditorfield-file').length),
editingSelected = node.is('img'); editingSelected = node.is('img'),
header = this.find('.header-edit');
// Only show second step if files are selected // Only show second step if files are selected
this.find('.header-edit')[(hasItems) ? 'show' : 'hide'](); if(header) header[(hasItems) ? 'show' : 'hide']();
// Disable "insert" button if no files are selected // Disable "insert" button if no files are selected
this.find('.Actions :submit') this.find('.Actions :submit')
@ -714,6 +703,12 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
// Hide file selection and step labels when editing an existing file // Hide file selection and step labels when editing an existing file
this.find('#MediaFormInsertImageTabs,.header-edit')[editingSelected ? 'hide' : 'show'](); this.find('#MediaFormInsertImageTabs,.header-edit')[editingSelected ? 'hide' : 'show']();
var updateExisting = Boolean(this.find('.ss-htmleditorfield-file').length);
this.find('.htmleditorfield-mediaform-heading.insert')[updateExisting ? 'hide' : 'show']();
this.find('.Actions .image-insert')[updateExisting ? 'hide' : 'show']();
this.find('.htmleditorfield-mediaform-heading.update')[updateExisting ? 'show' : 'hide']();
this.find('.Actions .image-update')[updateExisting ? 'show' : 'hide']();
}, },
resetFields: function() { resetFields: function() {
var ed = this.getEditor(), node = $(ed.getSelectedNode()); var ed = this.getEditor(), node = $(ed.getSelectedNode());