diff options
author | Armen Kesablyan | 2012-07-02 13:19:20 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-07-02 13:19:20 -0700 |
commit | 526b9d76686323f488f1b26175440172b715d808 (patch) | |
tree | 47fc6bd90715b403a08d08a48a86f4d24da1ba29 /js/stage | |
parent | b194664df7e01aaeb8d1e7220a6de0e7f879f1db (diff) | |
parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
download | ninja-526b9d76686323f488f1b26175440172b715d808.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/stage')
6 files changed, 103 insertions, 64 deletions
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 index fb0fd57e..a7fbb297 100755 --- 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 | |||
@@ -26,8 +26,28 @@ exports.BindingHudOption = Montage.create(Component, { | |||
26 | } | 26 | } |
27 | }, | 27 | }, |
28 | 28 | ||
29 | bound: { | 29 | _promoted : { value: null }, |
30 | value: false | 30 | promoted : { |
31 | get : function() { return this._promoted; }, | ||
32 | set : function(value) { | ||
33 | if(value === this._promoted) { return; } | ||
34 | |||
35 | this._promoted = value; | ||
36 | |||
37 | this.needsDraw = true; | ||
38 | } | ||
39 | }, | ||
40 | |||
41 | _bound : { value: null }, | ||
42 | bound : { | ||
43 | get : function() { return this._bound; }, | ||
44 | set : function(value) { | ||
45 | if(value === this._bound) { return; } | ||
46 | |||
47 | this._bound = value; | ||
48 | |||
49 | this.needsDraw = true; | ||
50 | } | ||
31 | }, | 51 | }, |
32 | 52 | ||
33 | prepareForDraw: { | 53 | prepareForDraw: { |
@@ -47,6 +67,12 @@ exports.BindingHudOption = Montage.create(Component, { | |||
47 | } else { | 67 | } else { |
48 | this.element.classList.remove("bound"); | 68 | this.element.classList.remove("bound"); |
49 | } | 69 | } |
70 | |||
71 | if(this.promoted || this.bound) { | ||
72 | this.element.classList.add("promoted"); | ||
73 | } else { | ||
74 | this.element.classList.remove("promoted"); | ||
75 | } | ||
50 | // if(this.bindings.length > 0) { | 76 | // if(this.bindings.length > 0) { |
51 | // this.element.classList.add("bound"); | 77 | // this.element.classList.add("bound"); |
52 | // } else { | 78 | // } else { |
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 index 5818eca8..1536c706 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css | |||
@@ -11,7 +11,7 @@ | |||
11 | font-size: 11px; | 11 | font-size: 11px; |
12 | box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61); | 12 | box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61); |
13 | border-radius: 6px; | 13 | border-radius: 6px; |
14 | padding: 3px 8px; | 14 | padding: 3px; |
15 | text-shadow: 1px 1px 0px #000; | 15 | text-shadow: 1px 1px 0px #000; |
16 | } | 16 | } |
17 | 17 | ||
@@ -29,6 +29,8 @@ | |||
29 | /*background: rgba(0, 0, 0, 0.3);*/ | 29 | /*background: rgba(0, 0, 0, 0.3);*/ |
30 | line-height:16px; | 30 | line-height:16px; |
31 | /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/ | 31 | /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/ |
32 | padding-top: 4px; | ||
33 | margin: 0 5px; | ||
32 | min-width: 80px; | 34 | min-width: 80px; |
33 | } | 35 | } |
34 | 36 | ||
@@ -38,7 +40,10 @@ | |||
38 | line-height:16px; | 40 | line-height:16px; |
39 | padding:1px 25px 1px 8px; | 41 | padding:1px 25px 1px 8px; |
40 | } | 42 | } |
41 | 43 | .bindingHud .hudOption.promoted { | |
44 | color: #FFF; | ||
45 | font-weight: bold; | ||
46 | } | ||
42 | .bindingHud .hudOption .connectorBubble:hover { | 47 | .bindingHud .hudOption .connectorBubble:hover { |
43 | background-color: #1B52A7; | 48 | background-color: #1B52A7; |
44 | box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747; | 49 | box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747; |
@@ -94,8 +99,13 @@ | |||
94 | } | 99 | } |
95 | .splitter.scrollArea:hover:not(.disabled) { | 100 | .splitter.scrollArea:hover:not(.disabled) { |
96 | background-color: #303030; | 101 | background-color: #303030; |
102 | border-bottom: 1px solid #252525; | ||
103 | box-shadow: 0 1px 0 0 #3F3F3F; | ||
104 | } | ||
105 | .splitter.scrollAreaBottom:hover:not(.disabled) { | ||
106 | border-bottom: 1px solid #3F3F3F; | ||
107 | box-shadow: 0 1px 0 0 #252525; | ||
97 | } | 108 | } |
98 | |||
99 | 109 | ||
100 | .hudRepetition { | 110 | .hudRepetition { |
101 | overflow: hidden; | 111 | overflow: hidden; |
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html index 7bb888d5..f7e1a1d2 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | |||
@@ -36,7 +36,8 @@ | |||
36 | "element": {"#" : "hudOption"} | 36 | "element": {"#" : "hudOption"} |
37 | }, | 37 | }, |
38 | "bindings": { | 38 | "bindings": { |
39 | "title": {"<-": "@repeater.objectAtCurrentIteration"} | 39 | "title": {"<-": "@repeater.objectAtCurrentIteration.property"}, |
40 | "promoted": {"<-": "@repeater.objectAtCurrentIteration.promoted"} | ||
40 | } | 41 | } |
41 | }, | 42 | }, |
42 | "resizer1": { | 43 | "resizer1": { |
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js index 6b802cb0..1b0af09d 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | |||
@@ -10,6 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
10 | */ | 10 | */ |
11 | var Montage = require("montage/core/core").Montage, | 11 | var Montage = require("montage/core/core").Montage, |
12 | Component = require("montage/ui/component").Component; | 12 | Component = require("montage/ui/component").Component; |
13 | var ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | ||
13 | 14 | ||
14 | exports.BindingHud = Montage.create(Component, { | 15 | exports.BindingHud = Montage.create(Component, { |
15 | scrollUp: { | 16 | scrollUp: { |
@@ -49,10 +50,10 @@ exports.BindingHud = Montage.create(Component, { | |||
49 | value: null, | 50 | value: null, |
50 | serializable: true | 51 | serializable: true |
51 | }, | 52 | }, |
52 | _userComponent: { value: null }, | 53 | _userElement: { value: null }, |
53 | userComponent: { | 54 | userElement: { |
54 | get: function() { | 55 | get: function() { |
55 | return this._userComponent; | 56 | return this._userElement; |
56 | }, | 57 | }, |
57 | set: function(val) { | 58 | set: function(val) { |
58 | if(!val) { return; } | 59 | if(!val) { return; } |
@@ -61,14 +62,14 @@ exports.BindingHud = Montage.create(Component, { | |||
61 | bindingView = this.parentComponent.parentComponent, | 62 | bindingView = this.parentComponent.parentComponent, |
62 | isOffStage, icon, iconOffsets; | 63 | isOffStage, icon, iconOffsets; |
63 | 64 | ||
64 | this._userComponent = val; | 65 | this._userElement = val; |
65 | this.properties = this.getPropertyList(val); //controller.getPropertiesFromObject(val, true); | 66 | this.properties = this.getPropertyList(val.controller); //controller.getPropertiesFromObject(val, true); |
66 | 67 | ||
67 | controller.getObjectBindings(this.userComponent).forEach(function(obj) { | 68 | controller.getObjectBindings(this._userElement.controller).forEach(function(obj) { |
68 | this.boundProperties.push(obj.sourceObjectPropertyPath); | 69 | this.boundProperties.push(obj.sourceObjectPropertyPath); |
69 | }, this); | 70 | }, this); |
70 | 71 | ||
71 | isOffStage = controller.isOffStageObject(val); | 72 | isOffStage = controller.isOffStageObject(val.controller); |
72 | 73 | ||
73 | if(isOffStage) { | 74 | if(isOffStage) { |
74 | icon = bindingView.getOffStageIcon(val); | 75 | icon = bindingView.getOffStageIcon(val); |
@@ -76,20 +77,33 @@ exports.BindingHud = Montage.create(Component, { | |||
76 | this.title = icon.name; | 77 | this.title = icon.name; |
77 | this.x = iconOffsets.x; | 78 | this.x = iconOffsets.x; |
78 | this.y = iconOffsets.y - 80; | 79 | this.y = iconOffsets.y - 80; |
80 | } else { | ||
81 | this.title = this._userElement.controller.identifier; | ||
82 | this.x = this._userElement.offsetLeft; | ||
83 | this.y = this._userElement.offsetTop; | ||
84 | // this.x = parseInt(ElementsMediator.getProperty(val, "left")); | ||
85 | // this.y = parseInt(ElementsMediator.getProperty(val, "top")); | ||
79 | } | 86 | } |
80 | this.needsDraw = true; | 87 | this.needsDraw = true; |
81 | |||
82 | } | 88 | } |
83 | }, | 89 | }, |
84 | 90 | ||
85 | getPropertyList : { | 91 | getPropertyList : { |
86 | value: function(component) { | 92 | value: function(component) { |
87 | var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true); | 93 | var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true), |
88 |