diff options
78 files changed, 1505 insertions, 2552 deletions
diff --git a/css/ninja.css b/css/ninja.css index 682dfc9d..ce27977b 100755 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -198,11 +198,13 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co | |||
198 | 198 | ||
199 | #iframeContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; width: 100%; height: 100%; overflow: scroll; background: gray; } | 199 | #iframeContainer { position: absolute; top: 0px; left: 0px; margin: 0px; padding: 0px; width: 100%; height: 100%; overflow: scroll; background: gray; } |
200 | 200 | ||
201 | .drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 6; } | 201 | .drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 7; } |
202 | 202 | ||
203 | .stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; } | 203 | .stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 6; } |
204 | 204 | ||
205 | .layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; } | 205 | .layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; } |
206 | |||
207 | .gridCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; } | ||
206 | 208 | ||
207 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } | 209 | .montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } |
208 | 210 | ||
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css index 6130382b..aeaf604c 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css | |||
@@ -18,7 +18,7 @@ | |||
18 | height: 20px; | 18 | height: 20px; |
19 | } | 19 | } |
20 | 20 | ||
21 | .viewOptions .autoCodeComplete span{ | 21 | .viewOptions .autoCodeComplete label{ |
22 | vertical-align: middle; | 22 | vertical-align: middle; |
23 | } | 23 | } |
24 | 24 | ||
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html index 14d6cb55..2c91ca13 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |||
@@ -14,6 +14,9 @@ | |||
14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/checkbox.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "codeComplete"} | 16 | "element": {"#": "codeComplete"} |
17 | }, | ||
18 | "bindings": { | ||
19 | "disabled": {"<-": "@owner.autocomplete"} | ||
17 | } | 20 | } |
18 | }, | 21 | }, |
19 | 22 | ||
@@ -33,6 +36,7 @@ | |||
33 | "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", | 36 | "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", |
34 | "properties": { | 37 | "properties": { |
35 | "element": {"#": "viewOptions"}, | 38 | "element": {"#": "viewOptions"}, |
39 | "autoCompleteLabel": {"#": "autoCompleteLabel"}, | ||
36 | "codeCompleteCheck":{"@": "codeCompleteCheck"}, | 40 | "codeCompleteCheck":{"@": "codeCompleteCheck"}, |
37 | "zoomHottext":{"@":"zoomHottext"}, | 41 | "zoomHottext":{"@":"zoomHottext"}, |
38 | "comment":{"#":"comment"}, | 42 | "comment":{"#":"comment"}, |
@@ -50,7 +54,7 @@ | |||
50 | <input class="zoomFont" data-montage-id="zoomFont"/> | 54 | <input class="zoomFont" data-montage-id="zoomFont"/> |
51 | <div class="autoCodeComplete" > | 55 | <div class="autoCodeComplete" > |
52 | <input type="checkbox" data-montage-id="codeComplete" /> | 56 | <input type="checkbox" data-montage-id="codeComplete" /> |
53 | <span>Automatic Completion</span> | 57 | <label data-montage-id="autoCompleteLabel">Automatic Completion</label> |
54 | </div> | 58 | </div> |
55 | <div class="floatButtons"> | 59 | <div class="floatButtons"> |
56 | <!--<button disabled="disabled" id="format" value="format" class="nj-skinned format">Format</button>--> | 60 | <!--<button disabled="disabled" id="format" value="format" class="nj-skinned format">Format</button>--> |
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js index a27d4450..dabce6e0 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js | |||
@@ -9,15 +9,80 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
9 | var Montage = require("montage/core/core").Montage, |