diff options
author | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
commit | 7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch) | |
tree | b632e72735c9a071078121be07cf8cba2ebf29cc /js/components/tools-properties | |
parent | b03c3b087297f471840ab8595d5aa8bd0249a742 (diff) | |
parent | bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff) | |
download | ninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz |
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/components/tools-properties')
19 files changed, 74 insertions, 132 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html index d9c35dc2..b0c02734 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.html +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -12,8 +12,7 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "strokeSizeHT": { | 14 | "strokeSizeHT": { |
15 | "module": "js/components/hottextunit.reel", | 15 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
16 | "name": "HotTextUnit", | ||
17 | "properties": { | 16 | "properties": { |
18 | "element": {"#": "strokeSize"}, | 17 | "element": {"#": "strokeSize"}, |
19 | "minValue": 1, | 18 | "minValue": 1, |
@@ -25,8 +24,7 @@ | |||
25 | }, | 24 | }, |
26 | 25 | ||
27 | "strokeHardnessHT": { | 26 | "strokeHardnessHT": { |
28 | "module": "js/components/hottextunit.reel", | 27 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
29 | "name": "HotTextUnit", | ||
30 | "properties": { | 28 | "properties": { |
31 | "element": {"#": "strokeHardness"}, | 29 | "element": {"#": "strokeHardness"}, |
32 | "minValue": 0, | 30 | "minValue": 0, |
@@ -39,8 +37,7 @@ | |||
39 | }, | 37 | }, |
40 | 38 | ||
41 | "strokeAngleHT": { | 39 | "strokeAngleHT": { |
42 | "module": "js/components/hottextunit.reel", | 40 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
43 | "name": "HotTextUnit", | ||
44 | "properties": { | 41 | "properties": { |
45 | "element": {"#": "strokeAngle"}, | 42 | "element": {"#": "strokeAngle"}, |
46 | "minValue": -90, | 43 | "minValue": -90, |
@@ -53,8 +50,7 @@ | |||
53 | }, | 50 | }, |
54 | 51 | ||
55 | "smoothingAmountHT": { | 52 | "smoothingAmountHT": { |
56 | "module": "js/components/hottext.reel", | 53 | "prototype": "js/components/hottext.reel[HotText]", |
57 | "name": "HotText", | ||
58 | "properties": { | 54 | "properties": { |
59 | "element": {"#": "smoothingAmount"}, | 55 | "element": {"#": "smoothingAmount"}, |
60 | "minValue": 0, | 56 | "minValue": 0, |
@@ -65,8 +61,7 @@ | |||
65 | }, | 61 | }, |
66 | 62 | ||
67 | "owner": { | 63 | "owner": { |
68 | "module": "js/components/tools-properties/brush-properties.reel", | 64 | "prototype": "js/components/tools-properties/brush-properties.reel", |
69 | "name": "BrushProperties", | ||
70 | "properties": { | 65 | "properties": { |
71 | "element": {"#": "brushProperties"}, | 66 | "element": {"#": "brushProperties"}, |
72 | "_strokeSize": {"@": "strokeSizeHT"}, | 67 | "_strokeSize": {"@": "strokeSizeHT"}, |
diff --git a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html index f6a58a10..7585bbb4 100755 --- a/js/components/tools-properties/eraser-properties.reel/eraser-properties.html +++ b/js/components/tools-properties/eraser-properties.reel/eraser-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | { | 13 | { |
14 | 14 | ||
15 | "owner": { | 15 | "owner": { |
16 | "module": "js/components/tools-properties/eraser-properties.reel", | 16 | "prototype": "js/components/tools-properties/eraser-properties.reel", |
17 | "name": "EraserProperties", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "eraserProperties"} | 18 | "element": {"#": "eraserProperties"} |
20 | } | 19 | } |
diff --git a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html index 3718c5c5..1cde7a3e 100755 --- a/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html +++ b/js/components/tools-properties/eyedropper-properties.reel/eyedropper-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -13,8 +13,7 @@ | |||
13 | { | 13 | { |
14 | 14 | ||
15 | "owner": { | 15 | "owner": { |
16 | "module": "js/components/tools-properties/eyedropper-properties.reel", | 16 | "prototype": "js/components/tools-properties/eyedropper-properties.reel", |
17 | "name": "EyedropperProperties", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "eyedropperProperties"} | 18 | "element": {"#": "eyedropperProperties"} |
20 | } | 19 | } |
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.html b/js/components/tools-properties/fill-properties.reel/fill-properties.html index a35f9b15..b81b09ba 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.html +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
@@ -12,8 +12,7 @@ | |||
12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
13 | { | 13 | { |
14 | "_fillMaterialCB": { | 14 | "_fillMaterialCB": { |
15 | "module": "js/components/combobox.reel", | 15 | "prototype": "js/components/combobox.reel", |
16 | "name": "Combobox", | ||
17 | "properties": { | 16 | "properties": { |
18 | "element": {"#": "fillMaterialCB"}, | 17 | "element": {"#": "fillMaterialCB"}, |
19 | "labelField": "_name", | 18 | "labelField": "_name", |
@@ -21,8 +20,7 @@ | |||
21 | } | 20 | } |
22 | }, | 21 | }, |
23 | "owner": { | 22 | "owner": { |
24 | "module": "js/components/tools-properties/fill-properties.reel", | 23 | "prototype": "js/components/tools-properties/fill-properties.reel", |
25 | "name": "FillProperties", | ||
26 | "properties": { | 24 | "properties": { |
27 | "element": {"#": "fillProperties"}, | 25 | "element": {"#": "fillProperties"}, |
28 | "_useWebGL": {"#": "useWebGLCH"}, | 26 | "_useWebGL": {"#": "useWebGLCH"}, |
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 81facc49..010e77b2 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |