Merge b9f252f into fa8d49a

.gitignore

@@ -32,6 +32,7 @@ var
 sys
 src/collective/ckeditor/browser/ckeditor
 lib
+lib64
 include
 htmlcov
 .coverage

.travis.yml

@@ -1,38 +1,17 @@
 language: python
 python: 2.7
-#virtualenv:
-#  system_site_packages: true
+addons:
+  apt:
+    packages:
+    - libxml2-dev
+    - libxslt1-dev
+sudo: false
 
 env:
-#  - PLONE_VERSION=4.0 TARGET=test
-#  - PLONE_VERSION=4.1 TARGET=test
   - PLONE_VERSION=4.2 TARGET=test
   - PLONE_VERSION=4.3 TARGET=test
-#  - PLONE_VERSION=4.4 TARGET=test
-# - TARGET=coverage.sh
-# - TARGET=python-validation.sh
-#  - TARGET=css-validation.sh
-#  - TARGET=js-validation.sh
-
-# csslint and jshint dependencies, uncomment if needed
-# before_install:
-#  - sudo apt-get install ack-grep
-#  - sudo apt-add-repository ppa:chris-lea/node.js -y
-#  - sudo apt-get update 1>/dev/null
-#  - sudo apt-get install nodejs npm -y
-
-# csslint
-#  - npm install csslint -g
-
-# jshint
-#  - npm install jshint -g
 
 before_install:
-  - sudo locale-gen en_US.UTF-8
-  - sudo update-locale LANG=en_US.UTF-8 LC_MESSAGES=POSIX
-  - sudo locale -a
-  - sudo locale
-  - sudo apt-get install -y libxml2-dev libxslt1-dev
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 
@@ -43,7 +22,6 @@ install:
   - python bootstrap.py -c travis.cfg
   - bin/buildout -N -t 3 -c travis.cfg
   - bin/buildout -N -t 3 -c travis.cfg install omelette
-#  - for po in $(find -L parts/omelette -path '*/LC_MESSAGES/*.po');do msgfmt -o ${po/%po/mo} $po;done
 
 script:
   - bin/test

base.cfg

@@ -176,3 +176,4 @@ Pygments = 2.0.2
 six = 1.9.0
 # necessary for running tests for Plone 4.1 and 4.2
 collective.recipe.template = 1.11
+plone.recipe.codeanalysis = 2.0

docs/HISTORY.txt

@@ -4,6 +4,9 @@ Changelog
 4.3.0b3 (unreleased)
 --------------------
 
+- Updated to CKeditor 4.4.8.
+  [gotcha]
+
 - Add defaultTableWidth option to control panel to set the default table width in the table dialog window.
 
 

src/collective/ckeditor/_src/ckeditor/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:

src/collective/ckeditor/_src/ckeditor/build-config.js

@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
  * For licensing, see LICENSE.md or http://ckeditor.com/license
  */
 
@@ -13,10 +13,10 @@
  * (1) http://ckeditor.com/builder
  *     Visit online builder to build CKEditor from scratch.
  *
- * (2) http://ckeditor.com/builder/46519db514290150731e78289dd8ffbb
+ * (2) http://ckeditor.com/builder/e41bccb8290b6d530f8478ddafe95c48
  *     Visit online builder to build CKEditor, starting with the same setup as before.
  *
- * (3) http://ckeditor.com/builder/download/46519db514290150731e78289dd8ffbb
+ * (3) http://ckeditor.com/builder/download/e41bccb8290b6d530f8478ddafe95c48
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -26,70 +26,61 @@
 
 var CKBUILDER_CONFIG = {
 	skin: 'moonocolor',
-	preset: 'full',
+	preset: 'standard',
 	ignore: [
+		'.bender',
+		'bender.js',
+		'bender-err.log',
+		'bender-out.log',
 		'dev',
-		'.gitignore',
+		'.DS_Store',
+		'.editorconfig',
 		'.gitattributes',
+		'.gitignore',
+		'gruntfile.js',
+		'.idea',
+		'.jscsrc',
+		'.jshintignore',
+		'.jshintrc',
+		'.mailmap',
+		'node_modules',
+		'package.json',
 		'README.md',
-		'.mailmap'
+		'tests'
 	],
 	plugins : {
 		'a11yhelp' : 1,
 		'about' : 1,
 		'basicstyles' : 1,
-		'bidi' : 1,
 		'blockquote' : 1,
 		'clipboard' : 1,
-		'colorbutton' : 1,
-		'colordialog' : 1,
 		'contextmenu' : 1,
-		'dialogadvtab' : 1,
-		'div' : 1,
 		'elementspath' : 1,
 		'enterkey' : 1,
 		'entities' : 1,
 		'filebrowser' : 1,
-		'find' : 1,
-		'flash' : 1,
 		'floatingspace' : 1,
-		'font' : 1,
 		'format' : 1,
-		'forms' : 1,
 		'horizontalrule' : 1,
 		'htmlwriter' : 1,
-		'iframe' : 1,
 		'image' : 1,
-		'indentblock' : 1,
 		'indentlist' : 1,
-		'justify' : 1,
-		'language' : 1,
 		'link' : 1,
 		'list' : 1,
-		'liststyle' : 1,
 		'magicline' : 1,
 		'maximize' : 1,
-		'newpage' : 1,
-		'pagebreak' : 1,
 		'pastefromword' : 1,
 		'pastetext' : 1,
-		'preview' : 1,
-		'print' : 1,
 		'removeformat' : 1,
 		'resize' : 1,
-		'save' : 1,
 		'scayt' : 1,
-		'selectall' : 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,
 		'wsc' : 1,
@@ -163,4 +154,4 @@ var CKBUILDER_CONFIG = {
 		'zh' : 1,
 		'zh-cn' : 1
 	}
-};
+};