Skip to content

Commit 3355eff

Browse files
committed
use push instead of concat to generate drawing symbolList
1 parent d11e92f commit 3355eff

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

src/components/drawing/index.js

+22-11
Original file line numberDiff line numberDiff line change
@@ -217,21 +217,31 @@ drawing.symbolList = [];
217217

218218
Object.keys(SYMBOLDEFS).forEach(function(k) {
219219
var symDef = SYMBOLDEFS[k];
220-
drawing.symbolList = drawing.symbolList.concat(
221-
[symDef.n, k, symDef.n + 100, k + '-open']);
222-
drawing.symbolNames[symDef.n] = k;
223-
drawing.symbolFuncs[symDef.n] = symDef.f;
220+
var n = symDef.n;
221+
drawing.symbolList.push(
222+
n,
223+
k,
224+
n + 100,
225+
k + '-open'
226+
);
227+
drawing.symbolNames[n] = k;
228+
drawing.symbolFuncs[n] = symDef.f;
229+
224230
if(symDef.needLine) {
225-
drawing.symbolNeedLines[symDef.n] = true;
231+
drawing.symbolNeedLines[n] = true;
226232
}
227233
if(symDef.noDot) {
228-
drawing.symbolNoDot[symDef.n] = true;
234+
drawing.symbolNoDot[n] = true;
229235
} else {
230-
drawing.symbolList = drawing.symbolList.concat(
231-
[symDef.n + 200, k + '-dot', symDef.n + 300, k + '-open-dot']);
236+
drawing.symbolList.push(
237+
n + 200,
238+
k + '-dot',
239+
n + 300,
240+
k + '-open-dot'
241+
);
232242
}
233243
if(symDef.noFill) {
234-
drawing.symbolNoFill[symDef.n] = true;
244+
drawing.symbolNoFill[n] = true;
235245
}
236246
});
237247

@@ -253,8 +263,9 @@ drawing.symbolNumber = function(v) {
253263
v = drawing.symbolNames.indexOf(v);
254264
if(v >= 0) { v += vbase; }
255265
}
256-
if((v % 100 >= MAXSYMBOL) || v >= 400) { return 0; }
257-
return Math.floor(Math.max(v, 0));
266+
267+
return (v % 100 >= MAXSYMBOL || v >= 400) ?
268+
0 : Math.floor(Math.max(v, 0));
258269
};
259270

260271
function makePointPath(symbolNumber, r) {

0 commit comments

Comments
 (0)