- Fix (Context menus): Avoid showing double shortcuts (#285); add some

missing ones

CHANGES.md

@@ -8,7 +8,9 @@
   PDF as export (#273 @cuixiping); fixes #124 and #254
 - Fix (image import): Put src after onload to avoid missing event;
   check other width/height properties in case offset is 0; fixes #278
-- Fix (image export) Export in Chrome; fixes #282
+- Fix (image export): Export in Chrome; fixes #282
+- Fix (Context menus): Avoid showing double shortcuts (#285); add some
+  missing ones
 - npm: Update devDeps
 - npm: Point to official sinon-test package now that ES6 Modules
     support landed

dist/locale/lang.en.js

@@ -127,10 +127,10 @@ var svgEditorLang_en = (function () {
       set_link_url: 'Set link URL (leave empty to remove)',
       to_path: 'Convert to Path',
       reorient_path: 'Reorient path',
-      ungroup: 'Ungroup Elements [G]',
+      ungroup: 'Ungroup Elements',
       docprops: 'Document Properties [D]',
-      move_bottom: 'Send to Back [ Ctrl+Shift+[ ]',
-      move_top: 'Bring to Front [ Ctrl+Shift+] ]',
+      move_bottom: 'Send to Back',
+      move_top: 'Bring to Front',
       node_clone: 'Clone Node',
       node_delete: 'Delete Node',
       node_link: 'Link Control Points',
@@ -143,10 +143,10 @@ var svgEditorLang_en = (function () {
       paste_in_place: 'Paste in Place',
       delete: 'Delete',
       group: 'Group',
-      move_front: 'Bring to Front [ Ctrl-Shift+] ]',
-      move_up: 'Bring Forward [ Ctrl+] ]',
-      move_down: 'Send Backward [ Ctrl+[ ]',
-      move_back: 'Send to Back [ Ctrl+Shift+[ ]'
+      move_front: 'Bring to Front',
+      move_up: 'Bring Forward',
+      move_down: 'Send Backward',
+      move_back: 'Send to Back'
     },
     layers: {
       layer: 'Layer',

editor/locale/lang.en.js

@@ -124,10 +124,10 @@ export default {
     set_link_url: 'Set link URL (leave empty to remove)',
     to_path: 'Convert to Path',
     reorient_path: 'Reorient path',
-    ungroup: 'Ungroup Elements [G]',
+    ungroup: 'Ungroup Elements',
     docprops: 'Document Properties [D]',
-    move_bottom: 'Send to Back [ Ctrl+Shift+[ ]',
-    move_top: 'Bring to Front [ Ctrl+Shift+] ]',
+    move_bottom: 'Send to Back',
+    move_top: 'Bring to Front',
     node_clone: 'Clone Node',
     node_delete: 'Delete Node',
     node_link: 'Link Control Points',
@@ -140,10 +140,10 @@ export default {
     paste_in_place: 'Paste in Place',
     delete: 'Delete',
     group: 'Group',
-    move_front: 'Bring to Front [ Ctrl-Shift+] ]',
-    move_up: 'Bring Forward [ Ctrl+] ]',
-    move_down: 'Send Backward [ Ctrl+[ ]',
-    move_back: 'Send to Back [ Ctrl+Shift+[ ]'
+    move_front: 'Bring to Front',
+    move_up: 'Bring Forward',
+    move_down: 'Send Backward',
+    move_back: 'Send to Back'
   },
   layers: {
     layer: 'Layer',

editor/svg-editor-es.html

@@ -748,17 +748,17 @@
   </div>
 </div>
 <ul id="cmenu_canvas" class="contextMenu">
-  <li><a href="#cut">Cut</a></li>
-  <li><a href="#copy">Copy</a></li>
+  <li><a href="#cut">Cut<span class="shortcut">META+X</span></a></li>
+  <li><a href="#copy">Copy<span class="shortcut">META+C</span></a></li>
   <li><a href="#paste">Paste</a></li>
   <li><a href="#paste_in_place">Paste in Place</a></li>
-  <li class="separator"><a href="#delete">Delete</a></li>
+  <li class="separator"><a href="#delete">Delete<span class="shortcut">BACKSPACE</span></a></li>
   <li class="separator"><a href="#group">Group<span class="shortcut">G</span></a></li>
   <li><a href="#ungroup">Ungroup<span class="shortcut">G</span></a></li>
-  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">SHFT+CTRL+]</span></a></li>
+  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">CTRL+SHFT+]</span></a></li>
   <li><a href="#move_up">Bring Forward<span class="shortcut">CTRL+]</span></a></li>
   <li><a href="#move_down">Send Backward<span class="shortcut">CTRL+[</span></a></li>
-  <li><a href="#move_back">Send to Back<span class="shortcut">SHFT+CTRL+[</span></a></li>
+  <li><a href="#move_back">Send to Back<span class="shortcut">CTRL+SHFT+[</span></a></li>
 </ul>
 <ul id="cmenu_layers" class="contextMenu">
   <li><a href="#dupe">Duplicate Layer...</a></li>

editor/svg-editor.html

@@ -749,17 +749,17 @@
   </div>
 </div>
 <ul id="cmenu_canvas" class="contextMenu">
-  <li><a href="#cut">Cut</a></li>
-  <li><a href="#copy">Copy</a></li>
+  <li><a href="#cut">Cut<span class="shortcut">META+X</span></a></li>
+  <li><a href="#copy">Copy<span class="shortcut">META+C</span></a></li>
   <li><a href="#paste">Paste</a></li>
   <li><a href="#paste_in_place">Paste in Place</a></li>
-  <li class="separator"><a href="#delete">Delete</a></li>
+  <li class="separator"><a href="#delete">Delete<span class="shortcut">BACKSPACE</span></a></li>
   <li class="separator"><a href="#group">Group<span class="shortcut">G</span></a></li>
   <li><a href="#ungroup">Ungroup<span class="shortcut">G</span></a></li>
-  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">SHFT+CTRL+]</span></a></li>
+  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">CTRL+SHFT+]</span></a></li>
   <li><a href="#move_up">Bring Forward<span class="shortcut">CTRL+]</span></a></li>
   <li><a href="#move_down">Send Backward<span class="shortcut">CTRL+[</span></a></li>
-  <li><a href="#move_back">Send to Back<span class="shortcut">SHFT+CTRL+[</span></a></li>
+  <li><a href="#move_back">Send to Back<span class="shortcut">CTRL+SHFT+[</span></a></li>
 </ul>
 <ul id="cmenu_layers" class="contextMenu">
   <li><a href="#dupe">Duplicate Layer...</a></li>

editor/xdomain-svg-editor-es.html

@@ -748,17 +748,17 @@
   </div>
 </div>
 <ul id="cmenu_canvas" class="contextMenu">
-  <li><a href="#cut">Cut</a></li>
-  <li><a href="#copy">Copy</a></li>
+  <li><a href="#cut">Cut<span class="shortcut">META+X</span></a></li>
+  <li><a href="#copy">Copy<span class="shortcut">META+C</span></a></li>
   <li><a href="#paste">Paste</a></li>
   <li><a href="#paste_in_place">Paste in Place</a></li>
-  <li class="separator"><a href="#delete">Delete</a></li>
+  <li class="separator"><a href="#delete">Delete<span class="shortcut">BACKSPACE</span></a></li>
   <li class="separator"><a href="#group">Group<span class="shortcut">G</span></a></li>
   <li><a href="#ungroup">Ungroup<span class="shortcut">G</span></a></li>
-  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">SHFT+CTRL+]</span></a></li>
+  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">CTRL+SHFT+]</span></a></li>
   <li><a href="#move_up">Bring Forward<span class="shortcut">CTRL+]</span></a></li>
   <li><a href="#move_down">Send Backward<span class="shortcut">CTRL+[</span></a></li>
-  <li><a href="#move_back">Send to Back<span class="shortcut">SHFT+CTRL+[</span></a></li>
+  <li><a href="#move_back">Send to Back<span class="shortcut">CTRL+SHFT+[</span></a></li>
 </ul>
 <ul id="cmenu_layers" class="contextMenu">
   <li><a href="#dupe">Duplicate Layer...</a></li>

editor/xdomain-svg-editor.html

@@ -749,17 +749,17 @@
   </div>
 </div>
 <ul id="cmenu_canvas" class="contextMenu">
-  <li><a href="#cut">Cut</a></li>
-  <li><a href="#copy">Copy</a></li>
+  <li><a href="#cut">Cut<span class="shortcut">META+X</span></a></li>
+  <li><a href="#copy">Copy<span class="shortcut">META+C</span></a></li>
   <li><a href="#paste">Paste</a></li>
   <li><a href="#paste_in_place">Paste in Place</a></li>
-  <li class="separator"><a href="#delete">Delete</a></li>
+  <li class="separator"><a href="#delete">Delete<span class="shortcut">BACKSPACE</span></a></li>
   <li class="separator"><a href="#group">Group<span class="shortcut">G</span></a></li>
   <li><a href="#ungroup">Ungroup<span class="shortcut">G</span></a></li>
-  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">SHFT+CTRL+]</span></a></li>
+  <li class="separator"><a href="#move_front">Bring to Front<span class="shortcut">CTRL+SHFT+]</span></a></li>
   <li><a href="#move_up">Bring Forward<span class="shortcut">CTRL+]</span></a></li>
   <li><a href="#move_down">Send Backward<span class="shortcut">CTRL+[</span></a></li>
-  <li><a href="#move_back">Send to Back<span class="shortcut">SHFT+CTRL+[</span></a></li>
+  <li><a href="#move_back">Send to Back<span class="shortcut">CTRL+SHFT+[</span></a></li>
 </ul>
 <ul id="cmenu_layers" class="contextMenu">
   <li><a href="#dupe">Duplicate Layer...</a></li>