diff options
author | John Mayhew | 2012-04-02 16:28:39 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-02 16:28:39 -0700 |
commit | b4155fb4c33675a8a7cd37473513718043fdf0ba (patch) | |
tree | 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/data | |
parent | 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff) | |
parent | c6de22bf42be90b403491b5f87b1818d9020310c (diff) | |
download | ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/helper-classes/RDGE/rdge-compiled.js
js/helper-classes/RDGE/runtime/GLRuntime.js
js/helper-classes/RDGE/src/core/script/MeshManager.js
js/helper-classes/RDGE/src/core/script/engine.js
js/helper-classes/RDGE/src/core/script/fx/ssao.js
js/helper-classes/RDGE/src/core/script/init_state.js
js/helper-classes/RDGE/src/core/script/run_state.js
js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
js/helper-classes/RDGE/src/core/script/utilities.js
js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
js/helper-classes/RDGE/src/tools/rdge-compiled.js
js/lib/drawing/world.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/linear-gradient-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-blur-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
js/preloader/Preloader.js
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/menu-data.js | 874 | ||||
-rwxr-xr-x | js/data/pi/pi-data.js | 209 |
2 files changed, 702 insertions, 381 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 52710b3a..3333d209 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js | |||
@@ -4,408 +4,522 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage; |
8 | 8 | ||
9 | exports.MenuData = Montage.create( Montage, { | 9 | exports.MenuData = Montage.create( Montage, { |
10 | topLevelMenu: { | 10 | topLevelMenu: { |
11 | value: [ | 11 | value: [ |
12 | { | 12 | { |
13 | "header": "File", | 13 | "header": "File", |
14 | "entries": [ | 14 | "entries": [ |
15 | { | 15 | { |
16 | "displayText" : "New Project", | 16 | "displayText" : "New Project", |
17 | "hasSubMenu" : false, | 17 | "hasSubMenu" : false, |
18 | "enabled": false, | 18 | "enabled": false, |
19 | "action": "executeNewProject" | 19 | "action": "executeNewProject" |
20 | }, | 20 | }, |
21 | { | 21 | { |
22 | "displayText" : "New File", | 22 | "displayText" : "New File", |
23 | "hasSubMenu" : false, | 23 | "hasSubMenu" : false, |
24 | "enabled": true, | 24 | "enabled": true, |
25 | "action": "executeNewFile" | 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": "executeFileOpen" | 31 | "action": "executeFileOpen" |
32 | }, | 32 | }, |
33 | { | 33 | { |
34 | "displayText" : "", | 34 | "displayText" : "Close File", |
35 | "separator": true | 35 | "hasSubMenu" : false, |
36 | }, | 36 | "enabled": { |
37 | { | 37 | "value": false, |
38 | "displayText" : "Save", | 38 | "boundObj": "documentController", |
39 | "hasSubMenu" : false, | 39 | "boundProperty": "activeDocument", |
40 | "enabled": true, | 40 | "oneway": true, |
41 | "action": "executeSave" | 41 | "boundValueMutator": function(activeDocument){ |
42 | }, | 42 | if(activeDocument !== null){return true;} |
43 | { | 43 | else{return false;} |
44 | "displayText" : "Save As", | 44 | } |
45 | "hasSubMenu" : false, | 45 | }, |
46 | "enabled": true, | 46 | "action": "executeFileClose" |
47 | "action":"executeSaveAs" | 47 | }, |
48 | }, | 48 | { |
49 | { | 49 | "displayText" : "Close All", |
50 | "displayText" : "Save All", | 50 | "hasSubMenu" : false, |
51 | "hasSubMenu" : false, | 51 | "enabled": { |
52 | "enabled": true, | 52 | "value": false, |
53 | "action": "executeSaveAll" | 53 | "boundObj": "documentController", |
54 | }, | 54 | "boundProperty": "activeDocument", |
55 | { | 55 | "oneway": true, |
56 | "displayText" : "", | 56 | "boundValueMutator": function(activeDocument){ |
57 | "separator": true | 57 | if(activeDocument !== null){return true;} |
58 | }, | 58 | else{return false;} |
59 | { | 59 | } |
60 | "displayText" : "Open Project", | 60 | }, |
61 | "hasSubMenu" : false, | 61 | "action": "executeFileCloseAll" |
62 | "enabled": false | 62 | }, |
63 | }, | 63 | { |
64 | { | 64 | "displayText" : "", |
65 | "displayText" : "Open Recent", | 65 | "separator": true |
66 | "hasSubMenu" : false, | 66 | }, |
67 | "enabled": false | 67 | { |
68 | }, | 68 | "displayText" : "Save", |
69 | { | 69 | "hasSubMenu" : false, |
70 | "displayText" : "Close Project", | 70 | "enabled": { |
71 | "hasSubMenu" : false, | 71 | "value": false, |
72 | "enabled": false | 72 | "boundObj": "documentController", |
73 | } | 73 | "boundProperty": "canSave", |
74 | ] | 74 | "oneway": true |
75 | }, | 75 | }, |
76 | { | 76 | "action": "executeSave" |
77 | "header": "Edit", | 77 | }, |
78 | "entries": [ | 78 | { |
79 | { | 79 | "displayText" : "Save As", |
80 | "displayText" : "Undo", | 80 | "hasSubMenu" : false, |
81 | "hasSubMenu" : false, | 81 | "enabled": { |
82 | "enabled": { | 82 | "value": false, |
83 | "value": false, | 83 | "boundObj": "documentController", |
84 | "boundObj": "undocontroller", | 84 | "boundProperty": "activeDocument", |
85 | "boundProperty": "canUndo" | 85 | "oneway": true, |
86 | }, | 86 | "boundValueMutator": function(activeDocument){ |
87 | "action": "executeUndo" | 87 | if(activeDocument !== null){return true;} |
88 | }, | 88 | else{return false;} |
89 | { | 89 | } |
90 | "displayText" : "Redo", | 90 | }, |
91 | "hasSubMenu" : false, | 91 | "action":"executeSaveAs" |
92 | "enabled": { | 92 | }, |
93 | "value": false, | 93 | { |
94 | "boundObj": "undocontroller", | 94 | "displayText" : "Save All", |
95 | "boundProperty": "canRedo" | 95 | "hasSubMenu" : false, |
96 | }, | 96 | "enabled": { |
97 | "action": "executeRedo" | 97 | "value": false, |
98 | }, | 98 | "boundObj": "documentController", |
99 | { | 99 | "boundProperty": "canSaveAll", |
100 | "displayText" : "Cut", | 100 | "oneway": true, |
101 | "hasSubMenu" : false, | 101 | "boundValueMutator": function(canSaveAll){ |
102 | "enabled": true | 102 | if(canSaveAll === true){return true;} |
103 | }, | 103 | else{return false;} |
104 | { | 104 | } |
105 | "displayText" : "Copy", | 105 | }, |
106 | "hasSubMenu" : false, | 106 | "action": "executeSaveAll" |
107 | "enabled": true | 107 | }, |
108 | }, | 108 | { |
109 | { | 109 | "displayText" : "", |
110 | "displayText" : "Paste", | 110 | "separator": true |
111 | "hasSubMenu" : false, | 111 | }, |
112 | "enabled": true | 112 | { |
113 | } | 113 | "displayText" : "Open Project", |
114 | ] | 114 | "hasSubMenu" : false, |
115 | }, | 115 | "enabled": false |
116 | { | 116 | }, |
117 | "header": "View", | 117 | { |
118 | "entries": [ | 118 | "displayText" : "Open Recent", |
119 | { | 119 | "hasSubMenu" : false, |
120 | "displayText" : "Zoom In", | 120 | "enabled": false |
121 | "hasSubMenu" : false, | 121 | }, |
122 | "enabled": true | 122 | { |
123 | }, | 123 | "displayText" : "Close Project", |
124 | { | 124 | "hasSubMenu" : false, |
125 | "displayText" : "Zoom Out", | 125 | "enabled": false |
126 | "hasSubMenu" : false, | ||
127 | "enabled": true | ||
128 | }, | ||
129 | { | ||
130 | "displayText" : "", | ||
131 | "separator": true | ||
132 | }, | ||
133 | { | ||
134 | "displayText" : "Live Preview", | ||
135 | "hasSubMenu" : false, | ||
136 | "enabled": true, | ||
137 | "checked": { | ||
138 | "value": false, | ||
139 | "boundProperty": "livePreview" | ||
140 | } | 126 | } |
141 | }, | 127 | ] |
142 | { | 128 | }, |
143 | "displayText" : "Chrome Preview", | 129 | { |
144 | "hasSubMenu" : false, | 130 | "header": "Edit", |
145 | "enabled": true, | 131 | "entries": [ |
146 | "checked": { | 132 | { |
147 | "value": false, | 133 | "displayText" : "Undo", |
148 | "boundProperty": "chromePreview" | 134 | "hasSubMenu" : false, |
135 | "enabled": { | ||
136 | "value": false, | ||
137 | "boundObj": "undocontroller", | ||
138 | "boundProperty": "canUndo", | ||
139 | "oneway": true | ||
140 | }, | ||
141 | "action": "executeUndo" | ||
142 | }, | ||
143 | { | ||