aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 23:01:31 -0700
committerValerio Virgillito2012-05-03 23:01:31 -0700
commit60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (patch)
tree9bfa4cc0fdb3a39abf151c05d013f2cde7aad296
parentdca94d9d1e2a6a113356b685df991472ea3e5576 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e.tar.gz
Merge branch 'refs/heads/master' into tag-2.0
-rwxr-xr-xcss/ninja.css2
-rw-r--r--imports/codemirror/lib/codemirror.css2
-rw-r--r--imports/codemirror/lib/codemirror.js247
-rw-r--r--imports/codemirror/lib/util/closetag.js174
-rw-r--r--imports/codemirror/lib/util/foldcode.js2
-rw-r--r--imports/codemirror/lib/util/formatting.js2
-rw-r--r--imports/codemirror/lib/util/javascript-hint.js6
-rw-r--r--imports/codemirror/lib/util/simple-hint.js6
-rw-r--r--imports/codemirror/mode/clike/index.html2
-rw-r--r--imports/codemirror/mode/clojure/clojure.js26
-rw-r--r--imports/codemirror/mode/css/css.js2
-rw-r--r--imports/codemirror/mode/htmlmixed/htmlmixed.js2
-rw-r--r--imports/codemirror/mode/javascript/javascript.js6
-rw-r--r--imports/codemirror/mode/less/index.html39
-rw-r--r--imports/codemirror/mode/less/less.js143
-rw-r--r--imports/codemirror/mode/markdown/index.html1
-rw-r--r--imports/codemirror/mode/markdown/markdown.js89
-rwxr-xr-ximports/codemirror/mode/properties/index.html4
-rwxr-xr-ximports/codemirror/mode/properties/properties.css3
-rwxr-xr-ximports/codemirror/mode/properties/properties.js28
-rw-r--r--imports/codemirror/mode/scheme/scheme.js402
-rw-r--r--imports/codemirror/mode/smarty/index.html82
-rw-r--r--imports/codemirror/mode/smarty/smarty.js148
-rw-r--r--imports/codemirror/mode/stex/stex.js17
-rw-r--r--imports/codemirror/mode/stex/test.html251
-rw-r--r--imports/codemirror/mode/tiddlywiki/index.html69
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.css2
-rw-r--r--imports/codemirror/mode/tiddlywiki/tiddlywiki.js72
-rw-r--r--imports/codemirror/mode/vbscript/index.html42
-rw-r--r--imports/codemirror/mode/vbscript/vbscript.js26
-rw-r--r--imports/codemirror/mode/xml/xml.js3
-rw-r--r--imports/codemirror/mode/xmlpure/index.html1
-rw-r--r--imports/codemirror/mode/xquery/LICENSE20
-rw-r--r--imports/codemirror/mode/xquery/index.html222
-rw-r--r--imports/codemirror/mode/xquery/test/index.html27
-rw-r--r--imports/codemirror/mode/xquery/test/testBase.js42
-rw-r--r--imports/codemirror/mode/xquery/test/testEmptySequenceKeyword.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testMultiAttr.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testNamespaces.js91
-rw-r--r--imports/codemirror/mode/xquery/test/testProcessingInstructions.js16
-rw-r--r--imports/codemirror/mode/xquery/test/testQuotes.js19
-rw-r--r--imports/codemirror/mode/xquery/xquery.js448
-rw-r--r--imports/codemirror/theme/eclipse.css2
-rw-r--r--imports/codemirror/theme/elegant.css4
-rw-r--r--imports/codemirror/theme/lesser-dark.css45
-rw-r--r--imports/codemirror/theme/neat.css6
-rw-r--r--imports/codemirror/theme/rubyblue.css2
-rw-r--r--imports/codemirror/theme/xq-dark.css46
-rwxr-xr-ximports/codemirror/version.txt2
-rwxr-xr-xindex.html26
-rw-r--r--js/code-editor/codemirror-ninja/lib/ninja-simple-hint.js86
-rw-r--r--js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css54
-rw-r--r--js/code-editor/codemirror-ninja/theme/rubyblue-ninja.css30
-rw-r--r--js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css54
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css112
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html87
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js79
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js2
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.html6
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html6
-rwxr-xr-xjs/components/ui/tree-basic/tree.reel/tree.html6
-rwxr-xr-xjs/components/ui/tree-basic/treeItem.reel/treeItem.html8
-rw-r--r--js/controllers/code-editor-controller.js258
-rwxr-xr-xjs/controllers/document-controller.js3
-rw-r--r--js/io/templates/descriptor.json9
-rw-r--r--js/io/templates/files/xml.txt1
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.html6
-rwxr-xr-xjs/io/ui/file-picker/picker-navigator.reel/picker-navigator.html34
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html10
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.html14
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html12
-rwxr-xr-xjs/ninja.reel/ninja.html23
-rwxr-xr-xjs/panels/Splitter.js35
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html2
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js43
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html2
-rw-r--r--js/panels/Timeline/Span.reel/Span.html2
-rw-r--r--js/panels/Timeline/Style.reel/Style.html12
-rw-r--r--js/panels/Timeline/Style.reel/Style.js6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html60
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js17
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js34
-rw-r--r--js/panels/Timeline/Track.reel/Track.html6
-rw-r--r--js/panels/Timeline/Track.reel/Track.js12
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html4
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html6
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js5
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.css46
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js192
-rw-r--r--scss/imports/scss/_Stage.scss4
90 files changed, 3459 insertions, 880 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 650f3b08..297ed7cd 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -212,7 +212,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
212 212
213#mainContent .CodeMirror { width: 100%; height: 100%; background: white; } 213#mainContent .CodeMirror { width: 100%; height: 100%; background: white; }
214 214
215#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } 215#mainContent .CodeMirror-scroll { height: 100%; overflow:auto; }
216 216
217.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } 217.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
218 218
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).