Skip to content

Commit 5cb006b

Browse files
author
Edward Xiao
committed
- fix bugs: showmsg -> showMsg
1 parent 148c6ec commit 5cb006b

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

‎lib/components/Textarea.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var getDefaultValidationOption = function getDefaultValidationOption(obj) {
9898
length = obj.length,
9999
regMsg = obj.regMsg,
100100
required = obj.required,
101-
showmsg = obj.showmsg,
101+
showMsg = obj.showMsg,
102102
locale = obj.locale,
103103
msgOnError = obj.msgOnError,
104104
msgOnSuccess = obj.msgOnSuccess,
@@ -110,7 +110,7 @@ var getDefaultValidationOption = function getDefaultValidationOption(obj) {
110110
type = typeof type !== 'undefined' ? type : 'string';
111111
name = typeof name !== 'undefined' ? name : '';
112112
check = typeof check !== 'undefined' ? check : true;
113-
showmsg = typeof showmsg !== 'undefined' ? showmsg : true;
113+
showMsg = typeof showMsg !== 'undefined' ? showMsg : true;
114114
length = typeof length !== 'undefined' ? length : 0;
115115
regMsg = typeof regMsg !== 'undefined' ? regMsg : '';
116116
required = typeof required !== 'undefined' ? required : true;
@@ -128,7 +128,7 @@ var getDefaultValidationOption = function getDefaultValidationOption(obj) {
128128
regMsg: regMsg,
129129
locale: locale,
130130
required: required,
131-
showmsg: showmsg,
131+
showMsg: showMsg,
132132
msgOnError: msgOnError,
133133
msgOnSuccess: msgOnSuccess,
134134
customFunc: customFunc
@@ -392,15 +392,15 @@ function (_React$Component) {
392392
var msgHtml;
393393

394394
var _getDefaultValidation3 = getDefaultValidationOption(validationOption),
395-
showmsg = _getDefaultValidation3.showmsg;
395+
showMsg = _getDefaultValidation3.showMsg;
396396

397-
if (showmsg && err && msg) {
397+
if (showMsg && err && msg) {
398398
msgHtml = React.createElement("div", {
399399
className: errmsgClass
400400
}, msg);
401401
}
402402

403-
if (showmsg && !err && successMsg) {
403+
if (showMsg && !err && successMsg) {
404404
msgHtml = React.createElement("div", {
405405
className: successMsgClass
406406
}, successMsg);

‎lib/components/Textbox.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ var getDefaultValidationOption = function getDefaultValidationOption(obj) {
9595
regMsg = obj.regMsg,
9696
compare = obj.compare,
9797
required = obj.required,
98-
showmsg = obj.showmsg,
98+
showMsg = obj.showMsg,
9999
locale = obj.locale,
100100
msgOnError = obj.msgOnError,
101101
msgOnSuccess = obj.msgOnSuccess,
@@ -107,7 +107,7 @@ var getDefaultValidationOption = function getDefaultValidationOption(obj) {
107107
type = typeof type !== 'undefined' ? type : 'string';
108108
name = typeof name !== 'undefined' ? name : '';
109109
check = typeof check !== 'undefined' ? check : true;
110-
showmsg = typeof showmsg !== 'undefined' ? showmsg : true;
110+
showMsg = typeof showMsg !== 'undefined' ? showMsg : true;
111111
length = typeof length !== 'undefined' ? length : 0;
112112
regMsg = typeof regMsg !== 'undefined' ? regMsg : '';
113113
compare = typeof compare !== 'undefined' ? compare : '';
@@ -127,7 +127,7 @@ var getDefaultValidationOption = function getDefaultValidationOption(obj) {
127127
locale: locale,
128128
compare: compare,
129129
required: required,
130-
showmsg: showmsg,
130+
showMsg: showMsg,
131131
msgOnError: msgOnError,
132132
msgOnSuccess: msgOnSuccess,
133133
customFunc: customFunc
@@ -483,15 +483,15 @@ function (_React$Component) {
483483
var msgHtml;
484484

485485
var _getDefaultValidation4 = getDefaultValidationOption(validationOption),
486-
showmsg = _getDefaultValidation4.showmsg;
486+
showMsg = _getDefaultValidation4.showMsg;
487487

488-
if (showmsg && err && msg) {
488+
if (showMsg && err && msg) {
489489
msgHtml = React.createElement("div", {
490490
className: errmsgClass
491491
}, msg);
492492
}
493493

494-
if (showmsg && !err && successMsg) {
494+
if (showMsg && !err && successMsg) {
495495
msgHtml = React.createElement("div", {
496496
className: successMsgClass
497497
}, successMsg);

‎lib/react-inputs-validation.js‎

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

‎lib/react-inputs-validation.js.map‎

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

‎lib/react-inputs-validation.min.js‎

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

‎lib/react-inputs-validation.min.js.map‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-inputs-validation",
3-
"version": "2.0.9",
3+
"version": "2.1.0",
44
"description": "a react inputs validation component",
55
"main": "index.js",
66
"repository": {

‎src/js/Inputs/Textarea.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ interface DefaultValidationOption {
1818
type?: string;
1919
name?: string;
2020
check?: boolean;
21-
showmsg?: boolean;
21+
showMsg?: boolean;
2222
length?: number;
2323
regMsg?: string;
2424
required?: boolean;
@@ -28,15 +28,15 @@ interface DefaultValidationOption {
2828
}
2929

3030
const getDefaultValidationOption = (obj: DefaultValidationOption) => {
31-
let { reg, min, max, type, name, check, length, regMsg, required, showmsg, locale, msgOnError, msgOnSuccess, customFunc } = obj;
31+
let { reg, min, max, type, name, check, length, regMsg, required, showMsg, locale, msgOnError, msgOnSuccess, customFunc } = obj;
3232
locale = typeof locale !== 'undefined' ? locale : DEFAULT_LOCALE;
3333
reg = typeof reg !== 'undefined' ? reg : '';
3434
min = typeof min !== 'undefined' ? min : 0;
3535
max = typeof max !== 'undefined' ? max : 0;
3636
type = typeof type !== 'undefined' ? type : 'string';
3737
name = typeof name !== 'undefined' ? name : '';
3838
check = typeof check !== 'undefined' ? check : true;
39-
showmsg = typeof showmsg !== 'undefined' ? showmsg : true;
39+
showMsg = typeof showMsg !== 'undefined' ? showMsg : true;
4040
length = typeof length !== 'undefined' ? length : 0;
4141
regMsg = typeof regMsg !== 'undefined' ? regMsg : '';
4242
required = typeof required !== 'undefined' ? required : true;
@@ -54,7 +54,7 @@ const getDefaultValidationOption = (obj: DefaultValidationOption) => {
5454
regMsg,
5555
locale,
5656
required,
57-
showmsg,
57+
showMsg,
5858
msgOnError,
5959
msgOnSuccess,
6060
customFunc,
@@ -336,11 +336,11 @@ class Index extends React.Component<Props, State> {
336336
const successMsgClass = classnames(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
337337

338338
let msgHtml;
339-
const { showmsg } = getDefaultValidationOption(validationOption);
340-
if (showmsg && err && msg) {
339+
const { showMsg } = getDefaultValidationOption(validationOption);
340+
if (showMsg && err && msg) {
341341
msgHtml = <div className={errmsgClass}>{msg}</div>;
342342
}
343-
if (showmsg && !err && successMsg) {
343+
if (showMsg && !err && successMsg) {
344344
msgHtml = <div className={successMsgClass}>{successMsg}</div>;
345345
}
346346
return (

‎src/js/Inputs/Textbox.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface DefaultValidationOption {
1616
type?: string;
1717
name?: string;
1818
check?: boolean;
19-
showmsg?: boolean;
19+
showMsg?: boolean;
2020
length?: number;
2121
regMsg?: string;
2222
compare?: string;
@@ -27,15 +27,15 @@ interface DefaultValidationOption {
2727
}
2828

2929
const getDefaultValidationOption = (obj: DefaultValidationOption) => {
30-
let { reg, min, max, type, name, check, length, regMsg, compare, required, showmsg, locale, msgOnError, msgOnSuccess, customFunc } = obj;
30+
let { reg, min, max, type, name, check, length, regMsg, compare, required, showMsg, locale, msgOnError, msgOnSuccess, customFunc } = obj;
3131
locale = typeof locale !== 'undefined' ? locale : DEFAULT_LOCALE;
3232
reg = typeof reg !== 'undefined' ? reg : '';
3333
min = typeof min !== 'undefined' ? min : 0;
3434
max = typeof max !== 'undefined' ? max : 0;
3535
type = typeof type !== 'undefined' ? type : 'string';
3636
name = typeof name !== 'undefined' ? name : '';
3737
check = typeof check !== 'undefined' ? check : true;
38-
showmsg = typeof showmsg !== 'undefined' ? showmsg : true;
38+
showMsg = typeof showMsg !== 'undefined' ? showMsg : true;
3939
length = typeof length !== 'undefined' ? length : 0;
4040
regMsg = typeof regMsg !== 'undefined' ? regMsg : '';
4141
compare = typeof compare !== 'undefined' ? compare : '';
@@ -55,7 +55,7 @@ const getDefaultValidationOption = (obj: DefaultValidationOption) => {
5555
locale,
5656
compare,
5757
required,
58-
showmsg,
58+
showMsg,
5959
msgOnError,
6060
msgOnSuccess,
6161
customFunc,
@@ -426,11 +426,11 @@ class Index extends React.Component<Props, State> {
426426
const successMsgClass = classnames(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
427427

428428
let msgHtml;
429-
const { showmsg } = getDefaultValidationOption(validationOption);
430-
if (showmsg && err && msg) {
429+
const { showMsg } = getDefaultValidationOption(validationOption);
430+
if (showMsg && err && msg) {
431431
msgHtml = <div className={errmsgClass}>{msg}</div>;
432432
}
433-
if (showmsg && !err && successMsg) {
433+
if (showMsg && !err && successMsg) {
434434
msgHtml = <div className={successMsgClass}>{successMsg}</div>;
435435
}
436436
return (

0 commit comments

Comments
 (0)