From 8abe69f8d179a3edd2498119ae2947d283c1b758 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 21 Jun 2012 13:54:53 -0700 Subject: Binding View - Minor Fixes to remove warnings Signed-off-by: Armen Kesablyan --- js/components/toolbar.reel/toolbar.html | 3 +-- js/panels/PanelContainer.reel/PanelContainer.html | 3 +-- js/panels/objects/object.reel/object.js | 11 +++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html index 51e7ebec..c23e082f 100644 --- a/js/components/toolbar.reel/toolbar.html +++ b/js/components/toolbar.reel/toolbar.html @@ -19,8 +19,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot }, "buttonList": { - "module": "montage/ui/repetition.reel", - "name": "Repetition", + "prototype" : "montage/ui/repetition.reel", "properties": { "element": {"#": "repetition"} }, diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index ed6e8463..820348d2 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html @@ -74,8 +74,7 @@ }, "panel_6": { - "module": "js/panels/Panel.reel", - "name": "Panel", + "prototype": "js/panels/Panel.reel", "properties": { "element": {"#": "panel_6"} }, diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js index 6f8f5c92..1426f800 100644 --- a/js/panels/objects/object.reel/object.js +++ b/js/panels/objects/object.reel/object.js @@ -16,6 +16,17 @@ exports.Object = Montage.create(Component, { iconElement : { value: null }, type : { value: null }, + + _name : { value: null }, + name: { + get: function() { + return this._name; + }, + set: function(val) { + this.name = val; + } + }, + _sourceObject : { value: null }, sourceObject : { get: function() { -- cgit v1.2.3 From 9ba766f77c56619cd977fce59cf1a000cbb9ecc8 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 21 Jun 2012 14:09:29 -0700 Subject: Binding View: Hud Scroll Limit Is now 8 Signed-off-by: Armen Kesablyan --- js/stage/binding-view.reel/binding-hud.reel/binding-hud.css | 1 - js/stage/binding-view.reel/binding-hud.reel/binding-hud.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'js') 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 3cc4bb0a..0f31a073 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 @@ -80,6 +80,5 @@ } .hudRepetition { - max-height:54px; overflow: hidden; } \ No newline at end of file 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 52bc7236..9918b06d 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 @@ -25,7 +25,7 @@ exports.BindingHud = Montage.create(Component, { value: null }, scrollSpace: { - value: 3 + value: 8 }, currentScrollDirection: { value: null @@ -198,6 +198,7 @@ exports.BindingHud = Montage.create(Component, { this.scrollDown.addEventListener("mouseover", this); this.scrollUp.addEventListener("mouseout", this); this.scrollDown.addEventListener("mouseout", this); + this.optionsRepeater.element.style.maxHeight = (this.scrollSpace * 18) + "px" this.scrollUp.style.display = "block"; this.scrollDown.style.display = "block"; } -- cgit v1.2.3