aboutsummaryrefslogtreecommitdiff
path: root/js/document/templates
diff options
context:
space:
mode:
authorJohn Mayhew2012-07-09 17:28:24 -0700
committerJohn Mayhew2012-07-09 17:28:24 -0700
commit770bcb52422742ff741a88a75ecefbeb90bc9247 (patch)
tree64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/document/templates
parent8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff)
parent2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff)
downloadninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts: manifest.json
Diffstat (limited to 'js/document/templates')
-rw-r--r--js/document/templates/app/main.js33
-rwxr-xr-xjs/document/templates/banner/index.html159
-rwxr-xr-xjs/document/templates/html/index.html103
-rwxr-xr-xjs/document/templates/preview/banner.html123
4 files changed, 211 insertions, 207 deletions
diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 6b15bb24..900893b1 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -27,10 +28,10 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 30</copyright> */
30var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
31 Component = require("montage/ui/component").Component, 32 Component = require("montage/ui/component").Component,
32 Template = require("montage/ui/template").Template, 33 Template = require("montage/ui/template").Template,
33 TemplateCreator = require("tools/template/template-creator").TemplateCreator; 34 TemplateCreator = require("tools/template/template-creator").TemplateCreator;
34 35
35 36
36//var njmodelGet = function njmodelGet() { 37//var njmodelGet = function njmodelGet() {
@@ -85,7 +86,7 @@ exports.Main = Montage.create(Component, {
85 var componentRequire = component[data.name]; 86 var componentRequire = component[data.name];
86 var componentInstance = componentRequire.create(); 87 var componentInstance = componentRequire.create();
87 88
88 componentInstance.identifier = data.identifier; 89 componentInstance.identifier = data.identifier;
89 componentInstance.addEventListener("firstDraw", self, false); 90 componentInstance.addEventListener("firstDraw", self, false);
90 91
91 componentInstance.element = element; 92 componentInstance.element = element;
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 8b602867..a2b59814 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -1,25 +1,26 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
5BSD License.
6 5
7Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
9 8
10 - Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice,
11 this list of conditions and the following disclaimer. 10 this list of conditions and the following disclaimer.
12 - Redistributions in binary form must reproduce the above copyright 11
13 notice, this list of conditions and the following disclaimer in the 12* Redistributions in binary form must reproduce the above copyright notice,
14 documentation and/or other materials provided with the distribution. 13 this list of conditions and the following disclaimer in the documentation
15 - Neither the name of Motorola Mobility nor the names of its contributors 14 and/or other materials provided with the distribution.
16 may be used to endorse or promote products derived from this software 15
17 without specific prior written permission. 16* Neither the name of Motorola Mobility LLC nor the names of its
17 contributors may be used to endorse or promote products derived from this
18 software without specific prior written permission.
18 19
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -28,32 +29,32 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 30POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 31</copyright> -->
31 32
32 33
33<!-- 34<!--
34 NOTE(s): 35 NOTE(s):
35 All elements in the head of the document to be exclude from I/O 36 All elements in the head of the document to be exclude from I/O
36 must set the 'data-ninja-template' 37 must set the 'data-ninja-template'
37 data-ninja-template="true" 38 data-ninja-template="true"
38--> 39-->
39<html> 40<html>
40 41
41 <head> 42 <head>
42 43
43 <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true"> 44 <style type="text/css" id="nj-stage-stylesheet" data-ninja-template="true">
44 * { 45 * {
45 -webkit-animation: none !important; 46 -webkit-animation: none !important;
46 -webkit-transition-duration: 0s !important; 47 -webkit-transition-duration: 0s !important;
47 -webkit-animation-duration: 0s !important; 48 -webkit-animation-duration: 0s !important;
48 -webkit-animation-name: none !important; 49 -webkit-animation-name: none !important;
49 -webkit-animation-fill-mode: none !important; 50 -webkit-animation-fill-mode: none !important;
50 } 51 }
51 52
52 body { 53 body {
53 margin: 0; 54 margin: 0;
54 padding: 0; 55 padding: 0;
55 position: absolute; 56 position: absolute;
56 } 57 }
57 58
58 html { 59 html {
59 overflow: scroll; 60 overflow: scroll;
@@ -65,38 +66,38 @@ POSSIBILITY OF SUCH DAMAGE.
65 background: #666; 66 background: #666;
66 } 67 }
67 68
68 .active-element-outline { 69 .active-element-outline {
69 outline: #adff2f solid 2px; 70 outline: #adff2f solid 2px;
70 } 71 }
71 72
72 .nj-preset-transition { 73 .nj-preset-transition {
73 -webkit-transition: all 450ms linear !important; 74 -webkit-transition: all 450ms linear !important;
74 } 75 }
75 76
76 ninjaloadinghack { 77 ninjaloadinghack {
77 display: none; 78 display: none;
78 } 79 }
79 80
80 ninja-viewport, ninja-content { 81 ninja-viewport, ninja-content {
81 display: block; 82 display: block;
82 margin: 0; 83 margin: 0;
83 padding: 0; 84 padding: 0;
84 border: 0; 85 border: 0;
85 position: absolute; 86 position: absolute;
86 overflow: visible; 87 overflow: visible;
87 top: 0; 88 top: 0;
88 left: 0; 89 left: 0;
89 background: transparent; 90 background: transparent;
90 } 91 }
91 92
92 ninja-viewport { 93 ninja-viewport {
93 background: #FFF; 94 background: #FFF;
94 } 95 }