Javascript and layout fixes

markguinn · Dec 23, 2014 · 2919e7a · 2919e7a
1 parent 9b21874
commit 2919e7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/code/GridFieldApplyToMultipleRows.php b/code/GridFieldApplyToMultipleRows.php
@@ -75,7 +75,7 @@ public function getHTMLFragments($gridField) {
 		}
 
 		return array(
-			$this->targetFragment => '<p class="grid-multiselect-button">' . $button->Field() . '</p>',
+			$this->targetFragment => $button->Field(),
 		);
 	}
 

diff --git a/javascript/GridFieldCheckboxSelectComponent.js b/javascript/GridFieldCheckboxSelectComponent.js
@@ -28,15 +28,13 @@
 					return false;
 				}
 
-				if (this.data('confirm')) {
-					if (confirm(this.data('confirm'))) {
-						return true;
-					} else {
-						e.preventDefault();
-						e.stopPropagation();
-						return false;
-					}
+				if (this.data('confirm') && !confirm(this.data('confirm'))) {
+					e.preventDefault();
+					e.stopPropagation();
+					return false;
 				}
+
+				this._super(e);
 			}
 		});
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ public function getHTMLFragments($gridField) { @@
     		}
     		return array(
-    			$this->targetFragment => '<p class="grid-multiselect-button">' . $button->Field() . '</p>',
+    			$this->targetFragment => $button->Field(),
     		);
     	}
@@ Expand Down @@