Commit 1d01c8d0 authored by campaign's avatar campaign

Merge remote-tracking branch 'origin/release-1.2.0' into release-1.2.0

parents 9681a99f fdf1c459
...@@ -230,6 +230,7 @@ KityMinder.registerModule('Expand', function() { ...@@ -230,6 +230,7 @@ KityMinder.registerModule('Expand', function() {
if (!visible) e.stopPropagation(); if (!visible) e.stopPropagation();
}, },
'beforekeydown': function(e) { 'beforekeydown': function(e) {
if (this.getStatus() == 'textedit') return;
if (e.originEvent.keyCode == keymap['/']) { if (e.originEvent.keyCode == keymap['/']) {
var expanded = this.getSelectedNode().isExpanded(); var expanded = this.getSelectedNode().isExpanded();
this.getSelectedNodes().forEach(function(node) { this.getSelectedNodes().forEach(function(node) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment