diff --git a/img/tui-icon-a.svg b/img/tui-icon-a.svg
deleted file mode 100644
index 7e1efb817..000000000
--- a/img/tui-icon-a.svg
+++ /dev/null
@@ -1,235 +0,0 @@
-
\ No newline at end of file
diff --git a/img/tui-icon-b.svg b/img/tui-icon-b.svg
deleted file mode 100644
index c1ea6256a..000000000
--- a/img/tui-icon-b.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-
\ No newline at end of file
diff --git a/img/tui-icon-c.svg b/img/tui-icon-c.svg
deleted file mode 100644
index 8074cf08d..000000000
--- a/img/tui-icon-c.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-
\ No newline at end of file
diff --git a/img/tui-icon-d.svg b/img/tui-icon-d.svg
deleted file mode 100644
index 52e6ffa30..000000000
--- a/img/tui-icon-d.svg
+++ /dev/null
@@ -1,224 +0,0 @@
-
\ No newline at end of file
diff --git a/js/commands/quicklook.plugins.js b/js/commands/quicklook.plugins.js
index 842f077e4..3f79eb24c 100644
--- a/js/commands/quicklook.plugins.js
+++ b/js/commands/quicklook.plugins.js
@@ -386,7 +386,7 @@ elFinder.prototype.commands.quicklook.plugins = [
ql.hideinfo();
var doc = $('').appendTo(preview)[0].contentWindow.document;
doc.open();
- doc.write(marked(data.content));
+ doc.write((marked.parse || marked)(data.content));
doc.close();
loading.remove();
},
diff --git a/js/elFinder.options.js b/js/elFinder.options.js
index 7674a5930..99144cf1b 100644
--- a/js/elFinder.options.js
+++ b/js/elFinder.options.js
@@ -12,27 +12,27 @@ elFinder.prototype._options = {
*/
cdns : {
// for editor etc.
- ace : 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.12',
- codemirror : 'https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.61.1',
- ckeditor : 'https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.16.1',
- ckeditor5 : 'https://cdn.ckeditor.com/ckeditor5/28.0.0',
- tinymce : 'https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.7.1',
+ ace : 'https://cdnjs.cloudflare.com/ajax/libs/ace/1.4.14',
+ codemirror : 'https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.2',
+ ckeditor : 'https://cdnjs.cloudflare.com/ajax/libs/ckeditor/4.17.2',
+ ckeditor5 : 'https://cdn.ckeditor.com/ckeditor5/33.0.0',
+ tinymce : 'https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.0.0',
simplemde : 'https://cdnjs.cloudflare.com/ajax/libs/simplemde/1.11.2',
fabric : 'https://cdnjs.cloudflare.com/ajax/libs/fabric.js/4.2.0',
fabric16 : 'https://cdnjs.cloudflare.com/ajax/libs/fabric.js/1.6.7',
tui : 'https://uicdn.toast.com',
// for quicklook etc.
- hls : 'https://cdnjs.cloudflare.com/ajax/libs/hls.js/1.0.2/hls.min.js',
- dash : 'https://cdnjs.cloudflare.com/ajax/libs/dashjs/3.2.2/dash.all.min.js',
- flv : 'https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.5.0/flv.min.js',
- videojs : 'https://cdnjs.cloudflare.com/ajax/libs/video.js/7.12.1',
+ hls : 'https://cdnjs.cloudflare.com/ajax/libs/hls.js/1.1.5/hls.min.js',
+ dash : 'https://cdnjs.cloudflare.com/ajax/libs/dashjs/4.3.0/dash.all.min.js',
+ flv : 'https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.6.2/flv.min.js',
+ videojs : 'https://cdnjs.cloudflare.com/ajax/libs/video.js/7.18.1',
prettify : 'https://cdn.jsdelivr.net/gh/google/code-prettify@f1c3473acd1e8ea8c8c1a60c56e89f5cdd06f915/loader/run_prettify.js',
- psd : 'https://cdnjs.cloudflare.com/ajax/libs/psd.js/3.2.0/psd.min.js',
+ psd : 'https://cdnjs.cloudflare.com/ajax/libs/psd.js/3.4.0/psd.min.js',
rar : 'https://cdn.jsdelivr.net/gh/nao-pon/rar.js@6cef13ec66dd67992fc7f3ea22f132d770ebaf8b/rar.min.js',
zlibUnzip : 'https://cdn.jsdelivr.net/gh/imaya/zlib.js@0.3.1/bin/unzip.min.js', // need check unzipFiles() in quicklook.plugins.js when update
zlibGunzip : 'https://cdn.jsdelivr.net/gh/imaya/zlib.js@0.3.1/bin/gunzip.min.js',
bzip2 : 'https://cdn.jsdelivr.net/gh/nao-pon/bzip2.js@0.8.0/bzip2.js',
- marked : 'https://cdnjs.cloudflare.com/ajax/libs/marked/2.0.3/marked.min.js',
+ marked : 'https://cdnjs.cloudflare.com/ajax/libs/marked/4.0.2/marked.min.js',
sparkmd5 : 'https://cdnjs.cloudflare.com/ajax/libs/spark-md5/3.0.0/spark-md5.min.js',
jssha : 'https://cdnjs.cloudflare.com/ajax/libs/jsSHA/3.2.0/sha.min.js',
amr : 'https://cdn.jsdelivr.net/gh/yxl/opencore-amr-js@dcf3d2b5f384a1d9ded2a54e4c137a81747b222b/js/amrnb.js',
diff --git a/js/extras/editors.default.js b/js/extras/editors.default.js
index 1ffbbc4cf..709b4fe6c 100644
--- a/js/extras/editors.default.js
+++ b/js/extras/editors.default.js
@@ -218,7 +218,7 @@
this.disabled = true;
} else {
this.opts = Object.assign({
- version: 'v3.14.3'
+ version: 'v3.15.2'
}, opts.extraOptions.tuiImgEditOpts || {}, {
iconsPath : fm.baseUrl + 'img/tui-',
theme : {}
@@ -255,20 +255,7 @@
path: $base.data('url'),
name: self.file.name
},
- theme: Object.assign(opts.theme, {
- 'menu.normalIcon.path': iconsPath + 'icon-d.svg',
- 'menu.normalIcon.name': 'icon-d',
- 'menu.activeIcon.path': iconsPath + 'icon-b.svg',
- 'menu.activeIcon.name': 'icon-b',
- 'menu.disabledIcon.path': iconsPath + 'icon-a.svg',
- 'menu.disabledIcon.name': 'icon-a',
- 'menu.hoverIcon.path': iconsPath + 'icon-c.svg',
- 'menu.hoverIcon.name': 'icon-c',
- 'submenu.normalIcon.path': iconsPath + 'icon-d.svg',
- 'submenu.normalIcon.name': 'icon-d',
- 'submenu.activeIcon.path': iconsPath + 'icon-c.svg',
- 'submenu.activeIcon.name': 'icon-c'
- }),
+ theme: opts.theme,
initMenu: 'filter',
menuBarPosition: 'bottom'
},
@@ -283,7 +270,7 @@
w = parseInt(c.attr('width')),
h = parseInt(c.attr('height')),
a = w / h,
- mw, mh;
+ z, mw, mh;
if (v === 0) {
mw = w;
mh = h;
@@ -295,7 +282,16 @@
mh = h;
}
}
- per.text(Math.round(mw / w * 100) + '%');
+ z = Math.round(mw / w * 100);
+ // Control zoom button of TUI Image Editor
+ if (z < 100) {
+ iEditor.resetZoom();
+ iEditor.stopDrawingMode();
+ tuiZoomCtrls.hide();
+ } else {
+ tuiZoomCtrls.show();
+ }
+ per.text(z + '%');
iEditor.resizeCanvasDimension({width: mw, height: mh});
// continually change more
if (zoomMore) {
@@ -308,6 +304,7 @@
zup = $('').data('val', 10),
zdown = $('').data('val', -10),
per = $('').css('width', '4em').text('%').attr('title', '100%').data('val', 0),
+ tuiZoomCtrls,
quty, qutyTm, zoomTm, zoomMore;
tmpContainer.remove();
@@ -372,6 +369,8 @@
quty.trigger('change');
});
}
+ // ZOOM controls of TUI Image Editor
+ tuiZoomCtrls = $base.find('.tie-btn-zoomIn,.tie-btn-zoomOut,.tie-btn-hand');
// show initial scale
zoom(null);
}, 100);