Fix #34 dragging images in firefox works, image browser fixes

mendixlabs · May 11, 2016 · 6f1a4eb · 6f1a4eb
1 parent 8c060c5
commit 6f1a4eb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/src/CKEditorForMendix/widget/CKEditorForMendix.js b/src/CKEditorForMendix/widget/CKEditorForMendix.js
@@ -425,6 +425,12 @@ define([
                         this._contextObj.addReference(this._imageReference, obj.getGuid());
                     }
 
+                    // Normalize file name and size (sometimes doesn't work in firefox)
+                    if (file.name === undefined && file.size === undefined) {
+                        file.name = file.fileName;
+                        file.size = file.fileSize;
+                    }
+
                     var guid = obj.getGuid();
                     var upload = new Upload({
                         objectGuid: guid,
@@ -592,6 +598,9 @@ define([
 
         _getFileUrl: function (guid) {
             var changedDate = Math.floor(Date.now() / 1); // Right now;
+            if (mx.data.getDocumentUrl) {
+                return mx.data.getDocumentUrl(guid, changedDate, false);
+            }
             return mx.appUrl + "file?" + [
                 "guid=" + guid,
                 "changedDate=" + changedDate

diff --git a/src/CKEditorForMendix/widget/CKEditorViewerForMendix.js b/src/CKEditorForMendix/widget/CKEditorViewerForMendix.js
@@ -71,6 +71,9 @@ define([
 
         _getFileUrl: function (guid) {
             var changedDate = Math.floor(Date.now() / 1); // Right now;
+            if (mx.data.getDocumentUrl) {
+                return mx.data.getDocumentUrl(guid, changedDate, false);
+            }
             return mx.appUrl + "file?" + [
                 "guid=" + guid,
                 "changedDate=" + changedDate

diff --git a/src/CKEditorForMendix/widget/lib/ckeditor.js b/src/CKEditorForMendix/widget/lib/ckeditor.js
diff --git a/src/CKEditorForMendix/widget/lib/plugins/simple-image-browser/plugin.js b/src/CKEditorForMendix/widget/lib/plugins/simple-image-browser/plugin.js
@@ -58,11 +58,11 @@ CKEDITOR.plugins.add('simple-image-browser', {
                 var txt = "";
                 $.each(images, function(key, value) {
                     var element = [
-                         "<div onclick=\"CKEDITOR.tools.simpleimagebrowserinsertpicture('",
-                         value.imageUrl, "','", value.guid,
-                         "');\" style=\"position:relative;width:75px;height:75px;margin:5px;background-image:url('",
+                         "<img src=\"",
                          value.thumbnailUrl,
-                         "');background-repeat:no-repeat;background-size:125%;background-position:center center;float:left;\"></div>"
+                         "\" onclick=\"CKEDITOR.tools.simpleimagebrowserinsertpicture('",
+                         value.imageUrl, "','", value.guid,
+                         "');\" style=\"position:relative;max-width:75px;max-height:75px;margin:5px;float:left;cursor:pointer;\" \\>"
                     ].join("");
                     txt = txt + element;
                  });

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