Commit 5fc1721f authored by Akikonata's avatar Akikonata

merge conflict

parents a0223c78 5f4a336a
...@@ -354,7 +354,7 @@ kity.extendClass(KityMinder, { ...@@ -354,7 +354,7 @@ kity.extendClass(KityMinder, {
var selection = this.getSelectedNodes(); var selection = this.getSelectedNodes();
if (false === nodes instanceof Array) nodes = [nodes]; if (false === nodes instanceof Array) nodes = [nodes];
for (var i = 0; i < nodes.length; i++) { for (var i = 0; i < nodes.length; i++) {
if (selection.indexOf(nodes[i]) !== -1) { if (selection.indexOf(nodes[i]) === -1) {
selection.push(nodes[i]); selection.push(nodes[i]);
} }
} }
...@@ -386,10 +386,11 @@ kity.extendClass(KityMinder, { ...@@ -386,10 +386,11 @@ kity.extendClass(KityMinder, {
this._selectedNodes = []; this._selectedNodes = [];
return this; return this;
} }
if (false === nodes instanceof Array) nodes = [nodes];
var originSelection = this.getSelectedNodes(); var originSelection = this.getSelectedNodes();
var newSelection = []; var newSelection = [];
for (var i = 0; i < originSelection.length; i++) { for (var i = 0; i < originSelection.length; i++) {
if (nodes.indexOf(originSelection[i]) !== -1) { if (nodes.indexOf(originSelection[i]) === -1) {
newSelection.push(originSelection[i]); newSelection.push(originSelection[i]);
} }
} }
......
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