Merge pull request #61 from mendix/update_libraries

Update libraries:
- jQuery 3.3.1
- CKEditor 4.10.0

.gitignore

@@ -16,3 +16,5 @@ node_modules/
 *DS_Store*
 .vscode/
 *.bak
+
+old/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CKEditorForMendix",
-  "version": "2.4.8",
+  "version": "2.5.0",
   "description": "A new WYSIWYG editor for Mendix that also has the ability to create MicroFlow links in your HTML output.",
   "license": "Apache License, Version 2",
   "author": "Mendix",

src/CKEditorForMendix/widget/CKEditorForMendix.js

@@ -11,7 +11,7 @@ define([
     "dojo/_base/lang",
     "dojo/text",
     "mendix/validator",
-    "CKEditorForMendix/widget/lib/jquery",
+    "CKEditorForMendix/widget/lib/jquery.min",
     "CKEditorForMendix/widget/lib/ckeditor",
     "dojo/text!CKEditorForMendix/widget/templates/CKEditorForMendix.html",
     "CKEditorForMendix/widget/lib/jquery.oembed"
@@ -110,7 +110,7 @@ define([
                 this._executeCallback(callback, "update");
             } else {
                 this._resetSubscriptions();
-                this._updateRendering(callback);
+                this._updateRendering(callback, "update");
             }
         },
 
@@ -127,11 +127,13 @@ define([
             }));
 
             this._editor.on("focus", lang.hitch(this, function(e) {
+                logger.debug(this.id + "focus");
                 this._focus = true;
             }));
 
             //On blur (unselecting the textbox) event
             this._editor.on("blur", lang.hitch(this, function(e) {
+                logger.debug(this.id + "blur");
                 this._focus = false;
                 if (this._editor.mode !== "source" && this._editor.checkDirty() && this.onChangeMicroflow && !this._strReadOnly()) {
                     this._executeMf(this._contextObj, this.onChangeMicroflow, lang.hitch(this, function (obj) {
@@ -294,6 +296,7 @@ define([
             };
 
             this._setupEvents();
+            this._ckConfig = config;
 
             this._editor.on("instanceReady", lang.hitch(this, function(event) {
                 logger.debug(this.id + "._createChildNodes editor ready, total height: " + $("#" + this.id).height() + ", calling _updateRendering");
@@ -327,7 +330,7 @@ define([
                     ]);
                 }
 
-                this._updateRendering(callback);
+                this._updateRendering(callback, "editor instance ready");
             }));
 
             if (this._useImageUpload) {
@@ -559,16 +562,16 @@ define([
 
         _updateAttrRendering: function() {
             if (!this._focus) {
-                this._updateRendering();
+                this._updateRendering(null, "_updateAttrRendering");
             }
         },
 
         _strReadOnly: function() {
             return this._contextObj.isReadonlyAttr && this._contextObj.isReadonlyAttr(this.messageString);
         },
 
-        _updateRendering: function(callback) {
-            logger.debug(this.id + "._updateRendering");
+        _updateRendering: function(callback, from) {
+            logger.debug(this.id + "._updateRendering" + (from ? " from: " + from : ""));
 
             if (!this._editor && !this._isReadOnly) {
                 this._createChildNodes(callback);
@@ -609,7 +612,7 @@ define([
                 objHandle = this.subscribe({
                     guid: this._contextObj.getGuid(),
                     callback: lang.hitch(this, function(guid) {
-                        this._updateRendering();
+                        this._updateRendering(null, "subscription");
                     })
                 });
 

src/CKEditorForMendix/widget/CKEditorViewerForMendix.js

@@ -6,7 +6,7 @@ define([
     "dojo/_base/array",
     "dojo/_base/lang",
     "dojo/text",
-    "CKEditorForMendix/widget/lib/jquery",
+    "CKEditorForMendix/widget/lib/jquery.min",
     "CKEditorForMendix/widget/lib/ckeditor_viewer",
     "dojo/text!CKEditorForMendix/widget/templates/CKEditorViewerForMendix.html",
     "CKEditorForMendix/widget/lib/highlight.pack",

src/CKEditorForMendix/widget/lib/LICENSE.md

@@ -1,8 +1,8 @@
 Software License Agreement
 ==========================
 
-CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+CKEditor - The text editor for Internet - https://ckeditor.com/
+Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -37,7 +37,7 @@ done by developers outside of CKSource with their express permission.
 
 The following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2015, CKSource - Frederico Knabben.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2018, CKSource - Frederico Knabben.
 * PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
 * CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <[email protected]> and others.
 

src/CKEditorForMendix/widget/lib/build-config.js

@@ -1,5 +1,5 @@
-/**
- * @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+/**
+ * @license Copyright (c) 2003-2018, 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/e28e1c17acaeb42364c092d2fe181fc5
+ * (2) http://ckeditor.com/builder/03d106a2057469ac90c3e25f9c087200
  *     Visit online builder to build CKEditor, starting with the same setup as before.
  *
- * (3) http://ckeditor.com/builder/download/e28e1c17acaeb42364c092d2fe181fc5
+ * (3) http://ckeditor.com/builder/download/03d106a2057469ac90c3e25f9c087200
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -28,30 +28,33 @@ var CKBUILDER_CONFIG = {
 	skin: 'moono',
 	preset: 'full',
 	ignore: [
-		'.bender',
-		'bender.js',
-		'bender-err.log',
-		'bender-out.log',
-		'dev',
 		'.DS_Store',
+		'.bender',
 		'.editorconfig',
 		'.gitattributes',
 		'.gitignore',
-		'gruntfile.js',
 		'.idea',
 		'.jscsrc',
 		'.jshintignore',
 		'.jshintrc',
-		'less',
 		'.mailmap',
+		'.travis.yml',
+		'README.md',
+		'bender-err.log',
+		'bender-out.log',
+		'bender.ci.js',
+		'bender.js',
+		'dev',
+		'gruntfile.js',
+		'less',
 		'node_modules',
 		'package.json',
-		'README.md',
 		'tests'
 	],
 	plugins : {
 		'a11yhelp' : 1,
 		'about' : 1,
+		'autocorrect' : 1,
 		'basicstyles' : 1,
 		'bidi' : 1,
 		'blockquote' : 1,
@@ -86,10 +89,11 @@ var CKBUILDER_CONFIG = {
 		'magicline' : 1,
 		'maximize' : 1,
 		'newpage' : 1,
+		'oembed' : 1,
 		'pagebreak' : 1,
+		'pastebase64' : 1,
 		'pastefromword' : 1,
 		'pastetext' : 1,
-        'pastebase64' : 1,
 		'preview' : 1,
 		'print' : 1,
 		'removeformat' : 1,
@@ -105,14 +109,14 @@ var CKBUILDER_CONFIG = {
 		'stylescombo' : 1,
 		'tab' : 1,
 		'table' : 1,
-		'tabletools' : 1,
 		'tableresize' : 1,
+		'tabletools' : 1,
 		'templates' : 1,
 		'toolbar' : 1,
 		'undo' : 1,
+		'videodetector' : 1,
 		'wsc' : 1,
-		'wysiwygarea' : 1,
-        'videodetector' : 1
+		'wysiwygarea' : 1
 	},
 	languages : {
 		'af' : 1,
@@ -182,4 +186,4 @@ var CKBUILDER_CONFIG = {
 		'zh' : 1,
 		'zh-cn' : 1
 	}
-};
+};