aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorJon Reid2012-06-25 11:07:33 -0700
committerJon Reid2012-06-25 11:07:33 -0700
commit831e3058a9d58c5e56066d2ff90e572be17d6f7e (patch)
treeaa6acda9aeddad8f93cae63b955349a442ddf01f /js/data
parent82638621ed793fcb37438798363dba151efd9cd2 (diff)
parentda3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff)
downloadninja-831e3058a9d58c5e56066d2ff90e572be17d6f7e.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both.
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index b6350893..386d5d87 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -170,17 +170,20 @@ exports.MenuData = Montage.create(Component, {
170 { 170 {
171 "displayText" : "Cut", 171 "displayText" : "Cut",
172 "hasSubMenu" : false, 172 "hasSubMenu" : false,
173 "enabled": false 173 "enabled": true,
174 "action": "executeCut"
174 }, 175 },
175 { 176 {
176 "displayText" : "Copy", 177 "displayText" : "Copy",
177 "hasSubMenu" : false, 178 "hasSubMenu" : false,
178 "enabled": false 179 "enabled": true,
180 "action": "executeCopy"
179 }, 181 },
180 { 182 {
181 "displayText" : "Paste", 183 "displayText" : "Paste",
182 "hasSubMenu" : false, 184 "hasSubMenu" : false,
183 "enabled": false 185 "enabled": true,
186 "action": "executePaste"
184 } 187 }
185 ] 188 ]
186 }, 189 },