aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcss/ninja.css8
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css2
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html6
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js106
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js48
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.html6
-rwxr-xr-xjs/components/layout/document-bar.reel/document-bar.js112
-rwxr-xr-xjs/components/layout/document-entry.reel/close_button.gifbin139 -> 0 bytes
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.css20
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html21
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.js58
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html13
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.js33
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.html6
-rwxr-xr-xjs/components/layout/tools-list.reel/tools-list.js40
-rwxr-xr-xjs/components/layout/tools-properties.reel/tools-properties.js46
-rwxr-xr-xjs/components/menu/menu-entry.reel/menu-entry.html13
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html13
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.js18
-rwxr-xr-xjs/components/menu/menu.reel/menu.html25
-rwxr-xr-xjs/components/menu/menu.reel/menu.js17
-rw-r--r--js/components/toolbar.reel/toolbar-button.js28
-rw-r--r--js/components/toolbar.reel/toolbar.html2
-rw-r--r--js/controllers/code-editor-controller.js125
-rwxr-xr-xjs/controllers/document-controller.js381
-rwxr-xr-xjs/controllers/elements/element-controller.js26
-rwxr-xr-xjs/controllers/elements/shapes-controller.js4
-rwxr-xr-xjs/controllers/selection-controller.js100
-rwxr-xr-xjs/controllers/styles-controller.js111
-rwxr-xr-xjs/controllers/undo-controller.js8
-rwxr-xr-xjs/data/menu-data.js147
-rwxr-xr-xjs/document/_toDelete/html-document.js874
-rwxr-xr-xjs/document/_toDelete/text-document.js198
-rwxr-xr-xjs/document/document-html.js23
-rwxr-xr-xjs/document/models/base.js14
-rwxr-xr-xjs/document/models/html.js11
-rwxr-xr-xjs/document/models/text.js3
-rwxr-xr-xjs/document/views/code.js6
-rwxr-xr-xjs/document/views/design.js15
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js21
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js13
-rwxr-xr-xjs/helper-classes/3D/view-utils.js53
-rwxr-xr-xjs/mediators/element-mediator.js6
-rw-r--r--js/mediators/io-mediator.js25
-rwxr-xr-xjs/models/app-model.js26
-rwxr-xr-xjs/ninja.reel/ninja.html122
-rwxr-xr-xjs/ninja.reel/ninja.js87
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.js29
-rwxr-xr-xjs/panels/Panel.reel/Panel.js29
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html21
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js41
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js90
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js6
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.html3
-rw-r--r--js/panels/css-panel/css-panel.reel/css-panel.js18
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js9
-rw-r--r--js/panels/css-panel/rule-list-container.reel/rule-list-container.js8
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.css3
-rw-r--r--js/panels/css-panel/style-declaration.reel/style-declaration.js10
-rw-r--r--js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js8
-rw-r--r--js/panels/css-panel/styles-view-container.reel/styles-view-container.js31
-rw-r--r--js/panels/css-panel/styles-view-delegate.js11
-rwxr-xr-xjs/panels/properties.reel/properties.html5
-rwxr-xr-xjs/panels/properties.reel/properties.js64
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js95
-rwxr-xr-xjs/stage/layout.js52
-rwxr-xr-xjs/stage/stage-deps.js27
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.css50
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.html30
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js62
-rwxr-xr-xjs/stage/stage.reel/stage.css47
-rwxr-xr-xjs/stage/stage.reel/stage.html27
-rwxr-xr-xjs/stage/stage.reel/stage.js175
-rwxr-xr-xjs/tools/PanTool.js1
-rwxr-xr-xjs/tools/PenTool.js2
-rwxr-xr-xjs/tools/RotateStage3DTool.js11
-rwxr-xr-xjs/tools/drawing-tool-base.js2
-rw-r--r--node_modules/components-data/searchfield.json20
-rw-r--r--node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html22
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html43
-rw-r--r--node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.js14
-rw-r--r--node_modules/montage-google/map.reel/map.js70
-rw-r--r--node_modules/montage-google/picasa-carousel.reel/picasa-carousel.js11
-rw-r--r--node_modules/montage-google/youtube-channel.reel/youtube-channel.js19
-rwxr-xr-xnode_modules/tools/template/template-creator.js1
-rw-r--r--scss/imports/scss/_Stage.scss14
87 files changed, 1637 insertions, 2588 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":{"@": "codeCompleteC