qa
Signed-off-by: Jeff <jeff@gotenzing.com>
Showing
6 changed files
with
355 additions
and
385 deletions
| ... | @@ -7444,7 +7444,7 @@ | ... | @@ -7444,7 +7444,7 @@ |
| 7444 | 7444 | ||
| 7445 | // DataTables code uses $ internally, but we want to be able to | 7445 | // DataTables code uses $ internally, but we want to be able to |
| 7446 | // reassign $ with the `use` method, so it is a regular var. | 7446 | // reassign $ with the `use` method, so it is a regular var. |
| 7447 | var $$2 = jquery__default["default"]; | 7447 | var $$1 = jquery__default["default"]; |
| 7448 | var DataTable = function (selector, options) { | 7448 | var DataTable = function (selector, options) { |
| 7449 | // Check if called with a window or jQuery object for DOM less applications | 7449 | // Check if called with a window or jQuery object for DOM less applications |
| 7450 | // This is for backwards compatibility | 7450 | // This is for backwards compatibility |
| ... | @@ -7454,7 +7454,7 @@ | ... | @@ -7454,7 +7454,7 @@ |
| 7454 | 7454 | ||
| 7455 | // When creating with `new`, create a new DataTable, returning the API instance | 7455 | // When creating with `new`, create a new DataTable, returning the API instance |
| 7456 | if (this instanceof DataTable) { | 7456 | if (this instanceof DataTable) { |
| 7457 | return $$2(selector).DataTable(options); | 7457 | return $$1(selector).DataTable(options); |
| 7458 | } else { | 7458 | } else { |
| 7459 | // Argument switching | 7459 | // Argument switching |
| 7460 | options = selector; | 7460 | options = selector; |
| ... | @@ -7607,7 +7607,7 @@ | ... | @@ -7607,7 +7607,7 @@ |
| 7607 | var api = this.api(true); | 7607 | var api = this.api(true); |
| 7608 | 7608 | ||
| 7609 | /* Check if we want to add multiple rows or not */ | 7609 | /* Check if we want to add multiple rows or not */ |
| 7610 | var rows = Array.isArray(data) && (Array.isArray(data[0]) || $$2.isPlainObject(data[0])) ? api.rows.add(data) : api.row.add(data); | 7610 | var rows = Array.isArray(data) && (Array.isArray(data[0]) || $$1.isPlainObject(data[0])) ? api.rows.add(data) : api.row.add(data); |
| 7611 | if (redraw === undefined || redraw) { | 7611 | if (redraw === undefined || redraw) { |
| 7612 | api.draw(); | 7612 | api.draw(); |
| 7613 | } | 7613 | } |
| ... | @@ -8155,7 +8155,7 @@ | ... | @@ -8155,7 +8155,7 @@ |
| 8155 | var sId = this.getAttribute('id'); | 8155 | var sId = this.getAttribute('id'); |
| 8156 | var bInitHandedOff = false; | 8156 | var bInitHandedOff = false; |
| 8157 | var defaults = DataTable.defaults; | 8157 | var defaults = DataTable.defaults; |
| 8158 | var $this = $$2(this); | 8158 | var $this = $$1(this); |
| 8159 | 8159 | ||
| 8160 | /* Sanity check */ | 8160 | /* Sanity check */ |
| 8161 | if (this.nodeName.toLowerCase() != 'table') { | 8161 | if (this.nodeName.toLowerCase() != 'table') { |
| ... | @@ -8172,7 +8172,7 @@ | ... | @@ -8172,7 +8172,7 @@ |
| 8172 | _fnCamelToHungarian(defaults.column, defaults.column, true); | 8172 | _fnCamelToHungarian(defaults.column, defaults.column, true); |
| 8173 | 8173 | ||
| 8174 | /* Setting up the initialisation object */ | 8174 | /* Setting up the initialisation object */ |
| 8175 | _fnCamelToHungarian(defaults, $$2.extend(oInit, $this.data()), true); | 8175 | _fnCamelToHungarian(defaults, $$1.extend(oInit, $this.data()), true); |
| 8176 | 8176 | ||
| 8177 | /* Check to see if we are re-initialising a table */ | 8177 | /* Check to see if we are re-initialising a table */ |
| 8178 | var allSettings = DataTable.settings; | 8178 | var allSettings = DataTable.settings; |
| ... | @@ -8212,7 +8212,7 @@ | ... | @@ -8212,7 +8212,7 @@ |
| 8212 | } | 8212 | } |
| 8213 | 8213 | ||
| 8214 | /* Create the settings object for this table and set some of the default parameters */ | 8214 | /* Create the settings object for this table and set some of the default parameters */ |
| 8215 | var oSettings = $$2.extend(true, {}, DataTable.models.oSettings, { | 8215 | var oSettings = $$1.extend(true, {}, DataTable.models.oSettings, { |
| 8216 | "sDestroyWidth": $this[0].style.width, | 8216 | "sDestroyWidth": $this[0].style.width, |
| 8217 | "sInstance": sId, | 8217 | "sInstance": sId, |
| 8218 | "sTableId": sId | 8218 | "sTableId": sId |
| ... | @@ -8237,7 +8237,7 @@ | ... | @@ -8237,7 +8237,7 @@ |
| 8237 | 8237 | ||
| 8238 | // Apply the defaults and init options to make a single init object will all | 8238 | // Apply the defaults and init options to make a single init object will all |
| 8239 | // options defined from defaults and instance options. | 8239 | // options defined from defaults and instance options. |
| 8240 | oInit = _fnExtend($$2.extend(true, {}, defaults), oInit); | 8240 | oInit = _fnExtend($$1.extend(true, {}, defaults), oInit); |
| 8241 | 8241 | ||
| 8242 | // Map the initialisation options onto the settings object | 8242 | // Map the initialisation options onto the settings object |
| 8243 | _fnMap(oSettings.oFeatures, oInit, ["bPaginate", "bLengthChange", "bFilter", "bSort", "bSortMulti", "bInfo", "bProcessing", "bAutoWidth", "bSortClasses", "bServerSide", "bDeferRender"]); | 8243 | _fnMap(oSettings.oFeatures, oInit, ["bPaginate", "bLengthChange", "bFilter", "bSort", "bSortMulti", "bInfo", "bProcessing", "bAutoWidth", "bSortClasses", "bServerSide", "bDeferRender"]); |
| ... | @@ -8264,7 +8264,7 @@ | ... | @@ -8264,7 +8264,7 @@ |
| 8264 | /* Browser support detection */ | 8264 | /* Browser support detection */ |
| 8265 | _fnBrowserDetect(oSettings); | 8265 | _fnBrowserDetect(oSettings); |
| 8266 | var oClasses = oSettings.oClasses; | 8266 | var oClasses = oSettings.oClasses; |
| 8267 | $$2.extend(oClasses, DataTable.ext.classes, oInit.oClasses); | 8267 | $$1.extend(oClasses, DataTable.ext.classes, oInit.oClasses); |
| 8268 | $this.addClass(oClasses.sTable); | 8268 | $this.addClass(oClasses.sTable); |
| 8269 | if (oSettings.iInitDisplayStart === undefined) { | 8269 | if (oSettings.iInitDisplayStart === undefined) { |
| 8270 | /* Display start point, taking into account the save saving */ | 8270 | /* Display start point, taking into account the save saving */ |
| ... | @@ -8280,19 +8280,19 @@ | ... | @@ -8280,19 +8280,19 @@ |
| 8280 | 8280 | ||
| 8281 | /* Language definitions */ | 8281 | /* Language definitions */ |
| 8282 | var oLanguage = oSettings.oLanguage; | 8282 | var oLanguage = oSettings.oLanguage; |
| 8283 | $$2.extend(true, oLanguage, oInit.oLanguage); | 8283 | $$1.extend(true, oLanguage, oInit.oLanguage); |
| 8284 | if (oLanguage.sUrl) { | 8284 | if (oLanguage.sUrl) { |
| 8285 | /* Get the language definitions from a file - because this Ajax call makes the language | 8285 | /* Get the language definitions from a file - because this Ajax call makes the language |
| 8286 | * get async to the remainder of this function we use bInitHandedOff to indicate that | 8286 | * get async to the remainder of this function we use bInitHandedOff to indicate that |
| 8287 | * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor | 8287 | * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor |
| 8288 | */ | 8288 | */ |
| 8289 | $$2.ajax({ | 8289 | $$1.ajax({ |
| 8290 | dataType: 'json', | 8290 | dataType: 'json', |
| 8291 | url: oLanguage.sUrl, | 8291 | url: oLanguage.sUrl, |
| 8292 | success: function (json) { | 8292 | success: function (json) { |
| 8293 | _fnCamelToHungarian(defaults.oLanguage, json); | 8293 | _fnCamelToHungarian(defaults.oLanguage, json); |
| 8294 | _fnLanguageCompat(json); | 8294 | _fnLanguageCompat(json); |
| 8295 | $$2.extend(true, oLanguage, json, oSettings.oInit.oLanguage); | 8295 | $$1.extend(true, oLanguage, json, oSettings.oInit.oLanguage); |
| 8296 | _fnCallbackFire(oSettings, null, 'i18n', [oSettings]); | 8296 | _fnCallbackFire(oSettings, null, 'i18n', [oSettings]); |
| 8297 | _fnInitialise(oSettings); | 8297 | _fnInitialise(oSettings); |
| 8298 | }, | 8298 | }, |
| ... | @@ -8316,10 +8316,10 @@ | ... | @@ -8316,10 +8316,10 @@ |
| 8316 | /* Remove row stripe classes if they are already on the table row */ | 8316 | /* Remove row stripe classes if they are already on the table row */ |
| 8317 | var stripeClasses = oSettings.asStripeClasses; | 8317 | var stripeClasses = oSettings.asStripeClasses; |
| 8318 | var rowOne = $this.children('tbody').find('tr').eq(0); | 8318 | var rowOne = $this.children('tbody').find('tr').eq(0); |
| 8319 | if ($$2.inArray(true, $$2.map(stripeClasses, function (el, i) { | 8319 | if ($$1.inArray(true, $$1.map(stripeClasses, function (el, i) { |
| 8320 | return rowOne.hasClass(el); | 8320 | return rowOne.hasClass(el); |
| 8321 | })) !== -1) { | 8321 | })) !== -1) { |
| 8322 | $$2('tbody tr', this).removeClass(stripeClasses.join(' ')); | 8322 | $$1('tbody tr', this).removeClass(stripeClasses.join(' ')); |
| 8323 | oSettings.asDestroyStripes = stripeClasses.slice(); | 8323 | oSettings.asDestroyStripes = stripeClasses.slice(); |
| 8324 | } | 8324 | } |
| 8325 | 8325 | ||
| ... | @@ -8362,7 +8362,7 @@ | ... | @@ -8362,7 +8362,7 @@ |
| 8362 | var a = function (cell, name) { | 8362 | var a = function (cell, name) { |
| 8363 | return cell.getAttribute('data-' + name) !== null ? name : null; | 8363 | return cell.getAttribute('data-' + name) !== null ? name : null; |
| 8364 | }; | 8364 | }; |
| 8365 | $$2(rowOne[0]).children('th, td').each(function (i, cell) { | 8365 | $$1(rowOne[0]).children('th, td').each(function (i, cell) { |
| 8366 | var col = oSettings.aoColumns[i]; | 8366 | var col = oSettings.aoColumns[i]; |
| 8367 | if (!col) { | 8367 | if (!col) { |
| 8368 | _fnLog(oSettings, 0, 'Incorrect column count', 18); | 8368 | _fnLog(oSettings, 0, 'Incorrect column count', 18); |
| ... | @@ -8408,7 +8408,7 @@ | ... | @@ -8408,7 +8408,7 @@ |
| 8408 | if (oSettings.bSorted) { | 8408 | if (oSettings.bSorted) { |
| 8409 | var aSort = _fnSortFlatten(oSettings); | 8409 | var aSort = _fnSortFlatten(oSettings); |
| 8410 | var sortedColumns = {}; | 8410 | var sortedColumns = {}; |
| 8411 | $$2.each(aSort, function (i, val) { | 8411 | $$1.each(aSort, function (i, val) { |
| 8412 | sortedColumns[val.src] = val.dir; | 8412 | sortedColumns[val.src] = val.dir; |
| 8413 | }); | 8413 | }); |
| 8414 | _fnCallbackFire(oSettings, null, 'order', [oSettings, aSort, sortedColumns]); | 8414 | _fnCallbackFire(oSettings, null, 'order', [oSettings, aSort, sortedColumns]); |
| ... | @@ -8429,23 +8429,23 @@ | ... | @@ -8429,23 +8429,23 @@ |
| 8429 | 8429 | ||
| 8430 | // Work around for Webkit bug 83867 - store the caption-side before removing from doc | 8430 | // Work around for Webkit bug 83867 - store the caption-side before removing from doc |
| 8431 | var captions = $this.children('caption').each(function () { | 8431 | var captions = $this.children('caption').each(function () { |
| 8432 | this._captionSide = $$2(this).css('caption-side'); | 8432 | this._captionSide = $$1(this).css('caption-side'); |
| 8433 | }); | 8433 | }); |
| 8434 | var thead = $this.children('thead'); | 8434 | var thead = $this.children('thead'); |
| 8435 | if (thead.length === 0) { | 8435 | if (thead.length === 0) { |
| 8436 | thead = $$2('<thead/>').appendTo($this); | 8436 | thead = $$1('<thead/>').appendTo($this); |
| 8437 | } | 8437 | } |
| 8438 | oSettings.nTHead = thead[0]; | 8438 | oSettings.nTHead = thead[0]; |
| 8439 | var tbody = $this.children('tbody'); | 8439 | var tbody = $this.children('tbody'); |
| 8440 | if (tbody.length === 0) { | 8440 | if (tbody.length === 0) { |
| 8441 | tbody = $$2('<tbody/>').insertAfter(thead); | 8441 | tbody = $$1('<tbody/>').insertAfter(thead); |
| 8442 | } | 8442 | } |
| 8443 | oSettings.nTBody = tbody[0]; | 8443 | oSettings.nTBody = tbody[0]; |
| 8444 | var tfoot = $this.children('tfoot'); | 8444 | var tfoot = $this.children('tfoot'); |
| 8445 | if (tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "")) { | 8445 | if (tfoot.length === 0 && captions.length > 0 && (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "")) { |
| 8446 | // If we are a scrolling table, and no footer has been given, then we need to create | 8446 | // If we are a scrolling table, and no footer has been given, then we need to create |
| 8447 | // a tfoot element for the caption element to be appended to | 8447 | // a tfoot element for the caption element to be appended to |
| 8448 | tfoot = $$2('<tfoot/>').appendTo($this); | 8448 | tfoot = $$1('<tfoot/>').appendTo($this); |
| 8449 | } | 8449 | } |
| 8450 | if (tfoot.length === 0 || tfoot.children().length === 0) { | 8450 | if (tfoot.length === 0 || tfoot.children().length === 0) { |
| 8451 | $this.addClass(oClasses.sNoFooter); | 8451 | $this.addClass(oClasses.sNoFooter); |
| ... | @@ -8464,7 +8464,7 @@ | ... | @@ -8464,7 +8464,7 @@ |
| 8464 | * source since there is no point in reading the DOM data if we are then going | 8464 | * source since there is no point in reading the DOM data if we are then going |
| 8465 | * to replace it with Ajax data | 8465 | * to replace it with Ajax data |
| 8466 | */ | 8466 | */ |
| 8467 | _fnAddTr(oSettings, $$2(oSettings.nTBody).children('tr')); | 8467 | _fnAddTr(oSettings, $$1(oSettings.nTBody).children('tr')); |
| 8468 | } | 8468 | } |
| 8469 | 8469 | ||
| 8470 | /* Copy the data index array */ | 8470 | /* Copy the data index array */ |
| ... | @@ -8817,7 +8817,7 @@ | ... | @@ -8817,7 +8817,7 @@ |
| 8817 | * @returns Write function | 8817 | * @returns Write function |
| 8818 | */ | 8818 | */ |
| 8819 | set: function (source) { | 8819 | set: function (source) { |
| 8820 | if ($$2.isPlainObject(source)) { | 8820 | if ($$1.isPlainObject(source)) { |
| 8821 | /* Unlike get, only the underscore (global) option is used for for | 8821 | /* Unlike get, only the underscore (global) option is used for for |
| 8822 | * setting data since we don't know the type here. This is why an object | 8822 | * setting data since we don't know the type here. This is why an object |
| 8823 | * option is not documented for `mData` (which is read/write), but it is | 8823 | * option is not documented for `mData` (which is read/write), but it is |
| ... | @@ -8915,10 +8915,10 @@ | ... | @@ -8915,10 +8915,10 @@ |
| 8915 | * @returns Value read | 8915 | * @returns Value read |
| 8916 | */ | 8916 | */ |
| 8917 | get: function (source) { | 8917 | get: function (source) { |
| 8918 | if ($$2.isPlainObject(source)) { | 8918 | if ($$1.isPlainObject(source)) { |
| 8919 | // Build an object of get functions, and wrap them in a single call | 8919 | // Build an object of get functions, and wrap them in a single call |
| 8920 | var o = {}; | 8920 | var o = {}; |
| 8921 | $$2.each(source, function (key, val) { | 8921 | $$1.each(source, function (key, val) { |
| 8922 | if (val) { | 8922 | if (val) { |
| 8923 | o[key] = DataTable.util.get(val); | 8923 | o[key] = DataTable.util.get(val); |
| 8924 | } | 8924 | } |
| ... | @@ -9023,7 +9023,7 @@ | ... | @@ -9023,7 +9023,7 @@ |
| 9023 | match, | 9023 | match, |
| 9024 | newKey, | 9024 | newKey, |
| 9025 | map = {}; | 9025 | map = {}; |
| 9026 | $$2.each(o, function (key, val) { | 9026 | $$1.each(o, function (key, val) { |
| 9027 | match = key.match(/^([^A-Z]+?)([A-Z])/); | 9027 | match = key.match(/^([^A-Z]+?)([A-Z])/); |
| 9028 | if (match && hungarian.indexOf(match[1] + ' ') !== -1) { | 9028 | if (match && hungarian.indexOf(match[1] + ' ') !== -1) { |
| 9029 | newKey = key.replace(match[0], match[2].toLowerCase()); | 9029 | newKey = key.replace(match[0], match[2].toLowerCase()); |
| ... | @@ -9052,7 +9052,7 @@ | ... | @@ -9052,7 +9052,7 @@ |
| 9052 | _fnHungarianMap(src); | 9052 | _fnHungarianMap(src); |
| 9053 | } | 9053 | } |
| 9054 | var hungarianKey; | 9054 | var hungarianKey; |
| 9055 | $$2.each(user, function (key, val) { | 9055 | $$1.each(user, function (key, val) { |
| 9056 | hungarianKey = src._hungarianMap[key]; | 9056 | hungarianKey = src._hungarianMap[key]; |
| 9057 | if (hungarianKey !== undefined && (force || user[hungarianKey] === undefined)) { | 9057 | if (hungarianKey !== undefined && (force || user[hungarianKey] === undefined)) { |
| 9058 | // For objects, we need to buzz down into the object to copy parameters | 9058 | // For objects, we need to buzz down into the object to copy parameters |
| ... | @@ -9061,7 +9061,7 @@ | ... | @@ -9061,7 +9061,7 @@ |
| 9061 | if (!user[hungarianKey]) { | 9061 | if (!user[hungarianKey]) { |
| 9062 | user[hungarianKey] = {}; | 9062 | user[hungarianKey] = {}; |
| 9063 | } | 9063 | } |
| 9064 | $$2.extend(true, user[hungarianKey], user[key]); | 9064 | $$1.extend(true, user[hungarianKey], user[key]); |
| 9065 | _fnCamelToHungarian(src[hungarianKey], user[hungarianKey], force); | 9065 | _fnCamelToHungarian(src[hungarianKey], user[hungarianKey], force); |
| 9066 | } else { | 9066 | } else { |
| 9067 | user[hungarianKey] = user[key]; | 9067 | user[hungarianKey] = user[key]; |
| ... | @@ -9195,21 +9195,21 @@ | ... | @@ -9195,21 +9195,21 @@ |
| 9195 | DataTable.__browser = browser; | 9195 | DataTable.__browser = browser; |
| 9196 | 9196 | ||
| 9197 | // Scrolling feature / quirks detection | 9197 | // Scrolling feature / quirks detection |
| 9198 | var n = $$2('<div/>').css({ | 9198 | var n = $$1('<div/>').css({ |
| 9199 | position: 'fixed', | 9199 | position: 'fixed', |
| 9200 | top: 0, | 9200 | top: 0, |
| 9201 | left: $$2(window).scrollLeft() * -1, | 9201 | left: $$1(window).scrollLeft() * -1, |
| 9202 | // allow for scrolling | 9202 | // allow for scrolling |
| 9203 | height: 1, | 9203 | height: 1, |
| 9204 | width: 1, | 9204 | width: 1, |
| 9205 | overflow: 'hidden' | 9205 | overflow: 'hidden' |
| 9206 | }).append($$2('<div/>').css({ | 9206 | }).append($$1('<div/>').css({ |
| 9207 | position: 'absolute', | 9207 | position: 'absolute', |
| 9208 | top: 1, | 9208 | top: 1, |
| 9209 | left: 1, | 9209 | left: 1, |
| 9210 | width: 100, | 9210 | width: 100, |
| 9211 | overflow: 'scroll' | 9211 | overflow: 'scroll' |
| 9212 | }).append($$2('<div/>').css({ | 9212 | }).append($$1('<div/>').css({ |
| 9213 | width: '100%', | 9213 | width: '100%', |
| 9214 | height: 10 | 9214 | height: 10 |
| 9215 | }))).appendTo('body'); | 9215 | }))).appendTo('body'); |
| ... | @@ -9242,7 +9242,7 @@ | ... | @@ -9242,7 +9242,7 @@ |
| 9242 | browser.bBounding = n[0].getBoundingClientRect().width ? true : false; | 9242 | browser.bBounding = n[0].getBoundingClientRect().width ? true : false; |
| 9243 | n.remove(); | 9243 | n.remove(); |
| 9244 | } | 9244 | } |
| 9245 | $$2.extend(settings.oBrowser, DataTable.__browser); | 9245 | $$1.extend(settings.oBrowser, DataTable.__browser); |
| 9246 | settings.oScroll.iBarWidth = DataTable.__browser.barWidth; | 9246 | settings.oScroll.iBarWidth = DataTable.__browser.barWidth; |
| 9247 | } | 9247 | } |
| 9248 | 9248 | ||
| ... | @@ -9281,7 +9281,7 @@ | ... | @@ -9281,7 +9281,7 @@ |
| 9281 | // Add column to aoColumns array | 9281 | // Add column to aoColumns array |
| 9282 | var oDefaults = DataTable.defaults.column; | 9282 | var oDefaults = DataTable.defaults.column; |
| 9283 | var iCol = oSettings.aoColumns.length; | 9283 | var iCol = oSettings.aoColumns.length; |
| 9284 | var oCol = $$2.extend({}, DataTable.models.oColumn, oDefaults, { | 9284 | var oCol = $$1.extend({}, DataTable.models.oColumn, oDefaults, { |
| 9285 | "nTh": nTh ? nTh : document.createElement('th'), | 9285 | "nTh": nTh ? nTh : document.createElement('th'), |
| 9286 | "sTitle": oDefaults.sTitle ? oDefaults.sTitle : nTh ? nTh.innerHTML : '', | 9286 | "sTitle": oDefaults.sTitle ? oDefaults.sTitle : nTh ? nTh.innerHTML : '', |
| 9287 | "aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol], | 9287 | "aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol], |
| ... | @@ -9294,10 +9294,10 @@ | ... | @@ -9294,10 +9294,10 @@ |
| 9294 | // passed into extend can be undefined. This allows the user to give a default | 9294 | // passed into extend can be undefined. This allows the user to give a default |
| 9295 | // with only some of the parameters defined, and also not give a default | 9295 | // with only some of the parameters defined, and also not give a default |
| 9296 | var searchCols = oSettings.aoPreSearchCols; | 9296 | var searchCols = oSettings.aoPreSearchCols; |
| 9297 | searchCols[iCol] = $$2.extend({}, DataTable.models.oSearch, searchCols[iCol]); | 9297 | searchCols[iCol] = $$1.extend({}, DataTable.models.oSearch, searchCols[iCol]); |
| 9298 | 9298 | ||
| 9299 | // Use the default column options function to initialise classes etc | 9299 | // Use the default column options function to initialise classes etc |
| 9300 | _fnColumnOptions(oSettings, iCol, $$2(nTh).data()); | 9300 | _fnColumnOptions(oSettings, iCol, $$1(nTh).data()); |
| 9301 | } | 9301 | } |
| 9302 | 9302 | ||
| 9303 | /** | 9303 | /** |
| ... | @@ -9310,7 +9310,7 @@ | ... | @@ -9310,7 +9310,7 @@ |
| 9310 | function _fnColumnOptions(oSettings, iCol, oOptions) { | 9310 | function _fnColumnOptions(oSettings, iCol, oOptions) { |
| 9311 | var oCol = oSettings.aoColumns[iCol]; | 9311 | var oCol = oSettings.aoColumns[iCol]; |
| 9312 | var oClasses = oSettings.oClasses; | 9312 | var oClasses = oSettings.oClasses; |
| 9313 | var th = $$2(oCol.nTh); | 9313 | var th = $$1(oCol.nTh); |
| 9314 | 9314 | ||
| 9315 | // Try to get width information from the DOM. We can't get it from CSS | 9315 | // Try to get width information from the DOM. We can't get it from CSS |
| 9316 | // as we'd need to parse the CSS stylesheet. `width` option can override | 9316 | // as we'd need to parse the CSS stylesheet. `width` option can override |
| ... | @@ -9350,7 +9350,7 @@ | ... | @@ -9350,7 +9350,7 @@ |
| 9350 | th.addClass(oOptions.sClass); | 9350 | th.addClass(oOptions.sClass); |
| 9351 | } | 9351 | } |
| 9352 | var origClass = oCol.sClass; | 9352 | var origClass = oCol.sClass; |
| 9353 | $$2.extend(oCol, oOptions); | 9353 | $$1.extend(oCol, oOptions); |
| 9354 | _fnMap(oCol, oOptions, "sWidth", "sWidthOrig"); | 9354 | _fnMap(oCol, oOptions, "sWidth", "sWidthOrig"); |
| 9355 | 9355 | ||
| 9356 | // Merge class from previously defined classes with this one, rather than just | 9356 | // Merge class from previously defined classes with this one, rather than just |
| ... | @@ -9375,7 +9375,7 @@ | ... | @@ -9375,7 +9375,7 @@ |
| 9375 | var attrTest = function (src) { | 9375 | var attrTest = function (src) { |
| 9376 | return typeof src === 'string' && src.indexOf('@') !== -1; | 9376 | return typeof src === 'string' && src.indexOf('@') !== -1; |
| 9377 | }; | 9377 | }; |
| 9378 | oCol._bAttrSrc = $$2.isPlainObject(mDataSrc) && (attrTest(mDataSrc.sort) || attrTest(mDataSrc.type) || attrTest(mDataSrc.filter)); | 9378 | oCol._bAttrSrc = $$1.isPlainObject(mDataSrc) && (attrTest(mDataSrc.sort) || attrTest(mDataSrc.type) || attrTest(mDataSrc.filter)); |
| 9379 | oCol._setter = null; | 9379 | oCol._setter = null; |
| 9380 | oCol.fnGetData = function (rowData, type, meta) { | 9380 | oCol.fnGetData = function (rowData, type, meta) { |
| 9381 | var innerData = mData(rowData, type, undefined, meta); | 9381 | var innerData = mData(rowData, type, undefined, meta); |
| ... | @@ -9398,8 +9398,8 @@ | ... | @@ -9398,8 +9398,8 @@ |
| 9398 | } | 9398 | } |
| 9399 | 9399 | ||
| 9400 | /* Check that the class assignment is correct for sorting */ | 9400 | /* Check that the class assignment is correct for sorting */ |
| 9401 | var bAsc = $$2.inArray('asc', oCol.asSorting) !== -1; | 9401 | var bAsc = $$1.inArray('asc', oCol.asSorting) !== -1; |
| 9402 | var bDesc = $$2.inArray('desc', oCol.asSorting) !== -1; | 9402 | var bDesc = $$1.inArray('desc', oCol.asSorting) !== -1; |
| 9403 | if (!oCol.bSortable || !bAsc && !bDesc) { | 9403 | if (!oCol.bSortable || !bAsc && !bDesc) { |
| 9404 | oCol.sSortingClass = oClasses.sSortableNone; | 9404 | oCol.sSortingClass = oClasses.sSortableNone; |
| 9405 | oCol.sSortingClassJUI = ""; | 9405 | oCol.sSortingClassJUI = ""; |
| ... | @@ -9460,7 +9460,7 @@ | ... | @@ -9460,7 +9460,7 @@ |
| 9460 | */ | 9460 | */ |
| 9461 | function _fnColumnIndexToVisible(oSettings, iMatch) { | 9461 | function _fnColumnIndexToVisible(oSettings, iMatch) { |
| 9462 | var aiVis = _fnGetColumns(oSettings, 'bVisible'); | 9462 | var aiVis = _fnGetColumns(oSettings, 'bVisible'); |
| 9463 | var iPos = $$2.inArray(iMatch, aiVis); | 9463 | var iPos = $$1.inArray(iMatch, aiVis); |
| 9464 | return iPos !== -1 ? iPos : null; | 9464 | return iPos !== -1 ? iPos : null; |
| 9465 | } | 9465 | } |
| 9466 | 9466 | ||
| ... | @@ -9474,8 +9474,8 @@ | ... | @@ -9474,8 +9474,8 @@ |
| 9474 | var vis = 0; | 9474 | var vis = 0; |
| 9475 | 9475 | ||
| 9476 | // No reduce in IE8, use a loop for now | 9476 | // No reduce in IE8, use a loop for now |
| 9477 | $$2.each(oSettings.aoColumns, function (i, col) { | 9477 | $$1.each(oSettings.aoColumns, function (i, col) { |
| 9478 | if (col.bVisible && $$2(col.nTh).css('display') !== 'none') { | 9478 | if (col.bVisible && $$1(col.nTh).css('display') !== 'none') { |
| 9479 | vis++; | 9479 | vis++; |
| 9480 | } | 9480 | } |
| 9481 | }); | 9481 | }); |
| ... | @@ -9492,7 +9492,7 @@ | ... | @@ -9492,7 +9492,7 @@ |
| 9492 | */ | 9492 | */ |
| 9493 | function _fnGetColumns(oSettings, sParam) { | 9493 | function _fnGetColumns(oSettings, sParam) { |
| 9494 | var a = []; | 9494 | var a = []; |
| 9495 | $$2.map(oSettings.aoColumns, function (val, i) { | 9495 | $$1.map(oSettings.aoColumns, function (val, i) { |
| 9496 | if (val[sParam]) { | 9496 | if (val[sParam]) { |
| 9497 | a.push(i); | 9497 | a.push(i); |
| 9498 | } | 9498 | } |
| ... | @@ -9602,7 +9602,7 @@ | ... | @@ -9602,7 +9602,7 @@ |
| 9602 | } else if (typeof aTargets[j] === 'string') { | 9602 | } else if (typeof aTargets[j] === 'string') { |
| 9603 | /* Class name matching on TH element */ | 9603 | /* Class name matching on TH element */ |
| 9604 | for (k = 0, kLen = columns.length; k < kLen; k++) { | 9604 | for (k = 0, kLen = columns.length; k < kLen; k++) { |
| 9605 | if (aTargets[j] == "_all" || $$2(columns[k].nTh).hasClass(aTargets[j])) { | 9605 | if (aTargets[j] == "_all" || $$1(columns[k].nTh).hasClass(aTargets[j])) { |
| 9606 | fn(k, def); | 9606 | fn(k, def); |
| 9607 | } | 9607 | } |
| 9608 | } | 9608 | } |
| ... | @@ -9635,7 +9635,7 @@ | ... | @@ -9635,7 +9635,7 @@ |
| 9635 | function _fnAddData(oSettings, aDataIn, nTr, anTds) { | 9635 | function _fnAddData(oSettings, aDataIn, nTr, anTds) { |
| 9636 | /* Create the object for storing information about this new row */ | 9636 | /* Create the object for storing information about this new row */ |
| 9637 | var iRow = oSettings.aoData.length; | 9637 | var iRow = oSettings.aoData.length; |
| 9638 | var oData = $$2.extend(true, {}, DataTable.models.oRow, { | 9638 | var oData = $$1.extend(true, {}, DataTable.models.oRow, { |
| 9639 | src: nTr ? 'dom' : 'data', | 9639 | src: nTr ? 'dom' : 'data', |
| 9640 | idx: iRow | 9640 | idx: iRow |
| 9641 | }); | 9641 | }); |
| ... | @@ -9676,8 +9676,8 @@ | ... | @@ -9676,8 +9676,8 @@ |
| 9676 | var row; | 9676 | var row; |
| 9677 | 9677 | ||
| 9678 | // Allow an individual node to be passed in | 9678 | // Allow an individual node to be passed in |
| 9679 | if (!(trs instanceof $$2)) { | 9679 | if (!(trs instanceof $$1)) { |
| 9680 | trs = $$2(trs); | 9680 | trs = $$1(trs); |
| 9681 | } | 9681 | } |
| 9682 | return trs.map(function (i, el) { | 9682 | return trs.map(function (i, el) { |
| 9683 | row = _fnGetRowElements(settings, el); | 9683 | row = _fnGetRowElements(settings, el); |
| ... | @@ -9705,7 +9705,7 @@ | ... | @@ -9705,7 +9705,7 @@ |
| 9705 | * @memberof DataTable#oApi | 9705 | * @memberof DataTable#oApi |
| 9706 | */ | 9706 | */ |
| 9707 | function _fnNodeToColumnIndex(oSettings, iRow, n) { | 9707 | function _fnNodeToColumnIndex(oSettings, iRow, n) { |
| 9708 | return $$2.inArray(n, oSettings.aoData[iRow].anCells); | 9708 | return $$1.inArray(n, oSettings.aoData[iRow].anCells); |
| 9709 | } | 9709 | } |
| 9710 | 9710 | ||
| 9711 | /** | 9711 | /** |
| ... | @@ -9789,7 +9789,7 @@ | ... | @@ -9789,7 +9789,7 @@ |
| 9789 | * @return {array} Split string | 9789 | * @return {array} Split string |
| 9790 | */ | 9790 | */ |
| 9791 | function _fnSplitObjNotation(str) { | 9791 | function _fnSplitObjNotation(str) { |
| 9792 | return $$2.map(str.match(/(\\.|[^\.])+/g) || [''], function (s) { | 9792 | return $$1.map(str.match(/(\\.|[^\.])+/g) || [''], function (s) { |
| 9793 | return s.replace(/\\\./g, '.'); | 9793 | return s.replace(/\\\./g, '.'); |
| 9794 | }); | 9794 | }); |
| 9795 | } | 9795 | } |
| ... | @@ -10068,7 +10068,7 @@ | ... | @@ -10068,7 +10068,7 @@ |
| 10068 | cells.push(nTd); | 10068 | cells.push(nTd); |
| 10069 | 10069 | ||
| 10070 | // Need to create the HTML if new, or if a rendering function is defined | 10070 | // Need to create the HTML if new, or if a rendering function is defined |
| 10071 | if (create || (oCol.mRender || oCol.mData !== i) && (!$$2.isPlainObject(oCol.mData) || oCol.mData._ !== i + '.display')) { | 10071 | if (create || (oCol.mRender || oCol.mData !== i) && (!$$1.isPlainObject(oCol.mData) || oCol.mData._ !== i + '.display')) { |
| 10072 | nTd.innerHTML = _fnGetCellData(oSettings, iRow, i, 'display'); | 10072 | nTd.innerHTML = _fnGetCellData(oSettings, iRow, i, 'display'); |
| 10073 | } | 10073 | } |
| 10074 | 10074 | ||
| ... | @@ -10110,13 +10110,13 @@ | ... | @@ -10110,13 +10110,13 @@ |
| 10110 | // Remove any classes added by DT_RowClass before | 10110 | // Remove any classes added by DT_RowClass before |
| 10111 | var a = data.DT_RowClass.split(' '); | 10111 | var a = data.DT_RowClass.split(' '); |
| 10112 | row.__rowc = row.__rowc ? _unique(row.__rowc.concat(a)) : a; | 10112 | row.__rowc = row.__rowc ? _unique(row.__rowc.concat(a)) : a; |
| 10113 | $$2(tr).removeClass(row.__rowc.join(' ')).addClass(data.DT_RowClass); | 10113 | $$1(tr).removeClass(row.__rowc.join(' ')).addClass(data.DT_RowClass); |
| 10114 | } | 10114 | } |
| 10115 | if (data.DT_RowAttr) { | 10115 | if (data.DT_RowAttr) { |
| 10116 | $$2(tr).attr(data.DT_RowAttr); | 10116 | $$1(tr).attr(data.DT_RowAttr); |
| 10117 | } | 10117 | } |
| 10118 | if (data.DT_RowData) { | 10118 | if (data.DT_RowData) { |
| 10119 | $$2(tr).data(data.DT_RowData); | 10119 | $$1(tr).data(data.DT_RowData); |
| 10120 | } | 10120 | } |
| 10121 | } | 10121 | } |
| 10122 | } | 10122 | } |
| ... | @@ -10130,15 +10130,15 @@ | ... | @@ -10130,15 +10130,15 @@ |
| 10130 | var i, ien, cell, row, column; | 10130 | var i, ien, cell, row, column; |
| 10131 | var thead = oSettings.nTHead; | 10131 | var thead = oSettings.nTHead; |
| 10132 | var tfoot = oSettings.nTFoot; | 10132 | var tfoot = oSettings.nTFoot; |
| 10133 | var createHeader = $$2('th, td', thead).length === 0; | 10133 | var createHeader = $$1('th, td', thead).length === 0; |
| 10134 | var classes = oSettings.oClasses; | 10134 | var classes = oSettings.oClasses; |
| 10135 | var columns = oSettings.aoColumns; | 10135 | var columns = oSettings.aoColumns; |
| 10136 | if (createHeader) { | 10136 | if (createHeader) { |
| 10137 | row = $$2('<tr/>').appendTo(thead); | 10137 | row = $$1('<tr/>').appendTo(thead); |
| 10138 | } | 10138 | } |
| 10139 | for (i = 0, ien = columns.length; i < ien; i++) { | 10139 | for (i = 0, ien = columns.length; i < ien; i++) { |
| 10140 | column = columns[i]; | 10140 | column = columns[i]; |
| 10141 | cell = $$2(column.nTh).addClass(column.sClass); | 10141 | cell = $$1(column.nTh).addClass(column.sClass); |
| 10142 | if (createHeader) { | 10142 | if (createHeader) { |
| 10143 | cell.appendTo(row); | 10143 | cell.appendTo(row); |
| 10144 | } | 10144 | } |
| ... | @@ -10161,8 +10161,8 @@ | ... | @@ -10161,8 +10161,8 @@ |
| 10161 | } | 10161 | } |
| 10162 | 10162 | ||
| 10163 | /* Deal with the footer - add classes if required */ | 10163 | /* Deal with the footer - add classes if required */ |
| 10164 | $$2(thead).children('tr').children('th, td').addClass(classes.sHeaderTH); | 10164 | $$1(thead).children('tr').children('th, td').addClass(classes.sHeaderTH); |
| 10165 | $$2(tfoot).children('tr').children('th, td').addClass(classes.sFooterTH); | 10165 | $$1(tfoot).children('tr').children('th, td').addClass(classes.sFooterTH); |
| 10166 | 10166 | ||
| 10167 | // Cache the footer cells. Note that we only take the cells from the first | 10167 | // Cache the footer cells. Note that we only take the cells from the first |
| 10168 | // row in the footer. If there is more than one row the user wants to | 10168 | // row in the footer. If there is more than one row the user wants to |
| ... | @@ -10175,7 +10175,7 @@ | ... | @@ -10175,7 +10175,7 @@ |
| 10175 | if (column) { | 10175 | if (column) { |
| 10176 | column.nTf = cells[i].cell; | 10176 | column.nTf = cells[i].cell; |
| 10177 | if (column.sClass) { | 10177 | if (column.sClass) { |
| 10178 | $$2(column.nTf).addClass(column.sClass); | 10178 | $$1(column.nTf).addClass(column.sClass); |
| 10179 | } | 10179 | } |
| 10180 | } else { | 10180 | } else { |
| 10181 | _fnLog(oSettings, 0, 'Incorrect column count', 18); | 10181 | _fnLog(oSettings, 0, 'Incorrect column count', 18); |
| ... | @@ -10261,7 +10261,7 @@ | ... | @@ -10261,7 +10261,7 @@ |
| 10261 | } | 10261 | } |
| 10262 | 10262 | ||
| 10263 | /* Do the actual expansion in the DOM */ | 10263 | /* Do the actual expansion in the DOM */ |
| 10264 | $$2(aoLocal[i][j].cell).attr('rowspan', iRowspan).attr('colspan', iColspan); | 10264 | $$1(aoLocal[i][j].cell).attr('rowspan', iRowspan).attr('colspan', iColspan); |
| 10265 | } | 10265 | } |
| 10266 | } | 10266 | } |
| 10267 | } | 10267 | } |
| ... | @@ -10279,7 +10279,7 @@ | ... | @@ -10279,7 +10279,7 @@ |
| 10279 | 10279 | ||
| 10280 | /* Provide a pre-callback function which can be used to cancel the draw is false is returned */ | 10280 | /* Provide a pre-callback function which can be used to cancel the draw is false is returned */ |
| 10281 | var aPreDraw = _fnCallbackFire(oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings]); | 10281 | var aPreDraw = _fnCallbackFire(oSettings, 'aoPreDrawCallback', 'preDraw', [oSettings]); |
| 10282 | if ($$2.inArray(false, aPreDraw) !== -1) { | 10282 | if ($$1.inArray(false, aPreDraw) !== -1) { |
| 10283 | _fnProcessingDisplay(oSettings, false); | 10283 | _fnProcessingDisplay(oSettings, false); |
| 10284 | return; | 10284 | return; |
| 10285 | } | 10285 | } |
| ... | @@ -10320,7 +10320,7 @@ | ... | @@ -10320,7 +10320,7 @@ |
| 10320 | if (iStripes !== 0) { | 10320 | if (iStripes !== 0) { |
| 10321 | var sStripe = asStripeClasses[iRowCount % iStripes]; | 10321 | var sStripe = asStripeClasses[iRowCount % iStripes]; |
| 10322 | if (aoData._sRowStripe != sStripe) { | 10322 | if (aoData._sRowStripe != sStripe) { |
| 10323 | $$2(nRow).removeClass(aoData._sRowStripe).addClass(sStripe); | 10323 | $$1(nRow).removeClass(aoData._sRowStripe).addClass(sStripe); |
| 10324 | aoData._sRowStripe = sStripe; | 10324 | aoData._sRowStripe = sStripe; |
| 10325 | } | 10325 | } |
| 10326 | } | 10326 | } |
| ... | @@ -10340,9 +10340,9 @@ | ... | @@ -10340,9 +10340,9 @@ |
| 10340 | } else if (oLang.sEmptyTable && oSettings.fnRecordsTotal() === 0) { | 10340 | } else if (oLang.sEmptyTable && oSettings.fnRecordsTotal() === 0) { |
| 10341 | sZero = oLang.sEmptyTable; | 10341 | sZero = oLang.sEmptyTable; |
| 10342 | } | 10342 | } |
| 10343 | anRows[0] = $$2('<tr/>', { | 10343 | anRows[0] = $$1('<tr/>', { |
| 10344 | 'class': iStripes ? asStripeClasses[0] : '' | 10344 | 'class': iStripes ? asStripeClasses[0] : '' |
| 10345 | }).append($$2('<td />', { | 10345 | }).append($$1('<td />', { |
| 10346 | 'valign': 'top', | 10346 | 'valign': 'top', |
| 10347 | 'colSpan': _fnVisbleColumns(oSettings), | 10347 | 'colSpan': _fnVisbleColumns(oSettings), |
| 10348 | 'class': oSettings.oClasses.sRowEmpty | 10348 | 'class': oSettings.oClasses.sRowEmpty |
| ... | @@ -10350,11 +10350,11 @@ | ... | @@ -10350,11 +10350,11 @@ |
| 10350 | } | 10350 | } |
| 10351 | 10351 | ||
| 10352 | /* Header and footer callbacks */ | 10352 | /* Header and footer callbacks */ |
| 10353 | _fnCallbackFire(oSettings, 'aoHeaderCallback', 'header', [$$2(oSettings.nTHead).children('tr')[0], _fnGetDataMaster(oSettings), iDisplayStart, iDisplayEnd, aiDisplay]); | 10353 | _fnCallbackFire(oSettings, 'aoHeaderCallback', 'header', [$$1(oSettings.nTHead).children('tr')[0], _fnGetDataMaster(oSettings), iDisplayStart, iDisplayEnd, aiDisplay]); |
| 10354 | _fnCallbackFire(oSettings, 'aoFooterCallback', 'footer', [$$2(oSettings.nTFoot).children('tr')[0], _fnGetDataMaster(oSettings), iDisplayStart, iDisplayEnd, aiDisplay]); | 10354 | _fnCallbackFire(oSettings, 'aoFooterCallback', 'footer', [$$1(oSettings.nTFoot).children('tr')[0], _fnGetDataMaster(oSettings), iDisplayStart, iDisplayEnd, aiDisplay]); |
| 10355 | var body = $$2(oSettings.nTBody); | 10355 | var body = $$1(oSettings.nTBody); |
| 10356 | body.children().detach(); | 10356 | body.children().detach(); |
| 10357 | body.append($$2(anRows)); | 10357 | body.append($$1(anRows)); |
| 10358 | 10358 | ||
| 10359 | /* Call all required callback functions for the end of a draw */ | 10359 | /* Call all required callback functions for the end of a draw */ |
| 10360 | _fnCallbackFire(oSettings, 'aoDrawCallback', 'draw', [oSettings]); | 10360 | _fnCallbackFire(oSettings, 'aoDrawCallback', 'draw', [oSettings]); |
| ... | @@ -10403,12 +10403,12 @@ | ... | @@ -10403,12 +10403,12 @@ |
| 10403 | */ | 10403 | */ |
| 10404 | function _fnAddOptionsHtml(oSettings) { | 10404 | function _fnAddOptionsHtml(oSettings) { |
| 10405 | var classes = oSettings.oClasses; | 10405 | var classes = oSettings.oClasses; |
| 10406 | var table = $$2(oSettings.nTable); | 10406 | var table = $$1(oSettings.nTable); |
| 10407 | var holding = $$2('<div/>').insertBefore(table); // Holding element for speed | 10407 | var holding = $$1('<div/>').insertBefore(table); // Holding element for speed |
| 10408 | var features = oSettings.oFeatures; | 10408 | var features = oSettings.oFeatures; |
| 10409 | 10409 | ||
| 10410 | // All DataTables are wrapped in a div | 10410 | // All DataTables are wrapped in a div |
| 10411 | var insert = $$2('<div/>', { | 10411 | var insert = $$1('<div/>', { |
| 10412 | id: oSettings.sTableId + '_wrapper', | 10412 | id: oSettings.sTableId + '_wrapper', |
| 10413 | 'class': classes.sWrapper + (oSettings.nTFoot ? '' : ' ' + classes.sNoFooter) | 10413 | 'class': classes.sWrapper + (oSettings.nTFoot ? '' : ' ' + classes.sNoFooter) |
| 10414 | }); | 10414 | }); |
| ... | @@ -10424,7 +10424,7 @@ | ... | @@ -10424,7 +10424,7 @@ |
| 10424 | cOption = aDom[i]; | 10424 | cOption = aDom[i]; |
| 10425 | if (cOption == '<') { | 10425 | if (cOption == '<') { |
| 10426 | /* New container div */ | 10426 | /* New container div */ |
| 10427 | nNewNode = $$2('<div/>')[0]; | 10427 | nNewNode = $$1('<div/>')[0]; |
| 10428 | 10428 | ||
| 10429 | /* Check to see if we should append an id and/or a class name to the container */ | 10429 | /* Check to see if we should append an id and/or a class name to the container */ |
| 10430 | cNext = aDom[i + 1]; | 10430 | cNext = aDom[i + 1]; |
| ... | @@ -10459,7 +10459,7 @@ | ... | @@ -10459,7 +10459,7 @@ |
| 10459 | } | 10459 | } |
| 10460 | 10460 | ||
| 10461 | insert.append(nNewNode); | 10461 | insert.append(nNewNode); |
| 10462 | insert = $$2(nNewNode); | 10462 | insert = $$1(nNewNode); |
| 10463 | } else if (cOption == '>') { | 10463 | } else if (cOption == '>') { |
| 10464 | /* End container div */ | 10464 | /* End container div */ |
| 10465 | insert = insert.parent(); | 10465 | insert = insert.parent(); |
| ... | @@ -10520,7 +10520,7 @@ | ... | @@ -10520,7 +10520,7 @@ |
| 10520 | * @memberof DataTable#oApi | 10520 | * @memberof DataTable#oApi |
| 10521 | */ | 10521 | */ |
| 10522 | function _fnDetectHeader(aLayout, nThead) { | 10522 | function _fnDetectHeader(aLayout, nThead) { |
| 10523 | var nTrs = $$2(nThead).children('tr'); | 10523 | var nTrs = $$1(nThead).children('tr'); |
| 10524 | var nTr, nCell; | 10524 | var nTr, nCell; |
| 10525 | var i, k, l, iLen, iColShifted, iColumn, iColspan, iRowspan; | 10525 | var i, k, l, iLen, iColShifted, iColumn, iColspan, iRowspan; |
| 10526 | var bUnique; | 10526 | var bUnique; |
| ... | @@ -10637,7 +10637,7 @@ | ... | @@ -10637,7 +10637,7 @@ |
| 10637 | if (data && Array.isArray(data)) { | 10637 | if (data && Array.isArray(data)) { |
| 10638 | var tmp = {}; | 10638 | var tmp = {}; |
| 10639 | var rbracket = /(.*?)\[\]$/; | 10639 | var rbracket = /(.*?)\[\]$/; |
| 10640 | $$2.each(data, function (key, val) { | 10640 | $$1.each(data, function (key, val) { |
| 10641 | var match = val.name.match(rbracket); | 10641 | var match = val.name.match(rbracket); |
| 10642 | if (match) { | 10642 | if (match) { |
| 10643 | // Support for arrays | 10643 | // Support for arrays |
| ... | @@ -10669,14 +10669,14 @@ | ... | @@ -10669,14 +10669,14 @@ |
| 10669 | _fnCallbackFire(oSettings, null, 'xhr', [oSettings, json, oSettings.jqXHR]); | 10669 | _fnCallbackFire(oSettings, null, 'xhr', [oSettings, json, oSettings.jqXHR]); |
| 10670 | fn(json); | 10670 | fn(json); |
| 10671 | }; | 10671 | }; |
| 10672 | if ($$2.isPlainObject(ajax) && ajax.data) { | 10672 | if ($$1.isPlainObject(ajax) && ajax.data) { |
| 10673 | ajaxData = ajax.data; | 10673 | ajaxData = ajax.data; |
| 10674 | var newData = typeof ajaxData === 'function' ? ajaxData(data, oSettings) : | 10674 | var newData = typeof ajaxData === 'function' ? ajaxData(data, oSettings) : |
| 10675 | // fn can manipulate data or return | 10675 | // fn can manipulate data or return |
| 10676 | ajaxData; // an object object or array to merge | 10676 | ajaxData; // an object object or array to merge |
| 10677 | 10677 | ||
| 10678 | // If the function returned something, use that alone | 10678 | // If the function returned something, use that alone |
| 10679 | data = typeof ajaxData === 'function' && newData ? newData : $$2.extend(true, data, newData); | 10679 | data = typeof ajaxData === 'function' && newData ? newData : $$1.extend(true, data, newData); |
| 10680 | 10680 | ||
| 10681 | // Remove the data property as we've resolved it already and don't want | 10681 | // Remove the data property as we've resolved it already and don't want |
| 10682 | // jQuery to do it again (it is restored at the end of the function) | 10682 | // jQuery to do it again (it is restored at the end of the function) |
| ... | @@ -10690,7 +10690,7 @@ | ... | @@ -10690,7 +10690,7 @@ |
| 10690 | "type": oSettings.sServerMethod, | 10690 | "type": oSettings.sServerMethod, |
| 10691 | "error": function (xhr, error, thrown) { | 10691 | "error": function (xhr, error, thrown) { |
| 10692 | var ret = _fnCallbackFire(oSettings, null, 'xhr', [oSettings, null, oSettings.jqXHR]); | 10692 | var ret = _fnCallbackFire(oSettings, null, 'xhr', [oSettings, null, oSettings.jqXHR]); |
| 10693 | if ($$2.inArray(true, ret) === -1) { | 10693 | if ($$1.inArray(true, ret) === -1) { |
| 10694 | if (error == "parsererror") { | 10694 | if (error == "parsererror") { |
| 10695 | _fnLog(oSettings, 0, 'Invalid JSON response', 1); | 10695 | _fnLog(oSettings, 0, 'Invalid JSON response', 1); |
| 10696 | } else if (xhr.readyState === 4) { | 10696 | } else if (xhr.readyState === 4) { |
| ... | @@ -10708,7 +10708,7 @@ | ... | @@ -10708,7 +10708,7 @@ |
| 10708 | _fnCallbackFire(oSettings, null, 'preXhr', [oSettings, data]); | 10708 | _fnCallbackFire(oSettings, null, 'preXhr', [oSettings, data]); |
| 10709 | if (oSettings.fnServerData) { | 10709 | if (oSettings.fnServerData) { |
| 10710 | // DataTables 1.9- compatibility | 10710 | // DataTables 1.9- compatibility |
| 10711 | oSettings.fnServerData.call(instance, oSettings.sAjaxSource, $$2.map(data, function (val, key) { | 10711 | oSettings.fnServerData.call(instance, oSettings.sAjaxSource, $$1.map(data, function (val, key) { |
| 10712 | // Need to convert back to 1.9 trad format | 10712 | // Need to convert back to 1.9 trad format |
| 10713 | return { | 10713 | return { |
| 10714 | name: key, | 10714 | name: key, |
| ... | @@ -10717,7 +10717,7 @@ | ... | @@ -10717,7 +10717,7 @@ |
| 10717 | }), callback, oSettings); | 10717 | }), callback, oSettings); |
| 10718 | } else if (oSettings.sAjaxSource || typeof ajax === 'string') { | 10718 | } else if (oSettings.sAjaxSource || typeof ajax === 'string') { |
| 10719 | // DataTables 1.9- compatibility | 10719 | // DataTables 1.9- compatibility |
| 10720 | oSettings.jqXHR = $$2.ajax($$2.extend(baseAjax, { | 10720 | oSettings.jqXHR = $$1.ajax($$1.extend(baseAjax, { |
| 10721 | url: ajax || oSettings.sAjaxSource | 10721 | url: ajax || oSettings.sAjaxSource |
| 10722 | })); | 10722 | })); |
| 10723 | } else if (typeof ajax === 'function') { | 10723 | } else if (typeof ajax === 'function') { |
| ... | @@ -10725,7 +10725,7 @@ | ... | @@ -10725,7 +10725,7 @@ |
| 10725 | oSettings.jqXHR = ajax.call(instance, data, callback, oSettings); | 10725 | oSettings.jqXHR = ajax.call(instance, data, callback, oSettings); |
| 10726 | } else { | 10726 | } else { |
| 10727 | // Object to extend the base settings | 10727 | // Object to extend the base settings |
| 10728 | oSettings.jqXHR = $$2.ajax($$2.extend(baseAjax, ajax)); | 10728 | oSettings.jqXHR = $$1.ajax($$1.extend(baseAjax, ajax)); |
| 10729 | 10729 | ||
| 10730 | // Restore for next time around | 10730 | // Restore for next time around |
| 10731 | ajax.data = ajaxData; | 10731 | ajax.data = ajaxData; |
| ... | @@ -10831,7 +10831,7 @@ | ... | @@ -10831,7 +10831,7 @@ |
| 10831 | param('bRegex', preSearch.bRegex); | 10831 | param('bRegex', preSearch.bRegex); |
| 10832 | } | 10832 | } |
| 10833 | if (features.bSort) { | 10833 | if (features.bSort) { |
| 10834 | $$2.each(sort, function (i, val) { | 10834 | $$1.each(sort, function (i, val) { |
| 10835 | d.order.push({ | 10835 | d.order.push({ |
| 10836 | column: val.col, | 10836 | column: val.col, |
| 10837 | dir: val.dir | 10837 | dir: val.dir |
| ... | @@ -10910,7 +10910,7 @@ | ... | @@ -10910,7 +10910,7 @@ |
| 10910 | * @return {array} Array of data to use | 10910 | * @return {array} Array of data to use |
| 10911 | */ | 10911 | */ |
| 10912 | function _fnAjaxDataSrc(oSettings, json, write) { | 10912 | function _fnAjaxDataSrc(oSettings, json, write) { |
| 10913 | var dataSrc = $$2.isPlainObject(oSettings.ajax) && oSettings.ajax.dataSrc !== undefined ? oSettings.ajax.dataSrc : oSettings.sAjaxDataProp; // Compatibility with 1.9-. | 10913 | var dataSrc = $$1.isPlainObject(oSettings.ajax) && oSettings.ajax.dataSrc !== undefined ? oSettings.ajax.dataSrc : oSettings.sAjaxDataProp; // Compatibility with 1.9-. |
| 10914 | 10914 | ||
| 10915 | if (!write) { | 10915 | if (!write) { |
| 10916 | if (dataSrc === 'data') { | 10916 | if (dataSrc === 'data') { |
| ... | @@ -10940,10 +10940,10 @@ | ... | @@ -10940,10 +10940,10 @@ |
| 10940 | var input = '<input type="search" class="' + classes.sFilterInput + '"/>'; | 10940 | var input = '<input type="search" class="' + classes.sFilterInput + '"/>'; |
| 10941 | var str = language.sSearch; | 10941 | var str = language.sSearch; |
| 10942 | str = str.match(/_INPUT_/) ? str.replace('_INPUT_', input) : str + input; | 10942 | str = str.match(/_INPUT_/) ? str.replace('_INPUT_', input) : str + input; |
| 10943 | var filter = $$2('<div/>', { | 10943 | var filter = $$1('<div/>', { |
| 10944 | 'id': !features.f ? tableId + '_filter' : null, | 10944 | 'id': !features.f ? tableId + '_filter' : null, |
| 10945 | 'class': classes.sFilter | 10945 | 'class': classes.sFilter |
| 10946 | }).append($$2('<label/>').append(str)); | 10946 | }).append($$1('<label/>').append(str)); |
| 10947 | var searchFn = function (event) { | 10947 | var searchFn = function (event) { |
| 10948 | /* Update all other filter input elements for the new display */ | 10948 | /* Update all other filter input elements for the new display */ |
| 10949 | features.f; | 10949 | features.f; |
| ... | @@ -10967,7 +10967,7 @@ | ... | @@ -10967,7 +10967,7 @@ |
| 10967 | } | 10967 | } |
| 10968 | }; | 10968 | }; |
| 10969 | var searchDelay = settings.searchDelay !== null ? settings.searchDelay : _fnDataSource(settings) === 'ssp' ? 400 : 0; | 10969 | var searchDelay = settings.searchDelay !== null ? settings.searchDelay : _fnDataSource(settings) === 'ssp' ? 400 : 0; |
| 10970 | var jqFilter = $$2('input', filter).val(previousSearch.sSearch).attr('placeholder', language.sSearchPlaceholder).on('keyup.DT search.DT input.DT paste.DT cut.DT', searchDelay ? _fnThrottle(searchFn, searchDelay) : searchFn).on('mouseup.DT', function (e) { | 10970 | var jqFilter = $$1('input', filter).val(previousSearch.sSearch).attr('placeholder', language.sSearchPlaceholder).on('keyup.DT search.DT input.DT paste.DT cut.DT', searchDelay ? _fnThrottle(searchFn, searchDelay) : searchFn).on('mouseup.DT', function (e) { |
| 10971 | // Edge fix! Edge 17 does not trigger anything other than mouse events when clicking | 10971 | // Edge fix! Edge 17 does not trigger anything other than mouse events when clicking |
| 10972 | // on the clear icon (Edge bug 17584515). This is safe in other browsers as `searchFn` | 10972 | // on the clear icon (Edge bug 17584515). This is safe in other browsers as `searchFn` |
| 10973 | // checks the value to see if it has changed. In other browsers it won't have. | 10973 | // checks the value to see if it has changed. In other browsers it won't have. |
| ... | @@ -10982,7 +10982,7 @@ | ... | @@ -10982,7 +10982,7 @@ |
| 10982 | }).attr('aria-controls', tableId); | 10982 | }).attr('aria-controls', tableId); |
| 10983 | 10983 | ||
| 10984 | // Update the input elements whenever the table is filtered | 10984 | // Update the input elements whenever the table is filtered |
| 10985 | $$2(settings.nTable).on('search.dt.DT', function (ev, s) { | 10985 | $$1(settings.nTable).on('search.dt.DT', function (ev, s) { |
| 10986 | if (settings === s) { | 10986 | if (settings === s) { |
| 10987 | // IE9 throws an 'unknown error' if document.activeElement is used | 10987 | // IE9 throws an 'unknown error' if document.activeElement is used |
| 10988 | // inside an iframe or frame... | 10988 | // inside an iframe or frame... |
| ... | @@ -11069,7 +11069,7 @@ | ... | @@ -11069,7 +11069,7 @@ |
| 11069 | // So the array reference doesn't break set the results into the | 11069 | // So the array reference doesn't break set the results into the |
| 11070 | // existing array | 11070 | // existing array |
| 11071 | displayRows.length = 0; | 11071 | displayRows.length = 0; |
| 11072 | $$2.merge(displayRows, rows); | 11072 | $$1.merge(displayRows, rows); |
| 11073 | } | 11073 | } |
| 11074 | } | 11074 | } |
| 11075 | 11075 | ||
| ... | @@ -11166,7 +11166,7 @@ | ... | @@ -11166,7 +11166,7 @@ |
| 11166 | * | 11166 | * |
| 11167 | * ^(?=.*?\bone\b)(?=.*?\btwo three\b)(?=.*?\bfour\b).*$ | 11167 | * ^(?=.*?\bone\b)(?=.*?\btwo three\b)(?=.*?\bfour\b).*$ |
| 11168 | */ | 11168 | */ |
| 11169 | var a = $$2.map(search.match(/["\u201C][^"\u201D]+["\u201D]|[^ ]+/g) || [''], function (word) { | 11169 | var a = $$1.map(search.match(/["\u201C][^"\u201D]+["\u201D]|[^ ]+/g) || [''], function (word) { |
| 11170 | if (word.charAt(0) === '"') { | 11170 | if (word.charAt(0) === '"') { |
| 11171 | var m = word.match(/^"(.*)"$/); | 11171 | var m = word.match(/^"(.*)"$/); |
| 11172 | word = m ? m[1] : word; | 11172 | word = m ? m[1] : word; |
| ... | @@ -11188,7 +11188,7 @@ | ... | @@ -11188,7 +11188,7 @@ |
| 11188 | * @memberof DataTable#oApi | 11188 | * @memberof DataTable#oApi |
| 11189 | */ | 11189 | */ |
| 11190 | var _fnEscapeRegex = DataTable.util.escapeRegex; | 11190 | var _fnEscapeRegex = DataTable.util.escapeRegex; |
| 11191 | var __filter_div = $$2('<div>')[0]; | 11191 | var __filter_div = $$1('<div>')[0]; |
| 11192 | var __filter_div_textContent = __filter_div.textContent !== undefined; | 11192 | var __filter_div_textContent = __filter_div.textContent !== undefined; |
| 11193 | 11193 | ||
| 11194 | // Update the filtering data for each row if needed (by invalidation or first run) | 11194 | // Update the filtering data for each row if needed (by invalidation or first run) |
| ... | @@ -11280,7 +11280,7 @@ | ... | @@ -11280,7 +11280,7 @@ |
| 11280 | function _fnFeatureHtmlInfo(settings) { | 11280 | function _fnFeatureHtmlInfo(settings) { |
| 11281 | var tid = settings.sTableId, | 11281 | var tid = settings.sTableId, |
| 11282 | nodes = settings.aanFeatures.i, | 11282 | nodes = settings.aanFeatures.i, |
| 11283 | n = $$2('<div/>', { | 11283 | n = $$1('<div/>', { |
| 11284 | 'class': settings.oClasses.sInfo, | 11284 | 'class': settings.oClasses.sInfo, |
| 11285 | 'id': !nodes ? tid + '_info' : null | 11285 | 'id': !nodes ? tid + '_info' : null |
| 11286 | }); | 11286 | }); |
| ... | @@ -11293,7 +11293,7 @@ | ... | @@ -11293,7 +11293,7 @@ |
| 11293 | n.attr('role', 'status').attr('aria-live', 'polite'); | 11293 | n.attr('role', 'status').attr('aria-live', 'polite'); |
| 11294 | 11294 | ||
| 11295 | // Table is described by our info div | 11295 | // Table is described by our info div |
| 11296 | $$2(settings.nTable).attr('aria-describedby', tid + '_info'); | 11296 | $$1(settings.nTable).attr('aria-describedby', tid + '_info'); |
| 11297 | } | 11297 | } |
| 11298 | return n[0]; | 11298 | return n[0]; |
| 11299 | } | 11299 | } |
| ... | @@ -11327,7 +11327,7 @@ | ... | @@ -11327,7 +11327,7 @@ |
| 11327 | if (callback !== null) { | 11327 | if (callback !== null) { |
| 11328 | out = callback.call(settings.oInstance, settings, start, end, max, total, out); | 11328 | out = callback.call(settings.oInstance, settings, start, end, max, total, out); |
| 11329 | } | 11329 | } |
| 11330 | $$2(nodes).html(out); | 11330 | $$1(nodes).html(out); |
| 11331 | } | 11331 | } |
| 11332 | function _fnInfoMacros(settings, str) { | 11332 | function _fnInfoMacros(settings, str) { |
| 11333 | // When infinite scrolling, we are always starting at 1. _iDisplayStart is used only | 11333 | // When infinite scrolling, we are always starting at 1. _iDisplayStart is used only |
| ... | @@ -11459,7 +11459,7 @@ | ... | @@ -11459,7 +11459,7 @@ |
| 11459 | d2 = Array.isArray(menu[0]), | 11459 | d2 = Array.isArray(menu[0]), |
| 11460 | lengths = d2 ? menu[0] : menu, | 11460 | lengths = d2 ? menu[0] : menu, |
| 11461 | language = d2 ? menu[1] : menu; | 11461 | language = d2 ? menu[1] : menu; |
| 11462 | var select = $$2('<select/>', { | 11462 | var select = $$1('<select/>', { |
| 11463 | 'name': tableId + '_length', | 11463 | 'name': tableId + '_length', |
| 11464 | 'aria-controls': tableId, | 11464 | 'aria-controls': tableId, |
| 11465 | 'class': classes.sLengthSelect | 11465 | 'class': classes.sLengthSelect |
| ... | @@ -11467,7 +11467,7 @@ | ... | @@ -11467,7 +11467,7 @@ |
| 11467 | for (var i = 0, ien = lengths.length; i < ien; i++) { | 11467 | for (var i = 0, ien = lengths.length; i < ien; i++) { |
| 11468 | select[0][i] = new Option(typeof language[i] === 'number' ? settings.fnFormatNumber(language[i]) : language[i], lengths[i]); | 11468 | select[0][i] = new Option(typeof language[i] === 'number' ? settings.fnFormatNumber(language[i]) : language[i], lengths[i]); |
| 11469 | } | 11469 | } |
| 11470 | var div = $$2('<div><label/></div>').addClass(classes.sLength); | 11470 | var div = $$1('<div><label/></div>').addClass(classes.sLength); |
| 11471 | if (!settings.aanFeatures.l) { | 11471 | if (!settings.aanFeatures.l) { |
| 11472 | div[0].id = tableId + '_length'; | 11472 | div[0].id = tableId + '_length'; |
| 11473 | } | 11473 | } |
| ... | @@ -11475,15 +11475,15 @@ | ... | @@ -11475,15 +11475,15 @@ |
| 11475 | 11475 | ||
| 11476 | // Can't use `select` variable as user might provide their own and the | 11476 | // Can't use `select` variable as user might provide their own and the |
| 11477 | // reference is broken by the use of outerHTML | 11477 | // reference is broken by the use of outerHTML |
| 11478 | $$2('select', div).val(settings._iDisplayLength).on('change.DT', function (e) { | 11478 | $$1('select', div).val(settings._iDisplayLength).on('change.DT', function (e) { |
| 11479 | _fnLengthChange(settings, $$2(this).val()); | 11479 | _fnLengthChange(settings, $$1(this).val()); |
| 11480 | _fnDraw(settings); | 11480 | _fnDraw(settings); |
| 11481 | }); | 11481 | }); |
| 11482 | 11482 | ||
| 11483 | // Update node value whenever anything changes the table's length | 11483 | // Update node value whenever anything changes the table's length |
| 11484 | $$2(settings.nTable).on('length.dt.DT', function (e, s, len) { | 11484 | $$1(settings.nTable).on('length.dt.DT', function (e, s, len) { |
| 11485 | if (settings === s) { | 11485 | if (settings === s) { |
| 11486 | $$2('select', div).val(len); | 11486 | $$1('select', div).val(len); |
| 11487 | } | 11487 | } |
| 11488 | }); | 11488 | }); |
| 11489 | return div[0]; | 11489 | return div[0]; |
| ... | @@ -11507,7 +11507,7 @@ | ... | @@ -11507,7 +11507,7 @@ |
| 11507 | redraw = function (settings) { | 11507 | redraw = function (settings) { |
| 11508 | _fnDraw(settings); | 11508 | _fnDraw(settings); |
| 11509 | }, | 11509 | }, |
| 11510 | node = $$2('<div/>').addClass(settings.oClasses.sPaging + type)[0], | 11510 | node = $$1('<div/>').addClass(settings.oClasses.sPaging + type)[0], |
| 11511 | features = settings.aanFeatures; | 11511 | features = settings.aanFeatures; |
| 11512 | if (!modern) { | 11512 | if (!modern) { |
| 11513 | plugin.fnInit(settings, node, redraw); | 11513 | plugin.fnInit(settings, node, redraw); |
| ... | @@ -11598,7 +11598,7 @@ | ... | @@ -11598,7 +11598,7 @@ |
| 11598 | * @memberof DataTable#oApi | 11598 | * @memberof DataTable#oApi |
| 11599 | */ | 11599 | */ |
| 11600 | function _fnFeatureHtmlProcessing(settings) { | 11600 | function _fnFeatureHtmlProcessing(settings) { |
| 11601 | return $$2('<div/>', { | 11601 | return $$1('<div/>', { |
| 11602 | 'id': !settings.aanFeatures.r ? settings.sTableId + '_processing' : null, | 11602 | 'id': !settings.aanFeatures.r ? settings.sTableId + '_processing' : null, |
| 11603 | 'class': settings.oClasses.sProcessing, | 11603 | 'class': settings.oClasses.sProcessing, |
| 11604 | 'role': 'status' | 11604 | 'role': 'status' |
| ... | @@ -11613,7 +11613,7 @@ | ... | @@ -11613,7 +11613,7 @@ |
| 11613 | */ | 11613 | */ |
| 11614 | function _fnProcessingDisplay(settings, show) { | 11614 | function _fnProcessingDisplay(settings, show) { |
| 11615 | if (settings.oFeatures.bProcessing) { | 11615 | if (settings.oFeatures.bProcessing) { |
| 11616 | $$2(settings.aanFeatures.r).css('display', show ? 'block' : 'none'); | 11616 | $$1(settings.aanFeatures.r).css('display', show ? 'block' : 'none'); |
| 11617 | } | 11617 | } |
| 11618 | _fnCallbackFire(settings, null, 'processing', [settings, show]); | 11618 | _fnCallbackFire(settings, null, 'processing', [settings, show]); |
| 11619 | } | 11619 | } |
| ... | @@ -11625,7 +11625,7 @@ | ... | @@ -11625,7 +11625,7 @@ |
| 11625 | * @memberof DataTable#oApi | 11625 | * @memberof DataTable#oApi |
| 11626 | */ | 11626 | */ |
| 11627 | function _fnFeatureHtmlTable(settings) { | 11627 | function _fnFeatureHtmlTable(settings) { |
| 11628 | var table = $$2(settings.nTable); | 11628 | var table = $$1(settings.nTable); |
| 11629 | 11629 | ||
| 11630 | // Scrolling from here on in | 11630 | // Scrolling from here on in |
| 11631 | var scroll = settings.oScroll; | 11631 | var scroll = settings.oScroll; |
| ... | @@ -11637,8 +11637,8 @@ | ... | @@ -11637,8 +11637,8 @@ |
| 11637 | var classes = settings.oClasses; | 11637 | var classes = settings.oClasses; |
| 11638 | var caption = table.children('caption'); | 11638 | var caption = table.children('caption'); |
| 11639 | var captionSide = caption.length ? caption[0]._captionSide : null; | 11639 | var captionSide = caption.length ? caption[0]._captionSide : null; |
| 11640 | var headerClone = $$2(table[0].cloneNode(false)); | 11640 | var headerClone = $$1(table[0].cloneNode(false)); |
| 11641 | var footerClone = $$2(table[0].cloneNode(false)); | 11641 | var footerClone = $$1(table[0].cloneNode(false)); |
| 11642 | var footer = table.children('tfoot'); | 11642 | var footer = table.children('tfoot'); |
| 11643 | var _div = '<div/>'; | 11643 | var _div = '<div/>'; |
| 11644 | var size = function (s) { | 11644 | var size = function (s) { |
| ... | @@ -11664,21 +11664,21 @@ | ... | @@ -11664,21 +11664,21 @@ |
| 11664 | * table - scroll foot table | 11664 | * table - scroll foot table |
| 11665 | * tfoot - tfoot | 11665 | * tfoot - tfoot |
| 11666 | */ | 11666 | */ |
| 11667 | var scroller = $$2(_div, { | 11667 | var scroller = $$1(_div, { |
| 11668 | 'class': classes.sScrollWrapper | 11668 | 'class': classes.sScrollWrapper |
| 11669 | }).append($$2(_div, { | 11669 | }).append($$1(_div, { |
| 11670 | 'class': classes.sScrollHead | 11670 | 'class': classes.sScrollHead |
| 11671 | }).css({ | 11671 | }).css({ |
| 11672 | overflow: 'hidden', | 11672 | overflow: 'hidden', |
| 11673 | position: 'relative', | 11673 | position: 'relative', |
| 11674 | border: 0, | 11674 | border: 0, |
| 11675 | width: scrollX ? size(scrollX) : '100%' | 11675 | width: scrollX ? size(scrollX) : '100%' |
| 11676 | }).append($$2(_div, { | 11676 | }).append($$1(_div, { |
| 11677 | 'class': classes.sScrollHeadInner | 11677 | 'class': classes.sScrollHeadInner |
| 11678 | }).css({ | 11678 | }).css({ |
| 11679 | 'box-sizing': 'content-box', | 11679 | 'box-sizing': 'content-box', |
| 11680 | width: scroll.sXInner || '100%' | 11680 | width: scroll.sXInner || '100%' |
| 11681 | }).append(headerClone.removeAttr('id').css('margin-left', 0).append(captionSide === 'top' ? caption : null).append(table.children('thead'))))).append($$2(_div, { | 11681 | }).append(headerClone.removeAttr('id').css('margin-left', 0).append(captionSide === 'top' ? caption : null).append(table.children('thead'))))).append($$1(_div, { |
| 11682 | 'class': classes.sScrollBody | 11682 | 'class': classes.sScrollBody |
| 11683 | }).css({ | 11683 | }).css({ |
| 11684 | position: 'relative', | 11684 | position: 'relative', |
| ... | @@ -11686,13 +11686,13 @@ | ... | @@ -11686,13 +11686,13 @@ |
| 11686 | width: size(scrollX) | 11686 | width: size(scrollX) |
| 11687 | }).append(table)); | 11687 | }).append(table)); |
| 11688 | if (footer) { | 11688 | if (footer) { |
| 11689 | scroller.append($$2(_div, { | 11689 | scroller.append($$1(_div, { |
| 11690 | 'class': classes.sScrollFoot | 11690 | 'class': classes.sScrollFoot |
| 11691 | }).css({ | 11691 | }).css({ |
| 11692 | overflow: 'hidden', | 11692 | overflow: 'hidden', |
| 11693 | border: 0, | 11693 | border: 0, |
| 11694 | width: scrollX ? size(scrollX) : '100%' | 11694 | width: scrollX ? size(scrollX) : '100%' |
| 11695 | }).append($$2(_div, { | 11695 | }).append($$1(_div, { |
| 11696 | 'class': classes.sScrollFootInner | 11696 | 'class': classes.sScrollFootInner |
| 11697 | }).append(footerClone.removeAttr('id').css('margin-left', 0).append(captionSide === 'bottom' ? caption : null).append(table.children('tfoot'))))); | 11697 | }).append(footerClone.removeAttr('id').css('margin-left', 0).append(captionSide === 'bottom' ? caption : null).append(table.children('tfoot'))))); |
| 11698 | } | 11698 | } |
| ... | @@ -11703,7 +11703,7 @@ | ... | @@ -11703,7 +11703,7 @@ |
| 11703 | 11703 | ||
| 11704 | // When the body is scrolled, then we also want to scroll the headers | 11704 | // When the body is scrolled, then we also want to scroll the headers |
| 11705 | if (scrollX) { | 11705 | if (scrollX) { |
| 11706 | $$2(scrollBody).on('scroll.DT', function (e) { | 11706 | $$1(scrollBody).on('scroll.DT', function (e) { |
| 11707 | var scrollLeft = this.scrollLeft; | 11707 | var scrollLeft = this.scrollLeft; |
| 11708 | scrollHead.scrollLeft = scrollLeft; | 11708 | scrollHead.scrollLeft = scrollLeft; |
| 11709 | if (footer) { | 11709 | if (footer) { |
| ... | @@ -11711,9 +11711,9 @@ | ... | @@ -11711,9 +11711,9 @@ |
| 11711 | } | 11711 | } |
| 11712 | }); | 11712 | }); |
| 11713 | } | 11713 | } |
| 11714 | $$2(scrollBody).css('max-height', scrollY); | 11714 | $$1(scrollBody).css('max-height', scrollY); |
| 11715 | if (!scroll.bCollapse) { | 11715 | if (!scroll.bCollapse) { |
| 11716 | $$2(scrollBody).css('height', scrollY); | 11716 | $$1(scrollBody).css('height', scrollY); |
| 11717 | } | 11717 | } |
| 11718 | settings.nScrollHead = scrollHead; | 11718 | settings.nScrollHead = scrollHead; |
| 11719 | settings.nScrollBody = scrollBody; | 11719 | settings.nScrollBody = scrollBody; |
| ... | @@ -11749,22 +11749,22 @@ | ... | @@ -11749,22 +11749,22 @@ |
| 11749 | scrollXInner = scroll.sXInner, | 11749 | scrollXInner = scroll.sXInner, |
| 11750 | scrollY = scroll.sY, | 11750 | scrollY = scroll.sY, |
| 11751 | barWidth = scroll.iBarWidth, | 11751 | barWidth = scroll.iBarWidth, |
| 11752 | divHeader = $$2(settings.nScrollHead), | 11752 | divHeader = $$1(settings.nScrollHead), |
| 11753 | divHeaderStyle = divHeader[0].style, | 11753 | divHeaderStyle = divHeader[0].style, |
| 11754 | divHeaderInner = divHeader.children('div'), | 11754 | divHeaderInner = divHeader.children('div'), |
| 11755 | divHeaderInnerStyle = divHeaderInner[0].style, | 11755 | divHeaderInnerStyle = divHeaderInner[0].style, |
| 11756 | divHeaderTable = divHeaderInner.children('table'), | 11756 | divHeaderTable = divHeaderInner.children('table'), |
| 11757 | divBodyEl = settings.nScrollBody, | 11757 | divBodyEl = settings.nScrollBody, |
| 11758 | divBody = $$2(divBodyEl), | 11758 | divBody = $$1(divBodyEl), |
| 11759 | divBodyStyle = divBodyEl.style, | 11759 | divBodyStyle = divBodyEl.style, |
| 11760 | divFooter = $$2(settings.nScrollFoot), | 11760 | divFooter = $$1(settings.nScrollFoot), |
| 11761 | divFooterInner = divFooter.children('div'), | 11761 | divFooterInner = divFooter.children('div'), |
| 11762 | divFooterTable = divFooterInner.children('table'), | 11762 | divFooterTable = divFooterInner.children('table'), |
| 11763 | header = $$2(settings.nTHead), | 11763 | header = $$1(settings.nTHead), |
| 11764 | table = $$2(settings.nTable), | 11764 | table = $$1(settings.nTable), |
| 11765 | tableEl = table[0], | 11765 | tableEl = table[0], |
| 11766 | tableStyle = tableEl.style, | 11766 | tableStyle = tableEl.style, |
| 11767 | footer = settings.nTFoot ? $$2(settings.nTFoot) : null, | 11767 | footer = settings.nTFoot ? $$1(settings.nTFoot) : null, |
| 11768 | browser = settings.oBrowser, | 11768 | browser = settings.oBrowser, |
| 11769 | ie67 = browser.bScrollOversize; | 11769 | ie67 = browser.bScrollOversize; |
| 11770 | _pluck(settings.aoColumns, 'nTh'); | 11770 | _pluck(settings.aoColumns, 'nTh'); |
| ... | @@ -11833,7 +11833,7 @@ | ... | @@ -11833,7 +11833,7 @@ |
| 11833 | divBodyStyle.width = '100%'; | 11833 | divBodyStyle.width = '100%'; |
| 11834 | divHeader[0].style.width = '100%'; | 11834 | divHeader[0].style.width = '100%'; |
| 11835 | } | 11835 | } |
| 11836 | $$2.each(_fnGetUniqueThs(settings, headerCopy), function (i, el) { | 11836 | $$1.each(_fnGetUniqueThs(settings, headerCopy), function (i, el) { |
| 11837 | idx = _fnVisibleToColumnIndex(settings, i); | 11837 | idx = _fnVisibleToColumnIndex(settings, i); |
| 11838 | el.style.width = settings.aoColumns[idx].sWidth; | 11838 | el.style.width = settings.aoColumns[idx].sWidth; |
| 11839 | }); | 11839 | }); |
| ... | @@ -11874,7 +11874,7 @@ | ... | @@ -11874,7 +11874,7 @@ |
| 11874 | 11874 | ||
| 11875 | // Read all widths in next pass | 11875 | // Read all widths in next pass |
| 11876 | _fnApplyToChildren(function (nSizer) { | 11876 | _fnApplyToChildren(function (nSizer) { |
| 11877 | var style = window.getComputedStyle ? window.getComputedStyle(nSizer).width : _fnStringToCss($$2(nSizer).width()); | 11877 | var style = window.getComputedStyle ? window.getComputedStyle(nSizer).width : _fnStringToCss($$1(nSizer).width()); |
| 11878 | headerContent.push(nSizer.innerHTML); | 11878 | headerContent.push(nSizer.innerHTML); |
| 11879 | headerWidths.push(style); | 11879 | headerWidths.push(style); |
| 11880 | }, headerSrcEls); | 11880 | }, headerSrcEls); |
| ... | @@ -11883,19 +11883,19 @@ | ... | @@ -11883,19 +11883,19 @@ |
| 11883 | _fnApplyToChildren(function (nToSize, i) { | 11883 | _fnApplyToChildren(function (nToSize, i) { |
| 11884 | nToSize.style.width = headerWidths[i]; | 11884 | nToSize.style.width = headerWidths[i]; |
| 11885 | }, headerTrgEls); | 11885 | }, headerTrgEls); |
| 11886 | $$2(headerSrcEls).css('height', 0); | 11886 | $$1(headerSrcEls).css('height', 0); |
| 11887 | 11887 | ||
| 11888 | /* Same again with the footer if we have one */ | 11888 | /* Same again with the footer if we have one */ |
| 11889 | if (footer) { | 11889 | if (footer) { |
| 11890 | _fnApplyToChildren(zeroOut, footerSrcEls); | 11890 | _fnApplyToChildren(zeroOut, footerSrcEls); |
| 11891 | _fnApplyToChildren(function (nSizer) { | 11891 | _fnApplyToChildren(function (nSizer) { |
| 11892 | footerContent.push(nSizer.innerHTML); | 11892 | footerContent.push(nSizer.innerHTML); |
| 11893 | footerWidths.push(_fnStringToCss($$2(nSizer).css('width'))); | 11893 | footerWidths.push(_fnStringToCss($$1(nSizer).css('width'))); |
| 11894 | }, footerSrcEls); | 11894 | }, footerSrcEls); |
| 11895 | _fnApplyToChildren(function (nToSize, i) { | 11895 | _fnApplyToChildren(function (nToSize, i) { |
| 11896 | nToSize.style.width = footerWidths[i]; | 11896 | nToSize.style.width = footerWidths[i]; |
| 11897 | }, footerTrgEls); | 11897 | }, footerTrgEls); |
| 11898 | $$2(footerSrcEls).height(0); | 11898 | $$1(footerSrcEls).height(0); |
| 11899 | } | 11899 | } |
| 11900 | 11900 | ||
| 11901 | /* | 11901 | /* |
| ... | @@ -12036,7 +12036,7 @@ | ... | @@ -12036,7 +12036,7 @@ |
| 12036 | scrollXInner = scroll.sXInner, | 12036 | scrollXInner = scroll.sXInner, |
| 12037 | columnCount = columns.length, | 12037 | columnCount = columns.length, |
| 12038 | visibleColumns = _fnGetColumns(oSettings, 'bVisible'), | 12038 | visibleColumns = _fnGetColumns(oSettings, 'bVisible'), |
| 12039 | headerCells = $$2('th', oSettings.nTHead), | 12039 | headerCells = $$1('th', oSettings.nTHead), |
| 12040 | tableWidthAttr = table.getAttribute('width'), | 12040 | tableWidthAttr = table.getAttribute('width'), |
| 12041 | // from DOM element | 12041 | // from DOM element |
| 12042 | tableContainer = table.parentNode, | 12042 | tableContainer = table.parentNode, |
| ... | @@ -12077,18 +12077,18 @@ | ... | @@ -12077,18 +12077,18 @@ |
| 12077 | // node in the data, assign any user defined widths, then insert it into | 12077 | // node in the data, assign any user defined widths, then insert it into |
| 12078 | // the DOM and allow the browser to do all the hard work of calculating | 12078 | // the DOM and allow the browser to do all the hard work of calculating |
| 12079 | // table widths | 12079 | // table widths |
| 12080 | var tmpTable = $$2(table).clone() // don't use cloneNode - IE8 will remove events on the main table | 12080 | var tmpTable = $$1(table).clone() // don't use cloneNode - IE8 will remove events on the main table |
| 12081 | .css('visibility', 'hidden').removeAttr('id'); | 12081 | .css('visibility', 'hidden').removeAttr('id'); |
| 12082 | 12082 | ||
| 12083 | // Clean up the table body | 12083 | // Clean up the table body |
| 12084 | tmpTable.find('tbody tr').remove(); | 12084 | tmpTable.find('tbody tr').remove(); |
| 12085 | var tr = $$2('<tr/>').appendTo(tmpTable.find('tbody')); | 12085 | var tr = $$1('<tr/>').appendTo(tmpTable.find('tbody')); |
| 12086 | 12086 | ||
| 12087 | // Clone the table header and footer - we can't use the header / footer | 12087 | // Clone the table header and footer - we can't use the header / footer |
| 12088 | // from the cloned table, since if scrolling is active, the table's | 12088 | // from the cloned table, since if scrolling is active, the table's |
| 12089 | // real header and footer are contained in different table tags | 12089 | // real header and footer are contained in different table tags |
| 12090 | tmpTable.find('thead, tfoot').remove(); | 12090 | tmpTable.find('thead, tfoot').remove(); |
| 12091 | tmpTable.append($$2(oSettings.nTHead).clone()).append($$2(oSettings.nTFoot).clone()); | 12091 | tmpTable.append($$1(oSettings.nTHead).clone()).append($$1(oSettings.nTFoot).clone()); |
| 12092 | 12092 | ||
| 12093 | // Remove any assigned widths from the footer (from scrolling) | 12093 | // Remove any assigned widths from the footer (from scrolling) |
| 12094 | tmpTable.find('tfoot th, tfoot td').css('width', ''); | 12094 | tmpTable.find('tfoot th, tfoot td').css('width', ''); |
| ... | @@ -12103,7 +12103,7 @@ | ... | @@ -12103,7 +12103,7 @@ |
| 12103 | // browser will collapse it. If this width is smaller than the | 12103 | // browser will collapse it. If this width is smaller than the |
| 12104 | // width the column requires, then it will have no effect | 12104 | // width the column requires, then it will have no effect |
| 12105 | if (column.sWidthOrig && scrollX) { | 12105 | if (column.sWidthOrig && scrollX) { |
| 12106 | $$2(headerCells[i]).append($$2('<div/>').css({ | 12106 | $$1(headerCells[i]).append($$1('<div/>').css({ |
| 12107 | width: column.sWidthOrig, | 12107 | width: column.sWidthOrig, |
| 12108 | margin: 0, | 12108 | margin: 0, |
| 12109 | padding: 0, | 12109 | padding: 0, |
| ... | @@ -12118,20 +12118,20 @@ | ... | @@ -12118,20 +12118,20 @@ |
| 12118 | for (i = 0; i < visibleColumns.length; i++) { | 12118 | for (i = 0; i < visibleColumns.length; i++) { |
| 12119 | columnIdx = visibleColumns[i]; | 12119 | columnIdx = visibleColumns[i]; |
| 12120 | column = columns[columnIdx]; | 12120 | column = columns[columnIdx]; |
| 12121 | $$2(_fnGetWidestNode(oSettings, columnIdx)).clone(false).append(column.sContentPadding).appendTo(tr); | 12121 | $$1(_fnGetWidestNode(oSettings, columnIdx)).clone(false).append(column.sContentPadding).appendTo(tr); |
| 12122 | } | 12122 | } |
| 12123 | } | 12123 | } |
| 12124 | 12124 | ||
| 12125 | // Tidy the temporary table - remove name attributes so there aren't | 12125 | // Tidy the temporary table - remove name attributes so there aren't |
| 12126 | // duplicated in the dom (radio elements for example) | 12126 | // duplicated in the dom (radio elements for example) |
| 12127 | $$2('[name]', tmpTable).removeAttr('name'); | 12127 | $$1('[name]', tmpTable).removeAttr('name'); |
| 12128 | 12128 | ||
| 12129 | // Table has been built, attach to the document so we can work with it. | 12129 | // Table has been built, attach to the document so we can work with it. |
| 12130 | // A holding element is used, positioned at the top of the container | 12130 | // A holding element is used, positioned at the top of the container |
| 12131 | // with minimal height, so it has no effect on if the container scrolls | 12131 | // with minimal height, so it has no effect on if the container scrolls |
| 12132 | // or not. Otherwise it might trigger scrolling when it actually isn't | 12132 | // or not. Otherwise it might trigger scrolling when it actually isn't |
| 12133 | // needed | 12133 | // needed |
| 12134 | var holder = $$2('<div/>').css(scrollX || scrollY ? { | 12134 | var holder = $$1('<div/>').css(scrollX || scrollY ? { |
| 12135 | position: 'absolute', | 12135 | position: 'absolute', |
| 12136 | top: 0, | 12136 | top: 0, |
| 12137 | left: 0, | 12137 | left: 0, |
| ... | @@ -12168,7 +12168,7 @@ | ... | @@ -12168,7 +12168,7 @@ |
| 12168 | // need to be modified. | 12168 | // need to be modified. |
| 12169 | var total = 0; | 12169 | var total = 0; |
| 12170 | for (i = 0; i < visibleColumns.length; i++) { | 12170 | for (i = 0; i < visibleColumns.length; i++) { |
| 12171 | var cell = $$2(headerCells[i]); | 12171 | var cell = $$1(headerCells[i]); |
| 12172 | var border = cell.outerWidth() - cell.width(); | 12172 | var border = cell.outerWidth() - cell.width(); |
| 12173 | 12173 | ||
| 12174 | // Use getBounding... where possible (not IE8-) because it can give | 12174 | // Use getBounding... where possible (not IE8-) because it can give |
| ... | @@ -12197,7 +12197,7 @@ | ... | @@ -12197,7 +12197,7 @@ |
| 12197 | } | 12197 | } |
| 12198 | if ((tableWidthAttr || scrollX) && !oSettings._reszEvt) { | 12198 | if ((tableWidthAttr || scrollX) && !oSettings._reszEvt) { |
| 12199 | var bindResize = function () { | 12199 | var bindResize = function () { |
| 12200 | $$2(window).on('resize.DT-' + oSettings.sInstance, _fnThrottle(function () { | 12200 | $$1(window).on('resize.DT-' + oSettings.sInstance, _fnThrottle(function () { |
| 12201 | _fnAdjustColumnSizing(oSettings); | 12201 | _fnAdjustColumnSizing(oSettings); |
| 12202 | })); | 12202 | })); |
| 12203 | }; | 12203 | }; |
| ... | @@ -12234,7 +12234,7 @@ | ... | @@ -12234,7 +12234,7 @@ |
| 12234 | if (!width) { | 12234 | if (!width) { |
| 12235 | return 0; | 12235 | return 0; |
| 12236 | } | 12236 | } |
| 12237 | var n = $$2('<div/>').css('width', _fnStringToCss(width)).appendTo(parent || document.body); | 12237 | var n = $$1('<div/>').css('width', _fnStringToCss(width)).appendTo(parent || document.body); |
| 12238 | var val = n[0].offsetWidth; | 12238 | var val = n[0].offsetWidth; |
| 12239 | n.remove(); | 12239 | n.remove(); |
| 12240 | return val; | 12240 | return val; |
| ... | @@ -12255,7 +12255,7 @@ | ... | @@ -12255,7 +12255,7 @@ |
| 12255 | var data = settings.aoData[idx]; | 12255 | var data = settings.aoData[idx]; |
| 12256 | return !data.nTr ? | 12256 | return !data.nTr ? |
| 12257 | // Might not have been created when deferred rendering | 12257 | // Might not have been created when deferred rendering |
| 12258 | $$2('<td/>').html(_fnGetCellData(settings, idx, colIdx, 'display'))[0] : data.anCells[colIdx]; | 12258 | $$1('<td/>').html(_fnGetCellData(settings, idx, colIdx, 'display'))[0] : data.anCells[colIdx]; |
| 12259 | } | 12259 | } |
| 12260 | 12260 | ||
| 12261 | /** | 12261 | /** |
| ... | @@ -12309,7 +12309,7 @@ | ... | @@ -12309,7 +12309,7 @@ |
| 12309 | sType, | 12309 | sType, |
| 12310 | srcCol, | 12310 | srcCol, |
| 12311 | fixed = settings.aaSortingFixed, | 12311 | fixed = settings.aaSortingFixed, |
| 12312 | fixedObj = $$2.isPlainObject(fixed), | 12312 | fixedObj = $$1.isPlainObject(fixed), |
| 12313 | nestedSort = [], | 12313 | nestedSort = [], |
| 12314 | add = function (a) { | 12314 | add = function (a) { |
| 12315 | if (a.length && !Array.isArray(a[0])) { | 12315 | if (a.length && !Array.isArray(a[0])) { |
| ... | @@ -12317,7 +12317,7 @@ | ... | @@ -12317,7 +12317,7 @@ |
| 12317 | nestedSort.push(a); | 12317 | nestedSort.push(a); |
| 12318 | } else { | 12318 | } else { |
| 12319 | // 2D array | 12319 | // 2D array |
| 12320 | $$2.merge(nestedSort, a); | 12320 | $$1.merge(nestedSort, a); |
| 12321 | } | 12321 | } |
| 12322 | }; | 12322 | }; |
| 12323 | 12323 | ||
| ... | @@ -12340,7 +12340,7 @@ | ... | @@ -12340,7 +12340,7 @@ |
| 12340 | iCol = aDataSort[k]; | 12340 | iCol = aDataSort[k]; |
| 12341 | sType = aoColumns[iCol].sType || 'string'; | 12341 | sType = aoColumns[iCol].sType || 'string'; |
| 12342 | if (nestedSort[i]._idx === undefined) { | 12342 | if (nestedSort[i]._idx === undefined) { |
| 12343 | nestedSort[i]._idx = $$2.inArray(nestedSort[i][1], aoColumns[iCol].asSorting); | 12343 | nestedSort[i]._idx = $$1.inArray(nestedSort[i][1], aoColumns[iCol].asSorting); |
| 12344 | } | 12344 | } |
| 12345 | aSort.push({ | 12345 | aSort.push({ |
| 12346 | src: srcCol, | 12346 | src: srcCol, |
| ... | @@ -12531,7 +12531,7 @@ | ... | @@ -12531,7 +12531,7 @@ |
| 12531 | var next = function (a, overflow) { | 12531 | var next = function (a, overflow) { |
| 12532 | var idx = a._idx; | 12532 | var idx = a._idx; |
| 12533 | if (idx === undefined) { | 12533 | if (idx === undefined) { |
| 12534 | idx = $$2.inArray(a[1], asSorting); | 12534 | idx = $$1.inArray(a[1], asSorting); |
| 12535 | } | 12535 | } |
| 12536 | return idx + 1 < asSorting.length ? idx + 1 : overflow ? null : 0; | 12536 | return idx + 1 < asSorting.length ? idx + 1 : overflow ? null : 0; |
| 12537 | }; | 12537 | }; |
| ... | @@ -12544,7 +12544,7 @@ | ... | @@ -12544,7 +12544,7 @@ |
| 12544 | // If appending the sort then we are multi-column sorting | 12544 | // If appending the sort then we are multi-column sorting |
| 12545 | if (append && settings.oFeatures.bSortMulti) { | 12545 | if (append && settings.oFeatures.bSortMulti) { |
| 12546 | // Are we already doing some kind of sort on this column? | 12546 | // Are we already doing some kind of sort on this column? |
| 12547 | var sortIdx = $$2.inArray(colIdx, _pluck(sorting, '0')); | 12547 | var sortIdx = $$1.inArray(colIdx, _pluck(sorting, '0')); |
| 12548 | if (sortIdx !== -1) { | 12548 | if (sortIdx !== -1) { |
| 12549 | // Yes, modify the sort | 12549 | // Yes, modify the sort |
| 12550 | nextSortIdx = next(sorting[sortIdx], true); | 12550 | nextSortIdx = next(sorting[sortIdx], true); |
| ... | @@ -12638,13 +12638,13 @@ | ... | @@ -12638,13 +12638,13 @@ |
| 12638 | colIdx = oldSort[i].src; | 12638 | colIdx = oldSort[i].src; |
| 12639 | 12639 | ||
| 12640 | // Remove column sorting | 12640 | // Remove column sorting |
| 12641 | $$2(_pluck(settings.aoData, 'anCells', colIdx)).removeClass(sortClass + (i < 2 ? i + 1 : 3)); | 12641 | $$1(_pluck(settings.aoData, 'anCells', colIdx)).removeClass(sortClass + (i < 2 ? i + 1 : 3)); |
| 12642 | } | 12642 | } |
| 12643 | 12643 | ||
| 12644 | // Add new column sorting | 12644 | // Add new column sorting |
| 12645 | for (i = 0, ien = sort.length; i < ien; i++) { | 12645 | for (i = 0, ien = sort.length; i < ien; i++) { |
| 12646 | colIdx = sort[i].src; | 12646 | colIdx = sort[i].src; |
| 12647 | $$2(_pluck(settings.aoData, 'anCells', colIdx)).addClass(sortClass + (i < 2 ? i + 1 : 3)); | 12647 | $$1(_pluck(settings.aoData, 'anCells', colIdx)).addClass(sortClass + (i < 2 ? i + 1 : 3)); |
| 12648 | } | 12648 | } |
| 12649 | } | 12649 | } |
| 12650 | settings.aLastSort = sort; | 12650 | settings.aLastSort = sort; |
| ... | @@ -12693,9 +12693,9 @@ | ... | @@ -12693,9 +12693,9 @@ |
| 12693 | time: +new Date(), | 12693 | time: +new Date(), |
| 12694 | start: settings._iDisplayStart, | 12694 | start: settings._iDisplayStart, |
| 12695 | length: settings._iDisplayLength, | 12695 | length: settings._iDisplayLength, |
| 12696 | order: $$2.extend(true, [], settings.aaSorting), | 12696 | order: $$1.extend(true, [], settings.aaSorting), |
| 12697 | search: _fnSearchToCamel(settings.oPreviousSearch), | 12697 | search: _fnSearchToCamel(settings.oPreviousSearch), |
| 12698 | columns: $$2.map(settings.aoColumns, function (col, i) { | 12698 | columns: $$1.map(settings.aoColumns, function (col, i) { |
| 12699 | return { | 12699 | return { |
| 12700 | visible: col.bVisible, | 12700 | visible: col.bVisible, |
| 12701 | search: _fnSearchToCamel(settings.aoPreSearchCols[i]) | 12701 | search: _fnSearchToCamel(settings.aoPreSearchCols[i]) |
| ... | @@ -12749,7 +12749,7 @@ | ... | @@ -12749,7 +12749,7 @@ |
| 12749 | // Allow custom and plug-in manipulation functions to alter the saved data set and | 12749 | // Allow custom and plug-in manipulation functions to alter the saved data set and |
| 12750 | // cancelling of loading by returning false | 12750 | // cancelling of loading by returning false |
| 12751 | var abStateLoad = _fnCallbackFire(settings, 'aoStateLoadParams', 'stateLoadParams', [settings, s]); | 12751 | var abStateLoad = _fnCallbackFire(settings, 'aoStateLoadParams', 'stateLoadParams', [settings, s]); |
| 12752 | if ($$2.inArray(false, abStateLoad) !== -1) { | 12752 | if ($$1.inArray(false, abStateLoad) !== -1) { |
| 12753 | settings._bLoadingState = false; | 12753 | settings._bLoadingState = false; |
| 12754 | callback(); | 12754 | callback(); |
| 12755 | return; | 12755 | return; |
| ... | @@ -12771,7 +12771,7 @@ | ... | @@ -12771,7 +12771,7 @@ |
| 12771 | } | 12771 | } |
| 12772 | 12772 | ||
| 12773 | // Store the saved state so it might be accessed at any time | 12773 | // Store the saved state so it might be accessed at any time |
| 12774 | settings.oLoadedState = $$2.extend(true, {}, s); | 12774 | settings.oLoadedState = $$1.extend(true, {}, s); |
| 12775 | 12775 | ||
| 12776 | // Page Length | 12776 | // Page Length |
| 12777 | if (s.length !== undefined) { | 12777 | if (s.length !== undefined) { |
| ... | @@ -12797,14 +12797,14 @@ | ... | @@ -12797,14 +12797,14 @@ |
| 12797 | // Order | 12797 | // Order |
| 12798 | if (s.order !== undefined) { | 12798 | if (s.order !== undefined) { |
| 12799 | settings.aaSorting = []; | 12799 | settings.aaSorting = []; |
| 12800 | $$2.each(s.order, function (i, col) { | 12800 | $$1.each(s.order, function (i, col) { |
| 12801 | settings.aaSorting.push(col[0] >= columns.length ? [0, col[1]] : col); | 12801 | settings.aaSorting.push(col[0] >= columns.length ? [0, col[1]] : col); |
| 12802 | }); | 12802 | }); |
| 12803 | } | 12803 | } |
| 12804 | 12804 | ||
| 12805 | // Search | 12805 | // Search |
| 12806 | if (s.search !== undefined) { | 12806 | if (s.search !== undefined) { |
| 12807 | $$2.extend(settings.oPreviousSearch, _fnSearchToHung(s.search)); | 12807 | $$1.extend(settings.oPreviousSearch, _fnSearchToHung(s.search)); |
| 12808 | } | 12808 | } |
| 12809 | 12809 | ||
| 12810 | // Columns | 12810 | // Columns |
| ... | @@ -12825,7 +12825,7 @@ | ... | @@ -12825,7 +12825,7 @@ |
| 12825 | 12825 | ||
| 12826 | // Search | 12826 | // Search |
| 12827 | if (col.search !== undefined) { | 12827 | if (col.search !== undefined) { |
| 12828 | $$2.extend(settings.aoPreSearchCols[i], _fnSearchToHung(col.search)); | 12828 | $$1.extend(settings.aoPreSearchCols[i], _fnSearchToHung(col.search)); |
| 12829 | } | 12829 | } |
| 12830 | } | 12830 | } |
| 12831 | 12831 | ||
| ... | @@ -12847,7 +12847,7 @@ | ... | @@ -12847,7 +12847,7 @@ |
| 12847 | */ | 12847 | */ |
| 12848 | function _fnSettingsFromNode(table) { | 12848 | function _fnSettingsFromNode(table) { |
| 12849 | var settings = DataTable.settings; | 12849 | var settings = DataTable.settings; |
| 12850 | var idx = $$2.inArray(table, _pluck(settings, 'nTable')); | 12850 | var idx = $$1.inArray(table, _pluck(settings, 'nTable')); |
| 12851 | return idx !== -1 ? settings[idx] : null; | 12851 | return idx !== -1 ? settings[idx] : null; |
| 12852 | } | 12852 | } |
| 12853 | 12853 | ||
| ... | @@ -12893,7 +12893,7 @@ | ... | @@ -12893,7 +12893,7 @@ |
| 12893 | */ | 12893 | */ |
| 12894 | function _fnMap(ret, src, name, mappedName) { | 12894 | function _fnMap(ret, src, name, mappedName) { |
| 12895 | if (Array.isArray(name)) { | 12895 | if (Array.isArray(name)) { |
| 12896 | $$2.each(name, function (i, val) { | 12896 | $$1.each(name, function (i, val) { |
| 12897 | if (Array.isArray(val)) { | 12897 | if (Array.isArray(val)) { |
| 12898 | _fnMap(ret, src, val[0], val[1]); | 12898 | _fnMap(ret, src, val[0], val[1]); |
| 12899 | } else { | 12899 | } else { |
| ... | @@ -12932,11 +12932,11 @@ | ... | @@ -12932,11 +12932,11 @@ |
| 12932 | for (var prop in extender) { | 12932 | for (var prop in extender) { |
| 12933 | if (extender.hasOwnProperty(prop)) { | 12933 | if (extender.hasOwnProperty(prop)) { |
| 12934 | val = extender[prop]; | 12934 | val = extender[prop]; |
| 12935 | if ($$2.isPlainObject(val)) { | 12935 | if ($$1.isPlainObject(val)) { |
| 12936 | if (!$$2.isPlainObject(out[prop])) { | 12936 | if (!$$1.isPlainObject(out[prop])) { |
| 12937 | out[prop] = {}; | 12937 | out[prop] = {}; |
| 12938 | } | 12938 | } |
| 12939 | $$2.extend(true, out[prop], val); | 12939 | $$1.extend(true, out[prop], val); |
| 12940 | } else if (breakRefs && prop !== 'data' && prop !== 'aaData' && Array.isArray(val)) { | 12940 | } else if (breakRefs && prop !== 'data' && prop !== 'aaData' && Array.isArray(val)) { |
| 12941 | out[prop] = val.slice(); | 12941 | out[prop] = val.slice(); |
| 12942 | } else { | 12942 | } else { |
| ... | @@ -12957,8 +12957,8 @@ | ... | @@ -12957,8 +12957,8 @@ |
| 12957 | * @memberof DataTable#oApi | 12957 | * @memberof DataTable#oApi |
| 12958 | */ | 12958 | */ |
| 12959 | function _fnBindAction(n, oData, fn) { | 12959 | function _fnBindAction(n, oData, fn) { |
| 12960 | $$2(n).on('click.DT', oData, function (e) { | 12960 | $$1(n).on('click.DT', oData, function (e) { |
| 12961 | $$2(n).trigger('blur'); // Remove focus outline for mouse users | 12961 | $$1(n).trigger('blur'); // Remove focus outline for mouse users |
| 12962 | fn(e); | 12962 | fn(e); |
| 12963 | }).on('keypress.DT', oData, function (e) { | 12963 | }).on('keypress.DT', oData, function (e) { |
| 12964 | if (e.which === 13) { | 12964 | if (e.which === 13) { |
| ... | @@ -13006,19 +13006,19 @@ | ... | @@ -13006,19 +13006,19 @@ |
| 13006 | function _fnCallbackFire(settings, callbackArr, eventName, args) { | 13006 | function _fnCallbackFire(settings, callbackArr, eventName, args) { |
| 13007 | var ret = []; | 13007 | var ret = []; |
| 13008 | if (callbackArr) { | 13008 | if (callbackArr) { |
| 13009 | ret = $$2.map(settings[callbackArr].slice().reverse(), function (val, i) { | 13009 | ret = $$1.map(settings[callbackArr].slice().reverse(), function (val, i) { |
| 13010 | return val.fn.apply(settings.oInstance, args); | 13010 | return val.fn.apply(settings.oInstance, args); |
| 13011 | }); | 13011 | }); |
| 13012 | } | 13012 | } |
| 13013 | if (eventName !== null) { | 13013 | if (eventName !== null) { |
| 13014 | var e = $$2.Event(eventName + '.dt'); | 13014 | var e = $$1.Event(eventName + '.dt'); |
| 13015 | var table = $$2(settings.nTable); | 13015 | var table = $$1(settings.nTable); |
| 13016 | table.trigger(e, args); | 13016 | table.trigger(e, args); |
| 13017 | 13017 | ||
| 13018 | // If not yet attached to the document, trigger the event | 13018 | // If not yet attached to the document, trigger the event |
| 13019 | // on the body directly to sort of simulate the bubble | 13019 | // on the body directly to sort of simulate the bubble |
| 13020 | if (table.parents('body').length === 0) { | 13020 | if (table.parents('body').length === 0) { |
| 13021 | $$2('body').trigger(e, args); | 13021 | $$1('body').trigger(e, args); |
| 13022 | } | 13022 | } |
| 13023 | ret.push(e.result); | 13023 | ret.push(e.result); |
| 13024 | } | 13024 | } |
| ... | @@ -13044,7 +13044,7 @@ | ... | @@ -13044,7 +13044,7 @@ |
| 13044 | function _fnRenderer(settings, type) { | 13044 | function _fnRenderer(settings, type) { |
| 13045 | var renderer = settings.renderer; | 13045 | var renderer = settings.renderer; |
| 13046 | var host = DataTable.ext.renderer[type]; | 13046 | var host = DataTable.ext.renderer[type]; |
| 13047 | if ($$2.isPlainObject(renderer) && renderer[type]) { | 13047 | if ($$1.isPlainObject(renderer) && renderer[type]) { |
| 13048 | // Specific renderer for this type. If available use it, otherwise use | 13048 | // Specific renderer for this type. If available use it, otherwise use |
| 13049 | // the default. | 13049 | // the default. |
| 13050 | return host[renderer[type]] || host._; | 13050 | return host[renderer[type]] || host._; |
| ... | @@ -13144,7 +13144,7 @@ | ... | @@ -13144,7 +13144,7 @@ |
| 13144 | var _toSettings = function (mixed) { | 13144 | var _toSettings = function (mixed) { |
| 13145 | var idx, jq; | 13145 | var idx, jq; |
| 13146 | var settings = DataTable.settings; | 13146 | var settings = DataTable.settings; |
| 13147 | var tables = $$2.map(settings, function (el, i) { | 13147 | var tables = $$1.map(settings, function (el, i) { |
| 13148 | return el.nTable; | 13148 | return el.nTable; |
| 13149 | }); | 13149 | }); |
| 13150 | if (!mixed) { | 13150 | if (!mixed) { |
| ... | @@ -13154,20 +13154,20 @@ | ... | @@ -13154,20 +13154,20 @@ |
| 13154 | return [mixed]; | 13154 | return [mixed]; |
| 13155 | } else if (mixed.nodeName && mixed.nodeName.toLowerCase() === 'table') { | 13155 | } else if (mixed.nodeName && mixed.nodeName.toLowerCase() === 'table') { |
| 13156 | // Table node | 13156 | // Table node |
| 13157 | idx = $$2.inArray(mixed, tables); | 13157 | idx = $$1.inArray(mixed, tables); |
| 13158 | return idx !== -1 ? [settings[idx]] : null; | 13158 | return idx !== -1 ? [settings[idx]] : null; |
| 13159 | } else if (mixed && typeof mixed.settings === 'function') { | 13159 | } else if (mixed && typeof mixed.settings === 'function') { |
| 13160 | return mixed.settings().toArray(); | 13160 | return mixed.settings().toArray(); |
| 13161 | } else if (typeof mixed === 'string') { | 13161 | } else if (typeof mixed === 'string') { |
| 13162 | // jQuery selector | 13162 | // jQuery selector |
| 13163 | jq = $$2(mixed); | 13163 | jq = $$1(mixed); |
| 13164 | } else if (mixed instanceof $$2) { | 13164 | } else if (mixed instanceof $$1) { |
| 13165 | // jQuery object (also DataTables instance) | 13165 | // jQuery object (also DataTables instance) |
| 13166 | jq = mixed; | 13166 | jq = mixed; |
| 13167 | } | 13167 | } |
| 13168 | if (jq) { | 13168 | if (jq) { |
| 13169 | return jq.map(function (i) { | 13169 | return jq.map(function (i) { |
| 13170 | idx = $$2.inArray(this, tables); | 13170 | idx = $$1.inArray(this, tables); |
| 13171 | return idx !== -1 ? settings[idx] : null; | 13171 | return idx !== -1 ? settings[idx] : null; |
| 13172 | }).toArray(); | 13172 | }).toArray(); |
| 13173 | } | 13173 | } |
| ... | @@ -13251,7 +13251,7 @@ | ... | @@ -13251,7 +13251,7 @@ |
| 13251 | 13251 | ||
| 13252 | // Initial data | 13252 | // Initial data |
| 13253 | if (data) { | 13253 | if (data) { |
| 13254 | $$2.merge(this, data); | 13254 | $$1.merge(this, data); |
| 13255 | } | 13255 | } |
| 13256 | 13256 | ||
| 13257 | // selector | 13257 | // selector |
| ... | @@ -13266,7 +13266,7 @@ | ... | @@ -13266,7 +13266,7 @@ |
| 13266 | 13266 | ||
| 13267 | // Don't destroy the existing prototype, just extend it. Required for jQuery 2's | 13267 | // Don't destroy the existing prototype, just extend it. Required for jQuery 2's |
| 13268 | // isPlainObject. | 13268 | // isPlainObject. |
| 13269 | $$2.extend(_Api.prototype, { | 13269 | $$1.extend(_Api.prototype, { |
| 13270 | any: function () { | 13270 | any: function () { |
| 13271 | return this.count() !== 0; | 13271 | return this.count() !== 0; |
| 13272 | }, | 13272 | }, |
| ... | @@ -13424,10 +13424,10 @@ | ... | @@ -13424,10 +13424,10 @@ |
| 13424 | return __arrayProto.slice.call(this); | 13424 | return __arrayProto.slice.call(this); |
| 13425 | }, | 13425 | }, |
| 13426 | to$: function () { | 13426 | to$: function () { |
| 13427 | return $$2(this); | 13427 | return $$1(this); |
| 13428 | }, | 13428 | }, |
| 13429 | toJQuery: function () { | 13429 | toJQuery: function () { |
| 13430 | return $$2(this); | 13430 | return $$1(this); |
| 13431 | }, | 13431 | }, |
| 13432 | unique: function () { | 13432 | unique: function () { |
| 13433 | return new _Api(this.context, _unique(this)); | 13433 | return new _Api(this.context, _unique(this)); |
| ... | @@ -13532,7 +13532,7 @@ | ... | @@ -13532,7 +13532,7 @@ |
| 13532 | } | 13532 | } |
| 13533 | if (i === ien - 1) { | 13533 | if (i === ien - 1) { |
| 13534 | src.val = val; | 13534 | src.val = val; |
| 13535 | src.type = typeof val === 'function' ? 'function' : $$2.isPlainObject(val) ? 'object' : 'other'; | 13535 | src.type = typeof val === 'function' ? 'function' : $$1.isPlainObject(val) ? 'object' : 'other'; |
| 13536 | } else { | 13536 | } else { |
| 13537 | struct = method ? src.methodExt : src.propExt; | 13537 | struct = method ? src.methodExt : src.propExt; |
| 13538 | } | 13538 | } |
| ... | @@ -13569,7 +13569,7 @@ | ... | @@ -13569,7 +13569,7 @@ |
| 13569 | */ | 13569 | */ |
| 13570 | var __table_selector = function (selector, a) { | 13570 | var __table_selector = function (selector, a) { |
| 13571 | if (Array.isArray(selector)) { | 13571 | if (Array.isArray(selector)) { |
| 13572 | return $$2.map(selector, function (item) { | 13572 | return $$1.map(selector, function (item) { |
| 13573 | return __table_selector(item, a); | 13573 | return __table_selector(item, a); |
| 13574 | }); | 13574 | }); |
| 13575 | } | 13575 | } |
| ... | @@ -13580,12 +13580,12 @@ | ... | @@ -13580,12 +13580,12 @@ |
| 13580 | } | 13580 | } |
| 13581 | 13581 | ||
| 13582 | // Perform a jQuery selector on the table nodes | 13582 | // Perform a jQuery selector on the table nodes |
| 13583 | var nodes = $$2.map(a, function (el, i) { | 13583 | var nodes = $$1.map(a, function (el, i) { |
| 13584 | return el.nTable; | 13584 | return el.nTable; |
| 13585 | }); | 13585 | }); |
| 13586 | return $$2(nodes).filter(selector).map(function (i) { | 13586 | return $$1(nodes).filter(selector).map(function (i) { |
| 13587 | // Need to translate back from the table node to the settings | 13587 | // Need to translate back from the table node to the settings |
| 13588 | var idx = $$2.inArray(this, nodes); | 13588 | var idx = $$1.inArray(this, nodes); |
| 13589 | return a[idx]; | 13589 | return a[idx]; |
| 13590 | }).toArray(); | 13590 | }).toArray(); |
| 13591 | }; | 13591 | }; |
| ... | @@ -13842,12 +13842,12 @@ | ... | @@ -13842,12 +13842,12 @@ |
| 13842 | return undefined; | 13842 | return undefined; |
| 13843 | } | 13843 | } |
| 13844 | ctx = ctx[0]; | 13844 | ctx = ctx[0]; |
| 13845 | return ctx.ajax ? $$2.isPlainObject(ctx.ajax) ? ctx.ajax.url : ctx.ajax : ctx.sAjaxSource; | 13845 | return ctx.ajax ? $$1.isPlainObject(ctx.ajax) ? ctx.ajax.url : ctx.ajax : ctx.sAjaxSource; |
| 13846 | } | 13846 | } |
| 13847 | 13847 | ||
| 13848 | // set | 13848 | // set |
| 13849 | return this.iterator('table', function (settings) { | 13849 | return this.iterator('table', function (settings) { |
| 13850 | if ($$2.isPlainObject(settings.ajax)) { | 13850 | if ($$1.isPlainObject(settings.ajax)) { |
| 13851 | settings.ajax.url = url; | 13851 | settings.ajax.url = url; |
| 13852 | } else { | 13852 | } else { |
| 13853 | settings.ajax = url; | 13853 | settings.ajax = url; |
| ... | @@ -13919,7 +13919,7 @@ | ... | @@ -13919,7 +13919,7 @@ |
| 13919 | if (opts.filter && opts.search === undefined) { | 13919 | if (opts.filter && opts.search === undefined) { |
| 13920 | opts.search = opts.filter; | 13920 | opts.search = opts.filter; |
| 13921 | } | 13921 | } |
| 13922 | return $$2.extend({ | 13922 | return $$1.extend({ |
| 13923 | search: 'none', | 13923 | search: 'none', |
| 13924 | order: 'current', | 13924 | order: 'current', |
| 13925 | page: 'all' | 13925 | page: 'all' |
| ... | @@ -13980,7 +13980,7 @@ | ... | @@ -13980,7 +13980,7 @@ |
| 13980 | for (var i = 0, ien = displayFiltered.length; i < ien; i++) { | 13980 | for (var i = 0, ien = displayFiltered.length; i < ien; i++) { |
| 13981 | displayFilteredMap[displayFiltered[i]] = null; | 13981 | displayFilteredMap[displayFiltered[i]] = null; |
| 13982 | } | 13982 | } |
| 13983 | a = $$2.map(displayMaster, function (el) { | 13983 | a = $$1.map(displayMaster, function (el) { |
| 13984 | return !displayFilteredMap.hasOwnProperty(el) ? el : null; | 13984 | return !displayFilteredMap.hasOwnProperty(el) ? el : null; |
| 13985 | }); | 13985 | }); |
| 13986 | } | 13986 | } |
| ... | @@ -13990,7 +13990,7 @@ | ... | @@ -13990,7 +13990,7 @@ |
| 13990 | a.push(i); | 13990 | a.push(i); |
| 13991 | } else { | 13991 | } else { |
| 13992 | // applied | removed | 13992 | // applied | removed |
| 13993 | tmp = $$2.inArray(i, displayFiltered); | 13993 | tmp = $$1.inArray(i, displayFiltered); |
| 13994 | if (tmp === -1 && search == 'removed' || tmp >= 0 && search == 'applied') { | 13994 | if (tmp === -1 && search == 'removed' || tmp >= 0 && search == 'applied') { |
| 13995 | a.push(i); | 13995 | a.push(i); |
| 13996 | } | 13996 | } |
| ... | @@ -14025,7 +14025,7 @@ | ... | @@ -14025,7 +14025,7 @@ |
| 14025 | if (!rows) { | 14025 | if (!rows) { |
| 14026 | rows = _selector_row_indexes(settings, opts); | 14026 | rows = _selector_row_indexes(settings, opts); |
| 14027 | } | 14027 | } |
| 14028 | if (selInt !== null && $$2.inArray(selInt, rows) !== -1) { | 14028 | if (selInt !== null && $$1.inArray(selInt, rows) !== -1) { |
| 14029 | // Selector - integer | 14029 | // Selector - integer |
| 14030 | return [selInt]; | 14030 | return [selInt]; |
| 14031 | } else if (sel === null || sel === undefined || sel === '') { | 14031 | } else if (sel === null || sel === undefined || sel === '') { |
| ... | @@ -14035,7 +14035,7 @@ | ... | @@ -14035,7 +14035,7 @@ |
| 14035 | 14035 | ||
| 14036 | // Selector - function | 14036 | // Selector - function |
| 14037 | if (typeof sel === 'function') { | 14037 | if (typeof sel === 'function') { |
| 14038 | return $$2.map(rows, function (idx) { | 14038 | return $$1.map(rows, function (idx) { |
| 14039 | var row = aoData[idx]; | 14039 | var row = aoData[idx]; |
| 14040 | return sel(idx, row._aData, row.nTr) ? idx : null; | 14040 | return sel(idx, row._aData, row.nTr) ? idx : null; |
| 14041 | }); | 14041 | }); |
| ... | @@ -14051,7 +14051,7 @@ | ... | @@ -14051,7 +14051,7 @@ |
| 14051 | } else if (cellIdx) { | 14051 | } else if (cellIdx) { |
| 14052 | return aoData[cellIdx.row] && aoData[cellIdx.row].nTr === sel.parentNode ? [cellIdx.row] : []; | 14052 | return aoData[cellIdx.row] && aoData[cellIdx.row].nTr === sel.parentNode ? [cellIdx.row] : []; |
| 14053 | } else { | 14053 | } else { |
| 14054 | var host = $$2(sel).closest('*[data-dt-row]'); | 14054 | var host = $$1(sel).closest('*[data-dt-row]'); |
| 14055 | return host.length ? [host.data('dt-row')] : []; | 14055 | return host.length ? [host.data('dt-row')] : []; |
| 14056 | } | 14056 | } |
| 14057 | } | 14057 | } |
| ... | @@ -14082,7 +14082,7 @@ | ... | @@ -14082,7 +14082,7 @@ |
| 14082 | // Selector - jQuery selector string, array of nodes or jQuery object/ | 14082 | // Selector - jQuery selector string, array of nodes or jQuery object/ |
| 14083 | // As jQuery's .filter() allows jQuery objects to be passed in filter, | 14083 | // As jQuery's .filter() allows jQuery objects to be passed in filter, |
| 14084 | // it also allows arrays, so this will cope with all three options | 14084 | // it also allows arrays, so this will cope with all three options |
| 14085 | return $$2(nodes).filter(sel).map(function () { | 14085 | return $$1(nodes).filter(sel).map(function () { |
| 14086 | return this._DT_RowIndex; | 14086 | return this._DT_RowIndex; |
| 14087 | }).toArray(); | 14087 | }).toArray(); |
| 14088 | }; | 14088 | }; |
| ... | @@ -14092,7 +14092,7 @@ | ... | @@ -14092,7 +14092,7 @@ |
| 14092 | // argument shifting | 14092 | // argument shifting |
| 14093 | if (selector === undefined) { | 14093 | if (selector === undefined) { |
| 14094 | selector = ''; | 14094 | selector = ''; |
| 14095 | } else if ($$2.isPlainObject(selector)) { | 14095 | } else if ($$1.isPlainObject(selector)) { |
| 14096 | opts = selector; | 14096 | opts = selector; |
| 14097 | selector = ''; | 14097 | selector = ''; |
| 14098 | } | 14098 | } |
| ... | @@ -14216,7 +14216,7 @@ | ... | @@ -14216,7 +14216,7 @@ |
| 14216 | // Return an Api.rows() extended instance, so rows().nodes() etc can be used | 14216 | // Return an Api.rows() extended instance, so rows().nodes() etc can be used |
| 14217 | var modRows = this.rows(-1); | 14217 | var modRows = this.rows(-1); |
| 14218 | modRows.pop(); | 14218 | modRows.pop(); |
| 14219 | $$2.merge(modRows, newRows); | 14219 | $$1.merge(modRows, newRows); |
| 14220 | return modRows; | 14220 | return modRows; |
| 14221 | }); | 14221 | }); |
| 14222 | 14222 | ||
| ... | @@ -14253,7 +14253,7 @@ | ... | @@ -14253,7 +14253,7 @@ |
| 14253 | _api_register('row.add()', function (row) { | 14253 | _api_register('row.add()', function (row) { |
| 14254 | // Allow a jQuery object to be passed in - only a single row is added from | 14254 | // Allow a jQuery object to be passed in - only a single row is added from |
| 14255 | // it though - the first element in the set | 14255 | // it though - the first element in the set |
| 14256 | if (row instanceof $$2 && row.length) { | 14256 | if (row instanceof $$1 && row.length) { |
| 14257 | row = row[0]; | 14257 | row = row[0]; |
| 14258 | } | 14258 | } |
| 14259 | var rows = this.iterator('table', function (settings) { | 14259 | var rows = this.iterator('table', function (settings) { |
| ... | @@ -14266,7 +14266,7 @@ | ... | @@ -14266,7 +14266,7 @@ |
| 14266 | // Return an Api.rows() extended instance, with the newly added row selected | 14266 | // Return an Api.rows() extended instance, with the newly added row selected |
| 14267 | return this.row(rows[0]); | 14267 | return this.row(rows[0]); |
| 14268 | }); | 14268 | }); |
| 14269 | $$2(document).on('plugin-init.dt', function (e, context) { | 14269 | $$1(document).on('plugin-init.dt', function (e, context) { |
| 14270 | var api = new _Api(context); | 14270 | var api = new _Api(context); |
| 14271 | var namespace = 'on-plugin-init'; | 14271 | var namespace = 'on-plugin-init'; |
| 14272 | var stateSaveParamsEvent = 'stateSaveParams.' + namespace; | 14272 | var stateSaveParamsEvent = 'stateSaveParams.' + namespace; |
| ... | @@ -14289,7 +14289,7 @@ | ... | @@ -14289,7 +14289,7 @@ |
| 14289 | }); | 14289 | }); |
| 14290 | var loaded = api.state.loaded(); | 14290 | var loaded = api.state.loaded(); |
| 14291 | if (loaded && loaded.childRows) { | 14291 | if (loaded && loaded.childRows) { |
| 14292 | api.rows($$2.map(loaded.childRows, function (id) { | 14292 | api.rows($$1.map(loaded.childRows, function (id) { |
| 14293 | return id.replace(/:/g, '\\:'); | 14293 | return id.replace(/:/g, '\\:'); |
| 14294 | })).every(function () { | 14294 | })).every(function () { |
| 14295 | _fnCallbackFire(context, null, 'requestChild', [this]); | 14295 | _fnCallbackFire(context, null, 'requestChild', [this]); |
| ... | @@ -14301,7 +14301,7 @@ | ... | @@ -14301,7 +14301,7 @@ |
| 14301 | var rows = []; | 14301 | var rows = []; |
| 14302 | var addRow = function (r, k) { | 14302 | var addRow = function (r, k) { |
| 14303 | // Recursion to allow for arrays of jQuery objects | 14303 | // Recursion to allow for arrays of jQuery objects |
| 14304 | if (Array.isArray(r) || r instanceof $$2) { | 14304 | if (Array.isArray(r) || r instanceof $$1) { |
| 14305 | for (var i = 0, ien = r.length; i < ien; i++) { | 14305 | for (var i = 0, ien = r.length; i < ien; i++) { |
| 14306 | addRow(r[i], k); | 14306 | addRow(r[i], k); |
| 14307 | } | 14307 | } |
| ... | @@ -14314,8 +14314,8 @@ | ... | @@ -14314,8 +14314,8 @@ |
| 14314 | rows.push(r); | 14314 | rows.push(r); |
| 14315 | } else { | 14315 | } else { |
| 14316 | // Otherwise create a row with a wrapper | 14316 | // Otherwise create a row with a wrapper |
| 14317 | var created = $$2('<tr><td></td></tr>').addClass(k); | 14317 | var created = $$1('<tr><td></td></tr>').addClass(k); |
| 14318 | $$2('td', created).addClass(k).html(r)[0].colSpan = _fnVisbleColumns(ctx); | 14318 | $$1('td', created).addClass(k).html(r)[0].colSpan = _fnVisbleColumns(ctx); |
| 14319 | rows.push(created[0]); | 14319 | rows.push(created[0]); |
| 14320 | } | 14320 | } |
| 14321 | }; | 14321 | }; |
| ... | @@ -14323,7 +14323,7 @@ | ... | @@ -14323,7 +14323,7 @@ |
| 14323 | if (row._details) { | 14323 | if (row._details) { |
| 14324 | row._details.detach(); | 14324 | row._details.detach(); |
| 14325 | } | 14325 | } |
| 14326 | row._details = $$2(rows); | 14326 | row._details = $$1(rows); |
| 14327 | 14327 | ||
| 14328 | // If the children were already shown, that state should be retained | 14328 | // If the children were already shown, that state should be retained |
| 14329 | if (row._detailsShow) { | 14329 | if (row._detailsShow) { |
| ... | @@ -14343,7 +14343,7 @@ | ... | @@ -14343,7 +14343,7 @@ |
| 14343 | row._details.remove(); | 14343 | row._details.remove(); |
| 14344 | row._detailsShow = undefined; | 14344 | row._detailsShow = undefined; |
| 14345 | row._details = undefined; | 14345 | row._details = undefined; |
| 14346 | $$2(row.nTr).removeClass('dt-hasChild'); | 14346 | $$1(row.nTr).removeClass('dt-hasChild'); |
| 14347 | __details_state(ctx); | 14347 | __details_state(ctx); |
| 14348 | } | 14348 | } |
| 14349 | } | 14349 | } |
| ... | @@ -14356,10 +14356,10 @@ | ... | @@ -14356,10 +14356,10 @@ |
| 14356 | row._detailsShow = show; | 14356 | row._detailsShow = show; |
| 14357 | if (show) { | 14357 | if (show) { |
| 14358 | row._details.insertAfter(row.nTr); | 14358 | row._details.insertAfter(row.nTr); |
| 14359 | $$2(row.nTr).addClass('dt-hasChild'); | 14359 | $$1(row.nTr).addClass('dt-hasChild'); |
| 14360 | } else { | 14360 | } else { |
| 14361 | row._details.detach(); | 14361 | row._details.detach(); |
| 14362 | $$2(row.nTr).removeClass('dt-hasChild'); | 14362 | $$1(row.nTr).removeClass('dt-hasChild'); |
| 14363 | } | 14363 | } |
| 14364 | _fnCallbackFire(ctx[0], null, 'childRow', [show, api.row(api[0])]); | 14364 | _fnCallbackFire(ctx[0], null, 'childRow', [show, api.row(api[0])]); |
| 14365 | __details_events(ctx[0]); | 14365 | __details_events(ctx[0]); |
| ... | @@ -14525,7 +14525,7 @@ | ... | @@ -14525,7 +14525,7 @@ |
| 14525 | // Selector = function | 14525 | // Selector = function |
| 14526 | if (typeof s === 'function') { | 14526 | if (typeof s === 'function') { |
| 14527 | var rows = _selector_row_indexes(settings, opts); | 14527 | var rows = _selector_row_indexes(settings, opts); |
| 14528 | return $$2.map(columns, function (col, idx) { | 14528 | return $$1.map(columns, function (col, idx) { |
| 14529 | return s(idx, __columnData(settings, idx, 0, 0, rows), nodes[idx]) ? idx : null; | 14529 | return s(idx, __columnData(settings, idx, 0, 0, rows), nodes[idx]) ? idx : null; |
| 14530 | }); | 14530 | }); |
| 14531 | } | 14531 | } |
| ... | @@ -14540,7 +14540,7 @@ | ... | @@ -14540,7 +14540,7 @@ |
| 14540 | // Visible index given, convert to column index | 14540 | // Visible index given, convert to column index |
| 14541 | if (idx < 0) { | 14541 | if (idx < 0) { |
| 14542 | // Counting from the right | 14542 | // Counting from the right |
| 14543 | var visColumns = $$2.map(columns, function (col, i) { | 14543 | var visColumns = $$1.map(columns, function (col, i) { |
| 14544 | return col.bVisible ? i : null; | 14544 | return col.bVisible ? i : null; |
| 14545 | }); | 14545 | }); |
| 14546 | return [visColumns[visColumns.length + idx]]; | 14546 | return [visColumns[visColumns.length + idx]]; |
| ... | @@ -14549,7 +14549,7 @@ | ... | @@ -14549,7 +14549,7 @@ |
| 14549 | return [_fnVisibleToColumnIndex(settings, idx)]; | 14549 | return [_fnVisibleToColumnIndex(settings, idx)]; |
| 14550 | case 'name': | 14550 | case 'name': |
| 14551 | // match by name. `names` is column index complete and in order | 14551 | // match by name. `names` is column index complete and in order |
| 14552 | return $$2.map(names, function (name, i) { | 14552 | return $$1.map(names, function (name, i) { |
| 14553 | return name === match[1] ? i : null; | 14553 | return name === match[1] ? i : null; |
| 14554 | }); | 14554 | }); |
| 14555 | default: | 14555 | default: |
| ... | @@ -14563,8 +14563,8 @@ | ... | @@ -14563,8 +14563,8 @@ |
| 14563 | } | 14563 | } |
| 14564 | 14564 | ||
| 14565 | // jQuery selector on the TH elements for the columns | 14565 | // jQuery selector on the TH elements for the columns |
| 14566 | var jqResult = $$2(nodes).filter(s).map(function () { | 14566 | var jqResult = $$1(nodes).filter(s).map(function () { |
| 14567 | return $$2.inArray(this, nodes); // `nodes` is column index complete and in order | 14567 | return $$1.inArray(this, nodes); // `nodes` is column index complete and in order |
| 14568 | }).toArray(); | 14568 | }).toArray(); |
| 14569 | if (jqResult.length || !s.nodeName) { | 14569 | if (jqResult.length || !s.nodeName) { |
| 14570 | return jqResult; | 14570 | return jqResult; |
| ... | @@ -14572,7 +14572,7 @@ | ... | @@ -14572,7 +14572,7 @@ |
| 14572 | 14572 | ||
| 14573 | // Otherwise a node which might have a `dt-column` data attribute, or be | 14573 | // Otherwise a node which might have a `dt-column` data attribute, or be |
| 14574 | // a child or such an element | 14574 | // a child or such an element |
| 14575 | var host = $$2(s).closest('*[data-dt-column]'); | 14575 | var host = $$1(s).closest('*[data-dt-column]'); |
| 14576 | return host.length ? [host.data('dt-column')] : []; | 14576 | return host.length ? [host.data('dt-column')] : []; |
| 14577 | }; | 14577 | }; |
| 14578 | return _selector_run('column', selector, run, settings, opts); | 14578 | return _selector_run('column', selector, run, settings, opts); |
| ... | @@ -14599,7 +14599,7 @@ | ... | @@ -14599,7 +14599,7 @@ |
| 14599 | if (vis) { | 14599 | if (vis) { |
| 14600 | // Insert column | 14600 | // Insert column |
| 14601 | // Need to decide if we should use appendChild or insertBefore | 14601 | // Need to decide if we should use appendChild or insertBefore |
| 14602 | var insertBefore = $$2.inArray(true, _pluck(cols, 'bVisible'), column + 1); | 14602 | var insertBefore = $$1.inArray(true, _pluck(cols, 'bVisible'), column + 1); |
| 14603 | for (i = 0, ien = data.length; i < ien; i++) { | 14603 | for (i = 0, ien = data.length; i < ien; i++) { |
| 14604 | tr = data[i].nTr; | 14604 | tr = data[i].nTr; |
| 14605 | cells = data[i].anCells; | 14605 | cells = data[i].anCells; |
| ... | @@ -14610,7 +14610,7 @@ | ... | @@ -14610,7 +14610,7 @@ |
| 14610 | } | 14610 | } |
| 14611 | } else { | 14611 | } else { |
| 14612 | // Remove column | 14612 | // Remove column |
| 14613 | $$2(_pluck(settings.aoData, 'anCells', column)).detach(); | 14613 | $$1(_pluck(settings.aoData, 'anCells', column)).detach(); |
| 14614 | } | 14614 | } |
| 14615 | 14615 | ||
| 14616 | // Common actions | 14616 | // Common actions |
| ... | @@ -14620,7 +14620,7 @@ | ... | @@ -14620,7 +14620,7 @@ |
| 14620 | // argument shifting | 14620 | // argument shifting |
| 14621 | if (selector === undefined) { | 14621 | if (selector === undefined) { |
| 14622 | selector = ''; | 14622 | selector = ''; |
| 14623 | } else if ($$2.isPlainObject(selector)) { | 14623 | } else if ($$1.isPlainObject(selector)) { |
| 14624 | opts = selector; | 14624 | opts = selector; |
| 14625 | selector = ''; | 14625 | selector = ''; |
| 14626 | } | 14626 | } |
| ... | @@ -14681,7 +14681,7 @@ | ... | @@ -14681,7 +14681,7 @@ |
| 14681 | // Update colspan for no records display. Child rows and extensions will use their own | 14681 | // Update colspan for no records display. Child rows and extensions will use their own |
| 14682 | // listeners to do this - only need to update the empty table item here | 14682 | // listeners to do this - only need to update the empty table item here |
| 14683 | if (!settings.aiDisplay.length) { | 14683 | if (!settings.aiDisplay.length) { |
| 14684 | $$2(settings.nTBody).find('td[colspan]').attr('colspan', _fnVisbleColumns(settings)); | 14684 | $$1(settings.nTBody).find('td[colspan]').attr('colspan', _fnVisbleColumns(settings)); |
| 14685 | } | 14685 | } |
| 14686 | _fnSaveState(settings); | 14686 | _fnSaveState(settings); |
| 14687 | 14687 | ||
| ... | @@ -14723,7 +14723,7 @@ | ... | @@ -14723,7 +14723,7 @@ |
| 14723 | var data = settings.aoData; | 14723 | var data = settings.aoData; |
| 14724 | var rows = _selector_row_indexes(settings, opts); | 14724 | var rows = _selector_row_indexes(settings, opts); |
| 14725 | var cells = _removeEmpty(_pluck_order(data, rows, 'anCells')); | 14725 | var cells = _removeEmpty(_pluck_order(data, rows, 'anCells')); |
| 14726 | var allCells = $$2(_flatten([], cells)); | 14726 | var allCells = $$1(_flatten([], cells)); |
| 14727 | var row; | 14727 | var row; |
| 14728 | var columns = settings.aoColumns.length; | 14728 | var columns = settings.aoColumns.length; |
| 14729 | var a, i, ien, j, o, host; | 14729 | var a, i, ien, j, o, host; |
| ... | @@ -14755,9 +14755,9 @@ | ... | @@ -14755,9 +14755,9 @@ |
| 14755 | } | 14755 | } |
| 14756 | 14756 | ||
| 14757 | // Selector - index | 14757 | // Selector - index |
| 14758 | if ($$2.isPlainObject(s)) { | 14758 | if ($$1.isPlainObject(s)) { |
| 14759 | // Valid cell index and its in the array of selectable rows | 14759 | // Valid cell index and its in the array of selectable rows |
| 14760 | return s.column !== undefined && s.row !== undefined && $$2.inArray(s.row, rows) !== -1 ? [s] : []; | 14760 | return s.column !== undefined && s.row !== undefined && $$1.inArray(s.row, rows) !== -1 ? [s] : []; |
| 14761 | } | 14761 | } |
| 14762 | 14762 | ||
| 14763 | // Selector - jQuery filtered cells | 14763 | // Selector - jQuery filtered cells |
| ... | @@ -14775,7 +14775,7 @@ | ... | @@ -14775,7 +14775,7 @@ |
| 14775 | // Otherwise the selector is a node, and there is one last option - the | 14775 | // Otherwise the selector is a node, and there is one last option - the |
| 14776 | // element might be a child of an element which has dt-row and dt-column | 14776 | // element might be a child of an element which has dt-row and dt-column |
| 14777 | // data attributes | 14777 | // data attributes |
| 14778 | host = $$2(s).closest('*[data-dt-row]'); | 14778 | host = $$1(s).closest('*[data-dt-row]'); |
| 14779 | return host.length ? [{ | 14779 | return host.length ? [{ |
| 14780 | row: host.data('dt-row'), | 14780 | row: host.data('dt-row'), |
| 14781 | column: host.data('dt-column') | 14781 | column: host.data('dt-column') |
| ... | @@ -14785,7 +14785,7 @@ | ... | @@ -14785,7 +14785,7 @@ |
| 14785 | }; | 14785 | }; |
| 14786 | _api_register('cells()', function (rowSelector, columnSelector, opts) { | 14786 | _api_register('cells()', function (rowSelector, columnSelector, opts) { |
| 14787 | // Argument shifting | 14787 | // Argument shifting |
| 14788 | if ($$2.isPlainObject(rowSelector)) { | 14788 | if ($$1.isPlainObject(rowSelector)) { |
| 14789 | // Indexes | 14789 | // Indexes |
| 14790 | if (rowSelector.row === undefined) { | 14790 | if (rowSelector.row === undefined) { |
| 14791 | // Selector options in first parameter | 14791 | // Selector options in first parameter |
| ... | @@ -14797,7 +14797,7 @@ | ... | @@ -14797,7 +14797,7 @@ |
| 14797 | columnSelector = null; | 14797 | columnSelector = null; |
| 14798 | } | 14798 | } |
| 14799 | } | 14799 | } |
| 14800 | if ($$2.isPlainObject(columnSelector)) { | 14800 | if ($$1.isPlainObject(columnSelector)) { |
| 14801 | opts = columnSelector; | 14801 | opts = columnSelector; |
| 14802 | columnSelector = null; | 14802 | columnSelector = null; |
| 14803 | } | 14803 | } |
| ... | @@ -14837,7 +14837,7 @@ | ... | @@ -14837,7 +14837,7 @@ |
| 14837 | // It is a _major_ performance drag to run this if it isn't needed, so this is | 14837 | // It is a _major_ performance drag to run this if it isn't needed, so this is |
| 14838 | // an extension specific check at the moment | 14838 | // an extension specific check at the moment |
| 14839 | var cells = opts && opts.selected ? this.cells(cellsNoOpts, opts) : cellsNoOpts; | 14839 | var cells = opts && opts.selected ? this.cells(cellsNoOpts, opts) : cellsNoOpts; |
| 14840 | $$2.extend(cells.selector, { | 14840 | $$1.extend(cells.selector, { |
| 14841 | cols: columnSelector, | 14841 | cols: columnSelector, |
| 14842 | rows: rowSelector, | 14842 | rows: rowSelector, |
| 14843 | opts: opts | 14843 | opts: opts |
| ... | @@ -14971,7 +14971,7 @@ | ... | @@ -14971,7 +14971,7 @@ |
| 14971 | } : fixed; | 14971 | } : fixed; |
| 14972 | } | 14972 | } |
| 14973 | return this.iterator('table', function (settings) { | 14973 | return this.iterator('table', function (settings) { |
| 14974 | settings.aaSortingFixed = $$2.extend(true, {}, set); | 14974 | settings.aaSortingFixed = $$1.extend(true, {}, set); |
| 14975 | }); | 14975 | }); |
| 14976 | }); | 14976 | }); |
| 14977 | 14977 | ||
| ... | @@ -14980,7 +14980,7 @@ | ... | @@ -14980,7 +14980,7 @@ |
| 14980 | var that = this; | 14980 | var that = this; |
| 14981 | return this.iterator('table', function (settings, i) { | 14981 | return this.iterator('table', function (settings, i) { |
| 14982 | var sort = []; | 14982 | var sort = []; |
| 14983 | $$2.each(that[i], function (j, col) { | 14983 | $$1.each(that[i], function (j, col) { |
| 14984 | sort.push([col, dir]); | 14984 | sort.push([col, dir]); |
| 14985 | }); | 14985 | }); |
| 14986 | settings.aaSorting = sort; | 14986 | settings.aaSorting = sort; |
| ... | @@ -14998,7 +14998,7 @@ | ... | @@ -14998,7 +14998,7 @@ |
| 14998 | if (!settings.oFeatures.bFilter) { | 14998 | if (!settings.oFeatures.bFilter) { |
| 14999 | return; | 14999 | return; |
| 15000 | } | 15000 | } |
| 15001 | _fnFilterComplete(settings, $$2.extend({}, settings.oPreviousSearch, { | 15001 | _fnFilterComplete(settings, $$1.extend({}, settings.oPreviousSearch, { |
| 15002 | "sSearch": input + "", | 15002 | "sSearch": input + "", |
| 15003 | "bRegex": regex === null ? false : regex, | 15003 | "bRegex": regex === null ? false : regex, |
| 15004 | "bSmart": smart === null ? true : smart, | 15004 | "bSmart": smart === null ? true : smart, |
| ... | @@ -15018,7 +15018,7 @@ | ... | @@ -15018,7 +15018,7 @@ |
| 15018 | if (!settings.oFeatures.bFilter) { | 15018 | if (!settings.oFeatures.bFilter) { |
| 15019 | return; | 15019 | return; |
| 15020 | } | 15020 | } |
| 15021 | $$2.extend(preSearch[column], { | 15021 | $$1.extend(preSearch[column], { |
| 15022 | "sSearch": input + "", | 15022 | "sSearch": input + "", |
| 15023 | "bRegex": regex === null ? false : regex, | 15023 | "bRegex": regex === null ? false : regex, |
| 15024 | "bSmart": smart === null ? true : smart, | 15024 | "bSmart": smart === null ? true : smart, |
| ... | @@ -15059,7 +15059,7 @@ | ... | @@ -15059,7 +15059,7 @@ |
| 15059 | */ | 15059 | */ |
| 15060 | DataTable.use = function (module, type) { | 15060 | DataTable.use = function (module, type) { |
| 15061 | if (type === 'lib' || module.fn) { | 15061 | if (type === 'lib' || module.fn) { |
| 15062 | $$2 = module; | 15062 | $$1 = module; |
| 15063 | } else if (type == 'win' || module.document) { | 15063 | } else if (type == 'win' || module.document) { |
| 15064 | window = module; | 15064 | window = module; |
| 15065 | document = module.document; | 15065 | document = module.document; |
| ... | @@ -15087,7 +15087,7 @@ | ... | @@ -15087,7 +15087,7 @@ |
| 15087 | 15087 | ||
| 15088 | // Test if the second parameter is a jQuery object | 15088 | // Test if the second parameter is a jQuery object |
| 15089 | if (jq && jq.fn && jq.fn.jquery) { | 15089 | if (jq && jq.fn && jq.fn.jquery) { |
| 15090 | $$2 = jq; | 15090 | $$1 = jq; |
| 15091 | is = true; | 15091 | is = true; |
| 15092 | } | 15092 | } |
| 15093 | return is; | 15093 | return is; |
| ... | @@ -15143,14 +15143,14 @@ | ... | @@ -15143,14 +15143,14 @@ |
| 15143 | * } | 15143 | * } |
| 15144 | */ | 15144 | */ |
| 15145 | DataTable.isDataTable = DataTable.fnIsDataTable = function (table) { | 15145 | DataTable.isDataTable = DataTable.fnIsDataTable = function (table) { |
| 15146 | var t = $$2(table).get(0); | 15146 | var t = $$1(table).get(0); |
| 15147 | var is = false; | 15147 | var is = false; |
| 15148 | if (table instanceof DataTable.Api) { | 15148 | if (table instanceof DataTable.Api) { |
| 15149 | return true; | 15149 | return true; |
| 15150 | } | 15150 | } |
| 15151 | $$2.each(DataTable.settings, function (i, o) { | 15151 | $$1.each(DataTable.settings, function (i, o) { |
| 15152 | var head = o.nScrollHead ? $$2('table', o.nScrollHead)[0] : null; | 15152 | var head = o.nScrollHead ? $$1('table', o.nScrollHead)[0] : null; |
| 15153 | var foot = o.nScrollFoot ? $$2('table', o.nScrollFoot)[0] : null; | 15153 | var foot = o.nScrollFoot ? $$1('table', o.nScrollFoot)[0] : null; |
| 15154 | if (o.nTable === t || head === t || foot === t) { | 15154 | if (o.nTable === t || head === t || foot === t) { |
| 15155 | is = true; | 15155 | is = true; |
| 15156 | } | 15156 | } |
| ... | @@ -15176,12 +15176,12 @@ | ... | @@ -15176,12 +15176,12 @@ |
| 15176 | */ | 15176 | */ |
| 15177 | DataTable.tables = DataTable.fnTables = function (visible) { | 15177 | DataTable.tables = DataTable.fnTables = function (visible) { |
| 15178 | var api = false; | 15178 | var api = false; |
| 15179 | if ($$2.isPlainObject(visible)) { | 15179 | if ($$1.isPlainObject(visible)) { |
| 15180 | api = visible.api; | 15180 | api = visible.api; |
| 15181 | visible = visible.visible; | 15181 | visible = visible.visible; |
| 15182 | } | 15182 | } |
| 15183 | var a = $$2.map(DataTable.settings, function (o) { | 15183 | var a = $$1.map(DataTable.settings, function (o) { |
| 15184 | if (!visible || visible && $$2(o.nTable).is(':visible')) { | 15184 | if (!visible || visible && $$1(o.nTable).is(':visible')) { |
| 15185 | return o.nTable; | 15185 | return o.nTable; |
| 15186 | } | 15186 | } |
| 15187 | }); | 15187 | }); |
| ... | @@ -15209,21 +15209,21 @@ | ... | @@ -15209,21 +15209,21 @@ |
| 15209 | _api_register('$()', function (selector, opts) { | 15209 | _api_register('$()', function (selector, opts) { |
| 15210 | var rows = this.rows(opts).nodes(), | 15210 | var rows = this.rows(opts).nodes(), |
| 15211 | // Get all rows | 15211 | // Get all rows |
| 15212 | jqRows = $$2(rows); | 15212 | jqRows = $$1(rows); |
| 15213 | return $$2([].concat(jqRows.filter(selector).toArray(), jqRows.find(selector).toArray())); | 15213 | return $$1([].concat(jqRows.filter(selector).toArray(), jqRows.find(selector).toArray())); |
| 15214 | }); | 15214 | }); |
| 15215 | 15215 | ||
| 15216 | // jQuery functions to operate on the tables | 15216 | // jQuery functions to operate on the tables |
| 15217 | $$2.each(['on', 'one', 'off'], function (i, key) { | 15217 | $$1.each(['on', 'one', 'off'], function (i, key) { |
| 15218 | _api_register(key + '()', function /* event, handler */ | 15218 | _api_register(key + '()', function /* event, handler */ |
| 15219 | () { | 15219 | () { |
| 15220 | var args = Array.prototype.slice.call(arguments); | 15220 | var args = Array.prototype.slice.call(arguments); |
| 15221 | 15221 | ||
| 15222 | // Add the `dt` namespace automatically if it isn't already present | 15222 | // Add the `dt` namespace automatically if it isn't already present |
| 15223 | args[0] = $$2.map(args[0].split(/\s/), function (e) { | 15223 | args[0] = $$1.map(args[0].split(/\s/), function (e) { |
| 15224 | return !e.match(/\.dt\b/) ? e + '.dt' : e; | 15224 | return !e.match(/\.dt\b/) ? e + '.dt' : e; |
| 15225 | }).join(' '); | 15225 | }).join(' '); |
| 15226 | var inst = $$2(this.tables().nodes()); | 15226 | var inst = $$1(this.tables().nodes()); |
| 15227 | inst[key].apply(inst, args); | 15227 | inst[key].apply(inst, args); |
| 15228 | return this; | 15228 | return this; |
| 15229 | }); | 15229 | }); |
| ... | @@ -15253,10 +15253,10 @@ | ... | @@ -15253,10 +15253,10 @@ |
| 15253 | var tbody = settings.nTBody; | 15253 | var tbody = settings.nTBody; |
| 15254 | var thead = settings.nTHead; | 15254 | var thead = settings.nTHead; |
| 15255 | var tfoot = settings.nTFoot; | 15255 | var tfoot = settings.nTFoot; |
| 15256 | var jqTable = $$2(table); | 15256 | var jqTable = $$1(table); |
| 15257 | var jqTbody = $$2(tbody); | 15257 | var jqTbody = $$1(tbody); |
| 15258 | var jqWrapper = $$2(settings.nTableWrapper); | 15258 | var jqWrapper = $$1(settings.nTableWrapper); |
| 15259 | var rows = $$2.map(settings.aoData, function (r) { | 15259 | var rows = $$1.map(settings.aoData, function (r) { |
| 15260 | return r.nTr; | 15260 | return r.nTr; |
| 15261 | }); | 15261 | }); |
| 15262 | var ien; | 15262 | var ien; |
| ... | @@ -15277,7 +15277,7 @@ | ... | @@ -15277,7 +15277,7 @@ |
| 15277 | // lowercase, `dt` events are user subscribed and they are responsible | 15277 | // lowercase, `dt` events are user subscribed and they are responsible |
| 15278 | // for removing them | 15278 | // for removing them |
| 15279 | jqWrapper.off('.DT').find(':not(tbody *)').off('.DT'); | 15279 | jqWrapper.off('.DT').find(':not(tbody *)').off('.DT'); |
| 15280 | $$2(window).off('.DT-' + settings.sInstance); | 15280 | $$1(window).off('.DT-' + settings.sInstance); |
| 15281 | 15281 | ||
| 15282 | // When scrolling we had to break the table up - restore it | 15282 | // When scrolling we had to break the table up - restore it |
| 15283 | if (table != thead.parentNode) { | 15283 | if (table != thead.parentNode) { |
| ... | @@ -15291,8 +15291,8 @@ | ... | @@ -15291,8 +15291,8 @@ |
| 15291 | settings.aaSorting = []; | 15291 | settings.aaSorting = []; |
| 15292 | settings.aaSortingFixed = []; | 15292 | settings.aaSortingFixed = []; |
| 15293 | _fnSortingClasses(settings); | 15293 | _fnSortingClasses(settings); |
| 15294 | $$2(rows).removeClass(settings.asStripeClasses.join(' ')); | 15294 | $$1(rows).removeClass(settings.asStripeClasses.join(' ')); |
| 15295 | $$2('th, td', thead).removeClass(classes.sSortable + ' ' + classes.sSortableAsc + ' ' + classes.sSortableDesc + ' ' + classes.sSortableNone); | 15295 | $$1('th, td', thead).removeClass(classes.sSortable + ' ' + classes.sSortableAsc + ' ' + classes.sSortableDesc + ' ' + classes.sSortableNone); |
| 15296 | 15296 | ||
| 15297 | // Add the TR elements back into the table in their original order | 15297 | // Add the TR elements back into the table in their original order |
| 15298 | jqTbody.children().detach(); | 15298 | jqTbody.children().detach(); |
| ... | @@ -15319,13 +15319,13 @@ | ... | @@ -15319,13 +15319,13 @@ |
| 15319 | ien = settings.asDestroyStripes.length; | 15319 | ien = settings.asDestroyStripes.length; |
| 15320 | if (ien) { | 15320 | if (ien) { |
| 15321 | jqTbody.children().each(function (i) { | 15321 | jqTbody.children().each(function (i) { |
| 15322 | $$2(this).addClass(settings.asDestroyStripes[i % ien]); | 15322 | $$1(this).addClass(settings.asDestroyStripes[i % ien]); |
| 15323 | }); | 15323 | }); |
| 15324 | } | 15324 | } |
| 15325 | } | 15325 | } |
| 15326 | 15326 | ||
| 15327 | /* Remove the settings object from the settings array */ | 15327 | /* Remove the settings object from the settings array */ |
| 15328 | var idx = $$2.inArray(settings, DataTable.settings); | 15328 | var idx = $$1.inArray(settings, DataTable.settings); |
| 15329 | if (idx !== -1) { | 15329 | if (idx !== -1) { |
| 15330 | DataTable.settings.splice(idx, 1); | 15330 | DataTable.settings.splice(idx, 1); |
| 15331 | } | 15331 | } |
| ... | @@ -15333,7 +15333,7 @@ | ... | @@ -15333,7 +15333,7 @@ |
| 15333 | }); | 15333 | }); |
| 15334 | 15334 | ||
| 15335 | // Add the `every()` method for rows, columns and cells in a compact form | 15335 | // Add the `every()` method for rows, columns and cells in a compact form |
| 15336 | $$2.each(['column', 'row', 'cell'], function (i, type) { | 15336 | $$1.each(['column', 'row', 'cell'], function (i, type) { |
| 15337 | _api_register(type + 's().every()', function (fn) { | 15337 | _api_register(type + 's().every()', function (fn) { |
| 15338 | var opts = this.selector.opts; | 15338 | var opts = this.selector.opts; |
| 15339 | var api = this; | 15339 | var api = this; |
| ... | @@ -15361,7 +15361,7 @@ | ... | @@ -15361,7 +15361,7 @@ |
| 15361 | if (resolved === undefined) { | 15361 | if (resolved === undefined) { |
| 15362 | resolved = def; | 15362 | resolved = def; |
| 15363 | } | 15363 | } |
| 15364 | if (plural !== undefined && $$2.isPlainObject(resolved)) { | 15364 | if (plural !== undefined && $$1.isPlainObject(resolved)) { |
| 15365 | resolved = resolved[plural] !== undefined ? resolved[plural] : resolved._; | 15365 | resolved = resolved[plural] !== undefined ? resolved[plural] : resolved._; |
| 15366 | } | 15366 | } |
| 15367 | return typeof resolved === 'string' ? resolved.replace('%d', plural) // nb: plural might be undefined, | 15367 | return typeof resolved === 'string' ? resolved.replace('%d', plural) // nb: plural might be undefined, |
| ... | @@ -17527,7 +17527,7 @@ | ... | @@ -17527,7 +17527,7 @@ |
| 17527 | * } ); | 17527 | * } ); |
| 17528 | * } ) | 17528 | * } ) |
| 17529 | */ | 17529 | */ |
| 17530 | "oSearch": $$2.extend({}, DataTable.models.oSearch), | 17530 | "oSearch": $$1.extend({}, DataTable.models.oSearch), |
| 17531 | /** | 17531 | /** |
| 17532 | * __Deprecated__ The functionality provided by this parameter has now been | 17532 | * __Deprecated__ The functionality provided by this parameter has now been |
| 17533 | * superseded by that provided through `ajax`, which should be used instead. | 17533 | * superseded by that provided through `ajax`, which should be used instead. |
| ... | @@ -19884,7 +19884,7 @@ | ... | @@ -19884,7 +19884,7 @@ |
| 19884 | // | 19884 | // |
| 19885 | // Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts | 19885 | // Backwards compatibility. Alias to pre 1.10 Hungarian notation counter parts |
| 19886 | // | 19886 | // |
| 19887 | $$2.extend(_ext, { | 19887 | $$1.extend(_ext, { |
| 19888 | afnFiltering: _ext.search, | 19888 | afnFiltering: _ext.search, |
| 19889 | aTypes: _ext.type.detect, | 19889 | aTypes: _ext.type.detect, |
| 19890 | ofnSearch: _ext.type.search, | 19890 | ofnSearch: _ext.type.search, |
| ... | @@ -19895,7 +19895,7 @@ | ... | @@ -19895,7 +19895,7 @@ |
| 19895 | oStdClasses: _ext.classes, | 19895 | oStdClasses: _ext.classes, |
| 19896 | oPagination: _ext.pager | 19896 | oPagination: _ext.pager |
| 19897 | }); | 19897 | }); |
| 19898 | $$2.extend(DataTable.ext.classes, { | 19898 | $$1.extend(DataTable.ext.classes, { |
| 19899 | "sTable": "dataTable", | 19899 | "sTable": "dataTable", |
| 19900 | "sNoFooter": "no-footer", | 19900 | "sNoFooter": "no-footer", |
| 19901 | /* Paging buttons */ | 19901 | /* Paging buttons */ |
| ... | @@ -19976,7 +19976,7 @@ | ... | @@ -19976,7 +19976,7 @@ |
| 19976 | numbers.DT_el = 'span'; | 19976 | numbers.DT_el = 'span'; |
| 19977 | return numbers; | 19977 | return numbers; |
| 19978 | } | 19978 | } |
| 19979 | $$2.extend(extPagination, { | 19979 | $$1.extend(extPagination, { |
| 19980 | simple: function (page, pages) { | 19980 | simple: function (page, pages) { |
| 19981 | return ['previous', 'next']; | 19981 | return ['previous', 'next']; |
| 19982 | }, | 19982 | }, |
| ... | @@ -20000,7 +20000,7 @@ | ... | @@ -20000,7 +20000,7 @@ |
| 20000 | // Number of number buttons (including ellipsis) to show. _Must be odd!_ | 20000 | // Number of number buttons (including ellipsis) to show. _Must be odd!_ |
| 20001 | numbers_length: 7 | 20001 | numbers_length: 7 |
| 20002 | }); | 20002 | }); |
| 20003 | $$2.extend(true, DataTable.ext.renderer, { | 20003 | $$1.extend(true, DataTable.ext.renderer, { |
| 20004 | pageButton: { | 20004 | pageButton: { |
| 20005 | _: function (settings, host, idx, buttons, page, pages) { | 20005 | _: function (settings, host, idx, buttons, page, pages) { |
| 20006 | var classes = settings.oClasses; | 20006 | var classes = settings.oClasses; |
| ... | @@ -20016,7 +20016,7 @@ | ... | @@ -20016,7 +20016,7 @@ |
| 20016 | for (i = 0, ien = buttons.length; i < ien; i++) { | 20016 | for (i = 0, ien = buttons.length; i < ien; i++) { |
| 20017 | button = buttons[i]; | 20017 | button = buttons[i]; |
| 20018 | if (Array.isArray(button)) { | 20018 | if (Array.isArray(button)) { |
| 20019 | var inner = $$2('<' + (button.DT_el || 'div') + '/>').appendTo(container); | 20019 | var inner = $$1('<' + (button.DT_el || 'div') + '/>').appendTo(container); |
| 20020 | attach(inner, button); | 20020 | attach(inner, button); |
| 20021 | } else { | 20021 | } else { |
| 20022 | btnDisplay = null; | 20022 | btnDisplay = null; |
| ... | @@ -20062,7 +20062,7 @@ | ... | @@ -20062,7 +20062,7 @@ |
| 20062 | if (btnDisplay !== null) { | 20062 | if (btnDisplay !== null) { |
| 20063 | var tag = settings.oInit.pagingTag || 'a'; | 20063 | var tag = settings.oInit.pagingTag || 'a'; |
| 20064 | var disabled = btnClass.indexOf(disabledClass) !== -1; | 20064 | var disabled = btnClass.indexOf(disabledClass) !== -1; |
| 20065 | node = $$2('<' + tag + '>', { | 20065 | node = $$1('<' + tag + '>', { |
| 20066 | 'class': classes.sPageButton + ' ' + btnClass, | 20066 | 'class': classes.sPageButton + ' ' + btnClass, |
| 20067 | 'aria-controls': settings.sTableId, | 20067 | 'aria-controls': settings.sTableId, |
| 20068 | 'aria-disabled': disabled ? 'true' : null, | 20068 | 'aria-disabled': disabled ? 'true' : null, |
| ... | @@ -20090,11 +20090,11 @@ | ... | @@ -20090,11 +20090,11 @@ |
| 20090 | // elements, focus is lost on the select button which is bad for | 20090 | // elements, focus is lost on the select button which is bad for |
| 20091 | // accessibility. So we want to restore focus once the draw has | 20091 | // accessibility. So we want to restore focus once the draw has |
| 20092 | // completed | 20092 | // completed |
| 20093 | activeEl = $$2(host).find(document.activeElement).data('dt-idx'); | 20093 | activeEl = $$1(host).find(document.activeElement).data('dt-idx'); |
| 20094 | } catch (e) {} | 20094 | } catch (e) {} |
| 20095 | attach($$2(host).empty(), buttons); | 20095 | attach($$1(host).empty(), buttons); |
| 20096 | if (activeEl !== undefined) { | 20096 | if (activeEl !== undefined) { |
| 20097 | $$2(host).find('[data-dt-idx=' + activeEl + ']').trigger('focus'); | 20097 | $$1(host).find('[data-dt-idx=' + activeEl + ']').trigger('focus'); |
| 20098 | } | 20098 | } |
| 20099 | } | 20099 | } |
| 20100 | } | 20100 | } |
| ... | @@ -20102,7 +20102,7 @@ | ... | @@ -20102,7 +20102,7 @@ |
| 20102 | 20102 | ||
| 20103 | // Built in type detection. See model.ext.aTypes for information about | 20103 | // Built in type detection. See model.ext.aTypes for information about |
| 20104 | // what is required from this methods. | 20104 | // what is required from this methods. |
| 20105 | $$2.extend(DataTable.ext.type.detect, [ | 20105 | $$1.extend(DataTable.ext.type.detect, [ |
| 20106 | // Plain numbers - first since V8 detects some plain numbers as dates | 20106 | // Plain numbers - first since V8 detects some plain numbers as dates |
| 20107 | // e.g. Date.parse('55') (but not all, e.g. Date.parse('22')...). | 20107 | // e.g. Date.parse('55') (but not all, e.g. Date.parse('22')...). |
| 20108 | function (d, settings) { | 20108 | function (d, settings) { |
| ... | @@ -20147,7 +20147,7 @@ | ... | @@ -20147,7 +20147,7 @@ |
| 20147 | // html formatted numbers by `_addNumericSort()` when we know what the decimal | 20147 | // html formatted numbers by `_addNumericSort()` when we know what the decimal |
| 20148 | // place is | 20148 | // place is |
| 20149 | 20149 | ||
| 20150 | $$2.extend(DataTable.ext.type.search, { | 20150 | $$1.extend(DataTable.ext.type.search, { |
| 20151 | html: function (data) { | 20151 | html: function (data) { |
| 20152 | return _empty(data) ? data : typeof data === 'string' ? data.replace(_re_new_lines, " ").replace(_re_html, "") : ''; | 20152 | return _empty(data) ? data : typeof data === 'string' ? data.replace(_re_new_lines, " ").replace(_re_html, "") : ''; |
| 20153 | }, | 20153 | }, |
| ... | @@ -20185,7 +20185,7 @@ | ... | @@ -20185,7 +20185,7 @@ |
| 20185 | // in a function to provide an easy ability for the language options to add | 20185 | // in a function to provide an easy ability for the language options to add |
| 20186 | // additional methods if a non-period decimal place is used. | 20186 | // additional methods if a non-period decimal place is used. |
| 20187 | function _addNumericSort(decimalPlace) { | 20187 | function _addNumericSort(decimalPlace) { |
| 20188 | $$2.each({ | 20188 | $$1.each({ |
| 20189 | // Plain numbers | 20189 | // Plain numbers |
| 20190 | "num": function (d) { | 20190 | "num": function (d) { |
| 20191 | return __numericReplace(d, decimalPlace); | 20191 | return __numericReplace(d, decimalPlace); |
| ... | @@ -20214,7 +20214,7 @@ | ... | @@ -20214,7 +20214,7 @@ |
| 20214 | } | 20214 | } |
| 20215 | 20215 | ||
| 20216 | // Default sort methods | 20216 | // Default sort methods |
| 20217 | $$2.extend(_ext.type.order, { | 20217 | $$1.extend(_ext.type.order, { |
| 20218 | // Dates | 20218 | // Dates |
| 20219 | "date-pre": function (d) { | 20219 | "date-pre": function (d) { |
| 20220 | var ts = Date.parse(d); | 20220 | var ts = Date.parse(d); |
| ... | @@ -20242,7 +20242,7 @@ | ... | @@ -20242,7 +20242,7 @@ |
| 20242 | 20242 | ||
| 20243 | // Numeric sorting types - order doesn't matter here | 20243 | // Numeric sorting types - order doesn't matter here |
| 20244 | _addNumericSort(''); | 20244 | _addNumericSort(''); |
| 20245 | $$2.extend(true, DataTable.ext.renderer, { | 20245 | $$1.extend(true, DataTable.ext.renderer, { |
| 20246 | header: { | 20246 | header: { |
| 20247 | _: function (settings, cell, column, classes) { | 20247 | _: function (settings, cell, column, classes) { |
| 20248 | // No additional mark-up required | 20248 | // No additional mark-up required |
| ... | @@ -20250,7 +20250,7 @@ | ... | @@ -20250,7 +20250,7 @@ |
| 20250 | // `DT` namespace will allow the event to be removed automatically | 20250 | // `DT` namespace will allow the event to be removed automatically |
| 20251 | // on destroy, while the `dt` namespaced event is the one we are | 20251 | // on destroy, while the `dt` namespaced event is the one we are |
| 20252 | // listening for | 20252 | // listening for |
| 20253 | $$2(settings.nTable).on('order.dt.DT', function (e, ctx, sorting, columns) { | 20253 | $$1(settings.nTable).on('order.dt.DT', function (e, ctx, sorting, columns) { |
| 20254 | if (settings !== ctx) { | 20254 | if (settings !== ctx) { |
| 20255 | // need to check this this is the host | 20255 | // need to check this this is the host |
| 20256 | return; // table, not a nested one | 20256 | return; // table, not a nested one |
| ... | @@ -20261,10 +20261,10 @@ | ... | @@ -20261,10 +20261,10 @@ |
| 20261 | }); | 20261 | }); |
| 20262 | }, | 20262 | }, |
| 20263 | jqueryui: function (settings, cell, column, classes) { | 20263 | jqueryui: function (settings, cell, column, classes) { |
| 20264 | $$2('<div/>').addClass(classes.sSortJUIWrapper).append(cell.contents()).append($$2('<span/>').addClass(classes.sSortIcon + ' ' + column.sSortingClassJUI)).appendTo(cell); | 20264 | $$1('<div/>').addClass(classes.sSortJUIWrapper).append(cell.contents()).append($$1('<span/>').addClass(classes.sSortIcon + ' ' + column.sSortingClassJUI)).appendTo(cell); |
| 20265 | 20265 | ||
| 20266 | // Attach a sort listener to update on sort | 20266 | // Attach a sort listener to update on sort |
| 20267 | $$2(settings.nTable).on('order.dt.DT', function (e, ctx, sorting, columns) { | 20267 | $$1(settings.nTable).on('order.dt.DT', function (e, ctx, sorting, columns) { |
| 20268 | if (settings !== ctx) { | 20268 | if (settings !== ctx) { |
| 20269 | return; | 20269 | return; |
| 20270 | } | 20270 | } |
| ... | @@ -20545,7 +20545,7 @@ | ... | @@ -20545,7 +20545,7 @@ |
| 20545 | * between versions. | 20545 | * between versions. |
| 20546 | * @namespace | 20546 | * @namespace |
| 20547 | */ | 20547 | */ |
| 20548 | $$2.extend(DataTable.ext.internal, { | 20548 | $$1.extend(DataTable.ext.internal, { |
| 20549 | _fnExternApiFunc: _fnExternApiFunc, | 20549 | _fnExternApiFunc: _fnExternApiFunc, |
| 20550 | _fnBuildAjax: _fnBuildAjax, | 20550 | _fnBuildAjax: _fnBuildAjax, |
| 20551 | _fnAjaxUpdate: _fnAjaxUpdate, | 20551 | _fnAjaxUpdate: _fnAjaxUpdate, |
| ... | @@ -20642,25 +20642,25 @@ | ... | @@ -20642,25 +20642,25 @@ |
| 20642 | }); | 20642 | }); |
| 20643 | 20643 | ||
| 20644 | // jQuery access | 20644 | // jQuery access |
| 20645 | $$2.fn.dataTable = DataTable; | 20645 | $$1.fn.dataTable = DataTable; |
| 20646 | 20646 | ||
| 20647 | // Provide access to the host jQuery object (circular reference) | 20647 | // Provide access to the host jQuery object (circular reference) |
| 20648 | DataTable.$ = $$2; | 20648 | DataTable.$ = $$1; |
| 20649 | 20649 | ||
| 20650 | // Legacy aliases | 20650 | // Legacy aliases |
| 20651 | $$2.fn.dataTableSettings = DataTable.settings; | 20651 | $$1.fn.dataTableSettings = DataTable.settings; |
| 20652 | $$2.fn.dataTableExt = DataTable.ext; | 20652 | $$1.fn.dataTableExt = DataTable.ext; |
| 20653 | 20653 | ||
| 20654 | // With a capital `D` we return a DataTables API instance rather than a | 20654 | // With a capital `D` we return a DataTables API instance rather than a |
| 20655 | // jQuery object | 20655 | // jQuery object |
| 20656 | $$2.fn.DataTable = function (opts) { | 20656 | $$1.fn.DataTable = function (opts) { |
| 20657 | return $$2(this).dataTable(opts).api(); | 20657 | return $$1(this).dataTable(opts).api(); |
| 20658 | }; | 20658 | }; |
| 20659 | 20659 | ||
| 20660 | // All properties that are available to $.fn.dataTable should also be | 20660 | // All properties that are available to $.fn.dataTable should also be |
| 20661 | // available on $.fn.DataTable | 20661 | // available on $.fn.DataTable |
| 20662 | $$2.each(DataTable, function (prop, val) { | 20662 | $$1.each(DataTable, function (prop, val) { |
| 20663 | $$2.fn.DataTable[prop] = val; | 20663 | $$1.fn.DataTable[prop] = val; |
| 20664 | }); | 20664 | }); |
| 20665 | 20665 | ||
| 20666 | // Search Filter | 20666 | // Search Filter |
| ... | @@ -21205,7 +21205,7 @@ | ... | @@ -21205,7 +21205,7 @@ |
| 21205 | } | 21205 | } |
| 21206 | return a; | 21206 | return a; |
| 21207 | } | 21207 | } |
| 21208 | function $$1(selector, context) { | 21208 | function $(selector, context) { |
| 21209 | const window = getWindow(); | 21209 | const window = getWindow(); |
| 21210 | const document = getDocument(); | 21210 | const document = getDocument(); |
| 21211 | let arr = []; | 21211 | let arr = []; |
| ... | @@ -21240,7 +21240,7 @@ | ... | @@ -21240,7 +21240,7 @@ |
| 21240 | } | 21240 | } |
| 21241 | return new Dom7(arrayUnique(arr)); | 21241 | return new Dom7(arrayUnique(arr)); |
| 21242 | } | 21242 | } |
| 21243 | $$1.fn = Dom7.prototype; | 21243 | $.fn = Dom7.prototype; |
| 21244 | 21244 | ||
| 21245 | // eslint-disable-next-line | 21245 | // eslint-disable-next-line |
| 21246 | 21246 | ||
| ... | @@ -21325,11 +21325,11 @@ | ... | @@ -21325,11 +21325,11 @@ |
| 21325 | if (eventData.indexOf(e) < 0) { | 21325 | if (eventData.indexOf(e) < 0) { |
| 21326 | eventData.unshift(e); | 21326 | eventData.unshift(e); |
| 21327 | } | 21327 | } |
| 21328 | if ($$1(target).is(targetSelector)) listener.apply(target, eventData);else { | 21328 | if ($(target).is(targetSelector)) listener.apply(target, eventData);else { |
| 21329 | const parents = $$1(target).parents(); // eslint-disable-line | 21329 | const parents = $(target).parents(); // eslint-disable-line |
| 21330 | 21330 | ||
| 21331 | for (let k = 0; k < parents.length; k += 1) { | 21331 | for (let k = 0; k < parents.length; k += 1) { |
| 21332 | if ($$1(parents[k]).is(targetSelector)) listener.apply(parents[k], eventData); | 21332 | if ($(parents[k]).is(targetSelector)) listener.apply(parents[k], eventData); |
| 21333 | } | 21333 | } |
| 21334 | } | 21334 | } |
| 21335 | } | 21335 | } |
| ... | @@ -21521,7 +21521,7 @@ | ... | @@ -21521,7 +21521,7 @@ |
| 21521 | } | 21521 | } |
| 21522 | function filter(callback) { | 21522 | function filter(callback) { |
| 21523 | const result = arrayFilter(this, callback); | 21523 | const result = arrayFilter(this, callback); |
| 21524 | return $$1(result); | 21524 | return $(result); |
| 21525 | } | 21525 | } |
| 21526 | function html(html) { | 21526 | function html(html) { |
| 21527 | if (typeof html === 'undefined') { | 21527 | if (typeof html === 'undefined') { |
| ... | @@ -21552,7 +21552,7 @@ | ... | @@ -21552,7 +21552,7 @@ |
| 21552 | if (el.matches) return el.matches(selector); | 21552 | if (el.matches) return el.matches(selector); |
| 21553 | if (el.webkitMatchesSelector) return el.webkitMatchesSelector(selector); | 21553 | if (el.webkitMatchesSelector) return el.webkitMatchesSelector(selector); |
| 21554 | if (el.msMatchesSelector) return el.msMatchesSelector(selector); | 21554 | if (el.msMatchesSelector) return el.msMatchesSelector(selector); |
| 21555 | compareWith = $$1(selector); | 21555 | compareWith = $(selector); |
| 21556 | for (i = 0; i < compareWith.length; i += 1) { | 21556 | for (i = 0; i < compareWith.length; i += 1) { |
| 21557 | if (compareWith[i] === el) return true; | 21557 | if (compareWith[i] === el) return true; |
| 21558 | } | 21558 | } |
| ... | @@ -21590,14 +21590,14 @@ | ... | @@ -21590,14 +21590,14 @@ |
| 21590 | if (typeof index === 'undefined') return this; | 21590 | if (typeof index === 'undefined') return this; |
| 21591 | const length = this.length; | 21591 | const length = this.length; |
| 21592 | if (index > length - 1) { | 21592 | if (index > length - 1) { |
| 21593 | return $$1([]); | 21593 | return $([]); |
| 21594 | } | 21594 | } |
| 21595 | if (index < 0) { | 21595 | if (index < 0) { |
| 21596 | const returnIndex = length + index; | 21596 | const returnIndex = length + index; |
| 21597 | if (returnIndex < 0) return $$1([]); | 21597 | if (returnIndex < 0) return $([]); |
| 21598 | return $$1([this[returnIndex]]); | 21598 | return $([this[returnIndex]]); |
| 21599 | } | 21599 | } |
| 21600 | return $$1([this[index]]); | 21600 | return $([this[index]]); |
| 21601 | } | 21601 | } |
| 21602 | function append(...els) { | 21602 | function append(...els) { |
| 21603 | let newChild; | 21603 | let newChild; |
| ... | @@ -21646,57 +21646,57 @@ | ... | @@ -21646,57 +21646,57 @@ |
| 21646 | function next(selector) { | 21646 | function next(selector) { |
| 21647 | if (this.length > 0) { | 21647 | if (this.length > 0) { |
| 21648 | if (selector) { | 21648 | if (selector) { |
| 21649 | if (this[0].nextElementSibling && $$1(this[0].nextElementSibling).is(selector)) { | 21649 | if (this[0].nextElementSibling && $(this[0].nextElementSibling).is(selector)) { |
| 21650 | return $$1([this[0].nextElementSibling]); | 21650 | return $([this[0].nextElementSibling]); |
| 21651 | } | 21651 | } |
| 21652 | return $$1([]); | 21652 | return $([]); |
| 21653 | } | 21653 | } |
| 21654 | if (this[0].nextElementSibling) return $$1([this[0].nextElementSibling]); | 21654 | if (this[0].nextElementSibling) return $([this[0].nextElementSibling]); |
| 21655 | return $$1([]); | 21655 | return $([]); |
| 21656 | } | 21656 | } |
| 21657 | return $$1([]); | 21657 | return $([]); |
| 21658 | } | 21658 | } |
| 21659 | function nextAll(selector) { | 21659 | function nextAll(selector) { |
| 21660 | const nextEls = []; | 21660 | const nextEls = []; |
| 21661 | let el = this[0]; | 21661 | let el = this[0]; |
| 21662 | if (!el) return $$1([]); | 21662 | if (!el) return $([]); |
| 21663 | while (el.nextElementSibling) { | 21663 | while (el.nextElementSibling) { |
| 21664 | const next = el.nextElementSibling; // eslint-disable-line | 21664 | const next = el.nextElementSibling; // eslint-disable-line |
| 21665 | 21665 | ||
| 21666 | if (selector) { | 21666 | if (selector) { |
| 21667 | if ($$1(next).is(selector)) nextEls.push(next); | 21667 | if ($(next).is(selector)) nextEls.push(next); |
| 21668 | } else nextEls.push(next); | 21668 | } else nextEls.push(next); |
| 21669 | el = next; | 21669 | el = next; |
| 21670 | } | 21670 | } |
| 21671 | return $$1(nextEls); | 21671 | return $(nextEls); |
| 21672 | } | 21672 | } |
| 21673 | function prev(selector) { | 21673 | function prev(selector) { |
| 21674 | if (this.length > 0) { | 21674 | if (this.length > 0) { |
| 21675 | const el = this[0]; | 21675 | const el = this[0]; |
| 21676 | if (selector) { | 21676 | if (selector) { |
| 21677 | if (el.previousElementSibling && $$1(el.previousElementSibling).is(selector)) { | 21677 | if (el.previousElementSibling && $(el.previousElementSibling).is(selector)) { |
| 21678 | return $$1([el.previousElementSibling]); | 21678 | return $([el.previousElementSibling]); |
| 21679 | } | 21679 | } |
| 21680 | return $$1([]); | 21680 | return $([]); |
| 21681 | } | 21681 | } |
| 21682 | if (el.previousElementSibling) return $$1([el.previousElementSibling]); | 21682 | if (el.previousElementSibling) return $([el.previousElementSibling]); |
| 21683 | return $$1([]); | 21683 | return $([]); |
| 21684 | } | 21684 | } |
| 21685 | return $$1([]); | 21685 | return $([]); |
| 21686 | } | 21686 | } |
| 21687 | function prevAll(selector) { | 21687 | function prevAll(selector) { |
| 21688 | const prevEls = []; | 21688 | const prevEls = []; |
| 21689 | let el = this[0]; | 21689 | let el = this[0]; |
| 21690 | if (!el) return $$1([]); | 21690 | if (!el) return $([]); |
| 21691 | while (el.previousElementSibling) { | 21691 | while (el.previousElementSibling) { |
| 21692 | const prev = el.previousElementSibling; // eslint-disable-line | 21692 | const prev = el.previousElementSibling; // eslint-disable-line |
| 21693 | 21693 | ||
| 21694 | if (selector) { | 21694 | if (selector) { |
| 21695 | if ($$1(prev).is(selector)) prevEls.push(prev); | 21695 | if ($(prev).is(selector)) prevEls.push(prev); |
| 21696 | } else prevEls.push(prev); | 21696 | } else prevEls.push(prev); |
| 21697 | el = prev; | 21697 | el = prev; |
| 21698 | } | 21698 | } |
| 21699 | return $$1(prevEls); | 21699 | return $(prevEls); |
| 21700 | } | 21700 | } |
| 21701 | function parent(selector) { | 21701 | function parent(selector) { |
| 21702 | const parents = []; // eslint-disable-line | 21702 | const parents = []; // eslint-disable-line |
| ... | @@ -21704,13 +21704,13 @@ | ... | @@ -21704,13 +21704,13 @@ |
| 21704 | for (let i = 0; i < this.length; i += 1) { | 21704 | for (let i = 0; i < this.length; i += 1) { |
| 21705 | if (this[i].parentNode !== null) { | 21705 | if (this[i].parentNode !== null) { |
| 21706 | if (selector) { | 21706 | if (selector) { |
| 21707 | if ($$1(this[i].parentNode).is(selector)) parents.push(this[i].parentNode); | 21707 | if ($(this[i].parentNode).is(selector)) parents.push(this[i].parentNode); |
| 21708 | } else { | 21708 | } else { |
| 21709 | parents.push(this[i].parentNode); | 21709 | parents.push(this[i].parentNode); |
| 21710 | } | 21710 | } |
| 21711 | } | 21711 | } |
| 21712 | } | 21712 | } |
| 21713 | return $$1(parents); | 21713 | return $(parents); |
| 21714 | } | 21714 | } |
| 21715 | function parents(selector) { | 21715 | function parents(selector) { |
| 21716 | const parents = []; // eslint-disable-line | 21716 | const parents = []; // eslint-disable-line |
| ... | @@ -21720,20 +21720,20 @@ | ... | @@ -21720,20 +21720,20 @@ |
| 21720 | 21720 | ||
| 21721 | while (parent) { | 21721 | while (parent) { |
| 21722 | if (selector) { | 21722 | if (selector) { |
| 21723 | if ($$1(parent).is(selector)) parents.push(parent); | 21723 | if ($(parent).is(selector)) parents.push(parent); |
| 21724 | } else { | 21724 | } else { |
| 21725 | parents.push(parent); | 21725 | parents.push(parent); |
| 21726 | } | 21726 | } |
| 21727 | parent = parent.parentNode; | 21727 | parent = parent.parentNode; |
| 21728 | } | 21728 | } |
| 21729 | } | 21729 | } |
| 21730 | return $$1(parents); | 21730 | return $(parents); |
| 21731 | } | 21731 | } |
| 21732 | function closest(selector) { | 21732 | function closest(selector) { |
| 21733 | let closest = this; // eslint-disable-line | 21733 | let closest = this; // eslint-disable-line |
| 21734 | 21734 | ||
| 21735 | if (typeof selector === 'undefined') { | 21735 | if (typeof selector === 'undefined') { |
| 21736 | return $$1([]); | 21736 | return $([]); |
| 21737 | } | 21737 | } |
| 21738 | if (!closest.is(selector)) { | 21738 | if (!closest.is(selector)) { |
| 21739 | closest = closest.parents(selector).eq(0); | 21739 | closest = closest.parents(selector).eq(0); |
| ... | @@ -21748,7 +21748,7 @@ | ... | @@ -21748,7 +21748,7 @@ |
| 21748 | foundElements.push(found[j]); | 21748 | foundElements.push(found[j]); |
| 21749 | } | 21749 | } |
| 21750 | } | 21750 | } |
| 21751 | return $$1(foundElements); | 21751 | return $(foundElements); |
| 21752 | } | 21752 | } |
| 21753 | function children(selector) { | 21753 | function children(selector) { |
| 21754 | const children = []; // eslint-disable-line | 21754 | const children = []; // eslint-disable-line |
| ... | @@ -21756,12 +21756,12 @@ | ... | @@ -21756,12 +21756,12 @@ |
| 21756 | for (let i = 0; i < this.length; i += 1) { | 21756 | for (let i = 0; i < this.length; i += 1) { |
| 21757 | const childNodes = this[i].children; | 21757 | const childNodes = this[i].children; |
| 21758 | for (let j = 0; j < childNodes.length; j += 1) { | 21758 | for (let j = 0; j < childNodes.length; j += 1) { |
| 21759 | if (!selector || $$1(childNodes[j]).is(selector)) { | 21759 | if (!selector || $(childNodes[j]).is(selector)) { |
| 21760 | children.push(childNodes[j]); | 21760 | children.push(childNodes[j]); |
| 21761 | } | 21761 | } |
| 21762 | } | 21762 | } |
| 21763 | } | 21763 | } |
| 21764 | return $$1(children); | 21764 | return $(children); |
| 21765 | } | 21765 | } |
| 21766 | function remove() { | 21766 | function remove() { |
| 21767 | for (let i = 0; i < this.length; i += 1) { | 21767 | for (let i = 0; i < this.length; i += 1) { |
| ... | @@ -21809,7 +21809,7 @@ | ... | @@ -21809,7 +21809,7 @@ |
| 21809 | remove | 21809 | remove |
| 21810 | }; | 21810 | }; |
| 21811 | Object.keys(Methods).forEach(methodName => { | 21811 | Object.keys(Methods).forEach(methodName => { |
| 21812 | Object.defineProperty($$1.fn, methodName, { | 21812 | Object.defineProperty($.fn, methodName, { |
| 21813 | value: Methods[methodName], | 21813 | value: Methods[methodName], |
| 21814 | writable: true | 21814 | writable: true |
| 21815 | }); | 21815 | }); |
| ... | @@ -22619,7 +22619,7 @@ | ... | @@ -22619,7 +22619,7 @@ |
| 22619 | 22619 | ||
| 22620 | if (swiper.params.slidesPerView !== 'auto' && swiper.params.slidesPerView > 1) { | 22620 | if (swiper.params.slidesPerView !== 'auto' && swiper.params.slidesPerView > 1) { |
| 22621 | if (swiper.params.centeredSlides) { | 22621 | if (swiper.params.centeredSlides) { |
| 22622 | (swiper.visibleSlides || $$1([])).each(slide => { | 22622 | (swiper.visibleSlides || $([])).each(slide => { |
| 22623 | activeSlides.push(slide); | 22623 | activeSlides.push(slide); |
| 22624 | }); | 22624 | }); |
| 22625 | } else { | 22625 | } else { |
| ... | @@ -22686,7 +22686,7 @@ | ... | @@ -22686,7 +22686,7 @@ |
| 22686 | slide.progress = rtl ? -slideProgress : slideProgress; | 22686 | slide.progress = rtl ? -slideProgress : slideProgress; |
| 22687 | slide.originalProgress = rtl ? -originalSlideProgress : originalSlideProgress; | 22687 | slide.originalProgress = rtl ? -originalSlideProgress : originalSlideProgress; |
| 22688 | } | 22688 | } |
| 22689 | swiper.visibleSlides = $$1(swiper.visibleSlides); | 22689 | swiper.visibleSlides = $(swiper.visibleSlides); |
| 22690 | } | 22690 | } |
| 22691 | 22691 | ||
| 22692 | function updateProgress(translate) { | 22692 | function updateProgress(translate) { |
| ... | @@ -22852,7 +22852,7 @@ | ... | @@ -22852,7 +22852,7 @@ |
| 22852 | function updateClickedSlide(e) { | 22852 | function updateClickedSlide(e) { |
| 22853 | const swiper = this; | 22853 | const swiper = this; |
| 22854 | const params = swiper.params; | 22854 | const params = swiper.params; |
| 22855 | const slide = $$1(e).closest(`.${params.slideClass}`)[0]; | 22855 | const slide = $(e).closest(`.${params.slideClass}`)[0]; |
| 22856 | let slideFound = false; | 22856 | let slideFound = false; |
| 22857 | let slideIndex; | 22857 | let slideIndex; |
| 22858 | if (slide) { | 22858 | if (slide) { |
| ... | @@ -22867,7 +22867,7 @@ | ... | @@ -22867,7 +22867,7 @@ |
| 22867 | if (slide && slideFound) { | 22867 | if (slide && slideFound) { |
| 22868 | swiper.clickedSlide = slide; | 22868 | swiper.clickedSlide = slide; |
| 22869 | if (swiper.virtual && swiper.params.virtual.enabled) { | 22869 | if (swiper.virtual && swiper.params.virtual.enabled) { |
| 22870 | swiper.clickedIndex = parseInt($$1(slide).attr('data-swiper-slide-index'), 10); | 22870 | swiper.clickedIndex = parseInt($(slide).attr('data-swiper-slide-index'), 10); |
| 22871 | } else { | 22871 | } else { |
| 22872 | swiper.clickedIndex = slideIndex; | 22872 | swiper.clickedIndex = slideIndex; |
| 22873 | } | 22873 | } |
| ... | @@ -23425,7 +23425,7 @@ | ... | @@ -23425,7 +23425,7 @@ |
| 23425 | let realIndex; | 23425 | let realIndex; |
| 23426 | if (params.loop) { | 23426 | if (params.loop) { |
| 23427 | if (swiper.animating) return; | 23427 | if (swiper.animating) return; |
| 23428 | realIndex = parseInt($$1(swiper.clickedSlide).attr('data-swiper-slide-index'), 10); | 23428 | realIndex = parseInt($(swiper.clickedSlide).attr('data-swiper-slide-index'), 10); |
| 23429 | if (params.centeredSlides) { | 23429 | if (params.centeredSlides) { |
| 23430 | if (slideToIndex < swiper.loopedSlides - slidesPerView / 2 || slideToIndex > swiper.slides.length - swiper.loopedSlides + slidesPerView / 2) { | 23430 | if (slideToIndex < swiper.loopedSlides - slidesPerView / 2 || slideToIndex > swiper.slides.length - swiper.loopedSlides + slidesPerView / 2) { |
| 23431 | swiper.loopFix(); | 23431 | swiper.loopFix(); |
| ... | @@ -23468,14 +23468,14 @@ | ... | @@ -23468,14 +23468,14 @@ |
| 23468 | $wrapperEl | 23468 | $wrapperEl |
| 23469 | } = swiper; // Remove duplicated slides | 23469 | } = swiper; // Remove duplicated slides |
| 23470 | 23470 | ||
| 23471 | const $selector = $wrapperEl.children().length > 0 ? $$1($wrapperEl.children()[0].parentNode) : $wrapperEl; | 23471 | const $selector = $wrapperEl.children().length > 0 ? $($wrapperEl.children()[0].parentNode) : $wrapperEl; |
| 23472 | $selector.children(`.${params.slideClass}.${params.slideDuplicateClass}`).remove(); | 23472 | $selector.children(`.${params.slideClass}.${params.slideDuplicateClass}`).remove(); |
| 23473 | let slides = $selector.children(`.${params.slideClass}`); | 23473 | let slides = $selector.children(`.${params.slideClass}`); |
| 23474 | if (params.loopFillGroupWithBlank) { | 23474 | if (params.loopFillGroupWithBlank) { |
| 23475 | const blankSlidesNum = params.slidesPerGroup - slides.length % params.slidesPerGroup; | 23475 | const blankSlidesNum = params.slidesPerGroup - slides.length % params.slidesPerGroup; |
| 23476 | if (blankSlidesNum !== params.slidesPerGroup) { | 23476 | if (blankSlidesNum !== params.slidesPerGroup) { |
| 23477 | for (let i = 0; i < blankSlidesNum; i += 1) { | 23477 | for (let i = 0; i < blankSlidesNum; i += 1) { |
| 23478 | const blankNode = $$1(document.createElement('div')).addClass(`${params.slideClass} ${params.slideBlankClass}`); | 23478 | const blankNode = $(document.createElement('div')).addClass(`${params.slideClass} ${params.slideBlankClass}`); |
| 23479 | $selector.append(blankNode); | 23479 | $selector.append(blankNode); |
| 23480 | } | 23480 | } |
| 23481 | slides = $selector.children(`.${params.slideClass}`); | 23481 | slides = $selector.children(`.${params.slideClass}`); |
| ... | @@ -23490,7 +23490,7 @@ | ... | @@ -23490,7 +23490,7 @@ |
| 23490 | const prependSlides = []; | 23490 | const prependSlides = []; |
| 23491 | const appendSlides = []; | 23491 | const appendSlides = []; |
| 23492 | slides.each((el, index) => { | 23492 | slides.each((el, index) => { |
| 23493 | const slide = $$1(el); | 23493 | const slide = $(el); |
| 23494 | slide.attr('data-swiper-slide-index', index); | 23494 | slide.attr('data-swiper-slide-index', index); |
| 23495 | }); | 23495 | }); |
| 23496 | for (let i = 0; i < swiper.loopedSlides; i += 1) { | 23496 | for (let i = 0; i < swiper.loopedSlides; i += 1) { |
| ... | @@ -23499,10 +23499,10 @@ | ... | @@ -23499,10 +23499,10 @@ |
| 23499 | prependSlides.unshift(slides.eq(slides.length - index - 1)[0]); | 23499 | prependSlides.unshift(slides.eq(slides.length - index - 1)[0]); |
| 23500 | } | 23500 | } |
| 23501 | for (let i = 0; i < appendSlides.length; i += 1) { | 23501 | for (let i = 0; i < appendSlides.length; i += 1) { |
| 23502 | $selector.append($$1(appendSlides[i].cloneNode(true)).addClass(params.slideDuplicateClass)); | 23502 | $selector.append($(appendSlides[i].cloneNode(true)).addClass(params.slideDuplicateClass)); |
| 23503 | } | 23503 | } |
| 23504 | for (let i = prependSlides.length - 1; i >= 0; i -= 1) { | 23504 | for (let i = prependSlides.length - 1; i >= 0; i -= 1) { |
| 23505 | $selector.prepend($$1(prependSlides[i].cloneNode(true)).addClass(params.slideDuplicateClass)); | 23505 | $selector.prepend($(prependSlides[i].cloneNode(true)).addClass(params.slideDuplicateClass)); |
| 23506 | } | 23506 | } |
| 23507 | } | 23507 | } |
| 23508 | 23508 | ||
| ... | @@ -23614,7 +23614,7 @@ | ... | @@ -23614,7 +23614,7 @@ |
| 23614 | } | 23614 | } |
| 23615 | let e = event; | 23615 | let e = event; |
| 23616 | if (e.originalEvent) e = e.originalEvent; | 23616 | if (e.originalEvent) e = e.originalEvent; |
| 23617 | let $targetEl = $$1(e.target); | 23617 | let $targetEl = $(e.target); |
| 23618 | if (params.touchEventsTarget === 'wrapper') { | 23618 | if (params.touchEventsTarget === 'wrapper') { |
| 23619 | if (!$targetEl.closest(swiper.wrapperEl).length) return; | 23619 | if (!$targetEl.closest(swiper.wrapperEl).length) return; |
| 23620 | } | 23620 | } |
| ... | @@ -23627,7 +23627,7 @@ | ... | @@ -23627,7 +23627,7 @@ |
| 23627 | 23627 | ||
| 23628 | const eventPath = event.composedPath ? event.composedPath() : event.path; | 23628 | const eventPath = event.composedPath ? event.composedPath() : event.path; |
| 23629 | if (swipingClassHasValue && e.target && e.target.shadowRoot && eventPath) { | 23629 | if (swipingClassHasValue && e.target && e.target.shadowRoot && eventPath) { |
| 23630 | $targetEl = $$1(eventPath[0]); | 23630 | $targetEl = $(eventPath[0]); |
| 23631 | } | 23631 | } |
| 23632 | const noSwipingSelector = params.noSwipingSelector ? params.noSwipingSelector : `.${params.noSwipingClass}`; | 23632 | const noSwipingSelector = params.noSwipingSelector ? params.noSwipingSelector : `.${params.noSwipingClass}`; |
| 23633 | const isTargetShadow = !!(e.target && e.target.shadowRoot); // use closestElement for shadow root element to get the actual closest for nested shadow root element | 23633 | const isTargetShadow = !!(e.target && e.target.shadowRoot); // use closestElement for shadow root element to get the actual closest for nested shadow root element |
| ... | @@ -23675,7 +23675,7 @@ | ... | @@ -23675,7 +23675,7 @@ |
| 23675 | data.isTouched = false; | 23675 | data.isTouched = false; |
| 23676 | } | 23676 | } |
| 23677 | } | 23677 | } |
| 23678 | if (document.activeElement && $$1(document.activeElement).is(data.focusableElements) && document.activeElement !== $targetEl[0]) { | 23678 | if (document.activeElement && $(document.activeElement).is(data.focusableElements) && document.activeElement !== $targetEl[0]) { |
| 23679 | document.activeElement.blur(); | 23679 | document.activeElement.blur(); |
| 23680 | } | 23680 | } |
| 23681 | const shouldPreventDefault = preventDefault && swiper.allowTouchMove && params.touchStartPreventDefault; | 23681 | const shouldPreventDefault = preventDefault && swiper.allowTouchMove && params.touchStartPreventDefault; |
| ... | @@ -23718,7 +23718,7 @@ | ... | @@ -23718,7 +23718,7 @@ |
| 23718 | return; | 23718 | return; |
| 23719 | } | 23719 | } |
| 23720 | if (!swiper.allowTouchMove) { | 23720 | if (!swiper.allowTouchMove) { |
| 23721 | if (!$$1(e.target).is(data.focusableElements)) { | 23721 | if (!$(e.target).is(data.focusableElements)) { |
| 23722 | swiper.allowClick = false; | 23722 | swiper.allowClick = false; |
| 23723 | } | 23723 | } |
| 23724 | if (data.isTouched) { | 23724 | if (data.isTouched) { |
| ... | @@ -23745,7 +23745,7 @@ | ... | @@ -23745,7 +23745,7 @@ |
| 23745 | } | 23745 | } |
| 23746 | } | 23746 | } |
| 23747 | if (data.isTouchEvent && document.activeElement) { | 23747 | if (data.isTouchEvent && document.activeElement) { |
| 23748 | if (e.target === document.activeElement && $$1(e.target).is(data.focusableElements)) { | 23748 | if (e.target === document.activeElement && $(e.target).is(data.focusableElements)) { |
| 23749 | data.isMoved = true; | 23749 | data.isMoved = true; |
| 23750 | swiper.allowClick = false; | 23750 | swiper.allowClick = false; |
| 23751 | return; | 23751 | return; |
| ... | @@ -24357,7 +24357,7 @@ | ... | @@ -24357,7 +24357,7 @@ |
| 24357 | function onReady() { | 24357 | function onReady() { |
| 24358 | if (callback) callback(); | 24358 | if (callback) callback(); |
| 24359 | } | 24359 | } |
| 24360 | const isPicture = $$1(imageEl).parent('picture')[0]; | 24360 | const isPicture = $(imageEl).parent('picture')[0]; |
| 24361 | if (!isPicture && (!imageEl.complete || !checkForComplete)) { | 24361 | if (!isPicture && (!imageEl.complete || !checkForComplete)) { |
| 24362 | if (src) { | 24362 | if (src) { |
| 24363 | image = new window.Image(); | 24363 | image = new window.Image(); |
| ... | @@ -24621,9 +24621,9 @@ | ... | @@ -24621,9 +24621,9 @@ |
| 24621 | if (!params) params = {}; | 24621 | if (!params) params = {}; |
| 24622 | params = extend({}, params); | 24622 | params = extend({}, params); |
| 24623 | if (el && !params.el) params.el = el; | 24623 | if (el && !params.el) params.el = el; |
| 24624 | if (params.el && $$1(params.el).length > 1) { | 24624 | if (params.el && $(params.el).length > 1) { |
| 24625 | const swipers = []; | 24625 | const swipers = []; |
| 24626 | $$1(params.el).each(containerEl => { | 24626 | $(params.el).each(containerEl => { |
| 24627 | const newParams = extend({}, params, { | 24627 | const newParams = extend({}, params, { |
| 24628 | el: containerEl | 24628 | el: containerEl |
| 24629 | }); | 24629 | }); |
| ... | @@ -24673,7 +24673,7 @@ | ... | @@ -24673,7 +24673,7 @@ |
| 24673 | swiper.onAny(swiper.params.onAny); | 24673 | swiper.onAny(swiper.params.onAny); |
| 24674 | } // Save Dom lib | 24674 | } // Save Dom lib |
| 24675 | 24675 | ||
| 24676 | swiper.$ = $$1; // Extend Swiper | 24676 | swiper.$ = $; // Extend Swiper |
| 24677 | 24677 | ||
| 24678 | Object.assign(swiper, { | 24678 | Object.assign(swiper, { |
| 24679 | enabled: swiper.params.enabled, | 24679 | enabled: swiper.params.enabled, |
| ... | @@ -24681,7 +24681,7 @@ | ... | @@ -24681,7 +24681,7 @@ |
| 24681 | // Classes | 24681 | // Classes |
| 24682 | classNames: [], | 24682 | classNames: [], |
| 24683 | // Slides | 24683 | // Slides |
| 24684 | slides: $$1(), | 24684 | slides: $(), |
| 24685 | slidesGrid: [], | 24685 | slidesGrid: [], |
| 24686 | snapGrid: [], | 24686 | snapGrid: [], |
| 24687 | slidesSizesGrid: [], | 24687 | slidesSizesGrid: [], |
| ... | @@ -24959,7 +24959,7 @@ | ... | @@ -24959,7 +24959,7 @@ |
| 24959 | const swiper = this; | 24959 | const swiper = this; |
| 24960 | if (swiper.mounted) return true; // Find el | 24960 | if (swiper.mounted) return true; // Find el |
| 24961 | 24961 | ||
| 24962 | const $el = $$1(el || swiper.params.el); | 24962 | const $el = $(el || swiper.params.el); |
| 24963 | el = $el[0]; | 24963 | el = $el[0]; |
| 24964 | if (!el) { | 24964 | if (!el) { |
| 24965 | return false; | 24965 | return false; |
| ... | @@ -24970,13 +24970,13 @@ | ... | @@ -24970,13 +24970,13 @@ |
| 24970 | }; | 24970 | }; |
| 24971 | const getWrapper = () => { | 24971 | const getWrapper = () => { |
| 24972 | if (el && el.shadowRoot && el.shadowRoot.querySelector) { | 24972 | if (el && el.shadowRoot && el.shadowRoot.querySelector) { |
| 24973 | const res = $$1(el.shadowRoot.querySelector(getWrapperSelector())); // Children needs to return slot items | 24973 | const res = $(el.shadowRoot.querySelector(getWrapperSelector())); // Children needs to return slot items |
| 24974 | 24974 | ||
| 24975 | res.children = options => $el.children(options); | 24975 | res.children = options => $el.children(options); |
| 24976 | return res; | 24976 | return res; |
| 24977 | } | 24977 | } |
| 24978 | if (!$el.children) { | 24978 | if (!$el.children) { |
| 24979 | return $$1($el).children(getWrapperSelector()); | 24979 | return $($el).children(getWrapperSelector()); |
| 24980 | } | 24980 | } |
| 24981 | return $el.children(getWrapperSelector()); | 24981 | return $el.children(getWrapperSelector()); |
| 24982 | }; // Find Wrapper | 24982 | }; // Find Wrapper |
| ... | @@ -24985,7 +24985,7 @@ | ... | @@ -24985,7 +24985,7 @@ |
| 24985 | if ($wrapperEl.length === 0 && swiper.params.createElements) { | 24985 | if ($wrapperEl.length === 0 && swiper.params.createElements) { |
| 24986 | const document = getDocument(); | 24986 | const document = getDocument(); |
| 24987 | const wrapper = document.createElement('div'); | 24987 | const wrapper = document.createElement('div'); |
| 24988 | $wrapperEl = $$1(wrapper); | 24988 | $wrapperEl = $(wrapper); |
| 24989 | wrapper.className = swiper.params.wrapperClass; | 24989 | wrapper.className = swiper.params.wrapperClass; |
| 24990 | $el.append(wrapper); | 24990 | $el.append(wrapper); |
| 24991 | $el.children(`.${swiper.params.slideClass}`).each(slideEl => { | 24991 | $el.children(`.${swiper.params.slideClass}`).each(slideEl => { |
| ... | @@ -25213,12 +25213,12 @@ | ... | @@ -25213,12 +25213,12 @@ |
| 25213 | } | 25213 | } |
| 25214 | function enable() { | 25214 | function enable() { |
| 25215 | if (swiper.keyboard.enabled) return; | 25215 | if (swiper.keyboard.enabled) return; |
| 25216 | $$1(document).on('keydown', handle); | 25216 | $(document).on('keydown', handle); |
| 25217 | swiper.keyboard.enabled = true; | 25217 | swiper.keyboard.enabled = true; |
| 25218 | } | 25218 | } |
| 25219 | function disable() { | 25219 | function disable() { |
| 25220 | if (!swiper.keyboard.enabled) return; | 25220 | if (!swiper.keyboard.enabled) return; |
| 25221 | $$1(document).off('keydown', handle); | 25221 | $(document).off('keydown', handle); |
| 25222 | swiper.keyboard.enabled = false; | 25222 | swiper.keyboard.enabled = false; |
| 25223 | } | 25223 | } |
| 25224 | on('init', () => { | 25224 | on('init', () => { |
| ... | @@ -25282,7 +25282,7 @@ | ... | @@ -25282,7 +25282,7 @@ |
| 25282 | function getEl(el) { | 25282 | function getEl(el) { |
| 25283 | let $el; | 25283 | let $el; |
| 25284 | if (el) { | 25284 | if (el) { |
| 25285 | $el = $$1(el); | 25285 | $el = $(el); |
| 25286 | if (swiper.params.uniqueNavElements && typeof el === 'string' && $el.length > 1 && swiper.$el.find(el).length === 1) { | 25286 | if (swiper.params.uniqueNavElements && typeof el === 'string' && $el.length > 1 && swiper.$el.find(el).length === 1) { |
| 25287 | $el = swiper.$el.find(el); | 25287 | $el = swiper.$el.find(el); |
| 25288 | } | 25288 | } |
| ... | @@ -25394,7 +25394,7 @@ | ... | @@ -25394,7 +25394,7 @@ |
| 25394 | $prevEl | 25394 | $prevEl |
| 25395 | } = swiper.navigation; | 25395 | } = swiper.navigation; |
| 25396 | const targetEl = e.target; | 25396 | const targetEl = e.target; |
| 25397 | if (swiper.params.navigation.hideOnClick && !$$1(targetEl).is($prevEl) && !$$1(targetEl).is($nextEl)) { | 25397 | if (swiper.params.navigation.hideOnClick && !$(targetEl).is($prevEl) && !$(targetEl).is($nextEl)) { |
| 25398 | if (swiper.pagination && swiper.params.pagination && swiper.params.pagination.clickable && (swiper.pagination.el === targetEl || swiper.pagination.el.contains(targetEl))) return; | 25398 | if (swiper.pagination && swiper.params.pagination && swiper.params.pagination.clickable && (swiper.pagination.el === targetEl || swiper.pagination.el.contains(targetEl))) return; |
| 25399 | let isHidden; | 25399 | let isHidden; |
| 25400 | if ($nextEl) { | 25400 | if ($nextEl) { |
| ... | @@ -25539,7 +25539,7 @@ | ... | @@ -25539,7 +25539,7 @@ |
| 25539 | bullets.removeClass(['', '-next', '-next-next', '-prev', '-prev-prev', '-main'].map(suffix => `${params.bulletActiveClass}${suffix}`).join(' ')); | 25539 | bullets.removeClass(['', '-next', '-next-next', '-prev', '-prev-prev', '-main'].map(suffix => `${params.bulletActiveClass}${suffix}`).join(' ')); |
| 25540 | if ($el.length > 1) { | 25540 | if ($el.length > 1) { |
| 25541 | bullets.each(bullet => { | 25541 | bullets.each(bullet => { |
| 25542 | const $bullet = $$1(bullet); | 25542 | const $bullet = $(bullet); |
| 25543 | const bulletIndex = $bullet.index(); | 25543 | const bulletIndex = $bullet.index(); |
| 25544 | if (bulletIndex === current) { | 25544 | if (bulletIndex === current) { |
| 25545 | $bullet.addClass(params.bulletActiveClass); | 25545 | $bullet.addClass(params.bulletActiveClass); |
| ... | @@ -25668,14 +25668,14 @@ | ... | @@ -25668,14 +25668,14 @@ |
| 25668 | }); | 25668 | }); |
| 25669 | const params = swiper.params.pagination; | 25669 | const params = swiper.params.pagination; |
| 25670 | if (!params.el) return; | 25670 | if (!params.el) return; |
| 25671 | let $el = $$1(params.el); | 25671 | let $el = $(params.el); |
| 25672 | if ($el.length === 0) return; | 25672 | if ($el.length === 0) return; |
| 25673 | if (swiper.params.uniqueNavElements && typeof params.el === 'string' && $el.length > 1) { | 25673 | if (swiper.params.uniqueNavElements && typeof params.el === 'string' && $el.length > 1) { |
| 25674 | $el = swiper.$el.find(params.el); // check if it belongs to another nested Swiper | 25674 | $el = swiper.$el.find(params.el); // check if it belongs to another nested Swiper |
| 25675 | 25675 | ||
| 25676 | if ($el.length > 1) { | 25676 | if ($el.length > 1) { |
| 25677 | $el = $el.filter(el => { | 25677 | $el = $el.filter(el => { |
| 25678 | if ($$1(el).parents('.swiper')[0] !== swiper.el) return false; | 25678 | if ($(el).parents('.swiper')[0] !== swiper.el) return false; |
| 25679 | return true; | 25679 | return true; |
| 25680 | }); | 25680 | }); |
| 25681 | } | 25681 | } |
| ... | @@ -25698,7 +25698,7 @@ | ... | @@ -25698,7 +25698,7 @@ |
| 25698 | if (params.clickable) { | 25698 | if (params.clickable) { |
| 25699 | $el.on('click', classesToSelector(params.bulletClass), function onClick(e) { | 25699 | $el.on('click', classesToSelector(params.bulletClass), function onClick(e) { |
| 25700 | e.preventDefault(); | 25700 | e.preventDefault(); |
| 25701 | let index = $$1(this).index() * swiper.params.slidesPerGroup; | 25701 | let index = $(this).index() * swiper.params.slidesPerGroup; |
| 25702 | if (swiper.params.loop) index += swiper.loopedSlides; | 25702 | if (swiper.params.loop) index += swiper.loopedSlides; |
| 25703 | swiper.slideTo(index); | 25703 | swiper.slideTo(index); |
| 25704 | }); | 25704 | }); |
| ... | @@ -25776,7 +25776,7 @@ | ... | @@ -25776,7 +25776,7 @@ |
| 25776 | const { | 25776 | const { |
| 25777 | $el | 25777 | $el |
| 25778 | } = swiper.pagination; | 25778 | } = swiper.pagination; |
| 25779 | if (swiper.params.pagination.el && swiper.params.pagination.hideOnClick && $el && $el.length > 0 && !$$1(targetEl).hasClass(swiper.params.pagination.bulletClass)) { | 25779 | if (swiper.params.pagination.el && swiper.params.pagination.hideOnClick && $el && $el.length > 0 && !$(targetEl).hasClass(swiper.params.pagination.bulletClass)) { |
| 25780 | if (swiper.navigation && (swiper.navigation.nextEl && targetEl === swiper.navigation.nextEl || swiper.navigation.prevEl && targetEl === swiper.navigation.prevEl)) return; | 25780 | if (swiper.navigation && (swiper.navigation.nextEl && targetEl === swiper.navigation.nextEl || swiper.navigation.prevEl && targetEl === swiper.navigation.prevEl)) return; |
| 25781 | const isHidden = $el.hasClass(swiper.params.pagination.hiddenClass); | 25781 | const isHidden = $el.hasClass(swiper.params.pagination.hiddenClass); |
| 25782 | if (isHidden === true) { | 25782 | if (isHidden === true) { |
| ... | @@ -25882,7 +25882,7 @@ | ... | @@ -25882,7 +25882,7 @@ |
| 25882 | function onEnterOrSpaceKey(e) { | 25882 | function onEnterOrSpaceKey(e) { |
| 25883 | if (e.keyCode !== 13 && e.keyCode !== 32) return; | 25883 | if (e.keyCode !== 13 && e.keyCode !== 32) return; |
| 25884 | const params = swiper.params.a11y; | 25884 | const params = swiper.params.a11y; |
| 25885 | const $targetEl = $$1(e.target); | 25885 | const $targetEl = $(e.target); |
| 25886 | if (swiper.navigation && swiper.navigation.$nextEl && $targetEl.is(swiper.navigation.$nextEl)) { | 25886 | if (swiper.navigation && swiper.navigation.$nextEl && $targetEl.is(swiper.navigation.$nextEl)) { |
| 25887 | if (!(swiper.isEnd && !swiper.params.loop)) { | 25887 | if (!(swiper.isEnd && !swiper.params.loop)) { |
| 25888 | swiper.slideNext(); | 25888 | swiper.slideNext(); |
| ... | @@ -25942,7 +25942,7 @@ | ... | @@ -25942,7 +25942,7 @@ |
| 25942 | const params = swiper.params.a11y; | 25942 | const params = swiper.params.a11y; |
| 25943 | if (!hasPagination()) return; | 25943 | if (!hasPagination()) return; |
| 25944 | swiper.pagination.bullets.each(bulletEl => { | 25944 | swiper.pagination.bullets.each(bulletEl => { |
| 25945 | const $bulletEl = $$1(bulletEl); | 25945 | const $bulletEl = $(bulletEl); |
| 25946 | if (swiper.params.pagination.clickable) { | 25946 | if (swiper.params.pagination.clickable) { |
| 25947 | makeElFocusable($bulletEl); | 25947 | makeElFocusable($bulletEl); |
| 25948 | if (!swiper.params.pagination.renderBullet) { | 25948 | if (!swiper.params.pagination.renderBullet) { |
| ... | @@ -25989,15 +25989,15 @@ | ... | @@ -25989,15 +25989,15 @@ |
| 25989 | const initSlides = () => { | 25989 | const initSlides = () => { |
| 25990 | const params = swiper.params.a11y; | 25990 | const params = swiper.params.a11y; |
| 25991 | if (params.itemRoleDescriptionMessage) { | 25991 | if (params.itemRoleDescriptionMessage) { |
| 25992 | addElRoleDescription($$1(swiper.slides), params.itemRoleDescriptionMessage); | 25992 | addElRoleDescription($(swiper.slides), params.itemRoleDescriptionMessage); |
| 25993 | } | 25993 | } |
| 25994 | if (params.slideRole) { | 25994 | if (params.slideRole) { |
| 25995 | addElRole($$1(swiper.slides), params.slideRole); | 25995 | addElRole($(swiper.slides), params.slideRole); |
| 25996 | } | 25996 | } |
| 25997 | const slidesLength = swiper.params.loop ? swiper.slides.filter(el => !el.classList.contains(swiper.params.slideDuplicateClass)).length : swiper.slides.length; | 25997 | const slidesLength = swiper.params.loop ? swiper.slides.filter(el => !el.classList.contains(swiper.params.slideDuplicateClass)).length : swiper.slides.length; |
| 25998 | if (params.slideLabelMessage) { | 25998 | if (params.slideLabelMessage) { |
| 25999 | swiper.slides.each((slideEl, index) => { | 25999 | swiper.slides.each((slideEl, index) => { |
| 26000 | const $slideEl = $$1(slideEl); | 26000 | const $slideEl = $(slideEl); |
| 26001 | const slideIndex = swiper.params.loop ? parseInt($slideEl.attr('data-swiper-slide-index'), 10) : index; | 26001 | const slideIndex = swiper.params.loop ? parseInt($slideEl.attr('data-swiper-slide-index'), 10) : index; |
| 26002 | const ariaLabelMessage = params.slideLabelMessage.replace(/\{\{index\}\}/, slideIndex + 1).replace(/\{\{slidesLength\}\}/, slidesLength); | 26002 | const ariaLabelMessage = params.slideLabelMessage.replace(/\{\{index\}\}/, slideIndex + 1).replace(/\{\{slidesLength\}\}/, slidesLength); |
| 26003 | addElLabel($slideEl, ariaLabelMessage); | 26003 | addElLabel($slideEl, ariaLabelMessage); |
| ... | @@ -26073,7 +26073,7 @@ | ... | @@ -26073,7 +26073,7 @@ |
| 26073 | swiper.$el.off('pointerup', handlePointerUp, true); | 26073 | swiper.$el.off('pointerup', handlePointerUp, true); |
| 26074 | } | 26074 | } |
| 26075 | on('beforeInit', () => { | 26075 | on('beforeInit', () => { |
| 26076 | liveRegion = $$1(`<span class="${swiper.params.a11y.notificationClass}" aria-live="assertive" aria-atomic="true"></span>`); | 26076 | liveRegion = $(`<span class="${swiper.params.a11y.notificationClass}" aria-live="assertive" aria-atomic="true"></span>`); |
| 26077 | }); | 26077 | }); |
| 26078 | on('afterInit', () => { | 26078 | on('afterInit', () => { |
| 26079 | if (!swiper.params.a11y.enabled) return; | 26079 | if (!swiper.params.a11y.enabled) return; |
| ... | @@ -26400,18 +26400,6 @@ | ... | @@ -26400,18 +26400,6 @@ |
| 26400 | if (evalType === "above") return y < vpH + st; | 26400 | if (evalType === "above") return y < vpH + st; |
| 26401 | }; | 26401 | }; |
| 26402 | jQuery(document).ready(function ($) { | 26402 | jQuery(document).ready(function ($) { |
| 26403 | // var itemToWatch = document.querySelector('.gt_options'); | ||
| 26404 | |||
| 26405 | // onClassChange(itemToWatch, (node) => { | ||
| 26406 | // node.classList.contains('gt-open') | ||
| 26407 | // ? $('#pojo-a11y-toolbar').removeClass('pojo-a11y-toolbar-open') | ||
| 26408 | // : console.log('class removed'); | ||
| 26409 | |||
| 26410 | // }); | ||
| 26411 | |||
| 26412 | $(document).on("click", ".mega-toggle-on", function (e) { | ||
| 26413 | if ($(this).hasClass('mega-toggle-on')) ; | ||
| 26414 | }); | ||
| 26415 | trim_text(); | 26403 | trim_text(); |
| 26416 | $('#relevant-resources').dataTable({ | 26404 | $('#relevant-resources').dataTable({ |
| 26417 | info: false, | 26405 | info: false, |
| ... | @@ -26458,7 +26446,6 @@ | ... | @@ -26458,7 +26446,6 @@ |
| 26458 | origOpen.apply(this, arguments); | 26446 | origOpen.apply(this, arguments); |
| 26459 | }; | 26447 | }; |
| 26460 | })(); | 26448 | })(); |
| 26461 | }); | ||
| 26462 | $(document).on("change", ' #top-news-select input[type="radio"][name="_sft_category[]"]', function (e) { | 26449 | $(document).on("change", ' #top-news-select input[type="radio"][name="_sft_category[]"]', function (e) { |
| 26463 | if (this.value == 'news') { | 26450 | if (this.value == 'news') { |
| 26464 | $('form input[type="radio"][name="_sft_category[]"][value="news"]').attr('checked', 'checked').trigger('change'); | 26451 | $('form input[type="radio"][name="_sft_category[]"][value="news"]').attr('checked', 'checked').trigger('change'); |
| ... | @@ -26470,6 +26457,7 @@ | ... | @@ -26470,6 +26457,7 @@ |
| 26470 | myLazyLoad.update(); | 26457 | myLazyLoad.update(); |
| 26471 | } | 26458 | } |
| 26472 | }); | 26459 | }); |
| 26460 | }); | ||
| 26473 | document.addEventListener('wpcf7mailsent', function (event) { | 26461 | document.addEventListener('wpcf7mailsent', function (event) { |
| 26474 | jQuery('.appArea.responsive').hide(); | 26462 | jQuery('.appArea.responsive').hide(); |
| 26475 | }, true); | 26463 | }, true); | ... | ... |
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
| ... | @@ -37,26 +37,6 @@ window.tz_checkVisible = function(elm, evalType , offset, heightBuffer) { | ... | @@ -37,26 +37,6 @@ window.tz_checkVisible = function(elm, evalType , offset, heightBuffer) { |
| 37 | jQuery(document).ready(function($) { | 37 | jQuery(document).ready(function($) { |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | // var itemToWatch = document.querySelector('.gt_options'); | ||
| 41 | |||
| 42 | // onClassChange(itemToWatch, (node) => { | ||
| 43 | // node.classList.contains('gt-open') | ||
| 44 | // ? $('#pojo-a11y-toolbar').removeClass('pojo-a11y-toolbar-open') | ||
| 45 | // : console.log('class removed'); | ||
| 46 | |||
| 47 | // }); | ||
| 48 | |||
| 49 | |||
| 50 | |||
| 51 | |||
| 52 | $(document).on("click", ".mega-toggle-on", function(e){ | ||
| 53 | if($(this).hasClass('mega-toggle-on')){ | ||
| 54 | //$(this).removeClass('mega-toggle-on'); | ||
| 55 | } | ||
| 56 | }); | ||
| 57 | |||
| 58 | |||
| 59 | |||
| 60 | 40 | ||
| 61 | trim_text(); | 41 | trim_text(); |
| 62 | $('#relevant-resources').dataTable( { | 42 | $('#relevant-resources').dataTable( { |
| ... | @@ -113,10 +93,8 @@ jQuery(document).ready(function($) { | ... | @@ -113,10 +93,8 @@ jQuery(document).ready(function($) { |
| 113 | }; | 93 | }; |
| 114 | })(); | 94 | })(); |
| 115 | 95 | ||
| 116 | }); | ||
| 117 | |||
| 118 | 96 | ||
| 119 | $(document).on("change",' #top-news-select input[type="radio"][name="_sft_category[]"]', function(e){ | 97 | $(document).on("change",' #top-news-select input[type="radio"][name="_sft_category[]"]', function(e){ |
| 120 | if (this.value == 'news') { | 98 | if (this.value == 'news') { |
| 121 | $('form input[type="radio"][name="_sft_category[]"][value="news"]').attr('checked', 'checked').trigger('change'); | 99 | $('form input[type="radio"][name="_sft_category[]"][value="news"]').attr('checked', 'checked').trigger('change'); |
| 122 | $('form input[type="radio"][name="_sft_category[]"][value="events"]').removeAttr('checked'); | 100 | $('form input[type="radio"][name="_sft_category[]"][value="events"]').removeAttr('checked'); |
| ... | @@ -127,10 +105,14 @@ $(document).on("change",' #top-news-select input[type="radio"][name="_sft_categ | ... | @@ -127,10 +105,14 @@ $(document).on("change",' #top-news-select input[type="radio"][name="_sft_categ |
| 127 | $('form input[type="radio"][name="_sft_category[]"][value="news"]').removeAttr('checked'); | 105 | $('form input[type="radio"][name="_sft_category[]"][value="news"]').removeAttr('checked'); |
| 128 | myLazyLoad.update(); | 106 | myLazyLoad.update(); |
| 129 | } | 107 | } |
| 108 | }); | ||
| 109 | |||
| 130 | }); | 110 | }); |
| 131 | 111 | ||
| 132 | 112 | ||
| 133 | 113 | ||
| 114 | |||
| 115 | |||
| 134 | document.addEventListener( 'wpcf7mailsent', function( event ) { | 116 | document.addEventListener( 'wpcf7mailsent', function( event ) { |
| 135 | jQuery('.appArea.responsive').hide(); | 117 | jQuery('.appArea.responsive').hide(); |
| 136 | }, true ); | 118 | }, true ); | ... | ... |
| ... | @@ -2,5 +2,5 @@ | ... | @@ -2,5 +2,5 @@ |
| 2 | Theme Name: MSF CA Child | 2 | Theme Name: MSF CA Child |
| 3 | Author: Tenzing Communications | 3 | Author: Tenzing Communications |
| 4 | Template: msf-ca | 4 | Template: msf-ca |
| 5 | Version: 1.0.527 | 5 | Version: 1.0.528 |
| 6 | */ | 6 | */ |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
-
Please register or sign in to post a comment