Merge pull request #454 from owncloud/fix_sidebar_button_issues

explicitly declare buttons as buttons to not make them trigger ng-submit
owncloud · Apr 12, 2016 · 0b06180 · 0b06180
2 parents 7751652 + 0f181a6
commit 0b06180
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/templates/editor.sidebar.php b/templates/editor.sidebar.php
@@ -35,7 +35,7 @@ class="advanced--input h2"
 					<label for="alldayeventcheckbox"><?php p($l->t('All day Event'))?></label>
 				</div>
 				<div class="pull-right">
-					<button class="button btn-default btn-timezone" ng-click="edittimezone = !edittimezone" ng-show="!readOnly">
+					<button class="button btn-default btn-timezone" ng-click="edittimezone = !edittimezone" ng-show="!readOnly" type="button">
 						<span class="icon-timezone"></span>
 					</button>
 				</div>

diff --git a/templates/part.eventsalarms.php b/templates/part.eventsalarms.php
@@ -28,7 +28,7 @@
 		<li class="advanced--list pull-left" ng-repeat="alarm in properties.alarm" ng-class="{ active : reminderoptions }">
 			<div class="advanced--toggler" ng-model="reminderoptions" ng-click="triggerEdit(alarm)">
 				<span class="pull-left margin-class">{{alarm | simpleReminderDescription}}</span>
-				<button class="advanced--button__icon pull-right icon-close" ng-click="remove(alarm)">
+				<button class="advanced--button__icon pull-right icon-close" ng-click="remove(alarm)" type="button">
 				</button>
 			</div>
 			<div class="reminderoptions pull-left full-width" ng-show="alarm.editor.editing">
@@ -141,7 +141,7 @@
 	</ul>
 </div>
 <div class="event-fieldset-interior">
-	<button id="addreminders" ng-click="add()" class="btn event-button button">
+	<button id="addreminders" ng-click="add()" class="btn event-button button" type="button">
 		<?php p($l->t('Add')); ?>
 	</button>
 </div>
diff --git a/templates/part.eventsattendees.php b/templates/part.eventsattendees.php
@@ -27,7 +27,7 @@
 		placeholder="<?php p($l->t('E-Mail address of attendee'))?>" name="nameofattendee" autocomplete="off"
 		uib-typeahead="contact.name for contact in search($viewValue)" typeahead-show-hint="true" typeahead-min-length="3"
 		   typeahead-on-select="selectFromTypeahead($item)" />
-	<button id="addmoreattendees" ng-click="add(nameofattendee)" class="btn event-button button">
+	<button id="addmoreattendees" ng-click="add(nameofattendee)" class="btn event-button button" type="button">
 		<?php p($l->t('Add')); ?>
 	</button>
 </div>
@@ -40,7 +40,7 @@
 		<li class="pull-left" ng-class="{ active: attendeeoptions }" ng-repeat="attendee in properties.attendee | attendeeNotOrganizerFilter: $scope.emailAddress">
 			<div class="advanced--toggler" ng-model="attendeeoptions" ng-click="attendeeoptions=!attendeeoptions">
 				<span class="bold pull-left">{{ attendee | attendeeFilter }}</span>
-				<button class="event-button event-delete-button icon-close pull-right" ng-click="remove(attendee)">
+				<button class="event-button event-delete-button icon-close pull-right" ng-click="remove(attendee)" type="button">
 				</button>
 			</div>
 			<div class="attendeeoptions" ng-show="attendeeoptions">