diff options
Diffstat (limited to 'js/stage/binding-view.reel/binding-hud.reel')
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | 2 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 39 |
2 files changed, 13 insertions, 28 deletions
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 b8410f9b..82686c7f 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 | |||
@@ -33,7 +33,7 @@ | |||
33 | "element": {"#" : "hudOption"} | 33 | "element": {"#" : "hudOption"} |
34 | }, | 34 | }, |
35 | "bindings": { | 35 | "bindings": { |
36 | "hudOptions": {"<-": "@repeater.objectAtCurrentIteration"} | 36 | "title": {"<-": "@repeater.objectAtCurrentIteration"} |
37 | } | 37 | } |
38 | }, | 38 | }, |
39 | "resizer1": { | 39 | "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 a8c3ae68..b03c5a06 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 | |||
@@ -26,34 +26,18 @@ exports.BindingHud = Montage.create(Component, { | |||
26 | return this._userComponent; | 26 | return this._userComponent; |
27 | }, | 27 | }, |
28 | set: function(val) { | 28 | set: function(val) { |
29 | this._userComponent = val; | ||
30 | } | ||
31 | }, | ||
32 | |||
33 | |||
34 | bindingArgs: { | ||
35 | get: function() { | ||
36 | return this._bindingArgs; | ||
37 | }, | ||
38 | set: function(val) { | ||
39 | if (typeof(val) !== "undefined") { | 29 | if (typeof(val) !== "undefined") { |
40 | this._bindingArgs = val; | 30 | this._userComponent = val; |
41 | this.userComponent = this.bindingArgs.component; | 31 | this.title = val.identifier; |
42 | this.title = this.bindingArgs.component.identifier; | 32 | this.x = val.element.offsetLeft; |
43 | this.x = this._bindingArgs.component.element.offsetLeft; | 33 | this.y = val.element.offsetTop; |
44 | this.y = this._bindingArgs.component.element.offsetTop; | 34 | this.properties = this.application.ninja.objectsController.getPropertiesFromObject(val, true); |
45 | this.properties = this._bindingArgs.properties; | ||
46 | this.needsDraw = true; | 35 | this.needsDraw = true; |
47 | } else { | ||
48 | this.properties = []; | ||
49 | } | 36 | } |
50 | } | 37 | } |
51 | }, | 38 | }, |
52 | 39 | ||
53 | properties: { | 40 | properties: { value: [] }, |
54 | value: [ | ||
55 | ] | ||
56 | }, | ||
57 | 41 | ||
58 | _isResizing: { | 42 | _isResizing: { |
59 | value: null | 43 | value: null |
@@ -149,19 +133,20 @@ exports.BindingHud = Montage.create(Component, { | |||
149 | // } | 133 | // } |
150 | // this.properties.push({"title":obj, "bound": objBound}); | 134 | // this.properties.push({"title":obj, "bound": objBound}); |
151 | // }.bind(this)); | 135 | // }.bind(this)); |
136 | this.parentComponent.parentComponent.handleShowBinding(this.application.ninja.objectsController.getObjectBindings(this.userComponent)); | ||
152 | } | 137 | } |
153 | }, | 138 | }, |
154 | 139 | ||
155 | draw: { | 140 | draw: { |
156 | value: function() { | 141 | value: function() { |
157 | this.titleElement.innerHTML = this.title; | 142 | this.titleElement.innerHTML = this.title; |
158 | |||
159 | // if(this.isResizing) { | ||
160 | // this.timelineSplitter.collapsed = this.height - this._resizedHeight < 46; | ||
161 | // this.panelSplitter.collapsed = this.width - this._resizedWidth < 30; | ||
162 | // } | ||
163 | this.element.style.top = (this.y + this._resizedY) + "px"; | 143 | this.element.style.top = (this.y + this._resizedY) + "px"; |
164 | this.element.style.left = (this.x + this._resizedX) + "px"; | 144 | this.element.style.left = (this.x + this._resizedX) + "px"; |
165 | } | 145 | } |
146 | }, | ||
147 | didDraw: { | ||
148 | value: function() { | ||
149 | |||
150 | } | ||
166 | } | 151 | } |
167 | }); \ No newline at end of file | 152 | }); \ No newline at end of file |