From 5d7e470351fd150d5e70a97332fa2f2553797499 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 7 May 2012 11:09:45 -0700 Subject: Initial Setup of the binding Tool Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4d009530..12c6c965 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -222,6 +222,17 @@ exports.ToolsData = Montage.create(Montage, { "lastInGroup": true, "container": false, "selected": false + }, + { + "id": "bindingTool", + "properties": "bindingProperties", + "spriteSheet": true, + "action": "bindingTool", + "toolTip": "Binding (B)", + "cursor": "url('images/cursors/binding.png'),default", + "lastInGroup": true, + "container": false, + "selected": false } ] }, -- cgit v1.2.3 From c80e7df1702dff09b5cc8447ab0619747fed2024 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Fri, 11 May 2012 15:03:10 -0700 Subject: created the initial environment requirements for workspace to be manipulated. Signed-off-by: Armen Kesablyan --- js/data/panels-data.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index f613a3be..7fa22995 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -105,6 +105,32 @@ exports.PanelsData = Montage.create(Montage, { open: true, modulePath: "js/panels/history-panel/history.reel", moduleName: "History" + }, + { + name: "Binding", + groups: ["ws-binding"], + minHeight: 100, + height: 100, + maxHeight: null, + flexible: true, + collapsed: true, + scrollable: true, + open: true, + modulePath: "js/panels/binding.reel", + moduleName: "BindingPanel" + }, + { + name: "Objects", + groups: ["ws-binding"], + minHeight: 100, + height: 100, + maxHeight: null, + flexible: true, + collapsed: true, + scrollable: true, + open: true, + modulePath: "js/panels/objects.reel", + moduleName: "ObjectsPanel" } ] } -- cgit v1.2.3 From 336e0e0ef242f5c472757fe3bbcdd54c04a00f1f Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Mon, 14 May 2012 10:32:59 -0700 Subject: Workspace: has customized Signed-off-by: Armen Kesablyan --- js/data/panels-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 7fa22995..23bfa1ed 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -116,7 +116,7 @@ exports.PanelsData = Montage.create(Montage, { collapsed: true, scrollable: true, open: true, - modulePath: "js/panels/binding.reel", + modulePath: "js/panels/binding-panel.reel", moduleName: "BindingPanel" }, { -- cgit v1.2.3 From c3452da7c18f73f45e4e6a58918f6459e7915b62 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Tue, 15 May 2012 15:02:40 -0700 Subject: Finished skeleton structure for binding. Signed-off-by: Armen Kesablyan --- js/data/panels-data.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 23bfa1ed..38fa3426 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -12,6 +12,7 @@ exports.PanelsData = Montage.create(Montage, { value: [ { name: "Color", + groups: ["default"], height: 200, minHeight: 200, maxHeight: null, @@ -24,6 +25,7 @@ exports.PanelsData = Montage.create(Montage, { }, { name: "Properties", + groups: ["default", "ws-binding"], minHeight: 200, height: 200, maxHeight: null, @@ -36,6 +38,7 @@ exports.PanelsData = Montage.create(Montage, { }, { name: "Materials", + groups: ["default"], minHeight: 100, height: 100, maxHeight: null, @@ -48,6 +51,7 @@ exports.PanelsData = Montage.create(Montage, { }, { name: "Components", + groups: ["default", "ws-binding"], minHeight: 100, height: 200, maxHeight: null, @@ -72,6 +76,7 @@ exports.PanelsData = Montage.create(Montage, { // }, { name: "CSS", + groups: ["default"], minHeight: 195, height: 195, maxHeight: null, @@ -84,6 +89,7 @@ exports.PanelsData = Montage.create(Montage, { }, { name: "Presets", + groups: ["default"], minHeight: 100, height: 100, maxHeight: null, @@ -96,6 +102,7 @@ exports.PanelsData = Montage.create(Montage, { }, { name: "History", + groups: ["default"], minHeight: 100, height: 100, maxHeight: null, -- cgit v1.2.3 From ab7f00cdf7941bd788fcf44e70e4d2a6ad8b2012 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Wed, 16 May 2012 22:18:39 -0700 Subject: Objects Panel - Hook in objects panel --- js/data/panels-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 38fa3426..37957892 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -136,7 +136,7 @@ exports.PanelsData = Montage.create(Montage, { collapsed: true, scrollable: true, open: true, - modulePath: "js/panels/objects.reel", + modulePath: "js/panels/objects/objects-panel.reel", moduleName: "ObjectsPanel" } ] -- cgit v1.2.3 From d38aaadda934c6ec92df565c86fd5bc6316ae6b4 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 23 May 2012 14:37:03 -0700 Subject: Binding tool subtool issues Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 0989f4f7..a6a03323 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -46,6 +46,9 @@ exports.ToolsData = Montage.create(Montage, { zoomToolIndex: { value: 12 }, + bindingToolIndex: { + value: 12 + }, // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above @@ -253,6 +256,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/cursors/binding.png'),default", "lastInGroup": true, "container": false, + "subtools": [], "selected": false } ] -- cgit v1.2.3 From c7b5f04d41f54ccabfb385a02c47f131383797d8 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Fri, 15 Jun 2012 15:06:05 -0700 Subject: Objects Panel - removed for now --- js/data/panels-data.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 6792aa51..fd83d0c7 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -125,20 +125,21 @@ exports.PanelsData = Montage.create(Montage, { open: true, modulePath: "js/panels/binding-panel.reel", moduleName: "BindingPanel" - }, - { - name: "Objects", - groups: ["ws-binding"], - minHeight: 100, - height: 100, - maxHeight: null, - flexible: true, - collapsed: true, - scrollable: true, - open: true, - modulePath: "js/panels/objects/objects-panel.reel", - moduleName: "ObjectsPanel" } +// , +// { +// name: "Objects", +// groups: ["ws-binding"], +// minHeight: 100, +// height: 100, +// maxHeight: null, +// flexible: true, +// collapsed: true, +// scrollable: true, +// open: true, +// modulePath: "js/panels/objects/objects-panel.reel", +// moduleName: "ObjectsPanel" +// } ] } -- cgit v1.2.3 From 4565558afff6fb07db3b5165042e028f467ac41b Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Thu, 21 Jun 2012 15:46:26 -0700 Subject: Binding View :Requested Changes for Pull Request Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index fb195bd3..8ed6433e 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -47,7 +47,7 @@ exports.ToolsData = Montage.create(Montage, { value: 12 }, bindingToolIndex: { - value: 12 + value: 13 }, // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. -- cgit v1.2.3