From 332e4901478bf76705c7175e4af10b91d4c3b30f Mon Sep 17 00:00:00 2001
From: Patrick Nelson <patnelson@ebay.com>
Date: Mon, 5 Oct 2015 11:22:36 -0400
Subject: [PATCH] FIX (partial) for #1288 where non-submit buttons are being
 activated on "enter" key press (relates to framework issue at
 https://github.com/silverstripe/silverstripe-framework/issues/3181).

---
 javascript/CMSMain.EditForm.js                              | 1 +
 templates/Includes/CMSPagesController_ContentToolActions.ss | 2 +-
 templates/forms/SiteTreeURLSegmentField.ss                  | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/javascript/CMSMain.EditForm.js b/javascript/CMSMain.EditForm.js
index 399f4d96..78dfcdd9 100644
--- a/javascript/CMSMain.EditForm.js
+++ b/javascript/CMSMain.EditForm.js
@@ -122,6 +122,7 @@
 				updateURLFromTitle = $('<button />', {
 					'class': 'update ss-ui-button-small',
 					'text': ss.i18n._t('URLSEGMENT.UpdateURL'),
+					'type': 'button',
 					'click': function(e) {
 						e.preventDefault();
 						self.updateURLSegment(self.val());
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss
index c023be36..d8f51017 100644
--- a/templates/Includes/CMSPagesController_ContentToolActions.ss
+++ b/templates/Includes/CMSPagesController_ContentToolActions.ss
@@ -3,7 +3,7 @@
 		<a class="ss-ui-button cms-content-addpage-button tool-button font-icon-plus" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd('', 'ParentID=%s')}"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
 
 		<% if $View == 'Tree' %>
-		<button class="cms-content-batchactions-button tool-button font-icon-check-mark-2" data-toolid="batch-actions">
+		<button type="button" class="cms-content-batchactions-button tool-button font-icon-check-mark-2" data-toolid="batch-actions">
 			<% _t("CMSPagesController_ContentToolbar_ss.MULTISELECT","Batch actions") %>
 		</button>
 		<% end_if %>
diff --git a/templates/forms/SiteTreeURLSegmentField.ss b/templates/forms/SiteTreeURLSegmentField.ss
index 619875e9..c03f5ae2 100644
--- a/templates/forms/SiteTreeURLSegmentField.ss
+++ b/templates/forms/SiteTreeURLSegmentField.ss
@@ -2,16 +2,16 @@
 	<a class="preview" href="$URL" target="_blank">
 		$URL
 	</a>
-	<button class="ss-ui-button ss-ui-button-small edit">
+	<button type="button" class="ss-ui-button ss-ui-button-small edit">
 		<% _t('URLSegmentField.Edit', 'Edit') %>
 	</button>
 </div>
 <div class="edit-holder">
 	<input $AttributesHTML />
-	<button class="update ss-ui-button-small">
+	<button type="button" class="update ss-ui-button-small">
 		<% _t('URLSegmentField.OK', 'OK') %>
 	</button>
-	<button class="cancel ss-ui-button-small ss-ui-action-minor">
+	<button type="button" class="cancel ss-ui-button-small ss-ui-action-minor">
 		<% _t('URLSegmentField.Cancel', 'Cancel') %>
 	</button>
 	<% if $HelpText %><p class="help">$HelpText</p><% end_if %>