Merge pull request #12 from RhubarbPHP/feature/AddButtonType

Adding the ability to set button type

Author: NiallSmyth

CHANGELOG.md

@@ -1,8 +1,12 @@
 # Changelog
 
+### 1.0.22
+
+* Added:    The HTML type of a Button can be changed from default "submit"
+
 ### 1.0.21
 
-* Fixed:     AJAX checkbox value parsing
+* Fixed:    AJAX checkbox value parsing
 
 ### 1.0.20
 

src/Buttons/Button.php

@@ -33,7 +33,7 @@ public function __construct($name, $text = "", callable $pressedCallback = null,
         $this->model->useXhr = $useXhr;
         $this->buttonPressedEvent = new Event();
 
-        if ($pressedCallback){
+        if ($pressedCallback) {
             $this->buttonPressedEvent->attachHandler($pressedCallback);
         }
     }
@@ -57,12 +57,12 @@ public function setUseXhr($useXhr)
     {
         $this->model->useXhr = $useXhr;
     }
-    
+
     protected function createModel()
     {
         $model = new ButtonModel();
-        $model->buttonPressedEvent->attachHandler(function(...$arguments){
-            if ($this->model->useXhr){
+        $model->buttonPressedEvent->attachHandler(function (...$arguments) {
+            if ($this->model->useXhr) {
                 return $this->buttonPressedEvent->raise(...$arguments);
             } else {
                 $this->runBeforeRender(function () use ($arguments) {
@@ -73,4 +73,19 @@ protected function createModel()
 
         return $model;
     }
+
+    /**
+     * Allows changing the HTML input type from default "submit"
+     *
+     * @param string $type e.g. "submit", "button", "reset"
+     * @param bool $submitFormOnClick If true, javascript will
+     */
+    public function setButtonType($type, $submitFormOnClick = false)
+    {
+        $this->model->type = $type;
+
+        if ($submitFormOnClick) {
+            $this->model->addCssClassNames("submit-on-click");
+        }
+    }
 }

src/Buttons/ButtonModel.php

@@ -24,6 +24,11 @@ class ButtonModel extends ControlModel
      */
     public $buttonPressedEvent;
 
+    /**
+     * @var string
+     */
+    public $type = 'submit';
+
     public function __construct()
     {
         $this->buttonPressedEvent = new Event();

src/Buttons/ButtonView.php

@@ -23,7 +23,7 @@ protected function printViewContent()
         $xhrAttribute = ($this->model->useXhr) ? ' xmlrpc="yes"' : '';
 
         ?>
-        <input leaf-name="<?=$this->model->leafName;?>" type="submit" name="<?=$this->model->leafPath;?>" id="<?=$this->model->leafPath;?>" value="<?=htmlentities($this->model->text);?>"<?=$classes.$otherAttributes.$confirmAttribute.$xhrAttribute;?> />
+        <input leaf-name="<?=$this->model->leafName;?>" type="<?=$this->model->type?>" name="<?=$this->model->leafPath;?>" id="<?=$this->model->leafPath;?>" value="<?=htmlentities($this->model->text);?>"<?=$classes.$otherAttributes.$confirmAttribute.$xhrAttribute;?> />
         <?php
     }