Merge remote-tracking branch 'origin' into y-richtext-rewrite

2018-02-26 02:19:08 +01:00
parent 248d08be30 641f426339
commit 250050e83b
11 changed files with 95 additions and 78 deletions
--- a/examples/html-editor/index.js
+++ b/examples/html-editor/index.js
@@ -18,7 +18,7 @@ window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
 })

 document.onkeydown = function interceptUndoRedo (e) {
-  if (e.keyCode === 90 && e.metaKey) {
+  if (e.keyCode === 90 && (e.metaKey || e.ctrlKey)) {
    if (!e.shiftKey) {
      window.undoManager.undo()
    } else {