diff options
| author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
| commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
| tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/tools-properties/shape-properties.reel | |
| parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
| parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
| download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.html | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 64840b17..117664a3 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
| @@ -13,8 +13,7 @@ | |||
| 13 | { | 13 | { |
| 14 | 14 | ||
| 15 | "ovalProperties1": { | 15 | "ovalProperties1": { |
| 16 | "module": "js/components/tools-properties/oval-properties.reel", | 16 | "prototype": "js/components/tools-properties/oval-properties.reel", |
| 17 | "name": "OvalProperties", | ||
| 18 | "properties": { | 17 | "properties": { |
| 19 | "element": {"#": "ovalProperties"}, | 18 | "element": {"#": "ovalProperties"}, |
| 20 | "base": {"@": "owner"} | 19 | "base": {"@": "owner"} |
| @@ -22,8 +21,7 @@ | |||
| 22 | }, | 21 | }, |
| 23 | 22 | ||
| 24 | "rectProperties1": { | 23 | "rectProperties1": { |
| 25 | "module": "js/components/tools-properties/rect-properties.reel", | 24 | "prototype": "js/components/tools-properties/rect-properties.reel", |
| 26 | "name": "RectProperties", | ||
| 27 | "properties": { | 25 | "properties": { |
| 28 | "element": {"#": "rectProperties"}, | 26 | "element": {"#": "rectProperties"}, |
| 29 | "base": {"@": "owner"} | 27 | "base": {"@": "owner"} |
| @@ -31,8 +29,7 @@ | |||
| 31 | }, | 29 | }, |
| 32 | 30 | ||
| 33 | "lineProperties1": { | 31 | "lineProperties1": { |
| 34 | "module": "js/components/tools-properties/line-properties.reel", | 32 | "prototype": "js/components/tools-properties/line-properties.reel", |
| 35 | "name": "LineProperties", | ||
| 36 | "properties": { | 33 | "properties": { |
| 37 | "element": {"#": "lineProperties"}, | 34 | "element": {"#": "lineProperties"}, |
| 38 | "base": {"@": "owner"} | 35 | "base": {"@": "owner"} |
| @@ -40,8 +37,7 @@ | |||
| 40 | }, | 37 | }, |
| 41 | 38 | ||
| 42 | "_strokeSize1": { | 39 | "_strokeSize1": { |
| 43 | "module": "js/components/hottextunit.reel", | 40 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 44 | "name": "HotTextUnit", | ||
| 45 | "properties": { | 41 | "properties": { |
| 46 | "element": {"#": "strokeControl"}, | 42 | "element": {"#": "strokeControl"}, |
| 47 | "minValue": 1, | 43 | "minValue": 1, |
| @@ -54,8 +50,7 @@ | |||
| 54 | }, | 50 | }, |
| 55 | 51 | ||
| 56 | "_strokeMaterial1": { | 52 | "_strokeMaterial1": { |
| 57 | "module": "js/components/combobox.reel", | 53 | "prototype": "js/components/combobox.reel", |
| 58 | "name": "Combobox", | ||
| 59 | "properties": { | 54 | "properties": { |
| 60 | "element": {"#": "strokeMaterialCB"}, | 55 | "element": {"#": "strokeMaterialCB"}, |
| 61 | "labelField": "_name", | 56 | "labelField": "_name", |
| @@ -64,8 +59,7 @@ | |||
| 64 | }, | 59 | }, |
| 65 | 60 | ||
| 66 | "_fillMaterial1": { | 61 | "_fillMaterial1": { |
| 67 | "module": "js/components/combobox.reel", | 62 | "prototype": "js/components/combobox.reel", |
| 68 | "name": "Combobox", | ||
| 69 | "properties": { | 63 | "properties": { |
| 70 | "element": {"#": "fillMaterialCB"}, | 64 | "element": {"#": "fillMaterialCB"}, |
| 71 | "labelField": "_name", | 65 | "labelField": "_name", |
| @@ -74,8 +68,7 @@ | |||
| 74 | }, | 68 | }, |
| 75 | 69 | ||
| 76 | "toolbutton1": { | 70 | "toolbutton1": { |
| 77 | "module": "js/components/layout/subtool-button.reel", | 71 | "prototype": "js/components/layout/subtool-button.reel[SubToolButton]", |
| 78 | "name": "SubToolButton", | ||
| 79 | "properties": { | 72 | "properties": { |
| 80 | "element": {"#": "toolbutton"} | 73 | "element": {"#": "toolbutton"} |
| 81 | }, | 74 | }, |
| @@ -89,8 +82,7 @@ | |||
| 89 | }, | 82 | }, |
| 90 | 83 | ||
| 91 | "repetition1": { | 84 | "repetition1": { |
| 92 | "module": "montage/ui/repetition.reel", | 85 | "prototype": "montage/ui/repetition.reel", |
| 93 | "name": "Repetition", | ||
| 94 | "properties": { | 86 | "properties": { |
| 95 | "element": {"#": "shapeToolsList"} | 87 | "element": {"#": "shapeToolsList"} |
| 96 | }, | 88 | }, |
| @@ -105,8 +97,7 @@ | |||
| 105 | 97 | ||
| 106 | 98 | ||
| 107 | "owner": { | 99 | "owner": { |
| 108 | "module": "js/components/tools-properties/shape-properties.reel", | 100 | "prototype": "js/components/tools-properties/shape-properties.reel", |
| 109 | "name": "ShapeProperties", | ||
| 110 | "properties": { | 101 | "properties": { |
| 111 | "element": {"#": "shapeProperties"}, | 102 | "element": {"#": "shapeProperties"}, |
| 112 | "_strokeMaterial": {"@": "_strokeMaterial1"}, | 103 | "_strokeMaterial": {"@": "_strokeMaterial1"}, |