Skip to content

Commit bbb6260

Browse files
ChronosSFChronosSF
committed
fix(*): replacing the deprecated $.type func
1 parent 6b10ac0 commit bbb6260

10 files changed

+196
-189
lines changed

‎src/js/modules/infragistics.datasource.js‎

Lines changed: 111 additions & 111 deletions
Large diffs are not rendered by default.

‎src/js/modules/infragistics.templating.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
},
350350
_populateTemplate: function (template, data) {
351351
var i, j, result = "", temp;
352-
if ($.type(data) !== "array") {
352+
if ($.ig.util.getType(data) !== "array") {
353353
for (i = 0; i < this.tokens.length; i++) {
354354
template = this._populateArgumentValue(data, this.tokens[ i ], template);
355355
}
@@ -373,7 +373,7 @@
373373
},
374374
_compileTemplate: function (template, data) {
375375
var i, j, k, result = "", temp, tempArgs = [ ], arg = "", f;
376-
if ($.type(data) !== "array") {
376+
if ($.ig.util.getType(data) !== "array") {
377377
for (j = 0; j < this.args.length; j++) {
378378
arg = this.args[ j ];
379379
for (i = 0; i < this.tokens.length; i++) {

‎src/js/modules/infragistics.ui.combo.js‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@
17051705
if (!options.textKey) {
17061706
if (options.valueKey) {
17071707
options.textKey = options.valueKey;
1708-
} else if (firstDataItem && $.type(firstDataItem) === "object") {
1708+
} else if (firstDataItem && $.ig.util.getType(firstDataItem) === "object") {
17091709

17101710
// Use first data source column
17111711
for (key in firstDataItem) {
@@ -2067,7 +2067,7 @@
20672067
_formatItem: function (item) {
20682068
if ($.ig && $.ig.formatter) {
20692069
if (this.options.format === "auto" &&
2070-
($.type(item) === "date" || $.type(item) === "number")) {
2070+
($.ig.util.getType(item) === "date" || $.ig.util.getType(item) === "number")) {
20712071
item = $.ig.formatter({
20722072
"val": item,
20732073
"reg": $.ig.regional[ this.options.regional ]
@@ -2523,15 +2523,15 @@
25232523
_convertToArrayOfObjects: function (options) {
25242524
var curData, len, i, ds;
25252525

2526-
if ($.type(options.dataSource) === "object" && (options.dataSource._data !== null &&
2526+
if ($.ig.util.getType(options.dataSource) === "object" && (options.dataSource._data !== null &&
25272527
options.dataSource._data !== undefined)) {
25282528
ds = options.dataSource._data;
25292529
} else {
25302530
ds = options.dataSource;
25312531
}
25322532

2533-
if ($.type(ds) === "array" && ($.type(ds[ 0 ]) === "number" ||
2534-
$.type(ds[ 0 ]) === "string" || $.type(ds[ 0 ]) === "date")) {
2533+
if ($.ig.util.getType(ds) === "array" && ($.ig.util.getType(ds[ 0 ]) === "number" ||
2534+
$.ig.util.getType(ds[ 0 ]) === "string" || $.ig.util.getType(ds[ 0 ]) === "date")) {
25352535
for (i = 0, len = ds.length; i < len; i++) {
25362536
curData = ds[ i ];
25372537

@@ -2624,7 +2624,7 @@
26242624
$items = $items || this._$items();
26252625

26262626
// Handle data as array
2627-
if ($.type(data) !== "array") {
2627+
if ($.ig.util.getType(data) !== "array") {
26282628
data = [ data ];
26292629
}
26302630

@@ -2647,7 +2647,7 @@
26472647
$items = $items || this._$items();
26482648

26492649
// Handle value as array
2650-
if ($.type(value) !== "array") {
2650+
if ($.ig.util.getType(value) !== "array") {
26512651
value = [ value ];
26522652
}
26532653

@@ -2671,7 +2671,7 @@
26712671
var i,
26722672
result = $();
26732673

2674-
if ($.type(items) !== "array") {
2674+
if ($.ig.util.getType(items) !== "array") {
26752675
items = [ items ];
26762676
}
26772677

@@ -2714,11 +2714,11 @@
27142714
var data2Len,
27152715
self = this;
27162716

2717-
if ($.type(data1) !== "array") {
2717+
if ($.ig.util.getType(data1) !== "array") {
27182718
data1 = [ data1 ];
27192719
}
27202720

2721-
if ($.type(data2) !== "array") {
2721+
if ($.ig.util.getType(data2) !== "array") {
27222722
data2 = [ data2 ];
27232723
}
27242724

@@ -2807,7 +2807,7 @@
28072807
}
28082808

28092809
// Handle item as array
2810-
if ($.type(item) !== "array") {
2810+
if ($.ig.util.getType(item) !== "array") {
28112811
item = [ item ];
28122812
}
28132813

@@ -2840,7 +2840,7 @@
28402840
var data, i, len,
28412841
result = [ ];
28422842

2843-
if ($.type(value) !== "array") {
2843+
if ($.ig.util.getType(value) !== "array") {
28442844
value = [ value ];
28452845
}
28462846

@@ -2887,7 +2887,7 @@
28872887
result = [ ];
28882888

28892889
// Handle data as array
2890-
if ($.type(data) !== "array") {
2890+
if ($.ig.util.getType(data) !== "array") {
28912891
data = [ data ];
28922892
}
28932893

@@ -3019,7 +3019,7 @@
30193019
mode = this.options.mode;
30203020

30213021
// Handle selectedItems option
3022-
if ($.type(selItems) === "array") {
3022+
if ($.ig.util.getType(selItems) === "array") {
30233023
for (i = 0; i < selItems.length; i++) {
30243024
curSelItem = selItems[ i ];
30253025
curIndex = curSelItem.index;
@@ -4976,8 +4976,8 @@
49764976
this._options.$input.attr("disabled", true);
49774977
this._options.$hiddenInput.attr("disabled", true);
49784978
} else {
4979-
this._options.$input.remoteProp("disabled");
4980-
this._options.$hiddenInput.removeProp("disabled");
4979+
this._options.$input[0].removeAttribute("disabled");
4980+
this._options.$hiddenInput[0].removeAttribute("disabled");
49814981
}
49824982
},
49834983
changeLocale: function () {
@@ -5129,7 +5129,7 @@
51295129
self = this,
51305130
lod = this.options.loadOnDemandSettings,
51315131
options = this.options,
5132-
isStringDataSource = $.type(options.dataSource) === "string",
5132+
isStringDataSource = $.ig.util.getType(options.dataSource) === "string",
51335133
url = options.dataSourceUrl;
51345134

51355135
// Set the data source that should be used
@@ -5144,7 +5144,7 @@
51445144
}
51455145

51465146
// P.P. 29-June-2015 Bug #201942: We need to unwrap the data here, because of the following logic.
5147-
if ($.type(options.dataSource) === "function") {
5147+
if ($.ig.util.getType(options.dataSource) === "function") {
51485148
options.dataSource = options.dataSource();
51495149
}
51505150

@@ -5208,7 +5208,7 @@
52085208
}
52095209

52105210
// S.T. Feb 24th, 2015 Bug #189447: Handle when data source is JSONP.
5211-
if ($.type(options.dataSource) === "string" &&
5211+
if ($.ig.util.getType(options.dataSource) === "string" &&
52125212
!options.dataSourceType &&
52135213
$.ig.util.isJsonpUrl(options.dataSource)) {
52145214

@@ -5316,7 +5316,7 @@
53165316
if (firstDsRow.hasOwnProperty(field)) {
53175317
schema.fields.push({
53185318
name: field,
5319-
type: $.type(firstDsRow[ field ])
5319+
type: $.ig.util.getType(firstDsRow[ field ])
53205320
});
53215321
}
53225322
}
@@ -5329,7 +5329,7 @@
53295329
_generateExpressions: function (texts) {
53305330
var i, expressions = [ ];
53315331

5332-
if ($.type(texts) === "string") {
5332+
if ($.ig.util.getType(texts) === "string") {
53335333

53345334
// K.D. March 3rd, 2015 Bug #189365 When clearing the filter leave the array empty.
53355335
if (texts.length > 0 || (this._options.expression &&
@@ -5345,9 +5345,9 @@
53455345
cond: this._filteringCondition()
53465346
});
53475347
}
5348-
} else if ($.type(texts) === "array") {
5348+
} else if ($.ig.util.getType(texts) === "array") {
53495349
for (i = 0; i < texts.length; i++) {
5350-
if ($.type(texts[ i ]) === "string") {
5350+
if ($.ig.util.getType(texts[ i ]) === "string") {
53515351
expressions.push({
53525352
fieldName: this.options.textKey,
53535353
expr: texts[ i ],
@@ -5381,7 +5381,7 @@
53815381
}
53825382
};
53835383

5384-
if ($.type(texts) === "string") {
5384+
if ($.ig.util.getType(texts) === "string") {
53855385
texts = [ texts ];
53865386
}
53875387

@@ -5395,7 +5395,7 @@
53955395
});
53965396

53975397
if (texts.length > 0) {
5398-
if ($.type(types[ this.options.highlightMatchesMode ]) === "function") {
5398+
if ($.ig.util.getType(types[ this.options.highlightMatchesMode ]) === "function") {
53995399
pattern = types[ this.options.highlightMatchesMode ](texts);
54005400
} else {
54015401
throw new Error(this._getLocaleValue("errorUnrecognizedHighlightMatchesMode"));
@@ -5815,7 +5815,7 @@
58155815
var curCallback, i,
58165816
callbacks = this._options.internalSelChangeSubs;
58175817

5818-
if ($.type(callbacks) === "array") {
5818+
if ($.ig.util.getType(callbacks) === "array") {
58195819
for (i = 0; i < callbacks.length; i++) {
58205820
curCallback = callbacks[ i ];
58215821

@@ -6194,7 +6194,7 @@
61946194
$items = this._$items(),
61956195
result = null;
61966196

6197-
if ($.type(value) === "array") {
6197+
if ($.ig.util.getType(value) === "array") {
61986198
// Filter duplicate values
61996199
value = $.grep(value, function (val, index) {
62006200
return self._isValueInArray(val, value) === index;
@@ -6247,7 +6247,7 @@
62476247
dataLen = data.length,
62486248
valKey = this.options.valueKey;
62496249

6250-
if ($.type(index) === "array") {
6250+
if ($.ig.util.getType(index) === "array") {
62516251
value = [ ];
62526252

62536253
for (i = 0; i < index.length; i++) {
@@ -6552,7 +6552,7 @@
65526552
self._updateItems(offset);
65536553
}
65546554

6555-
if ($.type(callback) === "function") {
6555+
if ($.ig.util.getType(callback) === "function") {
65566556
callback();
65576557
}
65586558

@@ -6672,7 +6672,7 @@
66726672
self.clearFiltering(event);
66736673
}
66746674

6675-
if ($.type(callback) === "function") {
6675+
if ($.ig.util.getType(callback) === "function") {
66766676
callback();
66776677
}
66786678

@@ -6808,7 +6808,7 @@
68086808
returnValue = { combo: this, selectionCanceled: false };
68096809

68106810
// Use first data when multi selection is not enabled
6811-
data = ($.type(data) === "array" && !multiSelEnabled) ? data[ 0 ] : data;
6811+
data = ($.ig.util.getType(data) === "array" && !multiSelEnabled) ? data[ 0 ] : data;
68126812
items = this._itemsFromData(data);
68136813

68146814
options = options || {};
@@ -6823,7 +6823,7 @@
68236823
return returnValue;
68246824
}
68256825

6826-
if ($.type(items) !== "array") {
6826+
if ($.ig.util.getType(items) !== "array") {
68276827
items = [ items ];
68286828
}
68296829

@@ -7162,7 +7162,7 @@
71627162
return indexes;
71637163
}
71647164

7165-
if ($.type(index) !== "array") {
7165+
if ($.ig.util.getType(index) !== "array") {
71667166
index = [ index ];
71677167
}
71687168

@@ -7226,7 +7226,7 @@
72267226
return this;
72277227
}
72287228

7229-
if ($.type(items) !== "array") {
7229+
if ($.ig.util.getType(items) !== "array") {
72307230
items = [ items ];
72317231
}
72327232

@@ -7376,7 +7376,7 @@
73767376
var i, len,
73777377
dataToDeselect = [ ];
73787378

7379-
if ($.type(index) !== "array") {
7379+
if ($.ig.util.getType(index) !== "array") {
73807380
index = [ index ];
73817381
}
73827382

0 commit comments

Comments
 (0)