diff options
| author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
| commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
| tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/data/menu-data.js | |
| parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/data/menu-data.js')
| -rwxr-xr-x | js/data/menu-data.js | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 9e8bf945..aeb95ccc 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 | }, |