Skip to content

Commit bad6d8b

Browse files
Updated "ngMaskedit"
- removed non-standard "GetValidText" method - removed "OnValidate" event, "IsValid" method an be used instead - changed "IsValid" method parameters
1 parent c2f768b commit bad6d8b

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

src/ng_controls/ui/designinfo/maskedit_di.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ ngUserControls['maskedit_designinfo'] = {
7272
"Events": {
7373
"OnTextChanged": ng_diEvent('function(c, cp) {}', { Level: 'basic' }),
7474
"OnGetAlt": ng_diEvent('function(c) { return ""; }', { Level: 'basic' }),
75-
"OnValidate": ng_diEvent('function(c, part, text, re) { return true; }', { Level: 'basic' }),
7675
"OnSetInvalid": ng_diEvent('function(c, state, update) { return true; }', { Level: 'basic' }),
7776
"OnSetInvalidPart": ng_diEvent('function(c, part, state, update) { return true; }', { Level: 'basic' }),
7877
"OnCreatePart": ng_diEvent('function(c, partInfo, def, parts) {}', { Level: 'advanced' }),

src/ng_controls/ui/maskedit.js

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -314,23 +314,6 @@ ngUserControls['maskedit'] = {
314314
return true;
315315
}
316316

317-
/* Function: GetValidText
318-
* ...
319-
*
320-
* Syntax:
321-
* string *GetValidText* ()
322-
*
323-
* Parameters:
324-
* editOnly - ...
325-
*
326-
* Returns:
327-
* -
328-
*/
329-
c.GetValidText = function () {
330-
if (!c.IsValid()) return '';
331-
return c.GetText();
332-
}
333-
334317
/* Function: GetParts
335318
* ...
336319
*
@@ -890,20 +873,19 @@ ngUserControls['maskedit'] = {
890873
* ...
891874
*
892875
* Syntax:
893-
* bool *IsValid* ([mixed data = -1, bool asArray = false])
876+
* bool *IsValid* ([string text = null, bool asArray = false])
894877
*
895878
* Parameters:
896-
* data - int: part>=0 (-1 for all parts) / string: text
879+
* text - ...
897880
* asArray - ...
898881
*
899882
* Returns:
900883
* -
901884
*/
902-
c.IsValid = function (data, asArray) {
903-
var part = (ng_typeNumberInt(data) ? data : -1);
885+
c.IsValid = function (text, asArray) {
904886
asArray = ngVal(asArray, false);
905887

906-
var parts = (ng_typeString(data) ? c.textToParts(data) : c.GetParts(part));
888+
var parts = (ng_typeString(text) ? c.textToParts(text) : c.GetParts());
907889
if (parts.length==0) return false;
908890

909891
var result = new Array();
@@ -914,9 +896,7 @@ ngUserControls['maskedit'] = {
914896

915897
re = new RegExp(parts[i].RegExp);
916898
test = re.test(parts[i].Text);
917-
918-
if (c.OnValidate) result.push(ng_toBool(c.OnValidate(c, parts[i], test, re)));
919-
else result.push(test);
899+
result.push(test);
920900
}
921901

922902
if (asArray) return result;
@@ -1178,11 +1158,6 @@ ngUserControls['maskedit'] = {
11781158
*/
11791159
c.OnGetAlt = null;
11801160

1181-
/*
1182-
* Event: OnValidate
1183-
*/
1184-
c.OnValidate = null;
1185-
11861161
/*
11871162
* Event: OnSetInvalid
11881163
*/

0 commit comments

Comments
 (0)