Update Ckeditor 4.3.2

nukeviet · Feb 13, 2014 · d2223d7 · d2223d7
1 parent bdc27c7
commit d2223d7
Show file tree

Hide file tree

Showing 82 changed files with 693 additions and 683 deletions.
diff --git a/data/formulas/.htaccess b/data/formulas/.htaccess
diff --git a/data/formulas/index.html b/data/formulas/index.html
diff --git a/editors/ckeditor/adapters/jquery.js b/editors/ckeditor/adapters/jquery.js
diff --git a/editors/ckeditor/build-config.js b/editors/ckeditor/build-config.js
@@ -1,14 +1,25 @@
-
-/**
- * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.html or http://ckeditor.com/license
+/**
+ * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
 /**
  * This file was added automatically by CKEditor builder.
- * You may re-use it at any time at http://ckeditor.com/builder to build CKEditor again.
- * 
- * NOTE: 
+ * You may re-use it at any time to build CKEditor again.
+ *
+ * If you would like to build CKEditor online again
+ * (for example to upgrade), visit one the following links:
+ *
+ * (1) http://ckeditor.com/builder
+ *     Visit online builder to build CKEditor from scratch.
+ *
+ * (2) http://ckeditor.com/builder/3b3543f6ba3fa8cb67f98511b2683782
+ *     Visit online builder to build CKEditor, starting with the same setup as before.
+ *
+ * (3) http://ckeditor.com/builder/download/3b3543f6ba3fa8cb67f98511b2683782
+ *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
+ *
+ * NOTE:
  *    This file is not used by CKEditor, you may remove it.
  *    Changing this file will not change your CKEditor configuration.
  */
@@ -25,79 +36,82 @@ var CKBUILDER_CONFIG = {
 	],
 	plugins : {
 		'a11yhelp' : 1,
-		'dialogadvtab' : 1,
 		'basicstyles' : 1,
 		'bidi' : 1,
 		'blockquote' : 1,
+		'button' : 1,
 		'clipboard' : 1,
 		'colorbutton' : 1,
 		'colordialog' : 1,
-		'templates' : 1,
 		'contextmenu' : 1,
+		'dialog' : 1,
+		'dialogadvtab' : 1,
+		'dialogui' : 1,
 		'div' : 1,
-		'resize' : 1,
-		'toolbar' : 1,
 		'elementspath' : 1,
 		'enterkey' : 1,
 		'entities' : 1,
+		'eqneditor' : 1,
+		'fakeobjects' : 1,
 		'filebrowser' : 1,
 		'find' : 1,
 		'flash' : 1,
 		'floatingspace' : 1,
+		'floatpanel' : 1,
 		'font' : 1,
 		'format' : 1,
+		'gg' : 1,
+		'googledocs' : 1,
 		'horizontalrule' : 1,
 		'htmlwriter' : 1,
-		'wysiwygarea' : 1,
+		'image2' : 1,
+		'indent' : 1,
 		'indentblock' : 1,
 		'indentlist' : 1,
-		'smiley' : 1,
 		'justify' : 1,
+		'lineutils' : 1,
 		'link' : 1,
 		'list' : 1,
+		'listblock' : 1,
 		'liststyle' : 1,
 		'magicline' : 1,
 		'maximize' : 1,
+		'menu' : 1,
 		'pagebreak' : 1,
-		'pastetext' : 1,
+		'panel' : 1,
+		'panelbutton' : 1,
 		'pastefromword' : 1,
+		'pastetext' : 1,
+		'popup' : 1,
 		'removeformat' : 1,
+		'resize' : 1,
+		'richcombo' : 1,
 		'showblocks' : 1,
 		'showborders' : 1,
+		'smiley' : 1,
 		'sourcearea' : 1,
 		'specialchar' : 1,
 		'stylescombo' : 1,
 		'tab' : 1,
 		'table' : 1,
 		'tabletools' : 1,
+		'templates' : 1,
+		'toolbar' : 1,
 		'undo' : 1,
-		'dialog' : 1,
-		'dialogui' : 1,
-		'panelbutton' : 1,
-		'button' : 1,
-		'floatpanel' : 1,
-		'panel' : 1,
-		'menu' : 1,
-		'popup' : 1,
-		'fakeobjects' : 1,
-		'richcombo' : 1,
-		'listblock' : 1,
-		'indent' : 1,
-		'gg' : 1,
-		'lineutils' : 1,
 		'widget' : 1,
-		'image2' : 1,
-		'mathjax' : 1
+		'wysiwygarea' : 1,
+		'youtube' : 1
 	},
 	languages : {
 		'ar' : 1,
-		'zh-cn' : 1,
 		'cs' : 1,
 		'de' : 1,
+		'en' : 1,
 		'fr' : 1,
 		'ja' : 1,
 		'ru' : 1,
 		'tr' : 1,
-		'vi' : 1
+		'vi' : 1,
+		'zh-cn' : 1
 	}
 };
diff --git a/editors/ckeditor/ckeditor.js b/editors/ckeditor/ckeditor.js
diff --git a/editors/ckeditor/config.js b/editors/ckeditor/config.js
@@ -7,6 +7,12 @@ CKEDITOR.editorConfig = function( config ) {
 	config.language = nv_sitelang;
 	config.extraPlugins = 'autosave';
 	config.entities = false;
+	config.youtube_width = '640';
+	config.youtube_height = '480';
+	config.youtube_related = false;
+	config.youtube_older = true;
+	config.youtube_privacy = false;
+	config.youtube_autoplay = true;
 	// Default setting.
 	config.toolbarGroups = [
 	    { name: 'clipboard',   groups: [ 'clipboard', 'undo' ] },

diff --git a/editors/ckeditor/contents.css b/editors/ckeditor/contents.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 
@@ -21,7 +21,7 @@ body
 .cke_editable
 {
 	font-size: 13px;
-	line-height: 1.6em;
+	line-height: 1.6;
 }
 
 blockquote
@@ -64,7 +64,7 @@ ol,ul,dl
 h1,h2,h3,h4,h5,h6
 {
 	font-weight: normal;
-	line-height: 1.2em;
+	line-height: 1.2;
 }
 
 hr

diff --git a/editors/ckeditor/lang/ar.js b/editors/ckeditor/lang/ar.js