From 4979ee361a11225f19b991810ca8d8c429a22620 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 13 Mar 2012 15:51:17 -0700 Subject: CSS Panel - Add new panel to panel data --- js/data/panels-data.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 2422f5e7..84ec9c3c 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -82,6 +82,18 @@ exports.PanelsData = Montage.create(Montage, { modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", moduleName: "CSSPanelBase" }, + { + name: "CSSPanel", + height: 200, + minHeight: 200, + maxHeight: null, + flexible: true, + scrollable: false, + collapsed: false, + open: true, + modulePath: "js/panels/css-panel/css-panel.reel", + moduleName: "CSSPanelNew" + }, { name: "Presets", minHeight: 100, -- cgit v1.2.3 From 8247cddcc7ddce25a6282e97d304cad9a0f0c4f3 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 18 May 2012 01:06:31 -0700 Subject: fixed the shape subtool not refreshing the icon Signed-off-by: Valerio Virgillito --- js/data/tools-data.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'js/data') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 32eaf24d..05455efe 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -60,6 +60,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": true }, { @@ -71,6 +72,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -82,6 +84,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": true, "container": false, + "subtools": [], "selected": false }, { @@ -93,6 +96,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/cursors/Crosshair.png') 8 8, default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -104,6 +108,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -115,6 +120,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "text", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -163,6 +169,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/brush_down.png') 9 17, default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -174,6 +181,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/bucket_down.png'), default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -185,6 +193,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/inkbottle_cursor.png'), default", "lastInGroup": true, "container": false, + "subtools": [], "selected": false }, // { @@ -196,6 +205,7 @@ exports.ToolsData = Montage.create(Montage, { // "cursor": "auto", // "lastInGroup": false, // "container": false, +// "subtools": [], // "selected": false // }, { @@ -207,6 +217,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "auto", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -218,6 +229,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/tools/hand_down.png'), default", "lastInGroup": false, "container": false, + "subtools": [], "selected": false }, { @@ -229,6 +241,7 @@ exports.ToolsData = Montage.create(Montage, { "cursor": "url('images/cursors/zoom.png'),default", "lastInGroup": true, "container": false, + "subtools": [], "selected": false } ] -- cgit v1.2.3 From a237dfaad38bb9efac803db83a28099f6f74dde8 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Mon, 21 May 2012 15:10:51 -0700 Subject: Remove Old CSS Panel --- js/data/panels-data.js | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'js/data') diff --git a/js/data/panels-data.js b/js/data/panels-data.js index 7ab40f11..ed346196 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -72,18 +72,6 @@ exports.PanelsData = Montage.create(Montage, { // }, { name: "CSS", - minHeight: 195, - height: 195, - maxHeight: null, - flexible: true, - scrollable: true, - collapsed: true, - open: true, - modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", - moduleName: "CSSPanelBase" - }, - { - name: "CSSPanel", height: 200, minHeight: 200, maxHeight: null, -- cgit v1.2.3 From 1c3da2901f454ad2c18e20216bb2517740a1c080 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 22 May 2012 14:28:00 -0700 Subject: CSS Panel - Update components to use new serialization format --- 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 ed346196..ffc76782 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js @@ -80,7 +80,7 @@ exports.PanelsData = Montage.create(Montage, { collapsed: false, open: true, modulePath: "js/panels/css-panel/css-panel.reel", - moduleName: "CSSPanelNew" + moduleName: "CssPanel" }, { name: "Presets", -- cgit v1.2.3