From f8c7025fcab6b1bf6b8dff790c17affbec679bff Mon Sep 17 00:00:00 2001
From: evgen-d <flynn068@gmail.com>
Date: Fri, 16 Jan 2015 10:20:20 +0300
Subject: [PATCH] fixed #3

---
 Ace.php       | 76 ++++++++++++++++++++++++++++++---------------------
 views/ace.php |  9 ------
 2 files changed, 45 insertions(+), 40 deletions(-)
 delete mode 100644 views/ace.php

diff --git a/Ace.php b/Ace.php
index 3e6070f..64e910f 100644
--- a/Ace.php
+++ b/Ace.php
@@ -2,48 +2,62 @@
 
 namespace devgroup\ace;
 
-use yii\base\Widget;
+use yii\helpers\BaseInflector;
+use yii\helpers\Html;
+use yii\widgets\InputWidget;
 
-class Ace extends Widget
+class Ace extends InputWidget
 {
     public $mode = 'php';
-    public $name = '';
-    public $options = [];
     public $theme = 'github';
-    public $value = '';
+
+    public function init()
+    {
+        parent::init();
+        if (!isset($this->options['id'])) {
+            $this->options['id'] = $this->id;
+        } else {
+            $this->id = $this->options['id'];
+        }
+
+        if (is_object($this->model)) {
+            $this->value = $this->model->{$this->attribute};
+            $this->name = Html::getInputName($this->model, $this->attribute);
+        }
+        $this->options['id'] .= '-ace';
+    }
 
     public function run()
     {
         $view = $this->getView();
         AceAsset::register($view);
+        $editorName = BaseInflector::camelize($this->id) . 'Editor';
         $view->registerJs(
-            "$('textarea[name={$this->name}]').each(function(index, element) {
-                var textarea = $(this);
-
-                var editDiv = $('<div>', {
-                    width: textarea.width(),
-                    height: textarea.height(),
-                    class: textarea.attr('class')
-                }).insertBefore(textarea);
-
-                textarea.addClass('hidden');
-
-                var editor = ace.edit(editDiv[0]);
-                var mode = ('{$this->mode}').trim();
-                var theme = ('{$this->theme}').trim();
-                editor.getSession().setValue(textarea.val());
-                if (mode.length !== 0) {
-                    editor.getSession().setMode('ace/mode/' + mode);
-                }
-                if (theme.length !== 0) {
-                    editor.setTheme('ace/theme/' + theme);
-                }
-
-                editor.getSession().on('change', function() {
-                    textarea.val(editor.getSession().getValue());
-                });
+            "var textarea = $('#{$this->options['id']}');
+
+            var editDiv = $('<div>', {
+                width: textarea.width(),
+                height: textarea.height(),
+                class: textarea.attr('class')
+            }).insertBefore(textarea);
+
+            textarea.addClass('hidden');
+
+            var {$editorName} = ace.edit(editDiv[0]);
+            var mode = ('{$this->mode}').trim();
+            var theme = ('{$this->theme}').trim();
+            {$editorName}.getSession().setValue(textarea.val());
+            if (mode.length !== 0) {
+                {$editorName}.getSession().setMode('ace/mode/' + mode);
+            }
+            if (theme.length !== 0) {
+                {$editorName}.setTheme('ace/theme/' + theme);
+            }
+
+            {$editorName}.getSession().on('change', function() {
+                textarea.val({$editorName}.getSession().getValue());
             });"
         );
-        return $this->render('ace', ['name' => $this->name, 'value' => $this->value, 'options' => $this->options]);
+        echo Html::textarea($this->name, $this->value, $this->options);
     }
 }
diff --git a/views/ace.php b/views/ace.php
deleted file mode 100644
index 9c333d4..0000000
--- a/views/ace.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * @var string $name
- * @var string $value
- * @var array $options
- */
-?>
-
-<?= \yii\helpers\Html::textarea($name, $value, $options); ?>