tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288).

This commit is contained in:
Patrick Nelson 2015-10-05 11:26:21 -04:00
parent 3b192ea67c
commit 12c423909f
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/HtmlEditorField.php
View File

@ -352,7 +352,7 @@ class HtmlEditorField_Toolbar extends RequestHandler {
'<h4>' . sprintf($numericLabelTmpl, '1', _t('HtmlEditorField.ADDURL', 'Add URL')) . '</h4>'), '<h4>' . sprintf($numericLabelTmpl, '1', _t('HtmlEditorField.ADDURL', 'Add URL')) . '</h4>'),
$remoteURL = new TextField('RemoteURL', 'http://'), $remoteURL = new TextField('RemoteURL', 'http://'),
new LiteralField('addURLImage', new LiteralField('addURLImage',
'<button class="action ui-action-constructive ui-button field add-url" data-icon="addMedia">' . '<button type="button" class="action ui-action-constructive ui-button field add-url" data-icon="addMedia">' .
_t('HtmlEditorField.BUTTONADDURL', 'Add url').'</button>') _t('HtmlEditorField.BUTTONADDURL', 'Add url').'</button>')
); );

2
forms/gridfield/GridFieldSortableHeader.php
View File

@ -150,7 +150,7 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
&& $gridField->getConfig()->getComponentByType('GridFieldFilterHeader')){ && $gridField->getConfig()->getComponentByType('GridFieldFilterHeader')){
$field = new LiteralField($fieldName, $field = new LiteralField($fieldName,
'<button name="showFilter" class="ss-gridfield-button-filter trigger"></button>'); '<button type="button" name="showFilter" class="ss-gridfield-button-filter trigger"></button>');
} else { } else {
$field = new LiteralField($fieldName, '<span class="non-sortable">' . $title . '</span>'); $field = new LiteralField($fieldName, '<span class="non-sortable">' . $title . '</span>');
} }

2
javascript/GridField.js
View File

@ -55,7 +55,7 @@
content = '<span class="non-sortable"></span>'; content = '<span class="non-sortable"></span>';
self.addClass('show-filter').find('.filter-header').show(); self.addClass('show-filter').find('.filter-header').show();
} else { } else {
content = '<button name="showFilter" class="ss-gridfield-button-filter trigger"></button>'; content = '<button type="button" name="showFilter" class="ss-gridfield-button-filter trigger"></button>';
self.removeClass('show-filter').find('.filter-header').hide(); self.removeClass('show-filter').find('.filter-header').hide();
} }

2
javascript/UploadField_downloadtemplate.js
View File

@ -22,7 +22,7 @@ window.tmpl.cache['ss-uploadfield-downloadtemplate'] = tmpl(
'</label>' + '</label>' +
'{% if (file.error) { %}' + '{% if (file.error) { %}' +
'<div class="ss-uploadfield-item-actions">' + '<div class="ss-uploadfield-item-actions">' +
'<div class="ss-uploadfield-item-cancel ss-uploadfield-item-cancelfailed delete"><button class="icon icon-16" data-icon="delete" title="' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '">' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '</button></div>' + '<div class="ss-uploadfield-item-cancel ss-uploadfield-item-cancelfailed delete"><button type="button" class="icon icon-16" data-icon="delete" title="' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '">' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '</button></div>' +
'</div>' + '</div>' +
'{% } else { %}' + '{% } else { %}' +
'<div class="ss-uploadfield-item-actions">{% print(file.buttons, true); %}</div>' + '<div class="ss-uploadfield-item-actions">{% print(file.buttons, true); %}</div>' +

6
javascript/UploadField_uploadtemplate.js
View File

@ -17,14 +17,14 @@ window.tmpl.cache['ss-uploadfield-uploadtemplate'] = tmpl(
'{% if (!file.error) { %}' + '{% if (!file.error) { %}' +
'<div class="ss-uploadfield-item-progress"><div class="ss-uploadfield-item-progressbar"><div class="ss-uploadfield-item-progressbarvalue"></div></div></div>' + '<div class="ss-uploadfield-item-progress"><div class="ss-uploadfield-item-progressbar"><div class="ss-uploadfield-item-progressbarvalue"></div></div></div>' +
'{% if (!o.options.autoUpload) { %}' + '{% if (!o.options.autoUpload) { %}' +
'<div class="ss-uploadfield-item-start start"><button class="icon icon-16" data-icon="navigation">' + ss.i18n._t('UploadField.START', 'Start') + '</button></div>' + '<div class="ss-uploadfield-item-start start"><button type="button" class="icon icon-16" data-icon="navigation">' + ss.i18n._t('UploadField.START', 'Start') + '</button></div>' +
'{% } %}' + '{% } %}' +
'{% } %}' + '{% } %}' +
'<div class="ss-uploadfield-item-cancel cancel">' + '<div class="ss-uploadfield-item-cancel cancel">' +
'<button class="icon icon-16" data-icon="minus-circle" title="' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '">' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '</button>' + '<button type="button" class="icon icon-16" data-icon="minus-circle" title="' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '">' + ss.i18n._t('UploadField.CANCELREMOVE', 'Cancel/Remove') + '</button>' +
'</div>' + '</div>' +
'<div class="ss-uploadfield-item-overwrite hide ">'+ '<div class="ss-uploadfield-item-overwrite hide ">'+
'<button data-icon="drive-upload" class="ss-uploadfield-item-overwrite-warning" title="' + ss.i18n._t('UploadField.OVERWRITE', 'Overwrite') + '">' + ss.i18n._t('UploadField.OVERWRITE', 'Overwrite') + '</button>' + '<button type="button" data-icon="drive-upload" class="ss-uploadfield-item-overwrite-warning" title="' + ss.i18n._t('UploadField.OVERWRITE', 'Overwrite') + '">' + ss.i18n._t('UploadField.OVERWRITE', 'Overwrite') + '</button>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>' + '</div>' +

2
templates/AssetUploadField.ss
View File

@ -47,7 +47,7 @@
</h3> </h3>
<div class="ss-uploadfield-item-actions edit-all"> <div class="ss-uploadfield-item-actions edit-all">
<button class="ss-uploadfield-item-edit-all ss-ui-button ui-corner-all" title="<%t AssetUploadField.EDITINFO 'Edit files' %>" style="display:none;"> <button type="button" class="ss-uploadfield-item-edit-all ss-ui-button ui-corner-all" title="<%t AssetUploadField.EDITINFO 'Edit files' %>" style="display:none;">
<%t AssetUploadField.EDITALL 'Edit all' %> <%t AssetUploadField.EDITALL 'Edit all' %>
<span class="toggle-details-icon"></span> <span class="toggle-details-icon"></span>
</button> </button>

4
templates/Includes/HtmlEditorField_viewfile.ss
View File

@ -23,12 +23,12 @@
<div class="clear"><!-- --></div> <div class="clear"><!-- --></div>
</label> </label>
<div class="ss-uploadfield-item-actions"> <div class="ss-uploadfield-item-actions">
<button data-icon="deleteLight" class="ss-uploadfield-item-cancel ss-uploadfield-item-remove" title="<%t UploadField.REMOVE 'Remove' %>"> <button type="button" data-icon="deleteLight" class="ss-uploadfield-item-cancel ss-uploadfield-item-remove" title="<%t UploadField.REMOVE 'Remove' %>">
<%t UploadField.REMOVE 'Remove' %> <%t UploadField.REMOVE 'Remove' %>
</button> </button>
<div class="ss-uploadfield-item-edit edit"> <div class="ss-uploadfield-item-edit edit">
<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<%t UploadField.EDITINFO 'Edit this file' %>" data-icon="pencil"> <button type="button" class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<%t UploadField.EDITINFO 'Edit this file' %>" data-icon="pencil">
<%t UploadField.EDIT 'Edit' %> <%t UploadField.EDIT 'Edit' %>
<span class="toggle-details"> <span class="toggle-details">
<span class="toggle-details-icon"></span> <span class="toggle-details-icon"></span>

8
templates/Includes/UploadField_FileButtons.ss
View File

@ -1,17 +1,17 @@
<% if $canEdit %> <% if $canEdit %>
<button class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<%t UploadField.EDITINFO 'Edit this file' %>" data-icon="pencil"> <button type="button" class="ss-uploadfield-item-edit ss-ui-button ui-corner-all" title="<%t UploadField.EDITINFO 'Edit this file' %>" data-icon="pencil">
<%t UploadField.EDIT 'Edit' %> <%t UploadField.EDIT 'Edit' %>
<span class="toggle-details"> <span class="toggle-details">
<span class="toggle-details-icon"></span> <span class="toggle-details-icon"></span>
</span> </span>
</button> </button>
<% end_if %> <% end_if %>
<button class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<%t UploadField.REMOVEINFO 'Remove this file from here, but do not delete it from the file store' %>" data-icon="plug-disconnect-prohibition"> <button type="button" class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<%t UploadField.REMOVEINFO 'Remove this file from here, but do not delete it from the file store' %>" data-icon="plug-disconnect-prohibition">
<%t UploadField.REMOVE 'Remove' %></button> <%t UploadField.REMOVE 'Remove' %></button>
<% if $canDelete %> <% if $canDelete %>
<button data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<%t UploadField.DELETEINFO 'Permanently delete this file from the file store' %>" data-icon="minus-circle"><%t UploadField.DELETE 'Delete from files' %></button> <button type="button" data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<%t UploadField.DELETEINFO 'Permanently delete this file from the file store' %>" data-icon="minus-circle"><%t UploadField.DELETE 'Delete from files' %></button>
<% end_if %> <% end_if %>
<% if $UploadField.canAttachExisting %> <% if $UploadField.canAttachExisting %>
<button class="ss-uploadfield-item-choose-another ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<%t UploadField.CHOOSEANOTHERINFO 'Replace this file with another one from the file store' %>" data-icon="network-cloud"> <button type="button" class="ss-uploadfield-item-choose-another ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<%t UploadField.CHOOSEANOTHERINFO 'Replace this file with another one from the file store' %>" data-icon="network-cloud">
<%t UploadField.CHOOSEANOTHERFILE 'Choose another file' %></button> <%t UploadField.CHOOSEANOTHERFILE 'Choose another file' %></button>
<% end_if %> <% end_if %>

4
templates/UploadField.ss
View File

@ -57,11 +57,11 @@
<% end_if %> <% end_if %>
<% if $canAttachExisting %> <% if $canAttachExisting %>
<button class="ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<%t UploadField.FROMCOMPUTERINFO 'Select from files' %>" data-icon="network-cloud"><%t UploadField.FROMFILES 'From files' %></button> <button type="button" class="ss-uploadfield-fromfiles ss-ui-button ui-corner-all" title="<%t UploadField.FROMCOMPUTERINFO 'Select from files' %>" data-icon="network-cloud"><%t UploadField.FROMFILES 'From files' %></button>
<% end_if %> <% end_if %>
<% if $canUpload %> <% if $canUpload %>
<% if not $autoUpload %> <% if not $autoUpload %>
<button class="ss-uploadfield-startall ss-ui-button ui-corner-all" data-icon="navigation"><%t UploadField.STARTALL 'Start all' %></button> <button type="button" class="ss-uploadfield-startall ss-ui-button ui-corner-all" data-icon="navigation"><%t UploadField.STARTALL 'Start all' %></button>
<% end_if %> <% end_if %>
<% end_if %> <% end_if %>
<div class="clear"><!-- --></div> <div class="clear"><!-- --></div>