Merge pull request #540 from MartialBE/master

Fix select2 和 TinyMCE 的一些问题

resources/views/form/select.blade.php

@@ -12,6 +12,7 @@
         <input type="hidden" name="{{$name}}"/>
 
         <select class="form-control {{$class}}" style="width: 100%;" name="{{$name}}" {!! $attributes !!} >
+            <option value=""></option>
             @if($groups)
                 @foreach($groups as $group)
                     <optgroup label="{{ $group['label'] }}">
@@ -21,7 +22,6 @@
                     </optgroup>
                 @endforeach
              @else
-                <option value=""></option>
                 @foreach($options as $select => $option)
                     <option value="{{$select}}" {{ Dcat\Admin\Support\Helper::equal($select, old($column, $value)) ?'selected':'' }}>{{$option}}</option>
                 @endforeach

src/Form/Field/Editor.php

@@ -163,7 +163,7 @@ class Editor extends Field
         return <<<JS
 function (editor) {
     editor.on('Change', function(e) {
-        var content = e.level.content;
+        var content = e.getContent();
         if (! content) {
             content = e.level.fragments;
             content = content.length && content.join('');