Untangle the callbacks; Add linkable diff tabs.

[redakcja.git] / src / redakcja / static / js / wiki / view_editor_source.js

diff --git a/src/redakcja/static/js/wiki/view_editor_source.js b/src/redakcja/static/js/wiki/view_editor_source.js
index 0766acf..478cb11 100644 (file)
--- a/src/redakcja/static/js/wiki/view_editor_source.js
+++ b/src/redakcja/static/js/wiki/view_editor_source.js
@@ -2,64 +2,49 @@
 
     class CodeMirrorPerspective extends $.wiki.Perspective {
         constructor(options) {
-            var old_callback = options.callback;
-            options.callback = function(){
-                var self = this;
-
-                this.codemirror = CodeMirror.fromTextArea($(
-                    '#codemirror_placeholder').get(0), {
-                        mode: 'xml',
-                        lineWrapping: true,
-                        lineNumbers: true,
-                        readOnly: CurrentDocument.readonly || false,
-                        identUnit: 0,
-                    });
-
-                $('#source-editor').keydown(function(event) {
-                    if(!event.altKey)
-                        return;
-
-                    var c = event.key;
-                    var button = $("#source-editor button[data-ui-accesskey='"+c+"']");
-                    if(button.length == 0)
-                        return;
-                    button.get(0).click();
-                    event.preventDefault();
+            super(options);
+            var self = this;
+
+            this.codemirror = CodeMirror.fromTextArea($(
+                '#codemirror_placeholder').get(0), {
+                    mode: 'xml',
+                    lineWrapping: true,
+                    lineNumbers: true,
+                    readOnly: CurrentDocument.readonly || false,
+                    identUnit: 0,
                 });
 
-                $('#source-editor .toolbar').toolbarize({
-                    actionContext: self.codemirror
-                });
+            $('#source-editor').keydown(function(event) {
+                if(!event.altKey)
+                    return;
 
-                // textarea is no longer needed
-                $('#codemirror_placeholder').remove();
-                old_callback.call(self);
-            }
-            super(options);
-        }
+                var c = event.key;
+                var button = $("#source-editor button[data-ui-accesskey='"+c+"']");
+                if(button.length == 0)
+                    return;
+                button.get(0).click();
+                event.preventDefault();
+            });
 
-        freezeState() {
-            this.config().position =  this.codemirror.getScrollInfo().top;
-        }
+            $('#source-editor .toolbar').toolbarize({
+                actionContext: self.codemirror
+            });
 
-        unfreezeState () {
-            this.codemirror.scrollTo(0, this.config().position || 0);
+            // textarea is no longer needed
+            $('#codemirror_placeholder').remove();
         }
 
         onEnter(success, failure) {
             super.onEnter();
-
             this.codemirror.setValue(this.doc.text);
-
-            this.unfreezeState(this._uistate);
+            this.codemirror.scrollTo(0, this.config().position || 0);
 
             if(success) success();
         }
 
         onExit(success, failure) {
-            this.freezeState();
-
             super.onExit();
+            this.config().position =  this.codemirror.getScrollInfo().top;
             this.doc.setText(this.codemirror.getValue());
 
             $.wiki.exitTab('#SearchPerspective');