Merge branch 'master' into 2.0

resources/lang/zh-CN/admin.php

@@ -31,6 +31,7 @@ return [
         'confirm'           => '确认',
         'cancel'            => '取消',
         'refresh_succeeded' => '刷新成功 !',
+        'submit'            => '提交',
         'close'             => '关闭',
         'selected_options'  => '已选中:num个选项',
         'exceed_max_item'   => '已超出最大可选数量',

resources/lang/zh-TW/admin.php

@@ -32,6 +32,7 @@ return [
         'cancel'            => '取消',
         'refresh_succeeded' => '刷新成功!',
         'close'             => '關閉',
+        'submit'            => '提交',
         'selected_options'  => '已選中:num個選項',
         'exceed_max_item'   => '已超出最大可選數量',
 

resources/views/grid/quick-create/form.blade.php

@@ -11,7 +11,7 @@
             @endforeach
                  
              
-            <button type="submit" class="btn btn-primary btn-sm">{{ strtoupper(__('admin.submit')) }}</button>&nbsp;
+            <button type="submit" class="btn btn-primary btn-sm">{{ __('admin.submit') }}</button>&nbsp;
             &nbsp;
             <a href="javascript:void(0);" class="cancel">{{ __('admin.cancel') }}</a>
             {{ csrf_field() }}

src/Grid/Displayers/Editable.php

@@ -57,7 +57,7 @@ CSS
     protected function addScript()
     {
         $script = <<<JS
-$(".{$this->selector}").on("click", function() {
+$(".{$this->selector}").on("click focus", function() {
     $(this).next().removeClass("hidden");
 }).on('blur', function () {
     var icon = $(this).next();