mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-29 20:59:23 +02:00
Show edit form in "Update Media" by default
Was showing collapsed UploadField row before which doesn't make a whole lot of sense.
This commit is contained in:
parent
23c0084193
commit
ec684a2e5c
@ -825,7 +825,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
|
|||||||
}
|
}
|
||||||
this.redraw();
|
this.redraw();
|
||||||
},
|
},
|
||||||
redraw: function() {
|
redraw: function(updateExisting) {
|
||||||
this._super();
|
this._super();
|
||||||
|
|
||||||
var node = this.getSelection(),
|
var node = this.getSelection(),
|
||||||
@ -834,7 +834,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
|
|||||||
header = this.find('.header-edit');
|
header = this.find('.header-edit');
|
||||||
|
|
||||||
// Only show second step if files are selected
|
// Only show second step if files are selected
|
||||||
if(header) header[(hasItems) ? 'show' : 'hide']();
|
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')
|
||||||
@ -844,11 +844,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('#MediaFormInsertMediaTabs,.header-edit')[editingSelected ? 'hide' : 'show']();
|
this.find('#MediaFormInsertMediaTabs,.header-edit')[editingSelected ? 'hide' : 'show']();
|
||||||
|
|
||||||
var updateExisting = Boolean(this.find('.ss-htmleditorfield-file').length);
|
// TODO Way too much knowledge on UploadField internals, use viewfile URL directly instead
|
||||||
this.find('.htmleditorfield-mediaform-heading.insert')[updateExisting ? 'hide' : 'show']();
|
this.find('.htmleditorfield-mediaform-heading.insert')[editingSelected ? 'hide' : 'show']();
|
||||||
this.find('.Actions .media-insert')[updateExisting ? 'hide' : 'show']();
|
this.find('.Actions .media-insert')[editingSelected ? 'hide' : 'show']();
|
||||||
this.find('.htmleditorfield-mediaform-heading.update')[updateExisting ? 'show' : 'hide']();
|
this.find('.htmleditorfield-mediaform-heading.update')[editingSelected ? 'show' : 'hide']();
|
||||||
this.find('.Actions .media-update')[updateExisting ? 'show' : 'hide']();
|
this.find('.Actions .media-update')[editingSelected ? 'show' : 'hide']();
|
||||||
|
this.find('.ss-uploadfield-item-editform').toggleEditForm(editingSelected);
|
||||||
},
|
},
|
||||||
resetFields: function() {
|
resetFields: function() {
|
||||||
this.find('.ss-htmleditorfield-file').remove(); // Remove any existing views
|
this.find('.ss-htmleditorfield-file').remove(); // Remove any existing views
|
||||||
@ -1301,11 +1302,11 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
|
|||||||
});
|
});
|
||||||
|
|
||||||
$('div.ss-assetuploadfield .ss-uploadfield-item-editform').entwine({
|
$('div.ss-assetuploadfield .ss-uploadfield-item-editform').entwine({
|
||||||
toggleEditForm: function() {
|
toggleEditForm: function(bool) {
|
||||||
var itemInfo = this.prev('.ss-uploadfield-item-info'), status = itemInfo.find('.ss-uploadfield-item-status');
|
var itemInfo = this.prev('.ss-uploadfield-item-info'), status = itemInfo.find('.ss-uploadfield-item-status');
|
||||||
var text="";
|
var text="";
|
||||||
|
|
||||||
if(this.height() === 0) {
|
if(bool === true || (bool !== false && this.height() === 0)) {
|
||||||
text = ss.i18n._t('UploadField.Editing', "Editing ...");
|
text = ss.i18n._t('UploadField.Editing', "Editing ...");
|
||||||
this.height('auto');
|
this.height('auto');
|
||||||
itemInfo.find('.toggle-details-icon').addClass('opened');
|
itemInfo.find('.toggle-details-icon').addClass('opened');
|
||||||
|
Loading…
Reference in New Issue
Block a user