aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJon Reid2012-06-26 14:58:10 -0700
committerJon Reid2012-06-26 14:58:10 -0700
commit2599f74d72293b809929d8a0b36fb8e721f194cd (patch)
treeca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/data
parentab9d14780eed98f39786fae4518e69861b34bad7 (diff)
parente4304b9ac6c58802de4dd334be1f5802533f5160 (diff)
downloadninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/data')
-rw-r--r--js/data/panels-data.js38
-rwxr-xr-xjs/data/tools-data.js15
2 files changed, 51 insertions, 2 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index ffc76782..fd83d0c7 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -12,6 +12,7 @@ exports.PanelsData = Montage.create(Montage, {
12 value: [ 12 value: [
13 { 13 {
14 name: "Color", 14 name: "Color",
15 groups: ["default"],
15 height: 200, 16 height: 200,
16 minHeight: 200, 17 minHeight: 200,
17 maxHeight: null, 18 maxHeight: null,
@@ -24,6 +25,7 @@ exports.PanelsData = Montage.create(Montage, {
24 }, 25 },
25 { 26 {
26 name: "Properties", 27 name: "Properties",
28 groups: ["default", "ws-binding"],
27 minHeight: 200, 29 minHeight: 200,
28 height: 200, 30 height: 200,
29 maxHeight: null, 31 maxHeight: null,
@@ -36,6 +38,7 @@ exports.PanelsData = Montage.create(Montage, {
36 }, 38 },
37 { 39 {
38 name: "Materials", 40 name: "Materials",
41 groups: ["default"],
39 minHeight: 100, 42 minHeight: 100,
40 height: 100, 43 height: 100,
41 maxHeight: null, 44 maxHeight: null,
@@ -48,6 +51,7 @@ exports.PanelsData = Montage.create(Montage, {
48 }, 51 },
49 { 52 {
50 name: "Components", 53 name: "Components",
54 groups: ["default", "ws-binding"],
51 minHeight: 100, 55 minHeight: 100,
52 height: 200, 56 height: 200,
53 maxHeight: null, 57 maxHeight: null,
@@ -72,8 +76,9 @@ exports.PanelsData = Montage.create(Montage, {
72// }, 76// },
73 { 77 {
74 name: "CSS", 78 name: "CSS",
75 height: 200, 79 groups: ["default"],
76 minHeight: 200, 80 minHeight: 195,
81 height: 195,
77 maxHeight: null, 82 maxHeight: null,
78 flexible: true, 83 flexible: true,
79 scrollable: false, 84 scrollable: false,
@@ -84,6 +89,7 @@ exports.PanelsData = Montage.create(Montage, {
84 }, 89 },
85 { 90 {
86 name: "Presets", 91 name: "Presets",
92 groups: ["default"],
87 minHeight: 100, 93 minHeight: 100,
88 height: 100, 94 height: 100,
89 maxHeight: null, 95 maxHeight: null,
@@ -96,6 +102,7 @@ exports.PanelsData = Montage.create(Montage, {
96 }, 102 },
97 { 103 {
98 name: "History", 104 name: "History",
105 groups: ["default"],
99 minHeight: 100, 106 minHeight: 100,
100 height: 100, 107 height: 100,
101 maxHeight: null, 108 maxHeight: null,
@@ -105,7 +112,34 @@ exports.PanelsData = Montage.create(Montage, {
105 open: true, 112 open: true,
106 modulePath: "js/panels/history-panel/history.reel", 113 modulePath: "js/panels/history-panel/history.reel",
107 moduleName: "History" 114 moduleName: "History"
115 },
116 {
117 name: "Binding",
118 groups: ["ws-binding"],
119 minHeight: 100,
120 height: 100,
121 maxHeight: null,
122 flexible: true,
123 collapsed: true,
124 scrollable: true,
125 open: true,
126 modulePath: "js/panels/binding-panel.reel",
127 moduleName: "BindingPanel"
108 } 128 }
129// ,
130// {
131// name: "Objects",
132// groups: ["ws-binding"],
133// minHeight: 100,
134// height: 100,
135// maxHeight: null,
136// flexible: true,
137// collapsed: true,
138// scrollable: true,
139// open: true,
140// modulePath: "js/panels/objects/objects-panel.reel",
141// moduleName: "ObjectsPanel"
142// }
109 ] 143 ]
110 } 144 }
111 145
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 138f9f4d..8ed6433e 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -46,6 +46,9 @@ exports.ToolsData = Montage.create(Montage, {
46 zoomToolIndex: { 46 zoomToolIndex: {
47 value: 12 47 value: 12
48 }, 48 },
49 bindingToolIndex: {
50 value: 13
51 },
49 52
50 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above. 53 // NOTE: additions or removal of any tools, or any changes in the order of these entries requires updating the constant index properties above.
51 // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above 54 // Code in the keyboard mediator and ninja.js accesses the array below through the index constants above
@@ -243,6 +246,18 @@ exports.ToolsData = Montage.create(Montage, {
243 "container": false, 246 "container": false,
244 "subtools": [], 247 "subtools": [],
245 "selected": false 248 "selected": false
249 },
250 {
251 "id": "bindingTool",
252 "properties": "bindingProperties",
253 "spriteSheet": true,
254 "action": "bindingTool",
255 "toolTip": "Binding (B)",
256 "cursor": "url('images/cursors/binding.png'),default",
257 "lastInGroup": true,
258 "container": false,
259 "subtools": [],
260 "selected": false
246 } 261 }
247 ] 262 ]
248 }, 263 },