diff options
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/menu-data.js | 47 | ||||
-rw-r--r-- | js/data/panels-data.js | 12 | ||||
-rwxr-xr-x | js/data/pi/pi-data.js | 18 | ||||
-rwxr-xr-x | js/data/tools-data.js | 89 |
4 files changed, 73 insertions, 93 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index e18fb5cf..0a40f1e8 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js | |||
@@ -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 | }, |
@@ -130,18 +115,6 @@ exports.MenuData = Montage.create( Montage, { | |||
130 | { | 115 | { |
131 | "displayText" : "", | 116 | "displayText" : "", |
132 | "separator": true | 117 | "separator": true |
133 | }, | ||
134 | { | ||
135 | "displayText" : "New Webpage", | ||
136 | "hasSubMenu" : false, | ||
137 | "enabled": true, | ||
138 | "action": "executeNewWebpage" | ||
139 | }, | ||
140 | { | ||
141 | "displayText" : "Open Webpage", | ||
142 | "hasSubMenu" : false, | ||
143 | "enabled": true, | ||
144 | "action": "executeWebpageOpen" | ||
145 | } | 118 | } |
146 | ] | 119 | ] |
147 | }, | 120 | }, |
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index f613a3be..ffc76782 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -72,15 +72,15 @@ exports.PanelsData = Montage.create(Montage, { | |||
72 | // }, | 72 | // }, |
73 | { | 73 | { |
74 | name: "CSS", | 74 | name: "CSS", |
75 | minHeight: 195, | 75 | height: 200, |
76 | height: 195, | 76 | minHeight: 200, |
77 | maxHeight: null, | 77 | maxHeight: null, |
78 | flexible: true, | 78 | flexible: true, |
79 | scrollable: true, | 79 | scrollable: false, |
80 | collapsed: true, | 80 | collapsed: false, |
81 | open: true, | 81 | open: true, |
82 | modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", | 82 | modulePath: "js/panels/css-panel/css-panel.reel", |
83 | moduleName: "CSSPanelBase" | 83 | moduleName: "CssPanel" |
84 | }, | 84 | }, |
85 | { | 85 | { |
86 | name: "Presets", | 86 | name: "Presets", |
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index d1dc9f34..157cbc64 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -14,25 +14,11 @@ exports.PiData = Montage.create( Montage, { | |||
14 | { | 14 | { |
15 | label: "Style", | 15 | label: "Style", |
16 | 16 | ||
17 | Section: [ | ||
18 | [ | ||
19 | |||
20 | ] | ||
21 | ] | ||
22 | } | ||
23 | ] | ||
24 | }, | ||
25 | |||
26 | stagePi: { | ||
27 | value: [ | ||
28 | { | ||
29 | label: "Style", | ||
30 | |||
31 | Section: [ | 17 | Section: [ |
32 | [ | 18 | [ |
33 | { | 19 | { |
34 | type : "chip", | 20 | type: "chip", |
35 | id : "background", | 21 | id: "background", |
36 | prop: "background" | 22 | prop: "background" |
37 | } | 23 | } |
38 | ] | 24 | ] |
diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 4d009530..05455efe 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 | |||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | 8 | ||
9 | exports.ToolsData = Montage.create(Montage, { | 9 | exports.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 | { |
@@ -19,20 +60,10 @@ exports.ToolsData = Montage.create(Montage, { | |||
19 | "cursor": "auto", | 60 | "cursor": "auto", |
20 | "lastInGroup": false, | 61 | "lastInGroup": false, |
21 | "container": false, | 62 | "container": false, |
63 | "subtools": [], | ||
22 | "selected": true | 64 | "selected": true |
23 | }, | 65 | }, |
24 | { | 66 | { |
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", | 67 | "id": "RotateTool3D", |
37 | "properties": "rotate3DProperties", | 68 | "properties": "rotate3DProperties", |
38 | "spriteSheet": true, | 69 | "spriteSheet": true, |
@@ -41,6 +72,7 @@ exp |