-- cgit v1.2.3 From cd8f5e98dd1ba97d81a7f1f2362f9ce481577957 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 11 Jun 2012 10:44:59 -0700 Subject: Binding-View : Deselect Works Now, Rendering multiple Huds Available Signed-off-by: Armen Kesablyan --- js/stage/binding-view.reel/binding-view.html | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'js/stage/binding-view.reel/binding-view.html') diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index 4eea3cc4..90ef2286 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html @@ -37,6 +37,17 @@ "bindingArgs": {"<-": "@hudRepeater.objectAtCurrentIteration"} } }, + "translateComposer": { + "prototype": "montage/ui/composer/translate-composer", + "properties": { + "component": {"@": "owner"} + }, + "bindings": { + "element": {"<-": "@owner._element"}, + "translateX": {"->": "@owner.translateX"}, + "translateY": {"->": "@owner.translateY"} + } + }, "nonVisualRepeater": { "prototype": "montage/ui/repetition.reel", "properties": { -- cgit v1.2.3 From 311fa07b85407386ed07237530cb464a432526c5 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 12 Jun 2012 12:59:22 -0700 Subject: Binding View - Use same icon component as objects panel --- js/stage/binding-view.reel/binding-view.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/stage/binding-view.reel/binding-view.html') diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index 90ef2286..a9e859e4 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html @@ -57,14 +57,14 @@ "objects": {"<-": "@owner.nonVisualComponents"} } }, - "nonVisualComponent": { - "prototype": "js/stage/binding-view.reel/non-visual-component.reel", + "objectIcon": { + "prototype": "js/panels/objects/object.reel", "properties": { "element": {"#": "nonVisualComponent"} }, "bindings": { - "objectName": {"<-": "@hudRepeater.objectAtCurrentIteration.objectName"}, - "objectImage": {"<-": "@hudRepeater.objectAtCurrentIteration.objectImage"} + "sourceObject": {"<-": "@nonVisualRepeater.objectAtCurrentIteration"}, + "identifier": {"<-": "@nonVisualRepeater.objectAtCurrentIteration.identifier"} } } } -- cgit v1.2.3 From cfa2d42f6ca65eb3ce1bea92db5f4af87dd68bb5 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 13 Jun 2012 11:36:01 -0700 Subject: Binding-View: Translate huds Signed-off-by: Armen Kesablyan --- js/stage/binding-view.reel/binding-view.html | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'js/stage/binding-view.reel/binding-view.html') diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index 90ef2286..4eea3cc4 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html @@ -37,17 +37,6 @@ "bindingArgs": {"<-": "@hudRepeater.objectAtCurrentIteration"} } }, - "translateComposer": { - "prototype": "montage/ui/composer/translate-composer", - "properties": { - "component": {"@": "owner"} - }, - "bindings": { - "element": {"<-": "@owner._element"}, - "translateX": {"->": "@owner.translateX"}, - "translateY": {"->": "@owner.translateY"} - } - }, "nonVisualRepeater": { "prototype": "montage/ui/repetition.reel", "properties": { -- cgit v1.2.3 From 60e9ea67e0f6d0cf167b6d5068e2e01db5f67966 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 14 Jun 2012 15:00:18 -0700 Subject: Binding-Huds draw to component Signed-off-by: Armen Kesablyan --- js/stage/binding-view.reel/binding-view.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'js/stage/binding-view.reel/binding-view.html') diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index 8abddbee..c7520132 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html @@ -35,7 +35,13 @@ }, "bindings": { "bindingArgs": {"<-": "@hudRepeater.objectAtCurrentIteration"} - } + }, + "listeners": [ + { + "type": "resizeMove", + "listener": {"@": "owner"} + } + ] }, "nonVisualRepeater": { "prototype": "montage/ui/repetition.reel", -- cgit v1.2.3 From d6c427432bd0040b084b854407e9ed59a6707b54 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 15 Jun 2012 15:00:06 -0700 Subject: Objects Tray - Add objects tray to binding view --- js/stage/binding-view.reel/binding-view.html | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'js/stage/binding-view.reel/binding-view.html') diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index c7520132..5fb7affd 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html @@ -43,23 +43,10 @@ } ] }, - "nonVisualRepeater": { - "prototype": "montage/ui/repetition.reel", - "properties": { - "element": {"#": "nonVisualRepeater"} - }, - "bindings": { - "objects": {"<-": "@owner.nonVisualComponents"} - } - }, - "objectIcon": { - "prototype": "js/panels/objects/object.reel", + "objectsTray" : { + "prototype": "js/stage/objects-tray.reel", "properties": { - "element": {"#": "nonVisualComponent"} - }, - "bindings": { - "sourceObject": {"<-": "@nonVisualRepeater.objectAtCurrentIteration"}, - "identifier": {"<-": "@nonVisualRepeater.objectAtCurrentIteration.identifier"} + "element": {"#": "objects-tray" } } } } @@ -75,11 +62,11 @@