aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorhwc4872012-04-04 16:32:53 -0700
committerhwc4872012-04-04 16:32:53 -0700
commit6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch)
treef267e05f623ed90d1cc841b8c79a338d6d8e807c /js/data
parent16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff)
parent17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff)
downloadninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts: js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 3333d209..a1fe2703 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -70,8 +70,12 @@ exports.MenuData = Montage.create( Montage, {
70 "enabled": { 70 "enabled": {
71 "value": false, 71 "value": false,
72 "boundObj": "documentController", 72 "boundObj": "documentController",
73 "boundProperty": "canSave", 73 "boundProperty": "activeDocument",
74 "oneway": true 74 "oneway": true,
75 "boundValueMutator": function(activeDocument){
76 if(activeDocument !== null){return true;}
77 else{return false;}
78 }
75 }, 79 },
76 "action": "executeSave" 80 "action": "executeSave"
77 }, 81 },
@@ -96,10 +100,10 @@ exports.MenuData = Montage.create( Montage, {
96 "enabled": { 100 "enabled": {
97 "value": false, 101 "value": false,
98 "boundObj": "documentController", 102 "boundObj": "documentController",
99 "boundProperty": "canSaveAll", 103 "boundProperty": "activeDocument",
100 "oneway": true, 104 "oneway": true,
101 "boundValueMutator": function(canSaveAll){ 105 "boundValueMutator": function(activeDocument){
102 if(canSaveAll === true){return true;} 106 if(activeDocument !== null){return true;}
103 else{return false;} 107 else{return false;}
104 } 108 }
105 }, 109 },