Skip to content

Commit 66a074c

Browse files
w8tchaw8tcha
committed
[FIXED #187] about dialog in wysiwyg mode
1 parent a9b06d5 commit 66a074c

File tree

5 files changed

+44
-25
lines changed

5 files changed

+44
-25
lines changed

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ckeditor-codemirror-plugin",
33
"homepage": "http://w8tcha.github.io/CKEditor-CodeMirror-Plugin/",
4-
"version": "1.18.1",
4+
"version": "1.18.2",
55
"authors": [
66
"Ingo Herbote"
77
],

‎codemirror/dialogs/codemirrorAbout.js‎

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,48 @@ CKEDITOR.dialog.add('codemirrorAboutDialog',
5959
'<div class="cke_about_container">' +
6060
'<div class="cke_about_logo"></div>' +
6161
'<p>' +
62-
'CodeMirror ' +
63-
CodeMirror.version + ' (CKEditor Plugin Version ' + editor.plugins.codemirror.version + ')<br>' +
62+
(typeof (CodeMirror) == "undefined" ? "" : 'CodeMirror ' + CodeMirror.version) +
63+
' (CKEditor Plugin Version ' +
64+
editor.plugins.codemirror.version +
65+
')<br>' +
6466
'<a target="_blank" rel="noopener noreferrer" href="https://codemirror.net">https://codemirror.net</a> - ' +
6567
'<a target="_blank" rel="noopener noreferrer" href="https://github.com/w8tcha/CKEditor-CodeMirror-Plugin">https://github.com/w8tcha/CKEditor-CodeMirror-Plugin</a>' +
6668
'</p>' +
67-
'<h5>' + lang.moreInfoShortcuts + '</h5>' +
69+
'<h5>' +
70+
lang.moreInfoShortcuts +
71+
'</h5>' +
6872
'<p><ul>' +
69-
'<li>' + lang.moreInfoShortcuts1 + '</li>' +
70-
'<li>' + lang.moreInfoShortcuts2 + '</li>' +
71-
'<li>' + lang.moreInfoShortcuts3 + '</li>' +
72-
'<li>' + lang.moreInfoShortcuts4 + '</li>' +
73-
'<li>' + lang.moreInfoShortcuts5 + '</li>' +
74-
'<li>' + lang.moreInfoShortcuts6 + '</li>' +
75-
'<li>' + lang.moreInfoShortcuts7 + '</li>' +
76-
'<li>' + lang.moreInfoShortcuts8 + '</li>' +
77-
'<li>' + lang.moreInfoShortcuts9 + '</li>' +
78-
73+
'<li>' +
74+
lang.moreInfoShortcuts1 +
75+
'</li>' +
76+
'<li>' +
77+
lang.moreInfoShortcuts2 +
78+
'</li>' +
79+
'<li>' +
80+
lang.moreInfoShortcuts3 +
81+
'</li>' +
82+
'<li>' +
83+
lang.moreInfoShortcuts4 +
84+
'</li>' +
85+
'<li>' +
86+
lang.moreInfoShortcuts5 +
87+
'</li>' +
88+
'<li>' +
89+
lang.moreInfoShortcuts6 +
90+
'</li>' +
91+
'<li>' +
92+
lang.moreInfoShortcuts7 +
93+
'</li>' +
94+
'<li>' +
95+
lang.moreInfoShortcuts8 +
96+
'</li>' +
97+
'<li>' +
98+
lang.moreInfoShortcuts9 +
99+
'</li>' +
79100
'</ul></p>' +
80-
81101
'<p>' +
82102
lang.copyright +
83103
'</p>' +
84-
85104
'</div>'
86105
}
87106
]

‎codemirror/plugin.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
(function() {
1010
CKEDITOR.plugins.add("codemirror", {
1111
lang: "af,ar,bg,bn,bs,ca,cs,cy,da,de,el,en-au,en-ca,en-gb,en,eo,es,et,eu,fa,fi,fo,fr-ca,fr,gl,gu,he,hi,hr,hu,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,pl,pt-br,pt,ro,ru,sk,sl,sr-latn,sr,sv,th,tr,ug,uk,vi,zh-cn,zh", // %REMOVE_LINE_CORE%
12-
version: "1.18.1",
12+
version: "1.18.2",
1313
init: function (editor) {
1414
var command = editor.addCommand("codemirrorAbout", new CKEDITOR.dialogCommand("codemirrorAboutDialog"));
1515
command.modes = { wysiwyg: 1, source: 1 };
@@ -1267,7 +1267,7 @@ CKEDITOR.plugins.sourcearea = {
12671267
},
12681268
editorFocus: false,
12691269
readOnly: 1,
1270-
exec: function(editor) {
1270+
exec: function (editor) {
12711271
if (editor.mode === "wysiwyg") {
12721272
editor.fire("saveSnapshot");
12731273
}
@@ -1284,7 +1284,7 @@ CKEDITOR.plugins.sourcearea = {
12841284
},
12851285
editorFocus: false,
12861286
readOnly: 1,
1287-
exec: function(editor) {
1287+
exec: function (editor) {
12881288
CodeMirror.commands.find(window["codemirror_" + editor.id]);
12891289
},
12901290
canUndo: true
@@ -1296,7 +1296,7 @@ CKEDITOR.plugins.sourcearea = {
12961296
},
12971297
editorFocus: false,
12981298
readOnly: 0,
1299-
exec: function(editor) {
1299+
exec: function (editor) {
13001300
var range = {
13011301
from: window["codemirror_" + editor.id].getCursor(true),
13021302
to: window["codemirror_" + editor.id].getCursor(false)
@@ -1312,7 +1312,7 @@ CKEDITOR.plugins.sourcearea = {
13121312
},
13131313
editorFocus: false,
13141314
readOnly: 0,
1315-
exec: function(editor) {
1315+
exec: function (editor) {
13161316
var range = {
13171317
from: window["codemirror_" + editor.id].getCursor(true),
13181318
to: window["codemirror_" + editor.id].getCursor(false)
@@ -1328,7 +1328,7 @@ CKEDITOR.plugins.sourcearea = {
13281328
},
13291329
editorFocus: false,
13301330
readOnly: 0,
1331-
exec: function(editor) {
1331+
exec: function (editor) {
13321332
var range = {
13331333
from: window["codemirror_" + editor.id].getCursor(true),
13341334
to: window["codemirror_" + editor.id].getCursor(false)
@@ -1349,7 +1349,7 @@ CKEDITOR.plugins.sourcearea = {
13491349
},
13501350
editorFocus: false,
13511351
readOnly: 1,
1352-
exec: function(editor) {
1352+
exec: function (editor) {
13531353
if (this.state == CKEDITOR.TRISTATE_ON) {
13541354
window["codemirror_" + editor.id].setOption("autoCloseTags", false);
13551355
} else if (this.state == CKEDITOR.TRISTATE_OFF) {

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ckeditor-codemirror-plugin",
33
"homepage": "http://w8tcha.github.io/CKEditor-CodeMirror-Plugin/",
4-
"version": "1.18.1",
4+
"version": "1.18.2",
55
"authors": [
66
"Ingo Herbote"
77
],

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ckeditor-codemirror-plugin",
3-
"version": "1.18.1",
3+
"version": "1.18.2",
44
"author": "w8tcha",
55
"description": "Syntax Highlighting for the CKEditor (Source View and Source Dialog) with the CodeMirror Plugin.",
66
"repository": {

0 commit comments

Comments
 (0)