glebtv-ckeditor 4.1.1.7 → 4.2.1

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/lt.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'lt', {
+	toolbar: 'Šaltinis',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/lv.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'lv', {
+	toolbar: 'HTML kods',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/mk.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'mk', {
+	toolbar: 'Source',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/mn.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'mn', {
+	toolbar: 'Код',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/ms.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'ms', {
+	toolbar: 'Sumber',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/nb.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'nb', {
+	toolbar: 'Kilde',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/nl.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'nl', {
+	toolbar: 'Code',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/no.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'no', {
+	toolbar: 'Kilde',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/pl.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'pl', {
+	toolbar: 'Źródło dokumentu',
+	autoFormat: 'Sformatuj zaznaczenie',
+	commentSelectedRange: 'Zakomentuj zaznaczenie',
+	uncommentSelectedRange: 'Odkomentuj zaznaczenie'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/pt-br.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'pt-br', {
+	toolbar: 'Código-Fonte',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/pt.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'pt', {
+	toolbar: 'Fonte',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/ro.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'ro', {
+	toolbar: 'Sursa',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/sk.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'sk', {
+	toolbar: 'Zdroj',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/sl.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'sl', {
+	toolbar: 'Izvorna koda',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/sr-latn.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'sr-latn', {
+	toolbar: 'Kôd',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/sr.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'sr', {
+	toolbar: 'Kôд',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/sv.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'sv', {
+	toolbar: 'Källa',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/th.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'th', {
+	toolbar: 'ดูรหัส HTML',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/tr.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'tr', {
+	toolbar: 'Kaynak',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/ug.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'ug', {
+	toolbar: 'مەنبە',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/uk.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'uk', {
+	toolbar: 'Джерело',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/vi.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'vi', {
+	toolbar: 'Mã HTML',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/zh-cn.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'zh-cn', {
+	toolbar: '源码',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/lang/zh.js

@@ -0,0 +1,10 @@
+/*
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.plugins.setLang( 'codemirror', 'zh', {
+	toolbar: '原始碼',
+	autoFormat: 'Format Selection',
+	commentSelectedRange: 'Comment Selection',
+	uncommentSelectedRange: 'Uncomment Selection'
+});

data/app/assets/javascripts/ckeditor/plugins/codemirror/plugin.js

@@ -14,27 +14,29 @@
             var rootPath = this.path;
             // Default Config
             var defaultConfig = {
-                theme: 'default',
-                matchBrackets: true,
-                lineNumbers: true,
-                lineWrapping: true,
-                autoCloseTags: true,
                 autoCloseBrackets: true,
+                autoCloseTags: true,
+                autoFormatOnStart: false,
+                autoFormatOnUncomment: true,
                 continueComments: true,
-                enableSearchTools: true,
                 enableCodeFolding: true,
                 enableCodeFormatting: true,
-                autoFormatOnStart: false,
-                autoFormatOnModeChange: true,
-                autoFormatOnUncomment: true,
+                enableSearchTools: true,
                 highlightActiveLine: true,
                 highlightMatches: true,
-                showFormatButton: true,
+                lineNumbers: true,
+                lineWrapping: true,
+                mode: 'text/html',
+                matchBrackets: true,
+                showAutoCompleteButton: true,
                 showCommentButton: true,
+                showFormatButton: true,
                 showSearchButton: true,
                 showUncommentButton: true,
-                showAutoCompleteButton: true
+                theme: 'default',
+                useBeautify: false
             };
+            
             // Get Config & Lang
             var config = CKEDITOR.tools.extend(defaultConfig, editor.config.codemirror || {}, true);
             var lang = editor.lang.codemirror;
@@ -48,6 +50,290 @@
 
             // Source mode isn't available in inline mode yet.
             if (editor.elementMode === CKEDITOR.ELEMENT_MODE_INLINE) {
+                
+                // Override Source Dialog
+                CKEDITOR.dialog.add('sourcedialog', function (editor) {
+                    var size = CKEDITOR.document.getWindow().getViewPaneSize();
+
+                    // Make it maximum 800px wide, but still fully visible in the viewport.
+                    var width = Math.min(size.width - 70, 800);
+
+                    // Make it use 2/3 of the viewport height.
+                    var height = size.height / 1.5;
+
+                    // Store old editor data to avoid unnecessary setData.
+                    var oldData;
+
+                    function loadCodeMirrorInline(editor, textarea) {
+                        var delay;
+
+                        window["codemirror_" + editor.id] = CodeMirror.fromTextArea(textarea, {
+                            mode: 'text/html',
+                            matchBrackets: config.matchBrackets,
+                            workDelay: 300,
+                            workTime: 35,
+                            readOnly: editor.config.readOnly,
+                            lineNumbers: config.lineNumbers,
+                            lineWrapping: config.lineWrapping,
+                            autoCloseTags: config.autoCloseTags,
+                            autoCloseBrackets: config.autoCloseBrackets,
+                            highligctionMatches: config.highlightMatches,
+                            continueComments: config.continueComments,
+                            theme: config.theme,
+                            viewportMargin: Infinity,
+                            //extraKeys: {"Ctrl-Space": "autocomplete"},
+                            extraKeys: { "Ctrl-Q": function (codeMirror_Editor) { window["foldFunc_" + editor.id](codeMirror_Editor, codeMirror_Editor.getCursor().line); } },
+                            onKeyEvent: function (codeMirror_Editor, evt) {
+                                if (config.enableCodeFormatting) {
+                                    var range = getSelectedRange();
+                                    if (evt.type === "keydown" && evt.ctrlKey && evt.keyCode === 75 && !evt.shiftKey && !evt.altKey) {
+                                        window["codemirror_" + editor.id].commentRange(true, range.from, range.to);
+                                    } else if (evt.type === "keydown" && evt.ctrlKey && evt.keyCode === 75 && evt.shiftKey && !evt.altKey) {
+                                        window["codemirror_" + editor.id].commentRange(false, range.from, range.to);
+                                        if (config.autoFormatOnUncomment) {
+                                            window["codemirror_" + editor.id].autoFormatRange(range.from, range.to);
+                                        }
+                                    } else if (evt.type === "keydown" && evt.ctrlKey && evt.keyCode === 75 && !evt.shiftKey && evt.altKey) {
+                                        window["codemirror_" + editor.id].autoFormatRange(range.from, range.to);
+                                    }
+                                }
+                            }
+                        });
+
+                        var holderHeight = height + 'px';
+                        var holderWidth = width + 'px';
+
+                        // Store config so we can access it within commands etc.
+                        window["codemirror_" + editor.id].config = config;
+                        
+                        if (config.autoFormatOnStart) {
+                            if (config.useBeautify) {
+                                var indent_size = 4;
+                                var indent_char = ' ';
+                                var brace_style = 'collapse'; //collapse, expand, end-expand 
+
+                                var source = window["codemirror_" + editor.id].getValue();
+
+                                window["codemirror_" + editor.id].setValue(html_beautify(source, indent_size, indent_char, 120, brace_style));
+                            } else {
+                                window["codemirror_" + editor.id].autoFormatAll({
+                                    line: 0,
+                                    ch: 0
+                                }, {
+                                    line: window["codemirror_" + editor.id].lineCount(),
+                                    ch: 0
+                                });
+                            }
+                        }
+
+                        function getSelectedRange() {
+                            return {
+                                from: window["codemirror_" + editor.id].getCursor(true),
+                                to: window["codemirror_" + editor.id].getCursor(false)
+                            };
+                        }
+
+                        window["codemirror_" + editor.id].on("change", function () {
+                            clearTimeout(delay);
+                            delay = setTimeout(function () {
+                                window["codemirror_" + editor.id].save();
+                            }, 300);
+                        });
+
+                        window["codemirror_" + editor.id].setSize(holderWidth, holderHeight);
+
+                        // Enable Code Folding (Requires 'lineNumbers' to be set to 'true')
+                        if (config.lineNumbers && config.enableCodeFolding) {
+                            window["codemirror_" + editor.id].on("gutterClick", window["foldFunc_" + editor.id]);
+                        }
+                        // Highlight Active Line
+                        if (config.highlightActiveLine) {
+                            window["codemirror_" + editor.id].hlLine = window["codemirror_" + editor.id].addLineClass(0, "background", "activeline");
+                            window["codemirror_" + editor.id].on("cursorActivity", function () {
+                                var cur = window["codemirror_" + editor.id].getLineHandle(window["codemirror_" + editor.id].getCursor().line);
+                                if (cur != window["codemirror_" + editor.id].hlLine) {
+                                    window["codemirror_" + editor.id].removeLineClass(window["codemirror_" + editor.id].hlLine, "background", "activeline");
+                                    window["codemirror_" + editor.id].hlLine = window["codemirror_" + editor.id].addLineClass(cur, "background", "activeline");
+                                }
+                            });
+                        }
+
+                        // Run config.onLoad callback, if present.
+                        if (typeof config.onLoad === 'function') {
+                            config.onLoad(window["codemirror_" + editor.id], editor);
+                        }
+                    }
+
+                    return {
+                        title: editor.lang.sourcedialog.title,
+                        minWidth: width,
+                        minHeight: height,
+                        resizable : CKEDITOR.DIALOG_RESIZE_NONE,
+                        onShow: function () {
+                            // Set Elements
+                            this.getContentElement('main', 'data').focus();
+                            this.getContentElement('main', 'AutoComplete').setValue(config.autoCloseTags, true);
+                            
+                            var textArea = this.getContentElement('main', 'data').getInputElement().$;
+                            
+                            // Load the content
+                            this.setValueOf('main', 'data', oldData = editor.getData());
+
+                            if (typeof (CodeMirror) == 'undefined') {
+
+                                CKEDITOR.document.appendStyleSheet(rootPath + 'css/codemirror.min.css');
+
+                                if (config.theme.length && config.theme != 'default') {
+                                    CKEDITOR.document.appendStyleSheet(rootPath + 'theme/' + config.theme + '.css');
+                                }
+
+                                CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.min.js', function () {
+
+                                    CKEDITOR.scriptLoader.load(getCodeMirrorScripts(), function () {
+                                        loadCodeMirrorInline(editor, textArea);
+                                    });
+                                });
+
+
+                            } else {
+                                loadCodeMirrorInline(editor, textArea);
+                            }
+
+
+                        },
+                        onCancel: function() {
+                            window["codemirror_" + editor.id].toTextArea();
+
+                            // Free Memory on destroy
+                            window["editable_" + editor.id] = null;
+                            window["codemirror_" + editor.id] = null;
+                        },
+                        onOk: (function () {
+
+                            function setData(newData) {
+                                var that = this;
+
+                                editor.setData(newData, function () {
+                                    that.hide();
+
+                                    // Ensure correct selection.
+                                    var range = editor.createRange();
+                                    range.moveToElementEditStart(editor.editable());
+                                    range.select();
+                                });
+                            }
+
+                            return function () {
+                                window["codemirror_" + editor.id].toTextArea();
+
+                                // Free Memory on destroy
+                                window["editable_" + editor.id] = null;
+                                window["codemirror_" + editor.id] = null;
+
+                                // Remove CR from input data for reliable comparison with editor data.
+                                var newData = this.getValueOf('main', 'data').replace(/\r/g, '');
+
+                                // Avoid unnecessary setData. Also preserve selection
+                                // when user changed his mind and goes back to wysiwyg editing.
+                                if (newData === oldData)
+                                    return true;
+
+                                // Set data asynchronously to avoid errors in IE.
+                                CKEDITOR.env.ie ?
+                                    CKEDITOR.tools.setTimeout(setData, 0, this, newData)
+                                    :
+                                    setData.call(this, newData);
+
+                                // Don't let the dialog close before setData is over.
+                                return false;
+                            };
+                        })(),
+
+                        contents: [{
+                            id: 'main',
+                            label: editor.lang.sourcedialog.title,
+                            elements: [
+                                {
+                                    type: 'hbox',
+                                    style: 'width: 80px;margin:0;',
+                                    widths: ['20px', '20px', '20px', '20px'],
+                                    children: [
+                                        {
+                                            type: 'button',
+                                            id: 'searchCode',
+                                            label: '',
+                                            title: lang.searchCode,
+                                            'class': 'searchCodeButton',
+                                            onClick: function() {
+                                                CodeMirror.commands.find(window["codemirror_" + editor.id]);
+                                            }
+                                        }, {
+                                            type: 'button',
+                                            id: 'autoFormat',
+                                            label: '',
+                                            title: lang.autoFormat,
+                                            'class': 'autoFormat',
+                                            onClick: function() {
+                                                var range = {
+                                                    from: window["codemirror_" + editor.id].getCursor(true),
+                                                    to: window["codemirror_" + editor.id].getCursor(false)
+                                                };
+                                                window["codemirror_" + editor.id].autoFormatRange(range.from, range.to);
+                                            }
+                                        }, {
+                                            type: 'button',
+                                            id: 'CommentSelectedRange',
+                                            label: '',
+                                            title: lang.commentSelectedRange,
+                                            'class': 'CommentSelectedRange',
+                                            onClick: function () {
+                                                var range = {
+                                                    from: window["codemirror_" + editor.id].getCursor(true),
+                                                    to: window["codemirror_" + editor.id].getCursor(false)
+                                                };
+                                                window["codemirror_" + editor.id].commentRange(true, range.from, range.to);
+                                            }
+                                        }, {
+                                            type: 'button',
+                                            id: 'UncommentSelectedRange',
+                                            label: '',
+                                            title: lang.uncommentSelectedRange,
+                                            'class': 'UncommentSelectedRange',
+                                            onClick: function () {
+                                                var range = {
+                                                    from: window["codemirror_" + editor.id].getCursor(true),
+                                                    to: window["codemirror_" + editor.id].getCursor(false)
+                                                };
+                                                window["codemirror_" + editor.id].commentRange(false, range.from, range.to);
+                                                if (window["codemirror_" + editor.id].config.autoFormatOnUncomment) {
+                                                    window["codemirror_" + editor.id].autoFormatRange(range.from, range.to);
+                                                }
+                                            }
+                                        }]
+                                }, {
+                                    type: 'checkbox',
+                                    id: 'AutoComplete',
+                                    label: lang.autoCompleteToggle,
+                                    title: lang.autoCompleteToggle,
+                                    onChange: function () {
+                                        window["codemirror_" + editor.id].setOption("autoCloseTags", this.getValue());
+                                    }
+                                }, {
+                                    type: 'textarea',
+                                    id: 'data',
+                                    dir: 'ltr',
+                                    inputStyle: 'cursor:auto;' +
+                                        'width:' + width + 'px;' +
+                                        'height:' + height + 'px;' +
+                                        'tab-size:4;' +
+                                        'text-align:left;',
+                                    'class': 'cke_source cke_enable_context_menu',
+                                }
+                            ]
+                        }]
+                    };
+                });
+
                 return;
             }
 
@@ -61,7 +347,7 @@
                         CKEDITOR.document.appendStyleSheet(rootPath + 'theme/' + config.theme + '.css');
                     }
 
-                    CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.js', function() {
+                    CKEDITOR.scriptLoader.load(rootPath + 'js/codemirror.min.js', function() {
 
                         CKEDITOR.scriptLoader.load(getCodeMirrorScripts(), function() {
                             loadCodeMirror(editor);
@@ -79,6 +365,10 @@
             function getCodeMirrorScripts() {
                 var scriptFiles = [rootPath + 'js/codemirror.modes.min.js', rootPath + 'js/codemirror.addons.min.js'];
 
+                if (config.useBeautify) {
+                    scriptFiles.push(rootPath + 'js/beautify.min.js');
+                }
+
                 if (config.enableSearchTools) {
                     scriptFiles.push(rootPath + 'js/codemirror.search-addons.min.js');
                 }
@@ -117,7 +407,7 @@
                 var sourceAreaElement = window["editable_" + editor.id],
                     holderElement = sourceAreaElement.getParent();
 
-                codemirror = editor.id;
+                //codemirror = editor.id;
 
                 /*CodeMirror.commands.autocomplete = function(cm) {
                     CodeMirror.showHint(cm, CodeMirror.htmlHint);
@@ -129,10 +419,11 @@
                 }
 
                 window["codemirror_" + editor.id] = CodeMirror.fromTextArea(sourceAreaElement.$, {
-                    mode: 'text/html',
+                    mode: config.mode,
                     matchBrackets: config.matchBrackets,
                     workDelay: 300,
                     workTime: 35,
+                    readOnly: editor.config.readOnly,
                     lineNumbers: config.lineNumbers,
                     lineWrapping: config.lineWrapping,
                     autoCloseTags: config.autoCloseTags,
@@ -165,13 +456,23 @@
                 // Store config so we can access it within commands etc.
                 window["codemirror_" + editor.id].config = config;
                 if (config.autoFormatOnStart) {
-                    window["codemirror_" + editor.id].autoFormatAll({
+                    if (config.useBeautify) {
+                        var indent_size = 4;
+                        var indent_char = ' ';
+                        var brace_style = 'collapse'; //collapse, expand, end-expand 
+
+                        var source = window["codemirror_" + editor.id].getValue();
+
+                        window["codemirror_" + editor.id].setValue(html_beautify(source, indent_size, indent_char, 120, brace_style));
+                    } else {
+                        window["codemirror_" + editor.id].autoFormatAll({
                             line: 0,
                             ch: 0
                         }, {
                             line: window["codemirror_" + editor.id].lineCount(),
                             ch: 0
                         });
+                    }
                 }
 
                 function getSelectedRange() {
@@ -225,7 +526,7 @@
                 editor.addCommand('commentSelectedRange', sourcearea.commands.commentSelectedRange);
                 editor.addCommand('uncommentSelectedRange', sourcearea.commands.uncommentSelectedRange);
                 editor.addCommand('autoCompleteToggle', sourcearea.commands.autoCompleteToggle);
-                
+
                 if (editor.ui.addButton) {
                     if (config.showFormatButton || config.showCommentButton || config.showUncommentButton || config.showSearchButton) {
                         editor.ui.add('-', CKEDITOR.UI_SEPARATOR, { toolbar: 'mode,30' });
@@ -284,6 +585,11 @@
                 }
             });
             
+            editor.on('readOnly', function () {
+                window["codemirror_" + editor.id].setOption("readOnly", this.readOnly);
+
+            });
+            
             var selectAllCommand = editor.commands.selectAll;
             
             if (selectAllCommand != null) {