diff options
Diffstat (limited to 'js/data')
-rw-r--r-- | js/data/panels-data.js | 12 | ||||
-rwxr-xr-x | js/data/pi/pi-data.js | 2 | ||||
-rwxr-xr-x | js/data/tools-data.js | 6 |
3 files changed, 17 insertions, 3 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index fd07b4fe..7ab40f11 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -105,6 +105,18 @@ exports.PanelsData = Montage.create(Montage, { | |||
105 | open: true, | 105 | open: true, |
106 | modulePath: "js/panels/presets/content.reel", | 106 | modulePath: "js/panels/presets/content.reel", |
107 | moduleName: "content" | 107 | moduleName: "content" |
108 | }, | ||
109 | { | ||
110 | name: "History", | ||
111 | minHeight: 100, | ||
112 | height: 100, | ||
113 | maxHeight: null, | ||
114 | flexible: true, | ||
115 | collapsed: true, | ||
116 | scrollable: true, | ||
117 | open: true, | ||
118 | modulePath: "js/panels/history-panel/history.reel", | ||
119 | moduleName: "History" | ||
108 | } | 120 | } |
109 | ] | 121 | ] |
110 | } | 122 | } |
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 07017f09..157c54ec 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, { | |||
131 | type : "hottext", | 131 | type : "hottext", |
132 | id : "borderWidth", | 132 | id : "borderWidth", |
133 | prop : "border-width", | 133 | prop : "border-width", |
134 | defaultValue: 0, | ||
135 | valueMutator: parseFloat, | ||
134 | label : "Border", | 136 | label : "Border", |
135 | min : 0, | 137 | min : 0, |
136 | max : 100, | 138 | max : 100, |
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index faf3336f..4d009530 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js | |||
@@ -151,7 +151,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
151 | "properties": "fillProperties", | 151 | "properties": "fillProperties", |
152 | "spriteSheet": true, | 152 | "spriteSheet": true, |
153 | "action": "FillTool", | 153 | "action": "FillTool", |
154 | "toolTip": "Fill Tool", | 154 | "toolTip": "Paint Bucket Tool (K)", |
155 | "cursor": "url('images/tools/bucket_down.png'), default", | 155 | "cursor": "url('images/tools/bucket_down.png'), default", |
156 | "lastInGroup": false, | 156 | "lastInGroup": false, |
157 | "container": false, | 157 | "container": false, |
@@ -162,7 +162,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
162 | "properties": "inkbottleProperties", | 162 | "properties": "inkbottleProperties", |
163 | "spriteSheet": true, | 163 | "spriteSheet": true, |
164 | "action": "InkBottleTool", | 164 | "action": "InkBottleTool", |
165 | "toolTip": "Ink Bottle Tool", | 165 | "toolTip": "Ink Bottle Tool (K)", |
166 | "cursor": "url('images/tools/inkbottle_down.png'), default", | 166 | "cursor": "url('images/tools/inkbottle_down.png'), default", |
167 | "lastInGroup": true, | 167 | "lastInGroup": true, |
168 | "container": false, | 168 | "container": false, |
@@ -173,7 +173,7 @@ exports.ToolsData = Montage.create(Montage, { | |||
173 | "properties": "eyedropperProperties", | 173 | "properties": "eyedropperProperties", |
174 | "spriteSheet": true, | 174 | "spriteSheet": true, |
175 | "action": "EyedropperTool", | 175 | "action": "EyedropperTool", |
176 | "toolTip": "Eyedropper Tool", | 176 | "toolTip": "Eyedropper Tool (I)", |
177 | "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", | 177 | "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", |
178 | "lastInGroup": false, | 178 | "lastInGroup": false, |
179 | "container": false, | 179 | "container": false, |