Skip to content

Commit fadeb3e

Browse files
committed
fix tag regExp
1 parent 688c153 commit fadeb3e

File tree

8 files changed

+51
-43
lines changed

8 files changed

+51
-43
lines changed

dist/ReactGrid.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ReactLib.js

Lines changed: 16 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ReactLib.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ReactModal.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ReactTagsManager.js

Lines changed: 16 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ReactTagsManager.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ReactTree.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/es6/TagsManager.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,23 @@ export default class TagsManager {
3030

3131
tagFields.forEach((field) => {
3232
const tagRegExp = new RegExp(`^${tagFieldNamePrefix}\\_(\\d+)\\_(id|text)$`);
33-
const [label, tagId, tagField] = field.id.match(tagRegExp);
33+
const regExpResult = field.id.match(tagRegExp);
3434

35-
if (Number(tagId) !== currentTagId) {
36-
tags.push(currentTag);
37-
currentTagId = Number(tagId);
38-
currentTag = {};
39-
}
35+
if (regExpResult !== null) {
36+
const [label, tagId, tagField] = regExpResult;
37+
38+
if (Number(tagId) !== currentTagId) {
39+
tags.push(currentTag);
40+
currentTagId = Number(tagId);
41+
currentTag = {};
42+
}
4043

41-
currentTag.tagId = currentTag.tagId ?
42-
`${currentTag.tagId}|${label}` :
43-
label;
44+
currentTag.tagId = currentTag.tagId ?
45+
`${currentTag.tagId}|${label}` :
46+
label;
4447

45-
currentTag[tagField] = field.value;
48+
currentTag[tagField] = field.value;
49+
}
4650
});
4751

4852
if (currentTag.id && currentTag.text) {

0 commit comments

Comments
 (0)