From a5387d3cc74350dd06ecab2c8524d63d7540e57f Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 4 Jun 2012 16:37:09 -0700 Subject: Binding Panel - Add edit view --- .../edit-binding-view.reel/edit-binding-view.html | 103 +++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 js/panels/binding/edit-binding-view.reel/edit-binding-view.html (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html new file mode 100644 index 00000000..1d502a3e --- /dev/null +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -0,0 +1,103 @@ + + + + + + + + + +
+ + + +
+ + \ No newline at end of file -- cgit v1.2.3 From d7e39dd2ff310b9f05676b7de49756036ab03514 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 8 Jun 2012 15:57:08 -0700 Subject: Binding Panel - Update edit view - populate binding arguments --- .../edit-binding-view.reel/edit-binding-view.html | 77 +++++++++++++++------- 1 file changed, 55 insertions(+), 22 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index 1d502a3e..0c1abcee 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -16,27 +16,36 @@ "element": {"#": "edit-binding"} } }, - "objectsList" : { - "prototype": "montage/ui/controller/array-controller", - "bindings" : { - "content": {"<-": "@owner.objectsList"} - } - }, - "sourceObjectSelect": { - "prototype": "montage/ui/select-input.reel", + "sourceObjectField": { + "prototype": "js/components/hintable.reel", "properties": { - "element": {"#": "sourceObjectSelect"}, - "contentController": {"@": "objectsList"} + "element": {"#": "sourceObjectField"} - } + }, + "bindings": { + "value": {"<-": "@owner.sourceObjectIdentifier"} + }, + "listeners" : [ + { + "type": "change", + "listener": {"@": "owner"} + } + ] }, - "boundObjectSelect": { - "prototype": "montage/ui/select-input.reel", + "boundObjectField": { + "prototype": "js/components/hintable.reel", "properties": { - "element": {"#": "boundObjectSelect"}, - "contentController": {"@": "objectsList"} - - } + "element": {"#": "boundObjectField"} + }, + "bindings": { + "value": {"<-": "@owner.boundObjectIdentifier"} + }, + "listeners" : [ + { + "type": "change", + "listener": {"@": "owner"} + } + ] }, "sourceObjectPropertyPathField": { "prototype": "js/components/hintable.reel", @@ -69,6 +78,28 @@ "listener": {"@": "owner"} } ] + }, + "directionCheckbox": { + "prototype": "montage/ui/checkbox.reel", + "properties": { + "element": {"#": "direction-checkbox"} + }, + "bindings": { + "checked": {"<-": "@owner.oneway"} + } + }, + "closeButton" : { + "prototype": "montage/ui/button.reel", + "properties": { + "element": {"#": "close-button" }, + "identifier": "closeButton" + }, + "listeners": [ + { + "type": "action", + "listener": {"@": "owner" } + } + ] } } @@ -79,25 +110,27 @@ + + \ No newline at end of file -- cgit v1.2.3 From 32f8b04c6911c6ac2f3f83dded50e6d5c0fbeede Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Sun, 10 Jun 2012 16:35:03 -0700 Subject: Binding Panel - Minor Editing Panel changes --- .../edit-binding-view.reel/edit-binding-view.html | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index 0c1abcee..d07f4445 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -13,14 +13,19 @@ "owner": { "prototype": "js/panels/binding/edit-binding-view.reel", "properties": { - "element": {"#": "edit-binding"} + "element": {"#": "edit-binding"}, + "sourceObjectField" : {"@": "sourceObjectField" }, + "boundObjectField" : {"@": "boundObjectField" }, + "sourceObjectPropertyPathField" : {"@": "sourceObjectPropertyPathField" }, + "boundObjectPropertyPathField" : {"@": "boundObjectPropertyPathField" }, + "directionCheckbox" : {"@": "directionCheckbox" } } }, "sourceObjectField": { "prototype": "js/components/hintable.reel", "properties": { + "startOnEvent": "click", "element": {"#": "sourceObjectField"} - }, "bindings": { "value": {"<-": "@owner.sourceObjectIdentifier"} @@ -35,6 +40,7 @@ "boundObjectField": { "prototype": "js/components/hintable.reel", "properties": { + "startOnEvent": "click", "element": {"#": "boundObjectField"} }, "bindings": { @@ -50,6 +56,7 @@ "sourceObjectPropertyPathField": { "prototype": "js/components/hintable.reel", "properties": { + "startOnEvent": "click", "element": {"#": "so-pp"}, "identifier": "sourceProperty" }, @@ -66,6 +73,7 @@ "boundObjectPropertyPathField": { "prototype": "js/components/hintable.reel", "properties": { + "startOnEvent": "click", "element": {"#": "bo-pp"}, "identifier": "boundProperty" }, @@ -109,18 +117,20 @@
- + + +
-- cgit v1.2.3 From bb1ab90e9ad1814f4e26f820bcdf5e54fa838a18 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 12 Jun 2012 12:59:42 -0700 Subject: Binding Panel - set up new edit view layout --- .../edit-binding-view.reel/edit-binding-view.html | 31 ++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index 604d4871..c13e4587 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -148,23 +148,26 @@
-
\ No newline at end of file -- cgit v1.2.3 From 62c7c2ac7b72c7e89611d064eef1f4f77a54696d Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Wed, 13 Jun 2012 19:08:46 -0700 Subject: Edit Binding - Binding improvements to show icon and save form --- .../edit-binding-view.reel/edit-binding-view.html | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index e2cbdd1d..91a5426f 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -21,7 +21,9 @@ "directionCheckbox" : {"@": "directionCheckbox" }, "saveButton":{ "@": "saveButton" }, "cancelButton":{ "@": "cancelButton" }, - "deleteButton":{ "@": "deleteButton" } + "deleteButton":{ "@": "deleteButton" }, + "sourceObjectIconElement": {"#": "source-object-icon"}, + "boundObjectIconElement": {"#": "bound-object-icon"} } }, "sourceObjectField": { @@ -31,7 +33,7 @@ "element": {"#": "sourceObjectField"} }, "bindings": { - "value": {"<-": "@owner.sourceObjectIdentifier"} + "value": {"<<->": "@owner.sourceObjectIdentifier"} }, "listeners" : [ { @@ -47,7 +49,7 @@ "element": {"#": "boundObjectField"} }, "bindings": { - "value": {"<-": "@owner.boundObjectIdentifier"} + "value": {"<<->": "@owner.boundObjectIdentifier"} }, "listeners" : [ { @@ -64,7 +66,7 @@ "identifier": "sourceProperty" }, "bindings": { - "value": {"<-": "@owner.sourceObjectPropertyPath"} + "value": {"<<->": "@owner.sourceObjectPropertyPath"} }, "listeners" : [ { @@ -81,7 +83,7 @@ "identifier": "boundProperty" }, "bindings": { - "value": {"<-": "@owner.boundObjectPropertyPath"} + "value": {"<<->": "@owner.boundObjectPropertyPath"} }, "listeners" : [ { @@ -147,14 +149,10 @@
- -
-
-
-
+
Test @@ -164,9 +162,7 @@
-
-
-
+
Test @@ -175,12 +171,10 @@
-
-
-- cgit v1.2.3 From e0db1e6cb924d6d863f3a0224b05e6c281443d02 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 18 Jun 2012 18:57:44 -0700 Subject: Edit View - Minor cleanup --- js/panels/binding/edit-binding-view.reel/edit-binding-view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index 91a5426f..d5409883 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -155,7 +155,7 @@
- Test +
@@ -165,7 +165,7 @@
- Test +
-- cgit v1.2.3 From 87377c81da06abf6d656017859830a3ab2902f0e Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 20 Jun 2012 15:21:55 -0700 Subject: BindingView :Montage Updates Signed-off-by: Armen Kesablyan --- .../edit-binding-view.reel/edit-binding-view.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index d5409883..0bd3cf32 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -33,7 +33,7 @@ "element": {"#": "sourceObjectField"} }, "bindings": { - "value": {"<<->": "@owner.sourceObjectIdentifier"} + "value": {"<->": "@owner.sourceObjectIdentifier"} }, "listeners" : [ { @@ -49,7 +49,7 @@ "element": {"#": "boundObjectField"} }, "bindings": { - "value": {"<<->": "@owner.boundObjectIdentifier"} + "value": {"<->": "@owner.boundObjectIdentifier"} }, "listeners" : [ { @@ -66,7 +66,7 @@ "identifier": "sourceProperty" }, "bindings": { - "value": {"<<->": "@owner.sourceObjectPropertyPath"} + "value": {"<->": "@owner.sourceObjectPropertyPath"} }, "listeners" : [ { @@ -83,7 +83,7 @@ "identifier": "boundProperty" }, "bindings": { - "value": {"<<->": "@owner.boundObjectPropertyPath"} + "value": {"<->": "@owner.boundObjectPropertyPath"} }, "listeners" : [ { @@ -93,7 +93,7 @@ ] }, "directionCheckbox": { - "prototype": "montage/ui/checkbox.reel", + "prototype": "montage/ui/native/input-checkbox.reel", "properties": { "element": {"#": "direction-checkbox"} }, @@ -102,7 +102,7 @@ } }, "cancelButton" : { - "prototype": "montage/ui/button.reel", + "prototype": "montage/ui/native/button.reel", "properties": { "element": {"#": "cancel-button" }, "identifier": "cancelButton" @@ -115,7 +115,7 @@ ] }, "deleteButton" : { - "prototype": "montage/ui/button.reel", + "prototype": "montage/ui/native/button.reel", "properties": { "element": {"#": "delete-button" }, "identifier": "deleteButton" @@ -128,13 +128,13 @@ ] }, "saveButton" : { - "prototype": "montage/ui/button.reel", + "prototype": "montage/ui/native/button.reel", "properties": { "element": {"#": "save-button" }, "identifier": "saveButton" }, "bindings" : { - "enabled": {"<<->": "@owner.dirty"} + "enabled": {"<->": "@owner.dirty"} }, "listeners": [ { -- cgit v1.2.3 From 7867aec2620b65605180979b5049cfa154ca7dd1 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 25 Jun 2012 10:49:23 -0700 Subject: Binding Panel - Changing direction in edit mode doesn't apply dirty to the edit form Check/Uncheck the Binding direction (Oneway) check box in the binding setting doesn't enable "SAVE" button. Signed-off-by: Armen Kesablyan --- .../binding/edit-binding-view.reel/edit-binding-view.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'js/panels/binding/edit-binding-view.reel/edit-binding-view.html') diff --git a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html index 0bd3cf32..67d06132 100644 --- a/js/panels/binding/edit-binding-view.reel/edit-binding-view.html +++ b/js/panels/binding/edit-binding-view.reel/edit-binding-view.html @@ -95,11 +95,18 @@ "directionCheckbox": { "prototype": "montage/ui/native/input-checkbox.reel", "properties": { - "element": {"#": "direction-checkbox"} + "element": {"#": "direction-checkbox"}, + "identifier": "directionCheckbox" }, "bindings": { "checked": {"<-": "@owner.oneway"} - } + }, + "listeners" : [ + { + "type": "action", + "listener": {"@": "owner"} + } + ] }, "cancelButton" : { "prototype": "montage/ui/native/button.reel", -- cgit v1.2.3