Skip to content

Commit 60f7963

Browse files
committed
source code optimization
1 parent a681933 commit 60f7963

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

js/mindmap.js

+18-21
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ var FilesMindMap = {
1414
var self = this;
1515
if (!Array.isArray(objs)) {
1616
objs = [objs];
17-
};
17+
}
1818
objs.forEach(function(obj){
1919
self._extensions.push(obj);
2020
});
2121
},
2222

2323
getExtensionByMime: function(mime) {
24-
for (i = 0; i < this._extensions.length; i++) {
24+
for (var i = 0; i < this._extensions.length; i++) {
2525
var obj = this._extensions[i];
2626
if (obj.mimes.indexOf(mime) >= 0) {
2727
return obj;
@@ -159,9 +159,9 @@ var FilesMindMap = {
159159
return;
160160
}
161161

162-
plugin.encode(data).then(function(data) {
162+
plugin.encode(data).then(function(data2) {
163163
var putObject = {
164-
filecontents: data,
164+
filecontents: data2,
165165
path: path
166166
};
167167

@@ -296,6 +296,7 @@ var FilesMindMap = {
296296
if (context.dir === '/') {
297297
fullName = '/' + fileName;
298298
}
299+
this._file.fullName = fullName;
299300
this.show();
300301
},
301302

@@ -468,9 +469,9 @@ FilesMindMap.Extensions.XMind = {
468469
if (tmp.length && tmp.length > 0) { //多个子节点
469470
obj.children = [];
470471

471-
for (var i in tmp) {
472+
for (var ii in tmp) {
472473
obj.children.push({});
473-
this.processTopic(tmp[i], obj.children[i]);
474+
this.processTopic(tmp[ii], obj.children[ii]);
474475
}
475476

476477
} else { //一个子节点
@@ -495,7 +496,7 @@ FilesMindMap.Extensions.XMind = {
495496
if (contentFile != null) {
496497
contentFile.async('text').then(function(text){
497498
try {
498-
json = self.toKm(text);
499+
var json = self.toKm(text);
499500
resolve(json);
500501
} catch (e) {
501502
reject(e);
@@ -544,8 +545,6 @@ FilesMindMap.Util = {
544545
if (!node) return null;
545546
var self = this;
546547
var txt = '', obj = null, att = null;
547-
var nt = node.nodeType, nn = this.jsVar(node.localName || node.nodeName);
548-
var nv = node.text || node.nodeValue || '';
549548

550549
if (node.childNodes) {
551550
if (node.childNodes.length > 0) {
@@ -561,7 +560,7 @@ FilesMindMap.Util = {
561560
else if (cnt == 3 || cnt == 4 || !cnn) {
562561
if (cnv.match(/^\s+$/)) {
563562
return;
564-
};
563+
}
565564
txt += cnv.replace(/^\s+/, '').replace(/\s+$/, '');
566565
} else {
567566
obj = obj || {};
@@ -574,11 +573,11 @@ FilesMindMap.Util = {
574573
obj[cnn].push(self.parseNode(cn, true));
575574
} else {
576575
obj[cnn] = self.parseNode(cn);
577-
};
578-
};
576+
}
577+
}
579578
});
580-
};
581-
};
579+
}
580+
}
582581
if (node.attributes && node.tagName !='title') {
583582
if (node.attributes.length > 0) {
584583
att = {}; obj = obj || {};
@@ -588,27 +587,25 @@ FilesMindMap.Util = {
588587
att[atn] = atv;
589588
if (obj[atn]) {
590589
obj[cnn] = this.toArray(obj[cnn]);
591-
592590
obj[atn][obj[atn].length] = atv;
593-
obj[atn].length = obj[atn].length;
594591
}
595592
else {
596593
obj[atn] = atv;
597-
};
594+
}
598595
});
599-
};
600-
};
596+
}
597+
}
601598
if (obj) {
602599
obj = Object.assign({}, (txt != '' ? new String(txt) : {}), obj || {});
603600
txt = (obj.text) ? ([obj.text || '']).concat([txt]) : txt;
604601
if (txt) obj.text = txt;
605602
txt = '';
606-
};
603+
}
607604
var out = obj || txt;
608605
return out;
609606
},
610607
parseXML: function (xml) {
611-
root = (xml.nodeType == 9) ? xml.documentElement : xml;
608+
var root = (xml.nodeType == 9) ? xml.documentElement : xml;
612609
return this.parseNode(root, true);
613610
},
614611
xml2json: function (str) {

0 commit comments

Comments
 (0)