aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/stage
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.html5
-rwxr-xr-xjs/stage/stage.reel/stage.html17
2 files changed, 8 insertions, 14 deletions
diff --git a/js/stage/stage-view.reel/stage-view.html b/js/stage/stage-view.reel/stage-view.html
index ee8fa315..3680e8b5 100755
--- a/js/stage/stage-view.reel/stage-view.html
+++ b/js/stage/stage-view.reel/stage-view.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/stage/stage-view.reel", 15 "prototype": "js/stage/stage-view.reel",
16 "name": "StageView",
17 "properties": { 16 "properties": {
18 "element": {"#": "codeViewContainer"} 17 "element": {"#": "codeViewContainer"}
19 } 18 }
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index f796303c..12a331c3 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,24 +12,21 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "stageView" : { 14 "stageView" : {
15 "module": "js/stage/stage-view.reel", 15 "prototype": "js/stage/stage-view.reel",
16 "name": "StageView",
17 "properties": { 16 "properties": {
18 "element": {"#": "stageView"} 17 "element": {"#": "stageView"}
19 } 18 }
20 }, 19 },
21 20
22 "StageDeps1": { 21 "StageDeps1": {
23 "module": "js/stage/stage-deps", 22 "prototype": "js/stage/stage-deps",
24 "name": "StageDeps",
25 "properties": { 23 "properties": {
26 "stage": {"@": "owner"} 24 "stage": {"@": "owner"}
27 } 25 }
28 }, 26 },
29 27
30 "layout1": { 28 "layout1": {
31 "module": "js/stage/layout", 29 "prototype": "js/stage/layout",
32 "name": "Layout",
33 "properties": { 30 "properties": {
34 "canvas": {"#": "layoutCanvas"}, 31 "canvas": {"#": "layoutCanvas"},
35 "stage": {"@": "owner"} 32 "stage": {"@": "owner"}
@@ -44,8 +41,7 @@
44 }, 41 },
45 42
46 "textTool": { 43 "textTool": {
47 "module": "node_modules/labs/rich-text-editor.reel", 44 "prototype": "node_modules/labs/rich-text-editor.reel",
48 "name": "RichTextEditor",
49 "properties": { 45 "properties": {
50 "element" : {"#": "textToolObject"} 46 "element" : {"#": "textToolObject"}
51 } 47 }
@@ -56,8 +52,7 @@
56 }, 52 },
57 53
58 "owner": { 54 "owner": {
59 "module": "js/stage/stage.reel", 55 "prototype": "js/stage/stage.reel",
60 "name": "Stage",
61 "properties": { 56 "properties": {
62 "element": {"#": "stageAndScenesContainer"}, 57 "element": {"#": "stageAndScenesContainer"},
63 "_iframeContainer": {"#": "iframeContainer"}, 58 "_iframeContainer": {"#": "iframeContainer"},