diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports')
48 files changed, 2370 insertions, 553 deletions
diff --git a/imports/codemirror/lib/codemirror.css b/imports/codemirror/lib/codemirror.css index 5eadb247..2d79f4aa 100644 --- a/imports/codemirror/lib/codemirror.css +++ b/imports/codemirror/lib/codemirror.css | |||
@@ -9,6 +9,7 @@ | |||
9 | /* This is needed to prevent an IE[67] bug where the scrolled content | 9 | /* This is needed to prevent an IE[67] bug where the scrolled content |
10 | is visible outside of the scrolling box. */ | 10 | is visible outside of the scrolling box. */ |
11 | position: relative; | 11 | position: relative; |
12 | outline: none; | ||
12 | } | 13 | } |
13 | 14 | ||
14 | .CodeMirror-gutter { | 15 | .CodeMirror-gutter { |
@@ -27,6 +28,7 @@ | |||
27 | } | 28 | } |
28 | .CodeMirror-lines { | 29 | .CodeMirror-lines { |
29 | padding: .4em; | 30 | padding: .4em; |
31 | white-space: pre; | ||
30 | } | 32 | } |
31 | 33 | ||
32 | .CodeMirror pre { | 34 | .CodeMirror pre { |
diff --git a/imports/codemirror/lib/codemirror.js b/imports/codemirror/lib/codemirror.js index 9c6e65e4..5434a8dd 100644 --- a/imports/codemirror/lib/codemirror.js +++ b/imports/codemirror/lib/codemirror.js | |||
@@ -1,4 +1,4 @@ | |||
1 | // CodeMirror version 2.22 | 1 | // CodeMirror version 2.23 |
2 | // | 2 | // |
3 | // All functions that need access to the editor's state live inside | 3 | // All functions that need access to the editor's state live inside |
4 | // the CodeMirror function. Below that, at the bottom of the file, | 4 | // the CodeMirror function. Below that, at the bottom of the file, |
@@ -15,9 +15,8 @@ var CodeMirror = (function() { | |||
15 | if (defaults.hasOwnProperty(opt)) | 15 | if (defaults.hasOwnProperty(opt)) |
16 | options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt]; | 16 | options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt]; |
17 | 17 | ||
18 | var targetDocument = options["document"]; | ||
19 | // The element in which the editor lives. | 18 | // The element in which the editor lives. |
20 | var wrapper = targetDocument.createElement("div"); | 19 | var wrapper = document.createElement("div"); |
21 | wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : ""); | 20 | wrapper.className = "CodeMirror" + (options.lineWrapping ? " CodeMirror-wrap" : ""); |
22 | // This mess creates the base DOM structure for the editor. | 21 | // This mess creates the base DOM structure for the editor. |
23 | wrapper.innerHTML = | 22 | wrapper.innerHTML = |
@@ -48,7 +47,10 @@ var CodeMirror = (function() { | |||
48 | if (!webkit) lineSpace.draggable = true; | 47 | if (!webkit) lineSpace.draggable = true; |
49 | lineSpace.style.outline = "none"; | 48 | lineSpace.style.outline = "none"; |
50 | if (options.tabindex != null) input.tabIndex = options.tabindex; | 49 | if (options.tabindex != null) input.tabIndex = options.tabindex; |
50 | if (options.autofocus) focusInput(); | ||
51 | if (!options.gutter && !options.lineNumbers) gutter.style.display = "none"; | 51 | if (!options.gutter && !options.lineNumbers) gutter.style.display = "none"; |
52 | // Needed to handle Tab key in KHTML | ||
53 | if (khtml) inputDiv.style.height = "1px", inputDiv.style.position = "absolute"; | ||
52 | 54 | ||
53 | // Check for problem with IE innerHTML not working when we have a | 55 | // Check for problem with IE innerHTML not working when we have a |
54 | // P (or similar) parent node. | 56 | // P (or similar) parent node. |
@@ -81,12 +83,13 @@ var CodeMirror = (function() { | |||
81 | gutterDirty, callbacks; | 83 | gutterDirty, callbacks; |
82 | // Current visible range (may be bigger than the view window). | 84 | // Current visible range (may be bigger than the view window). |
83 | var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0; | 85 | var displayOffset = 0, showingFrom = 0, showingTo = 0, lastSizeC = 0; |
84 | // bracketHighlighted is used to remember that a backet has been | 86 | // bracketHighlighted is used to remember that a bracket has been |
85 | // marked. | 87 | // marked. |
86 | var bracketHighlighted; | 88 | var bracketHighlighted; |
87 | // Tracks the maximum line length so that the horizontal scrollbar | 89 | // Tracks the maximum line length so that the horizontal scrollbar |
88 | // can be kept static when scrolling. | 90 | // can be kept static when scrolling. |
89 | var maxLine = "", maxWidth; | 91 | var maxLine = "", maxWidth; |
92 | var tabCache = {}; | ||
90 | 93 | ||
91 | // Initialize the content. | 94 | // Initialize the content. |
92 | operation(function(){setValue(options.value || ""); updateInput = false;})(); | 95 | operation(function(){setValue(options.value || ""); updateInput = false;})(); |
@@ -124,10 +127,16 @@ var CodeMirror = (function() { | |||
124 | if (!options.readOnly) replaceSelection(""); | 127 | if (!options.readOnly) replaceSelection(""); |
125 | })); | 128 | })); |
126 | 129 | ||
130 | // Needed to handle Tab key in KHTML | ||
131 | if (khtml) connect(code, "mouseup", function() { | ||
132 | if (document.activeElement == input) input.blur(); | ||
133 | focusInput(); | ||
134 | }); | ||
135 | |||
127 | // IE throws unspecified error in certain cases, when | 136 | // IE throws unspecified error in certain cases, when |
128 | // trying to access activeElement before onload | 137 | // trying to access activeElement before onload |
129 | var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { } | 138 | var hasFocus; try { hasFocus = (document.activeElement == input); } catch(e) { } |
130 | if (hasFocus) setTimeout(onFocus, 20); | 139 | if (hasFocus || options.autofocus) setTimeout(onFocus, 20); |
131 | else onBlur(); | 140 | else onBlur(); |
132 | 141 | ||
133 | function isLine(l) {return l >= 0 && l < doc.size;} | 142 | function isLine(l) {return l >= 0 && l < doc.size;} |
@@ -178,17 +187,23 @@ var CodeMirror = (function() { | |||
178 | line = clipLine(line == null ? doc.size - 1: line); | 187 | line = clipLine(line == null ? doc.size - 1: line); |
179 | return getStateBefore(line + 1); | 188 | return getStateBefore(line + 1); |
180 | }, | 189 | }, |
181 | cursorCoords: function(start){ | 190 | cursorCoords: function(start, mode) { |
182 | if (start == null) start = sel.inverted; | 191 | if (start == null) start = sel.inverted; |
183 | return pageCoords(start ? sel.from : sel.to); | 192 | return this.charCoords(start ? sel.from : sel.to, mode); |
193 | }, | ||
194 | charCoords: function(pos, mode) { | ||
195 | pos = clipPos(pos); | ||
196 | if (mode == "local") return localCoords(pos, false); | ||
197 | if (mode == "div") return localCoords(pos, true); | ||
198 | return pageCoords(pos); | ||
184 | }, | 199 | }, |
185 | charCoords: function(pos){return pageCoords(clipPos(pos));}, | ||
186 | coordsChar: function(coords) { | 200 | coordsChar: function(coords) { |
187 | var off = eltOffset(lineSpace); | 201 | var off = eltOffset(lineSpace); |
188 | return coordsChar(coords.x - off.left, coords.y - off.top); | 202 | return coordsChar(coords.x - off.left, coords.y - off.top); |
189 | }, | 203 | }, |
190 | markText: operation(markText), | 204 | markText: operation(markText), |
191 | setBookmark: setBookmark, | 205 | setBookmark: setBookmark, |
206 | findMarksAt: findMarksAt, | ||
192 | setMarker: operation(addGutterMarker), | 207 | setMarker: operation(addGutterMarker), |
193 | clearMarker: operation(removeGutterMarker), | 208 | clearMarker: operation(removeGutterMarker), |
194 | setLineClass: operation(setLineClass), | 209 | setLineClass: operation(setLineClass), |
@@ -256,6 +271,7 @@ var CodeMirror = (function() { | |||
256 | replaceRange: operation(replaceRange), | 271 | replaceRange: operation(replaceRange), |
257 | getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));}, | 272 | getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));}, |
258 | 273 | ||
274 | triggerOnKeyDown: operation(onKeyDown), | ||
259 | execCommand: function(cmd) {return commands[cmd](instance);}, | 275 | execCommand: function(cmd) {return commands[cmd](instance);}, |
260 | // Stuff used by commands, probably not much use to outside code. | 276 | // Stuff used by commands, probably not much use to outside code. |