aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/document/templates
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/document/templates')
-rw-r--r--js/document/templates/app/main.js (renamed from js/document/templates/montage-web/main.reel/main.js)18
-rwxr-xr-xjs/document/templates/app/package.json (renamed from js/document/templates/montage-html/package.json)1
-rwxr-xr-xjs/document/templates/banner/index.html108
-rwxr-xr-xjs/document/templates/html/index.html83
-rwxr-xr-xjs/document/templates/montage-html/default_html.css74
-rwxr-xr-xjs/document/templates/montage-html/index.html48
-rw-r--r--js/document/templates/montage-html/main.reel/main.js48
-rwxr-xr-xjs/document/templates/montage-web/default_html.css28
-rwxr-xr-xjs/document/templates/montage-web/index.html38
-rwxr-xr-xjs/document/templates/montage-web/package.json8
-rwxr-xr-xjs/document/templates/preview/banner.html64
11 files changed, 271 insertions, 247 deletions
diff --git a/js/document/templates/montage-web/main.reel/main.js b/js/document/templates/app/main.js
index d5ac88d5..a406abdb 100644
--- a/js/document/templates/montage-web/main.reel/main.js
+++ b/js/document/templates/app/main.js
@@ -3,8 +3,10 @@
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<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. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6var Montage = require("montage/core/core").Montage, 6var Montage = require("montage/core/core").Montage,
7 Component = require("montage/ui/component").Component; 7 Component = require("montage/ui/component").Component,
8 Template = require("montage/ui/template").Template,
9 TemplateCreator = require("tools/template/template-creator").TemplateCreator;
8 10
9exports.Main = Montage.create(Component, { 11exports.Main = Montage.create(Component, {
10 12
@@ -18,6 +20,7 @@ exports.Main = Montage.create(Component, {
18 templateDidLoad: { 20 templateDidLoad: {
19 value: function(){ 21 value: function(){
20 var self = this; 22 var self = this;
23 //
21 window.addComponent = function(element, data, callback) { 24 window.addComponent = function(element, data, callback) {
22 var component; 25 var component;
23 26
@@ -36,7 +39,16 @@ exports.Main = Montage.create(Component, {
36 .end(); 39 .end();
37 40
38 }; 41 };
39 42 //
43 window.mjsTemplateCreator = TemplateCreator;
44 //
45 window.mjsTemplate = Template;
46 //
47 var templateEvent = document.createEvent("CustomEvent");
48 templateEvent.initCustomEvent("mjsTemplateReady", false, true);
49 document.body.dispatchEvent(templateEvent);
50
51
40 // Dispatch event when this template has loaded. 52 // Dispatch event when this template has loaded.
41 /* 53 /*
42 var newEvent = document.createEvent( "CustomEvent" ); 54 var newEvent = document.createEvent( "CustomEvent" );
diff --git a/js/document/templates/montage-html/package.json b/js/document/templates/app/package.json
index d1e839dc..4f36090a 100755
--- a/js/document/templates/montage-html/package.json
+++ b/js/document/templates/app/package.json
@@ -4,6 +4,7 @@
4 }, 4 },
5 "mappings": { 5 "mappings": {
6 "montage": "../../../../node_modules/montage/", 6 "montage": "../../../../node_modules/montage/",
7 "tools": "../../../../node_modules/tools/",
7 "montage-google": "../../../../node_modules/montage-google/" 8 "montage-google": "../../../../node_modules/montage-google/"
8 } 9 }
9} \ No newline at end of file 10} \ No newline at end of file
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
new file mode 100755
index 00000000..f1ee3d98
--- /dev/null
+++ b/js/document/templates/banner/index.html
@@ -0,0 +1,108 @@
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
9<!--
10 NOTE(s):
11 All elements in the head of the document to be exclude from I/O
12 must set the 'data-ninja-template'
13 data-ninja-template="true"
14-->
15<html>
16
17 <head>
18
19 <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
20 * {
21 -webkit-transition-duration: 0s !important;
22 -webkit-animation-duration: 0s !important;
23 -webkit-animation-name: none !important;
24 }
25
26 body {
27 margin: 0;
28 padding: 0;
29 position: absolute;
30 }
31
32 html {
33 overflow: scroll;
34 }
35
36 html, body {
37 width: 100%;
38 height: 100%;
39 background: #666;
40 }
41
42 .active-element-outline {
43 outline: #adff2f solid 2px;
44 }
45
46 .nj-preset-transition {
47 -webkit-transition: all 450ms linear !important;
48 }
49
50 ninjaloadinghack {
51 display: none;
52 }
53
54 ninja-viewport, ninja-content {
55 display: block;
56 margin: 0;
57 padding: 0;
58 border: 0;
59 position: absolute;
60 overflow: visible;
61 top: 0;
62 left: 0;
63 background: transparent;
64 }
65
66 ninja-viewport {
67 background: #FFF;
68 }
69
70 ninja-content {
71 -webkit-transform-style: preserve-3d;
72 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
73 }
74 </style>
75
76 <script type="text/javascript" data-ninja-template="true">
77 function getElement(x,y) {
78 return document.elementFromPoint(x,y);
79 }
80 </script>
81
82 <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
83
84 <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
85
86 <script type="text/montage-serialization" data-ninja-template="true">
87 {
88 "owner": {
89 "prototype": "main"
90 }
91 }
92 </script>
93
94 </head>
95
96 <body>
97
98 <ninjaloadinghack></ninjaloadinghack>
99
100 <ninja-viewport>
101
102 <ninja-content></ninja-content>
103
104 </ninja-viewport>
105
106 </body>
107
108</html> \ No newline at end of file
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
new file mode 100755
index 00000000..70187900
--- /dev/null
+++ b/js/document/templates/html/index.html
@@ -0,0 +1,83 @@
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
9<!--
10 NOTE(s):
11 All elements in the head of the document to be exclude from I/O
12 must set the 'data-ninja-template'
13 data-ninja-template="true"
14-->
15
16<!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
17
18<html>
19
20 <head>
21
22 <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
23 * {
24 -webkit-transition-duration: 0s !important;
25 -webkit-animation-duration: 0s !important;
26 -webkit-animation-name: none !important;
27 }
28
29 body {
30 margin: 0;
31 padding: 0;
32 position: absolute;
33 -webkit-transform-style: preserve-3d;
34 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1,