Merge branch 'zuber-view-refactor'

[redakcja.git] / project / static / js / lib / codemirror / codemirror.js

diff --git a/project/static/js/lib/codemirror/codemirror.js b/project/static/js/lib/codemirror/codemirror.js
index 97e2657..f63ed07 100644 (file)
--- a/project/static/js/lib/codemirror/codemirror.js
+++ b/project/static/js/lib/codemirror/codemirror.js
@@ -81,13 +81,10 @@ var CodeMirror = (function(){
 
     var nextNum = 1, barWidth = null;
     function sizeBar() {
 
     var nextNum = 1, barWidth = null;
     function sizeBar() {

-      if (!frame.offsetWidth || !win.Editor) {
-        for (var cur = frame; cur.parentNode; cur = cur.parentNode) {
-          if (cur != document) {
-            clearInterval(sizeInterval);
-            return;
-          }
-        }
+      for (var root = frame; root.parentNode; root = root.parentNode);
+      if (root != document || !win.Editor) {
+        clearInterval(sizeInterval);
+        return;

       }
 
       if (nums.offsetWidth != barWidth) {
       }
 
       if (nums.offsetWidth != barWidth) {


@@ -135,6 +132,7 @@ var CodeMirror = (function(){
       var node = place;
       place = function(n){node.appendChild(n);};
     }
       var node = place;
       place = function(n){node.appendChild(n);};
     }

+    

     if (options.lineNumbers) place = wrapLineNumberDiv(place);
     place(frame);
 
     if (options.lineNumbers) place = wrapLineNumberDiv(place);
     place(frame);
 


@@ -175,10 +173,14 @@ var CodeMirror = (function(){
 
     getCode: function() {return this.editor.getCode();},
     setCode: function(code) {this.editor.importCode(code);},
 
     getCode: function() {return this.editor.getCode();},
     setCode: function(code) {this.editor.importCode(code);},

-    selection: function() {return this.editor.selectedText();},
+    selection: function() {this.focusIfIE(); return this.editor.selectedText();},

     reindent: function() {this.editor.reindent();},
     reindent: function() {this.editor.reindent();},

-    reindentSelection: function() {this.editor.reindentSelection(null);},
+    reindentSelection: function() {this.focusIfIE(); this.editor.reindentSelection(null);},

 
 

+    focusIfIE: function() {
+      // in IE, a lot of selection-related functionality only works when the frame is focused
+      if (this.win.select.ie_selection) this.focus();
+    },

     focus: function() {
       this.win.focus();
       if (this.editor.selectionSnapshot) // IE hack
     focus: function() {
       this.win.focus();
       if (this.editor.selectionSnapshot) // IE hack


@@ -206,10 +208,7 @@ var CodeMirror = (function(){
 
     setParser: function(name) {this.editor.setParser(name);},
 
 
     setParser: function(name) {this.editor.setParser(name);},
 

-    cursorPosition: function(start) {
-      if (this.win.select.ie_selection) this.focus();
-      return this.editor.cursorPosition(start);
-    },
+    cursorPosition: function(start) {this.focusIfIE(); return this.editor.cursorPosition(start);},

     firstLine: function() {return this.editor.firstLine();},
     lastLine: function() {return this.editor.lastLine();},
     nextLine: function(line) {return this.editor.nextLine(line);},
     firstLine: function() {return this.editor.firstLine();},
     lastLine: function() {return this.editor.lastLine();},
     nextLine: function(line) {return this.editor.nextLine(line);},