diff options
author | hwc487 | 2012-04-27 14:35:46 -0700 |
---|---|---|
committer | hwc487 | 2012-04-27 14:35:46 -0700 |
commit | 1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce (patch) | |
tree | 3853b15ca684a7bdc7e7a8bdb7935be61ff85671 /js/stage/stage.reel/stage.html | |
parent | 5a1965bf2ed9a54601ca16fd67555335c510ce08 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-1a92b93994cd90abc8df61b7a1e5cfc1f65a19ce.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/stage/stage.reel/stage.html')
-rwxr-xr-x | js/stage/stage.reel/stage.html | 17 |
1 files changed, 6 insertions, 11 deletions
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"}, |