Fix Upload, crashes in cloud deployment

mendixlabs · Dec 22, 2016 · d253742 · d253742
1 parent 544edd4
commit d253742
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CKEditorForMendix",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "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",

diff --git a/src/CKEditorForMendix/widget/CKEditorForMendix.js b/src/CKEditorForMendix/widget/CKEditorForMendix.js
@@ -13,13 +13,12 @@ define([
     "CKEditorForMendix/widget/lib/jquery",
     "CKEditorForMendix/widget/lib/ckeditor",
     "dojo/text!CKEditorForMendix/widget/templates/CKEditorForMendix.html",
-    "CKEditorForMendix/widget/lib/jquery.oembed",
-    "mendix/lib/Upload"
-], function(declare, _WidgetBase, _TemplatedMixin, dom, domStyle, dojoClass, domConstruct, html, dojoArray, lang, text, _jQuery, _CKEditor, widgetTemplate, MxUpload) {
+    "CKEditorForMendix/widget/lib/jquery.oembed"
+], function(declare, _WidgetBase, _TemplatedMixin, dom, domStyle, dojoClass, domConstruct, html, dojoArray, lang, text, _jQuery, _CKEditor, widgetTemplate) {
     "use strict";
 
     var $ = _jQuery.noConflict(true),
-        Upload = MxUpload || mendix.lib.Upload;
+        Upload = mendix.lib.Upload; // This needs to be fixed for future version. Remove Upload and use mx.data.saveDocument, make a distinction
 
     return declare("CKEditorForMendix.widget.CKEditorForMendix", [_WidgetBase, _TemplatedMixin], {
 

diff --git a/src/package.xml b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="CKEditorForMendix" version="2.4.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="CKEditorForMendix" version="2.4.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="CKEditorForMendix/CKEditorForMendix.xml"/>
             <widgetFile path="CKEditorForMendix/CKEditorViewerForMendix.xml"/>

diff --git a/test/widgets/CKEditorForMendix.mpk b/test/widgets/CKEditorForMendix.mpk