diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /js/document/templates/montage-html | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/document/templates/montage-html')
-rwxr-xr-x | js/document/templates/montage-html/default_html.css | 75 | ||||
-rwxr-xr-x | js/document/templates/montage-html/index.html | 50 | ||||
-rw-r--r-- | js/document/templates/montage-html/main.reel/main.js | 54 | ||||
-rwxr-xr-x | js/document/templates/montage-html/package.json | 8 | ||||
-rwxr-xr-x | js/document/templates/montage-html/styles.css | 5 |
5 files changed, 192 insertions, 0 deletions
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css new file mode 100755 index 00000000..68300edf --- /dev/null +++ b/js/document/templates/montage-html/default_html.css | |||
@@ -0,0 +1,75 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | |||
7 | * { | ||
8 | -webkit-transition-duration: 0s !important; | ||
9 | -webkit-animation-duration: 0s !important; | ||
10 | -webkit-animation-name: none !important; | ||
11 | } | ||
12 | |||
13 | html{ | ||
14 | overflow:hidden; | ||
15 | } | ||
16 | |||
17 | body | ||
18 | { | ||
19 | background: #808080; | ||
20 | } | ||
21 | |||
22 | #Viewport | ||
23 | { | ||
24 | margin: 0px; | ||
25 | padding: 0px; | ||
26 | top: 200px; | ||
27 | left: 700px; | ||
28 | /*position: absolute;*/ | ||
29 | /*height: 600px;*/ | ||
30 | /*width: 800px;*/ | ||
31 | opacity: 0.99; | ||
32 | z-index:2; | ||
33 | } | ||
34 | |||
35 | #stageBG | ||
36 | { | ||
37 | background: #ffffff; | ||
38 | top: 200px; | ||
39 | left: 700px; | ||
40 | z-index:1; | ||
41 | } | ||
42 | |||
43 | .stageDimension | ||
44 | { | ||
45 | position: absolute; | ||
46 | height: 600px; | ||
47 | width: 800px; | ||
48 | } | ||
49 | |||
50 | .stageView | ||
51 | { | ||
52 | border: 1px solid black; | ||
53 | -webkit-transform-style: preserve-3d; | ||
54 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | ||
55 | } | ||
56 | |||
57 | .stageContentShadow { | ||
58 | -webkit-box-shadow: 3px 5px 4px rgba(0,0,0,.5); | ||
59 | -moz-box-shadow: 3px 5px 4px rgba(0,0,0,.5); | ||
60 | box-shadow: 3px 5px 4px rgba(0,0,0,.5); | ||
61 | } | ||
62 | |||
63 | #userHead | ||
64 | { | ||
65 | display: none; | ||
66 | } | ||
67 | |||
68 | .global3DSettings { | ||
69 | -webkit-transform-style: preserve-3d; | ||
70 | -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); | ||
71 | } | ||
72 | |||
73 | .elem-red-outline { | ||
74 | outline: red solid thin; | ||
75 | } \ No newline at end of file | ||
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html new file mode 100755 index 00000000..8b3d73bb --- /dev/null +++ b/js/document/templates/montage-html/index.html | |||
@@ -0,0 +1,50 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
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/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | |||
8 | <html> | ||
9 | |||
10 | <head> | ||
11 | |||
12 | <title>Ninja Prototype</title> | ||
13 | |||
14 | <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | ||
15 | <link href="styles.css" id="nj-default-stylesheet" rel="stylesheet" type="text/css" media="screen"/> | ||
16 | |||
17 | <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script> | ||
18 | |||
19 | <script type="text/javascript"> | ||
20 | function getElement(x,y) { | ||
21 | return document.elementFromPoint(x,y); | ||
22 | } | ||
23 | </script> | ||
24 | |||
25 | <script type="text/montage-serialization"> | ||
26 | { | ||
27 | "owner": { | ||
28 | "module": "main.reel", | ||
29 | "name": "Main" | ||
30 | } | ||
31 | } | ||
32 | </script> | ||
33 | |||
34 | </head> | ||
35 | |||
36 | <body> | ||
37 | |||
38 | <ninja-div id="userHead"></ninja-div> | ||
39 | |||
40 | <ninja-div id="stageBG" class="stageDimension stageContentShadow"></ninja-div> | ||
41 | |||
42 | <ninja-div id="Viewport" class="stageDimension"> | ||
43 | |||
44 | <ninja-div id="UserContent" class="stageView stageDimension global3DSettings"></ninja-div> | ||
45 | |||
46 | </ninja-div> | ||
47 | |||
48 | </body> | ||
49 | |||
50 | </html> \ No newline at end of file | ||
diff --git a/js/document/templates/montage-html/main.reel/main.js b/js/document/templates/montage-html/main.reel/main.js new file mode 100644 index 00000000..567f481c --- /dev/null +++ b/js/document/templates/montage-html/main.reel/main.js | |||
@@ -0,0 +1,54 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ | ||
6 | var Montage = require("montage/core/core").Montage, | ||
7 | Component = require("montage/ui/component").Component; | ||
8 | |||
9 | exports.Main = Montage.create(Component, { | ||
10 | |||
11 | hasTemplate: { | ||
12 | value: false | ||
13 | }, | ||
14 | |||
15 | /** | ||
16 | * Adding window hooks to callback into this object from Ninja. | ||
17 | */ | ||
18 | templateDidLoad: { | ||
19 | value: function(){ | ||
20 | window.addComponent = this.addComponentToUserDocument; | ||
21 | // window.addBinding = this.addBindingToUserDocument; | ||
22 | |||
23 | // Dispatch event when this template has loaded. | ||
24 | var newEvent = document.createEvent( "CustomEvent" ); | ||
25 | newEvent.initCustomEvent( "userTemplateDidLoad", false, true ); | ||
26 | |||
27 | document.body.dispatchEvent( newEvent ); | ||
28 | |||
29 | } | ||
30 | }, | ||
31 | |||
32 | // Adding components to the user document by using a async require. | ||
33 | addComponentToUserDocument:{ | ||
34 | value:function(element, data, callback){ | ||
35 | |||
36 | var component; | ||
37 | |||
38 | component = require.async(data.path) | ||
39 | .then(function(component) { | ||
40 | var componentRequire = component[data.name]; | ||
41 | var componentInstance = componentRequire.create(); | ||
42 | |||
43 | componentInstance.element = element; | ||
44 | //componentInstance.deserializedFromTemplate(); | ||
45 | componentInstance.needsDraw = true; | ||
46 | |||
47 | callback(componentInstance, element); | ||
48 | }) | ||
49 | .end(); | ||
50 | |||
51 | } | ||
52 | } | ||
53 | |||
54 | }); \ No newline at end of file | ||
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/montage-html/package.json new file mode 100755 index 00000000..c8bc02fb --- /dev/null +++ b/js/document/templates/montage-html/package.json | |||
@@ -0,0 +1,8 @@ | |||
1 | { | ||
2 | "directories": { | ||
3 | "lib": "" | ||
4 | }, | ||
5 | "mappings": { | ||
6 | "montage": "../../../../node_modules/montage/" | ||
7 | } | ||
8 | } \ No newline at end of file | ||
diff --git a/js/document/templates/montage-html/styles.css b/js/document/templates/montage-html/styles.css new file mode 100755 index 00000000..0441c1cf --- /dev/null +++ b/js/document/templates/montage-html/styles.css | |||
@@ -0,0 +1,5 @@ | |||
1 | /* <copyright> | ||
2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
5 | </copyright> */ \ No newline at end of file | ||