diff options
author | Ananya Sen | 2012-07-09 16:52:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-07-09 16:52:49 -0700 |
commit | 2eb84584f44b8c774479d1af2ee1d810597474cf (patch) | |
tree | 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/ninja.reel | |
parent | bf9dba001ec84243e2f12cd13b0c0ae020fba4a2 (diff) | |
parent | cee0deca695359ab468bd06d0e05ed3b2010b338 (diff) | |
download | ninja-2eb84584f44b8c774479d1af2ee1d810597474cf.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into codemirror-custom-theme-removal
Conflicts:
js/code-editor/codemirror-ninja/theme/lesser-dark-ninja.css
js/code-editor/codemirror-ninja/theme/xq-dark-ninja.css
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x | js/ninja.reel/ninja.css | 23 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.html | 917 | ||||
-rwxr-xr-x | js/ninja.reel/ninja.js | 123 |
3 files changed, 535 insertions, 528 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css index 46e53078..ab62db84 100755 --- a/js/ninja.reel/ninja.css +++ b/js/ninja.reel/ninja.css | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, 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 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 706b77d4..f80acdca 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -1,26 +1,27 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | 2 | ||
3 | <!-- <copyright> | 3 | <!-- <copyright> |
4 | Copyright (c) 2012, Motorola Mobility, Inc | 4 | Copyright (c) 2012, Motorola Mobility LLC. |
5 | All Rights Reserved. | 5 | All Rights Reserved. |
6 | BSD License. | ||
7 | 6 | ||
8 | Redistribution and use in source and binary forms, with or without | 7 | Redistribution and use in source and binary forms, with or without |
9 | modification, are permitted provided that the following conditions are met: | 8 | modification, are permitted provided that the following conditions are met: |
10 | 9 | ||
11 | - Redistributions of source code must retain the above copyright notice, | 10 | * Redistributions of source code must retain the above copyright notice, |
12 | this list of conditions and the following disclaimer. | 11 | this list of conditions and the following disclaimer. |
13 | - Redistributions in binary form must reproduce the above copyright | 12 | |
14 | notice, this list of conditions and the following disclaimer in the | 13 | * Redistributions in binary form must reproduce the above copyright notice, |
15 | documentation and/or other materials provided with the distribution. | 14 | this list of conditions and the following disclaimer in the documentation |
16 | - Neither the name of Motorola Mobility nor the names of its contributors | 15 | and/or other materials provided with the distribution. |
17 | may be used to endorse or promote products derived from this software | 16 | |
18 | without specific prior written permission. | 17 | * Neither the name of Motorola Mobility LLC nor the names of its |
18 | contributors may be used to endorse or promote products derived from this | ||
19 | software without specific prior written permission. | ||
19 | 20 | ||
20 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 21 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
21 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 22 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
22 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 23 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
23 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 24 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
24 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 25 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
25 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 26 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
26 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 27 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -31,482 +32,486 @@ POSSIBILITY OF SUCH DAMAGE. | |||
31 | </copyright> --> | 32 | </copyright> --> |
32 | 33 | ||
33 | <html> | 34 | <html> |
34 | <head> | ||
35 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
36 | |||
37 | <link href="../../css/ninja.css" rel="stylesheet" type="text/css" media="screen"/> | ||
38 | |||
39 | <title>Main Ninja Component</title> | ||
40 | |||
41 | <script type="text/montage-serialization"> | ||
42 | { | ||
43 | "localStorage": { | ||
44 | "prototype": "js/controllers/local-storage-controller[LocalStorage]" | ||
45 | }, | ||
46 | 35 | ||
47 | "toolsData1": { | 36 | <head> |
48 | "prototype": "js/data/tools-data" | 37 | |
49 | }, | 38 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
50 | 39 | ||
51 | "appModel": { | 40 | <link href="../../css/ninja.css" rel="stylesheet" type="text/css" media="screen"/> |
52 | "prototype": "js/models/app-model", | ||
53 | "bindings": { | ||
54 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | ||
55 | } | ||
56 | }, | ||
57 | 41 | ||
58 | "materialsModel": { | 42 | <title>Main Ninja Component</title> |
59 | "prototype": "js/models/materials-model" | ||
60 | }, | ||
61 | 43 | ||
62 | "menu": { | 44 | <script type="text/montage-serialization"> |
63 | "prototype": "js/components/menu/menu.reel", | 45 | { |
64 | "properties": { | 46 | "localStorage": { |
65 | "element": {"#": "mainMenuBar"} | 47 | "prototype": "js/controllers/local-storage-controller[LocalStorage]" |
66 | }, | 48 | }, |
67 | "bindings": { | 49 | |
68 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} | 50 | "toolsData1": { |
69 | } | 51 | "prototype": "js/data/tools-data" |
70 | }, | 52 | }, |
71 | 53 | ||
72 | "splitter1": { | 54 | "appModel": { |
73 | "prototype": "js/panels/Splitter", | 55 | "prototype": "js/models/app-model", |
74 | "properties": { | 56 | "bindings": { |
75 | "element": {"#": "topSplitter"}, | 57 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
76 | "panel": {"#": "topPanelContainer"} | 58 | } |
77 | } | 59 | }, |
78 | }, | 60 | |
79 | 61 | "materialsModel": { | |
80 | "splitter2": { | 62 | "prototype": "js/models/materials-model" |
81 | "prototype": "js/panels/Splitter", | 63 | }, |
82 | "properties": { | 64 | |
83 | "element": {"#": "leftSplitter"}, | 65 | "menu": { |
84 | "panel": {"#": "leftPanelContainer"} | 66 | "prototype": "js/components/menu/menu.reel", |
85 | } | 67 | "properties": { |
86 | }, | 68 | "element": {"#": "mainMenuBar"} |
87 | |||
88 | "splitter3": { | ||
89 | "prototype": "js/panels/Splitter", | ||
90 | "properties": { | ||
91 | "element": {"#": "rightSplitter"}, | ||
92 | "panel": {"#": "rightPanelContainer"}, | ||
93 | "resizeBar": {"#": "rightPanelResizer"} | ||
94 | } | ||
95 | }, | ||
96 | |||
97 | "splitter4": { | ||
98 | "prototype": "js/panels/Splitter", | ||
99 | "properties": { | ||
100 | "element": {"#": "bottomSplitter"}, | ||
101 | "panel": {"@": "timeline"} | ||
102 | } | ||
103 | }, | ||
104 | |||
105 | "resizer1": { | ||
106 | "prototype": "js/panels/resize-composer", | ||
107 | "properties": { | ||
108 | "element": {"#": "rightPanelResizer"}, | ||
109 | "component": {"@": "owner"}, | ||
110 | "yAxis": false | ||
111 | }, | ||
112 | "listeners": [ | ||
113 | { | ||
114 | "type": "resizeStart", | ||
115 | "listener": {"@": "owner"} | ||
116 | }, | 69 | }, |
117 | { | 70 | "bindings": { |
118 | "type": "resizeMove", | 71 | "currentDocument": {"<-": "@documentList.selectedObjects.0"} |
119 | "listener": {"@": "owner"} | 72 | } |
73 | }, | ||
74 | |||
75 | "splitter1": { | ||
76 | "prototype": "js/panels/Splitter", | ||
77 | "properties": { | ||
78 | "element": {"#": "topSplitter"}, | ||
79 | "panel": {"#": "topPanelContainer"} | ||
80 | } | ||
81 | }, | ||
82 | |||
83 | "splitter2": { | ||
84 | "prototype": "js/panels/Splitter", | ||
85 | "properties": { | ||
86 | "element": {"#": "leftSplitter"}, | ||
87 | "panel": {"#": "leftPanelContainer"} | ||
88 | } | ||
89 | }, | ||
90 | |||
91 | "splitter3": { | ||
92 | "prototype": "js/panels/Splitter", | ||
93 | "properties": { | ||
94 | "element": {"#": "rightSplitter"}, | ||
95 | "panel": {"#": "rightPanelContainer"}, | ||
96 | "resizeBar": {"#": "rightPanelResizer"} | ||
97 | } | ||
98 | }, | ||
99 | |||
100 | "splitter4": { | ||
101 | "prototype": "js/panels/Splitter", | ||