diff options
author | Kruti Shah | 2012-06-27 09:25:42 -0700 |
---|---|---|
committer | Kruti Shah | 2012-06-27 09:25:42 -0700 |
commit | d6bffa2450f68bdf9bfff0f4e155778f59f3624a (patch) | |
tree | c37300f67a3fb502d7f4e277600944739d48fd82 /js/stage | |
parent | b52747edbeba7d210fca98acccb2d2df52134bca (diff) | |
parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
download | ninja-d6bffa2450f68bdf9bfff0f4e155778f59f3624a.tar.gz |
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css | 5 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html | 39 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js | 57 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.css | 104 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | 78 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 314 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.css | 38 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.html | 74 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.js | 440 | ||||
-rw-r--r-- | js/stage/objects-tray.reel/objects-tray.css | 41 | ||||
-rw-r--r-- | js/stage/objects-tray.reel/objects-tray.html | 66 | ||||
-rw-r--r-- | js/stage/objects-tray.reel/objects-tray.js | 140 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.css | 13 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.html | 12 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 12 |
15 files changed, 1425 insertions, 8 deletions
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.css new file mode 100755 index 00000000..018448f1 --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.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> */ | ||
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html new file mode 100755 index 00000000..6af26f7c --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html | |||
@@ -0,0 +1,39 @@ | |||
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 | <html> | ||
8 | <head> | ||
9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
10 | <link rel="stylesheet" type="text/css" href="binding-hud-option.css"> | ||
11 | |||
12 | <script type="text/montage-serialization"> | ||
13 | { | ||
14 | "owner": { | ||
15 | "prototype": "js/stage/binding-view.reel/binding-hud-option.reel", | ||
16 | "properties": { | ||
17 | "element": {"#": "hudOption"} | ||
18 | } | ||
19 | }, | ||
20 | "label": { | ||
21 | "prototype": "montage/ui/dynamic-text.reel", | ||
22 | "properties": { | ||
23 | "element": {"#": "hudLabel"} | ||
24 | }, | ||
25 | "bindings": { | ||
26 | "value": {"<-": "@owner.title"} | ||
27 | } | ||
28 | } | ||
29 | } | ||
30 | </script> | ||
31 | |||
32 | </head> | ||
33 | <body> | ||
34 | <div data-montage-id="hudOption" class="hudOption"> | ||
35 | <label data-montage-id="hudLabel" class="hudLabel">Label</label> | ||
36 | <div class="connectorBubble"></div> | ||
37 | </div> | ||
38 | </body> | ||
39 | </html> | ||
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js new file mode 100755 index 00000000..fb0fd57e --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.js | |||
@@ -0,0 +1,57 @@ | |||
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 | @requires montage/core/core | ||
9 | @requires montage/ui/component | ||
10 | */ | ||
11 | var Montage = require("montage/core/core").Montage, | ||
12 | Component = require("montage/ui/component").Component; | ||
13 | |||
14 | exports.BindingHudOption = Montage.create(Component, { | ||
15 | _title: { | ||
16 | value: null | ||
17 | }, | ||
18 | |||
19 | title: { | ||
20 | get: function() { | ||
21 | return this._title; | ||
22 | }, | ||
23 | set: function(val) { | ||
24 | this._title = val; | ||
25 | this.needsDraw = true; | ||
26 | } | ||
27 | }, | ||
28 | |||
29 | bound: { | ||
30 | value: false | ||
31 | }, | ||
32 | |||
33 | prepareForDraw: { | ||
34 | value: function() { | ||
35 | // Set Up Listener for click and propagate up to Binding View | ||
36 | var matchesBound = this.parentComponent.parentComponent.boundProperties.filter(function(obj) { | ||
37 | return (obj === this.title); | ||
38 | }.bind(this)); | ||
39 | if(matchesBound.length > 0) this.bound = true; | ||
40 | } | ||
41 | }, | ||
42 | |||
43 | draw: { | ||
44 | value:function() { | ||
45 | if(this.bound) { | ||
46 | this.element.classList.add("bound"); | ||
47 | } else { | ||
48 | this.element.classList.remove("bound"); | ||
49 | } | ||
50 | // if(this.bindings.length > 0) { | ||
51 | // this.element.classList.add("bound"); | ||
52 | // } else { | ||
53 | // this.element.classList.remove("bound"); | ||
54 | // } | ||
55 | } | ||
56 | } | ||
57 | }); \ No newline at end of file | ||
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css new file mode 100755 index 00000000..680f9183 --- /dev/null +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css | |||
@@ -0,0 +1,104 @@ | |||
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 | .bindingHud { | ||
8 | position: absolute; | ||
9 | background: rgba(0, 0, 0, 0.85); | ||
10 | /*padding: 0px;*/ | ||
11 | color: #C4C4C4; | ||
12 | font-size: 11px; | ||
13 | box-shadow: inset 0px 0px 0px 0px #CCC; | ||
14 | border-radius: 6px; | ||
15 | padding: 3px 1px 1px; | ||
16 | border:1px solid #000; | ||
17 | text-shadow: 1px 1px 0px #000; | ||
18 | } | ||
19 | |||
20 | .bindingHud .bindingTitle { | ||
21 | font-weight:bold; | ||
22 | background: url('/images/panels/horizontal-resize.png') no-repeat; | ||
23 | padding-left: 10px; | ||
24 | line-height: 20px; | ||
25 | background-position: left center; | ||
26 | padding-top: 2px; | ||
27 | color: #EBE6E6; | ||
28 | } | ||
29 | |||
30 | .bindingHud .hudRepetition { | ||
31 | /*background: rgba(0, 0, 0, 0.3);*/ | ||
32 | line-height:16px; | ||
33 | /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/ | ||
34 | min-width: 80px; | ||
35 | } | ||
36 | |||
37 | .bindingHud .hudOption { | ||
38 | position:relative; | ||
39 | /*border-bottom:1px solid #505050;*/ | ||
40 | line-height:16px; | ||
41 | padding:1px 25px 1px 8px; | ||
42 | } | ||
43 | |||
44 | .bindingHud .hudOption .connectorBubble:hover { | ||
45 | background-color: #1B52A7; | ||
46 | box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747; | ||
47 | cursor: pointer; | ||
48 | } | ||
49 | |||
50 | .bindingHud .hudOption.bound .connectorBubble { | ||
51 | background: -webkit-linear-gradient(top, #d0e4f7 0%,#73b1e7 24%,#0a77d5 50%,#539fe1 79%,#87bcea 100%); | ||
52 | box-shadow: none; | ||
53 | } | ||
54 | |||
55 | .bindingHud .hudOption:last-child { | ||
56 | border-bottom: 0px; | ||
57 | } | ||
58 | |||
59 | .bindingHud .hudOption .connectorBubble { | ||
60 | position: absolute; | ||
61 | right: 5px; | ||
62 | top: 3px; | ||
63 | border-radius: 50%; | ||
64 | width: 10px; | ||
65 | height: 10px; | ||
66 | border-left: 0px; | ||
67 | display: block; | ||
68 | background-color: #313131; | ||
69 | box-shadow: inset 0px 2px 7px 1px #0F0F0F, 0 1px #424242; | ||
70 | |||
71 | } | ||
72 | |||
73 | .splitter.scrollArea { | ||
74 | background-color: transparent; | ||
75 | background-size: 12%; | ||
76 |