aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-20 10:44:02 -0700
committerJose Antonio Marquez2012-04-20 10:44:02 -0700
commit0b7848540a7ca84b7c67821fedc275cf243eff2f (patch)
treea26b2986d412a02eb93fc7fa1b0f495cab40e757 /js/data
parent154d1a8fdbbe050dbfc97cd13baa8981d8fc1e47 (diff)
parent8a546291a9d0de3bda1a7765ae9008f2ad052bba (diff)
downloadninja-0b7848540a7ca84b7c67821fedc275cf243eff2f.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/data')
-rw-r--r--js/data/panels-data.js12
-rwxr-xr-xjs/data/tools-data.js6
2 files changed, 15 insertions, 3 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7a2d817a..f613a3be 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, {
93 open: true, 93 open: true,
94 modulePath: "js/panels/presets/content.reel", 94 modulePath: "js/panels/presets/content.reel",
95 moduleName: "content" 95 moduleName: "content"
96 },
97 {
98 name: "History",
99 minHeight: 100,
100 height: 100,
101 maxHeight: null,
102 flexible: true,
103 collapsed: true,
104 scrollable: true,
105 open: true,
106 modulePath: "js/panels/history-panel/history.reel",
107 moduleName: "History"
96 } 108 }
97 ] 109 ]
98 } 110 }
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,