Merge pull request #11 from germanbisurgi/master

Uses the “startval” configuration object to set the JSONEditorr initi…

Author: schmunk42

src/JsonEditorWidget.php

@@ -137,7 +137,18 @@ public function run()
         // Prepare client options
         $clientOptions           = $this->clientOptions;
         $clientOptions['schema'] = $this->schema;
-        ArrayHelper::remove($clientOptions, 'startval');
+
+        try {
+            $parsedValue = Json::decode($this->value);
+        } catch (\Exception $e) {
+            $parsedValue = null;
+            \Yii::error($e->getMessage(), __METHOD__);
+        }
+
+        if (!empty($parsedValue)) {
+            $clientOptions['startval'] = $parsedValue;
+        }
+
         $clientOptions = Json::encode($clientOptions);
 
         // Prepare element IDs
@@ -151,17 +162,6 @@ public function run()
         $widgetJs .= "if (!window.jsonEditors) { window.jsonEditors = []; } window.jsonEditors.push(window.{$widgetId});";
 
         $readyFunction = '';
-        try {
-            $parsedValue = Json::decode($this->value);
-        } catch (\Exception $e) {
-            $parsedValue = null;
-        }
-
-        if (!empty($parsedValue)) {
-            $encodedValue  = Json::encode($parsedValue);
-            $readyFunction .= "try { {$widgetId}.setValue({$encodedValue}); } catch (e) { console.warn('Could not parse initial value for {$widgetId}, error: '+e); }\n";
-        }
-
         $readyFunction .= "{$widgetId}.on('change', function() { document.getElementById('{$inputId}').value = JSON.stringify({$widgetId}.getValue()); });\n";
 
         $widgetJs .= "{$widgetId}.on('ready', function() {\n{$readyFunction}\n});";