1.2.0.1

Proper component uses for older php version with empty() (fixes #2 ) Fixed configuration of toolbar as array.
bizley · Aug 1, 2016 · abd91cc · abd91cc
1 parent 7fcfb49
commit abd91cc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/Quill.php b/Quill.php
@@ -22,7 +22,7 @@
  * See the documentation for more details.
  * 
  * @author Paweł Bizley Brzozowski
- * @version 1.2.0
+ * @version 1.2.0.1
  * @license Apache 2.0
  * https://github.com/bizley/yii2-quill
  * 
@@ -115,7 +115,7 @@ public function addModule($name)
     public function addModules()
     {
         if ($this->quillToolbar) {
-            foreach ($this->quillToolbar->getModules() as $module) {
+            foreach ($this->quillToolbar->modules as $module) {
                 $this->addModule($module);
             }
         }
@@ -190,7 +190,7 @@ public function run()
      */
     public function registerClientScript()
     {
-        $view = $this->getView();
+        $view = $this->view;
         $asset = Asset::register($view);
         $asset->theme = $this->_css;
 
@@ -247,7 +247,7 @@ public function renderEditor($toolbar)
      */
     public function renderToolbar()
     {
-        if (!empty($this->quillToolbar->getElements())) {
+        if (!empty($this->quillToolbar->elements)) {
             $toolbarId = 'toolbar-' . $this->id;
 
             if (empty($this->configs['modules'])) {
@@ -318,7 +318,7 @@ public function addToolbar()
      */
     public function getColors()
     {
-        return $this->quillToolbar->getColors();
+        return $this->quillToolbar->colors;
     }
 
     /**

diff --git a/QuillToolbar.php b/QuillToolbar.php
@@ -11,7 +11,7 @@
  * Quill Toolbar helper class.
  * 
  * @author Paweł Bizley Brzozowski
- * @version 1.2.0
+ * @version 1.2.0.1
  * @license Apache 2.0
  * https://github.com/bizley/yii2-quill
  * 
@@ -48,17 +48,20 @@ public function __construct($configuration, $componentConfig = [])
             if (!is_string($configuration) && !is_array($configuration)) {
                 throw new InvalidConfigException('Toolbar configuration must be a string or an array!');
             }
-        }
-        if (is_string($configuration)) {
-            switch ($configuration) {
-                case Quill::TOOLBAR_FULL:
-                    $this->prepareFullToolbar();
-                    break;
-                case Quill::TOOLBAR_BASIC:
-                    $this->prepareBasicToolbar();
-                    break;
-                default:
-                    $this->_elements = (array)$configuration;
+            if (is_string($configuration)) {
+                switch ($configuration) {
+                    case Quill::TOOLBAR_FULL:
+                        $this->prepareFullToolbar();
+                        break;
+                    case Quill::TOOLBAR_BASIC:
+                        $this->prepareBasicToolbar();
+                        break;
+                    default:
+                        $this->_elements = (array)$configuration;
+                }
+            }
+            if (is_array($configuration)) {
+                $this->_elements = $configuration;
             }
         }
         parent::__construct($componentConfig);
@@ -209,7 +212,7 @@ public function renderAlignment()
      */
     public function renderBackColor()
     {
-        return $this->renderDropdown('rgb(0, 0, 0)', $this->getColors(), 
+        return $this->renderDropdown('rgb(0, 0, 0)', $this->colors, 
             [
                 'title' => Yii::t('app', 'Background Color'), 
                 'class' => 'ql-background'
@@ -470,7 +473,7 @@ public function renderStrikethrough()
      */
     public function renderTextColor()
     {
-        return $this->renderDropdown('rgb(0, 0, 0)', $this->getColors(), 
+        return $this->renderDropdown('rgb(0, 0, 0)', $this->colors, 
             [
                 'title' => Yii::t('app', 'Text Color'), 
                 'class' => 'ql-color'