Update precompiled admin assets for product locale tab fix

public/assets/ckeditor/config.js

@@ -12,6 +12,7 @@ CKEDITOR.editorConfig = function( config )
 
     /* Filebrowser routes */
     // The location of an external file browser, that should be launched when "Browse Server" button is pressed.
+    //文件上传POST请求的URL
     config.filebrowserBrowseUrl = "/ckeditor/attachment_files";
 
     // The location of an external file browser, that should be launched when "Browse Server" button is pressed in the Flash dialog.
@@ -34,6 +35,17 @@ CKEDITOR.editorConfig = function( config )
 
     config.allowedContent = true;
 
+    //上传图片去掉预览文字
+    config.image_previewText =' ';
+    //config.maxSize = 0;
+    // 字体
+    config.font_names= '宋体/SimSun;新宋体/NSimSun;仿宋_GB2312/FangSong_GB2312;楷体_GB2312/KaiTi_GB2312;黑体/SimHei;微软雅黑/Microsoft YaHei;' + config.font_names;
+
+    //增加行距插件
+    config.extraPlugins += (config.extraPlugins ? ',lineheight' : 'lineheight');
+    //从word复制时保留格式
+    config.pasteFromWordRemoveFontStyles = false;
+    config.pasteFromWordRemoveStyles = false;
     // Rails CSRF token
     config.filebrowserParams = function(){
         var csrf_token, csrf_param, meta,
@@ -93,6 +105,8 @@ CKEDITOR.editorConfig = function( config )
         }
     });
 
+    // 设置初始高度
+    config.height = 600;
     // Toolbar groups configuration.
     config.toolbar = [
         { name: 'document', groups: [ 'mode', 'document', 'doctools' ], items: [ 'Source'] },
@@ -100,12 +114,13 @@ CKEDITOR.editorConfig = function( config )
         // { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ], items: [ 'Find', 'Replace', '-', 'SelectAll', '-', 'Scayt' ] },
         // { name: 'forms', items: [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
         { name: 'links', items: [ 'Link', 'Unlink', 'Anchor' ] },
-        { name: 'insert', items: [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar' ] },
+        { name: 'insert', items: [ 'Image', 'Iframe','Table', 'HorizontalRule', 'SpecialChar' ] },
         { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ], items: [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock' ] },
         '/',
-        { name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize' ] },
+        { name: 'styles', items: [ 'Styles', 'Format', 'Font', 'FontSize', 'lineheight' ] },
         { name: 'colors', items: [ 'TextColor', 'BGColor' ] },
-        { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] }
+        { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ], items: [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
+        { name: 'tools', items : [ 'Maximize','-','About' ] } 
     ];
 
     config.toolbar_mini = [
@@ -116,4 +131,6 @@ CKEDITOR.editorConfig = function( config )
         { name: 'insert', items: [ 'Image', 'Table', 'HorizontalRule', 'SpecialChar' ] },
         { name: 'maximize'}
     ];
+
+    // config.extraPlugins += (config.extraPlugins ? ',helloworld' : 'helloworld');
 };

public/assets/ckeditor/plugins/colordialog/dialogs/colordialog.css

@@ -1 +1,21 @@
-.cke_colordialog_colorcell{width:12px;height:14px;padding:1px}.cke_colordialog_colorcell.cke_colordialog_focused_light,.cke_colordialog_colorcell.cke_colordialog_focused_dark{padding:0;border:1px dotted #000}.cke_colordialog_colorcell.cke_colordialog_focused_dark{border-color:#FFF}
+/**
+ * @license Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
+ */
+
+
+.cke_colordialog_colorcell {
+	width: 12px; /* All cells have equal width which depends on parent width (in this case table parent). Width works more like max-width. */
+	height: 14px;
+	padding: 1px; /* Padding is replaced by border for focused cells. Prevents 'jumping' when adding borders. */
+}
+
+.cke_colordialog_colorcell.cke_colordialog_focused_light,
+.cke_colordialog_colorcell.cke_colordialog_focused_dark {
+	padding: 0; /* Shrink cell to allow 1px border indicating focus. */
+	border: 1px dotted #000;
+}
+
+.cke_colordialog_colorcell.cke_colordialog_focused_dark {
+	border-color: #FFF;
+}