aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-17 14:01:38 -0700
committerArmen Kesablyan2012-05-17 14:01:38 -0700
commit6c8f3525b839e82cf43df43700a0160ee2c5458f (patch)
tree3fb801fa54b759c5568d75bb467e02652ce77c3e /js/data
parente8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff)
parent342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff)
downloadninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js39
-rwxr-xr-xjs/data/tools-data.js76
2 files changed, 54 insertions, 61 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 1cde3e8d..aeb95ccc 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -22,13 +22,13 @@ exports.MenuData = Montage.create( Montage, {
22 "displayText" : "New File", 22 "displayText" : "New File",
23 "hasSubMenu" : false, 23 "hasSubMenu" : false,
24 "enabled": true, 24 "enabled": true,
25 "action": "executeNewWebpage" 25 "action": "executeNewFile"
26 }, 26 },
27 { 27 {
28 "displayText" : "Open File", 28 "displayText" : "Open File",
29 "hasSubMenu" : false, 29 "hasSubMenu" : false,
30 "enabled": true, 30 "enabled": true,
31 "action": "executeWebpageOpen" 31 "action": "executeFileOpen"
32 }, 32 },
33 { 33 {
34 "displayText" : "Close File", 34 "displayText" : "Close File",
@@ -36,11 +36,8 @@ exports.MenuData = Montage.create( Montage, {
36 "enabled": { 36 "enabled": {
37 "value": false, 37 "value": false,
38 "boundObj": "documentController", 38 "boundObj": "documentController",
39 "boundProperty": "activeDocument", 39 "boundProperty": "_documents.count()",
40 "oneway": true, 40 "oneway": true
41 "boundValueMutator": function(activeDocument){
42 return activeDocument !== null;
43 }
44 }, 41 },
45 "action": "executeFileClose" 42 "action": "executeFileClose"
46 }, 43 },
@@ -50,11 +47,8 @@ exports.MenuData = Montage.create( Montage, {
50 "enabled": { 47 "enabled": {
51 "value": false, 48 "value": false,
52 "boundObj": "documentController", 49 "boundObj": "documentController",
53 "boundProperty": "activeDocument", 50 "boundProperty": "_documents.count()",
54 "oneway": true, 51 "oneway": true
55 "boundValueMutator": function(activeDocument){
56 return activeDocument !== null;
57 }
58 }, 52 },
59 "action": "executeFileCloseAll" 53 "action": "executeFileCloseAll"
60 }, 54 },
@@ -68,11 +62,8 @@ exports.MenuData = Montage.create( Montage, {
68 "enabled": { 62 "enabled": {
69 "value": false, 63 "value": false,
70 "boundObj": "documentController", 64 "boundObj": "documentController",
71 "boundProperty": "activeDocument", 65 "boundProperty": "_documents.count()",
72 "oneway": true, 66 "oneway": true
73 "boundValueMutator": function(activeDocument){
74 return activeDocument !== null;
75 }
76 }, 67 },
77 "action": "executeSave" 68 "action": "executeSave"
78 }, 69 },
@@ -82,11 +73,8 @@ exports.MenuData = Montage.create( Montage, {
82 "enabled": { 73 "enabled": {
83 "value": false, 74 "value": false,
84 "boundObj": "documentController", 75 "boundObj": "documentController",
85 "boundProperty": "activeDocument", 76 "boundProperty": "_documents.count()",
86 "oneway": true, 77 "oneway": true
87 "boundValueMutator": function(activeDocument) {
88 return activeDocument !== null;
89 }
90 }, 78 },
91 "action":"executeSaveAs" 79 "action":"executeSaveAs"
92 }, 80 },
@@ -96,11 +84,8 @@ exports.MenuData = Montage.create( Montage, {
96 "enabled": { 84 "enabled": {
97 "value": false, 85 "value": false,
98 "boundObj": "documentController", 86 "boundObj": "documentController",
99 "boundProperty": "activeDocument", 87 "boundProperty": "_documents.count()",
100 "oneway": true, 88 "oneway": true
101 "boundValueMutator": function(activeDocument){
102 return activeDocument !== null;
103 }
104 }, 89 },
105 "action": "executeSaveAll" 90 "action": "executeSaveAll"
106 }, 91 },
diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 12c6c965..257302b3 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -7,7 +7,48 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8 8
9exports.ToolsData = Montage.create(Montage, { 9exports.ToolsData = Montage.create(Montage, {
10 selectionToolIndex : {
11 value: 0
12 },
13 rotate3DToolIndex: {
14 value: 1
15 },
16 translate3DToolIndex: {
17 value: 2
18 },
19 tagToolIndex: {
20 value: 3
21 },
22 penToolIndex: {
23 value: 4
24 },
25 textToolIndex: {
26 value: 5
27 },
28 shapeToolIndex: {
29 value: 6
30 },
31 brushToolIndex: {
32 value: 7
33 },
34 fillToolIndex: {
35 value: 8
36 },
37 inkBottleToolIndex: {
38 value: 9
39 },
40 rotateStage3DToolIndex: {
41 value: 10
42 },
43 panToolIndex: {
44 value: 11
45 },
46 zoomToolIndex: {
47 value: 12
48 },
10 49
50 // 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
11 defaultToolsData: { 52 defaultToolsData: {
12 value: [ 53 value: [
13 { 54 {
@@ -22,17 +63,6 @@ exports.ToolsData = Montage.create(Montage, {
22 "selected": true 63 "selected": true
23 }, 64 },
24 { 65 {
25 "id": "SubselectionTool",
26 "properties": "subSelectionProperties",
27 "spriteSheet": true,
28 "action": "SubselectionTool",
29 "toolTip": "Subselect Tool",
30 "cursor": "auto",
31 "lastInGroup": true,
32 "container": false,
33 "selected": false
34 },
35 {
36 "id": "RotateTool3D", 66 "id": "RotateTool3D",
37 "properties": "rotate3DProperties", 67 "properties": "rotate3DProperties",
38 "spriteSheet": true, 68 "spriteSheet": true,
@@ -125,17 +155,6 @@ exports.ToolsData = Montage.create(Montage, {
125 "selected": false 155 "selected": false
126 }, 156 },
127 { 157 {
128 "id": "PencilTool",
129 "properties": "pencilProperties",
130 "spriteSheet": true,
131 "action": "PencilTool",
132 "toolTip": "Pencil Tool",
133 "cursor": "auto",
134 "lastInGroup": false,
135 "container": false,
136 "selected": false
137 },
138 {
139 "id": "BrushTool", 158 "id": "BrushTool",
140 "properties": "brushProperties", 159 "properties": "brushProperties",
141 "spriteSheet": true, 160 "spriteSheet": true,
@@ -163,22 +182,11 @@ exports.ToolsData = Montage.create(Montage, {
163 "spriteSheet": true, 182 "spriteSheet": true,
164 "action": "InkBottleTool", 183 "action": "InkBottleTool",
165 "toolTip": "Ink Bottle Tool (K)", 184 "toolTip": "Ink Bottle Tool (K)",
166 "cursor": "url('images/tools/inkbottle_down.png'), default", 185 "cursor": "url('images/tools/inkbottle_cursor.png'), default",
167 "lastInGroup": true, 186 "lastInGroup": true,
168 "container": false, 187 "container": false,
169 "selected": false 188 "selected": false
170 }, 189 },
171 {
172 "id": "EyedropperTool",
173 "properties": "eyedropperProperties",
174 "spriteSheet": true,
175 "action": "EyedropperTool",
176 "toolTip": "Eyedropper Tool (I)",
177 "cursor": "url('images/tools/eyedropper_down.png') 6 20, default",
178 "lastInGroup": false,
179 "container": false,
180 "selected": false
181 },
182// { 190// {
183// "id": "EraserTool", 191// "id": "EraserTool",
184// "properties": "eraserProperties", 192// "properties": "eraserProperties",
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 21:36:17 +0000