Merge pull request #1 from korepashka/korepashka-patch-1

korepashka · web-flow · commit 587b8133a3c2 · 2017-01-31T12:47:27.000+05:00
Make form-control class optional for input
diff --git a/DatePicker.php b/DatePicker.php
@@ -233,6 +233,10 @@ protected function renderDatePicker()
                 $this->layout = '{input1}{separator}{input2}';
             }
         }
+     
+        if (empty($this->options['class'])) {
+            Html::addCssClass($this->options, 'form-control');
+        }
         Html::addCssClass($this->options, 'krajee-datepicker');
         $this->options['data-datepicker-source'] = $this->type === self::TYPE_INPUT ? $this->options['id'] :
             $this->_container['id'];
@@ -296,7 +300,6 @@ protected function validateConfig()
      */
     protected function renderInput()
     {
-        Html::addCssClass($this->options, 'form-control');
         if ($this->type == self::TYPE_INLINE) {
             if (empty($this->options['readonly'])) {
                 $this->options['readonly'] = true;

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,10 @@ protected function renderDatePicker()`
`233`	`233`	`$this->layout = '{input1}{separator}{input2}';`
`234`	`234`	`}`
`235`	`235`	`}`
	`236`	`+`
	`237`	`+ if (empty($this->options['class'])) {`
	`238`	`+ Html::addCssClass($this->options, 'form-control');`
	`239`	`+ }`
`236`	`240`	`Html::addCssClass($this->options, 'krajee-datepicker');`
`237`	`241`	`$this->options['data-datepicker-source'] = $this->type === self::TYPE_INPUT ? $this->options['id'] :`
`238`	`242`	`$this->_container['id'];`
`@@ -296,7 +300,6 @@ protected function validateConfig()`
`296`	`300`	`*/`
`297`	`301`	`protected function renderInput()`
`298`	`302`	`{`
`299`		`- Html::addCssClass($this->options, 'form-control');`
`300`	`303`	`if ($this->type == self::TYPE_INLINE) {`
`301`	`304`	`if (empty($this->options['readonly'])) {`
`302`	`305`	`$this->options['readonly'] = true;`