aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-25 11:14:40 -0700
committerArmen Kesablyan2012-06-25 11:14:40 -0700
commit446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch)
tree0b7e7154979754db2c0ebb7b7908c555068d515d /js/data
parent7867aec2620b65605180979b5049cfa154ca7dd1 (diff)
parent35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff)
downloadninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 },