Skip to content

Commit e174f55

Browse files
committed
Drop support for tinymce 3
1 parent 1bc9b7c commit e174f55

File tree

2 files changed

+44
-98
lines changed

2 files changed

+44
-98
lines changed

resources/assets/js/include.js

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,37 +2105,17 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
21052105
}
21062106
else
21072107
{
2108-
var editor = jQuery('#editor').val();
2109-
if (editor == 'ckeditor')
2110-
{
2108+
if (jQuery('#editor').val() === 'ckeditor') {
21112109
var funcNum = getUrlParam('CKEditorFuncNum');
21122110
window.opener.CKEDITOR.tools.callFunction(funcNum, url);
21132111
window.close();
2114-
}
2115-
else
2116-
{
2117-
// tinymce 3.X
2118-
if (parent.tinymce.majorVersion < 4)
2119-
{
2120-
parent.tinymce.activeEditor.windowManager.params.setUrl(url);
2121-
parent.tinymce.activeEditor.windowManager.close(parent.tinymce.activeEditor.windowManager.params.mce_window_id);
2122-
}
2123-
// tinymce 4.X
2124-
else if (parent.tinymce.majorVersion === 4)
2125-
{
2126-
parent.tinymce.activeEditor.windowManager.getParams().setUrl(url);
2127-
parent.tinymce.activeEditor.windowManager.close();
2128-
}
2129-
// tinymce 5.x
2130-
else
2131-
{
2132-
window.parent.postMessage({
2133-
sender: 'responsivefilemanager',
2134-
url: url,
2135-
field_id: null
2136-
}, window.location.origin);
2137-
parent.tinymce.activeEditor.windowManager.close();
2138-
}
2112+
} else {
2113+
window.parent.postMessage({
2114+
sender: 'responsivefilemanager',
2115+
url: url,
2116+
field_id: null
2117+
}, window.location.origin);
2118+
parent.tinymce.activeEditor.windowManager.close();
21392119
}
21402120
}
21412121
}

resources/assets/js/plugin.js

Lines changed: 36 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@
99

1010
tinymce.PluginManager.add('filemanager', function(editor) {
1111

12-
if (tinymce.majorVersion < 5) {
13-
editor.settings.file_browser_callback = filemanager;
14-
} else {
1512
editor.settings.file_picker_types = 'file image media';
16-
editor.settings.file_picker_callback = filemanagerForTinymce5;
17-
}
13+
editor.settings.file_picker_callback = filemanager;
1814

1915
function filemanager_onMessage(event){
2016
if(editor.settings.external_filemanager_path.toLowerCase().indexOf(event.origin.toLowerCase()) === 0){
@@ -32,55 +28,7 @@ tinymce.PluginManager.add('filemanager', function(editor) {
3228
}
3329
}
3430

35-
function filemanager (id, value, type, win) {
36-
var dimensions = getWidthAndHeight();
37-
38-
tinymce.activeEditor.windowManager.open({
39-
title: getTitle(),
40-
file: getDialogUrl(type),
41-
width: dimensions.width,
42-
height: dimensions.height,
43-
resizable: true,
44-
maximizable: true,
45-
inline: 1
46-
}, {
47-
setUrl: function (url) {
48-
var fieldElm = win.document.getElementById(id);
49-
fieldElm.value = editor.convertURL(url);
50-
if ("createEvent" in document) {
51-
var evt = document.createEvent("HTMLEvents");
52-
evt.initEvent("change", false, true);
53-
fieldElm.dispatchEvent(evt)
54-
} else {
55-
fieldElm.fireEvent("onchange")
56-
}
57-
}
58-
});
59-
}
60-
61-
function filemanagerForTinymce5(callback, value, meta) {
62-
window.addEventListener('message', function receiveMessage(event) {
63-
window.removeEventListener('message', receiveMessage, false);
64-
if (event.data.sender === 'responsivefilemanager') {
65-
callback(event.data.url);
66-
}
67-
}, false);
68-
69-
70-
var dimensions = getWidthAndHeight();
71-
72-
tinymce.activeEditor.windowManager.openUrl({
73-
title: getTitle(),
74-
url: getDialogUrl(meta.filetype),
75-
width: dimensions.width,
76-
height: dimensions.height,
77-
resizable: true,
78-
maximizable: true,
79-
inline: 1,
80-
});
81-
}
82-
83-
function getWidthAndHeight() {
31+
function filemanager(callback, value, meta) {
8432
var width = window.innerWidth-30;
8533
var height = window.innerHeight-60;
8634
if(width > 1800) width=1800;
@@ -90,26 +38,15 @@ tinymce.PluginManager.add('filemanager', function(editor) {
9038
width = width - width_reduce + 10;
9139
}
9240

93-
return {
94-
width: width,
95-
height: height
96-
}
97-
}
41+
// DEFAULT AS FILE
42+
urltype=2;
43+
if (meta.mediaType === 'image') { urltype=1; }
44+
if (meta.mediaType === 'media') { urltype=3; }
9845

99-
function getTitle() {
10046
var title="RESPONSIVE FileManager";
10147
if (typeof editor.settings.filemanager_title !== "undefined" && editor.settings.filemanager_title) {
10248
title=editor.settings.filemanager_title;
10349
}
104-
return title;
105-
}
106-
107-
function getDialogUrl(mediaType) {
108-
// DEFAULT AS FILE
109-
urltype=2;
110-
if (mediaType === 'image') { urltype=1; }
111-
if (mediaType === 'media') { urltype=3; }
112-
11350
var akey="key";
11451
if (typeof editor.settings.filemanager_access_key !== "undefined" && editor.settings.filemanager_access_key) {
11552
akey=editor.settings.filemanager_access_key;
@@ -138,7 +75,36 @@ tinymce.PluginManager.add('filemanager', function(editor) {
13875
}
13976
}
14077

141-
return editor.settings.external_filemanager_path+'dialog.php?type='+urltype+'&descending='+descending+sort_by+fldr+crossdomain+'&lang='+editor.settings.language+'&akey='+akey;
78+
window.addEventListener('message', function receiveMessage(event) {
79+
window.removeEventListener('message', receiveMessage, false);
80+
if (event.data.sender === 'responsivefilemanager') {
81+
callback(event.data.url);
82+
}
83+
}, false);
84+
85+
var dialogUrl = editor.settings.external_filemanager_path+'dialog.php?type='+urltype+'&descending='+descending+sort_by+fldr+crossdomain+'&lang='+editor.settings.language+'&akey='+akey;
86+
87+
if (tinymce.majorVersion > 4) {
88+
tinymce.activeEditor.windowManager.openUrl({
89+
title: title,
90+
url: dialogUrl,
91+
width: width,
92+
height: height,
93+
resizable: true,
94+
maximizable: true,
95+
inline: 1,
96+
});
97+
} else {
98+
tinymce.activeEditor.windowManager.open({
99+
title: title,
100+
file: dialogUrl,
101+
width: width,
102+
height: height,
103+
resizable: true,
104+
maximizable: true,
105+
inline: 1,
106+
});
107+
}
142108
}
143109

144110
return false;

0 commit comments

Comments
 (0)