Fixed $htmlOptions['id']

omcrn · Mar 31, 2015 · 8f0842a · 8f0842a
1 parent 28b843d
commit 8f0842a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Widget.php b/Widget.php
@@ -37,17 +37,17 @@ public function init() {
      * @inheritdoc
      */
     public function run() {
-        $this->registerClientScript();
 
+        $output = '';
         if ($this->selector === null) {
-            $htmlOptions = ArrayHelper::merge([
+            $this->htmlOptions = ArrayHelper::merge([
                 'id' => $this->getId()
             ], $this->htmlOptions);
 
-            Html::addCssClass($htmlOptions, 'gtreetable');
-            Html::addCssClass($htmlOptions, 'table');
+            Html::addCssClass($this->htmlOptions, 'gtreetable');
+            Html::addCssClass($this->htmlOptions, 'table');
 
-            $output = Html::beginTag('table', $htmlOptions);
+            $output = Html::beginTag('table', $this->htmlOptions);
             $output .= Html::beginTag('thead');
             $output .= Html::beginTag('tr');
             $output .= Html::beginTag('th', array('width' => '100%'));
@@ -56,9 +56,9 @@ public function run() {
             $output .= Html::endTag('tr');
             $output .= Html::endTag('thead');
             $output .= Html::endTag('table');
-
-            return $output;
         }
+        $this->registerClientScript();
+        return $output;
     }
 
     /**
@@ -72,7 +72,7 @@ public function registerClientScript() {
             $assetBundle->language = $this->options['language'];
         }
 
-        $selector = $this->selector === null ? '#' . (array_key_exists('id', $this->htmlOptions) ? $this->htmlOptions['id'] : $this->getId()) : $this->selector;
+        $selector = $this->selector === null ? '#' . $this->htmlOptions['id'] : $this->selector;
         $options = Json::encode($this->options);
 
         $view->registerJs("jQuery('$selector').gtreetable($options);");