Merge pull request #62 from mendix/bugfix_appUrl

Small bugfix for CKEditor basepath
mendixlabs · Aug 16, 2018 · ee48fd3 · ee48fd3
2 parents 429ffa9 + a68252e
commit ee48fd3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/dist/CKEditorForMendix.mpk b/dist/CKEditorForMendix.mpk
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CKEditorForMendix",
-  "version": "2.5.0",
+  "version": "2.5.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/lib/ckeditor.js b/src/CKEditorForMendix/widget/lib/ckeditor.js
@@ -1,15 +1,15 @@
 /* Mendix CKEditor paths */
 ((function () {
     console.log('CKEDITOR SCRIPT LOADING.');
-    if (typeof window.mxmob !== 'undefined') {
+    if (typeof mx.appUrl !== "undefined") {
+        window.CKEDITOR_BASEPATH = mx.appUrl + 'widgets/CKEditorForMendix/widget/lib/';
+    } else if (typeof window.mxmob !== 'undefined') {
         window.CKEDITOR_BASEPATH = window.mxmob.app._currentURL + 'widgets/CKEditorForMendix/widget/lib/';
         window.mxmob.ui.alert(window.CKEDITOR_BASEPATH);
-    } else {
-        if (typeof window.mxapp !== 'undefined') {
-            window.CKEDITOR_BASEPATH = window.mxapp._appUrl + 'widgets/CKEditorForMendix/widget/lib/';
-        } else if (typeof window.mx !== 'undefined') {
-            window.CKEDITOR_BASEPATH = mx.appUrl + 'widgets/CKEditorForMendix/widget/lib/';
-        }
+    } else if (typeof window.mxapp !== 'undefined' && typeof window.mxapp._appUrl !== "undefined") {
+        window.CKEDITOR_BASEPATH = window.mxapp._appUrl + 'widgets/CKEditorForMendix/widget/lib/';
+    } else if (typeof window.mx !== 'undefined') {
+        window.CKEDITOR_BASEPATH = mx.appUrl + 'widgets/CKEditorForMendix/widget/lib/';
     }
 }()));
 

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.5.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="CKEditorForMendix" version="2.5.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