diff options
Diffstat (limited to 'js/data')
| -rw-r--r-- | js/data/pi/pi-data.js | 28 | ||||
| -rw-r--r-- | js/data/tools-data.js | 6 |
2 files changed, 19 insertions, 15 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index de5cd34d..dd75e255 100644 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
| @@ -23,13 +23,13 @@ exports.PiData = Montage.create( Montage, { | |||
| 23 | { | 23 | { |
| 24 | type : "color", | 24 | type : "color", |
| 25 | id : "colorStroke", | 25 | id : "colorStroke", |
| 26 | prop: "border-color", | 26 | prop: "border", |
| 27 | label : "Stroke" | 27 | label : "Stroke" |
| 28 | }, | 28 | }, |
| 29 | { | 29 | { |
| 30 | type : "color", | 30 | type : "color", |
| 31 | id : "colorFill", | 31 | id : "colorFill", |
| 32 | prop: "background-color", | 32 | prop: "background", |
| 33 | divider : true | 33 | divider : true |
| 34 | } | 34 | } |
| 35 | ], | 35 | ], |
| @@ -102,11 +102,13 @@ exports.PiData = Montage.create( Montage, { | |||
| 102 | { | 102 | { |
| 103 | type : "color", | 103 | type : "color", |
| 104 | id : "colorStroke", | 104 | id : "colorStroke", |
| 105 | prop: "border", | ||
| 105 | label : "Stroke" | 106 | label : "Stroke" |
| 106 | }, | 107 | }, |
| 107 | { | 108 | { |
| 108 | type : "color", | 109 | type : "color", |
| 109 | id : "colorFill", | 110 | id : "colorFill", |
| 111 | prop: "background", | ||
| 110 | divider : true | 112 | divider : true |
| 111 | } | 113 | } |
| 112 | ], | 114 | ], |
| @@ -221,13 +223,13 @@ exports.PiData = Montage.create( Montage, { | |||
| 221 | { | 223 | { |
| 222 | type : "color", | 224 | type : "color", |
| 223 | id : "colorStroke", | 225 | id : "colorStroke", |
| 224 | prop: "border-color", | 226 | prop: "border", |
| 225 | label : "Stroke" | 227 | label : "Stroke" |
| 226 | }, | 228 | }, |
| 227 | { | 229 | { |
| 228 | type : "color", | 230 | type : "color", |
| 229 | id : "colorFill", | 231 | id : "colorFill", |
| 230 | prop: "background-color", | 232 | prop: "background", |
| 231 | divider : true | 233 | divider : true |
| 232 | } | 234 | } |
| 233 | ], | 235 | ], |
| @@ -279,13 +281,13 @@ exports.PiData = Montage.create( Montage, { | |||
| 279 | [ | 281 | [ |
| 280 | { | 282 | { |
| 281 | type : "color", | 283 | type : "color", |
| 282 | id : "stroke", | 284 | prop: "border", |
| 283 | prop : "stroke" | 285 | id : "stroke" |
| 284 | }, | 286 | }, |
| 285 | { | 287 | { |
| 286 | type : "color", | 288 | type : "color", |
| 289 | prop: "background", | ||
| 287 | id : "fill", | 290 | id : "fill", |
| 288 | prop : "fill", | ||
| 289 | divider : true | 291 | divider : true |
| 290 | } | 292 | } |
| 291 | ], | 293 | ], |
| @@ -399,12 +401,13 @@ exports.PiData = Montage.create( Montage, { | |||
| 399 | [ | 401 | [ |
| 400 | { | 402 | { |
| 401 | type : "color", | 403 | type : "color", |
| 402 | id : "stroke", | 404 | prop: "border", |
| 403 | prop : "stroke" | 405 | id : "stroke" |
| 404 | }, | 406 | }, |
| 405 | { | 407 | { |
| 406 | type : "color", | 408 | type : "color", |
| 407 | id : "fill", | 409 | id : "fill", |
| 410 | prop: "background", | ||
| 408 | visible : false, | 411 | visible : false, |
| 409 | divider : true | 412 | divider : true |
| 410 | } | 413 | } |
| @@ -451,13 +454,13 @@ exports.PiData = Montage.create( Montage, { | |||
| 451 | [ | 454 | [ |
| 452 | { | 455 | { |
| 453 | type : "color", | 456 | type : "color", |
| 454 | id : "stroke", | 457 | prop: "border", |
| 455 | prop : "stroke" | 458 | id : "stroke" |
| 456 | }, | 459 | }, |
| 457 | { | 460 | { |
| 458 | type : "color", | 461 | type : "color", |
| 462 | prop: "background", | ||
| 459 | id : "fill", | 463 | id : "fill", |
| 460 | prop : "fill", | ||
| 461 | divider : true | 464 | divider : true |
| 462 | } | 465 | } |
| 463 | ], | 466 | ], |
| @@ -467,6 +470,7 @@ exports.PiData = Montage.create( Montage, { | |||
| 467 | id : "strokeSize", | 470 | id : "strokeSize", |
| 468 | prop : "strokeSize", | 471 | prop : "strokeSize", |
| 469 | label : "Stroke", | 472 | label : "Stroke", |
| 473 | valueMutator: parseFloat, | ||
| 470 | min : 0, | 474 | min : 0, |
| 471 | max : 100, | 475 | max : 100, |
| 472 | value : 1, | 476 | value : 1, |
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 8ea84574..de965dbc 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
| @@ -37,7 +37,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 37 | "properties": "rotate3DProperties", | 37 | "properties": "rotate3DProperties", |
| 38 | "spriteSheet": true, | 38 | "spriteSheet": true, |
| 39 | "action": "Rotate3DTool", | 39 | "action": "Rotate3DTool", |
| 40 | "toolTip": "3D Rotate Object Tool", | 40 | "toolTip": "3D Rotate Object Tool (W)", |
| 41 | "cursor": "auto", | 41 | "cursor": "auto", |
| 42 | "lastInGroup": false, | 42 | "lastInGroup": false, |
| 43 | "container": false, | 43 | "container": false, |
| @@ -48,7 +48,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 48 | "properties": "translate3DProperties", | 48 | "properties": "translate3DProperties", |
| 49 | "spriteSheet": true, | 49 | "spriteSheet": true, |
| 50 | "action": "Translate3DTool", | 50 | "action": "Translate3DTool", |
| 51 | "toolTip": "3D Translate Object Tool", | 51 | "toolTip": "3D Translate Object Tool (G)", |
| 52 | "cursor": "auto", | 52 | "cursor": "auto", |
| 53 | "lastInGroup": true, | 53 | "lastInGroup": true, |
| 54 | "container": false, | 54 | "container": false, |
| @@ -206,7 +206,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
| 206 | "properties": "panProperties", | 206 | "properties": "panProperties", |
| 207 | "spriteSheet": true, | 207 | "spriteSheet": true, |
| 208 | "action": "PanTool", | 208 | "action": "PanTool", |
| 209 | "toolTip": "Pan Tool", | 209 | "toolTip": "Hand Tool (H)", |
| 210 | "cursor": "url('images/tools/hand_down.png'), default", | 210 | "cursor": "url('images/tools/hand_down.png'), default", |
| 211 | "lastInGroup": false, | 211 | "lastInGroup": false, |
| 212 | "container": false, | 212 | "container": false, |