Skip to content

Commit

Permalink
解决eslint问题,忽略no-invalid-this问题
Browse files Browse the repository at this point in the history
  • Loading branch information
twinh committed Jan 3, 2018
1 parent d930bf8 commit ca69dd3
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 19 deletions.
23 changes: 12 additions & 11 deletions modules/datatables-net-mx.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import 'datatables.net'
import 'datatables.net-bs/js/dataTables.bootstrap'
import 'datatables.net';
import 'datatables.net-bs/js/dataTables.bootstrap';

import './datatables/deletable'
import './datatables/search'
import './datatables/reload'
import './datatables/external-search'
import './datatables/deletable';
import './datatables/search';
import './datatables/reload';
import './datatables/external-search';

// 初始化默认配置
$.extend(true, $.fn.dataTable.defaults, {
dom: "tr<'row'<'col-sm-4'i><'col-sm-8'pl>>",
dom: 'tr<\'row\'<\'col-sm-4\'i><\'col-sm-8\'pl>>',
processing: true,
serverSide: true,
autoWidth: false,
pagingType: 'full_numbers',
// eslint-disable-next-line no-magic-numbers
lengthMenu: [10, 25, 50, 100, 500, 1000],
columnDefs: [
{
Expand Down Expand Up @@ -53,14 +54,14 @@ $.extend(true, $.fn.dataTable.defaults, {
return;
}

if (undefined == json.recordsTotal) {
if (undefined === json.recordsTotal) {
json.recordsTotal = json.records;
}
if (undefined == json.recordsFiltered) {
if (undefined === json.recordsFiltered) {
json.recordsFiltered = json.records;
}
origSuccess.apply(this, arguments)
}
origSuccess.apply(this, arguments);
};
}
},
language: {
Expand Down
6 changes: 3 additions & 3 deletions modules/datatables/deletable.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
* @param message
*/
$.fn.dataTableExt.oApi.deletable = function (setting, linkSelector, message) {
var $table = this;
var that = this;
linkSelector = linkSelector || '.js-delete-record';
message = message || '删除后将无法还原,确认删除?';
$table.on('click', linkSelector, function () {
that.on('click', linkSelector, function () {
var $link = $(this);
$.confirm(message, function () {
$.post($link.data('href'), function (ret) {
$.msg(ret);
$table.reload();
that.reload();
}, 'json');
});
});
Expand Down
1 change: 1 addition & 0 deletions modules/datatables/external-search.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ $(document).on('init.dt', (event, settings) => {
return;
}

// eslint-disable-next-line babel/new-cap
var api = $.fn.dataTable.Api(settings);
var options = api.init();
if (!options.searchEl) {
Expand Down
1 change: 1 addition & 0 deletions modules/datatables/reload.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
* 2. 保留在当前页面
*/
$.fn.dataTableExt.oApi.reload = function (setting, callback) {
// eslint-disable-next-line babel/new-cap
this.DataTable().ajax.reload(callback, false);
};
3 changes: 2 additions & 1 deletion modules/datatables/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
$.fn.dataTableExt.oApi.search = function (setting, params) {
// 记录原始的URL,每次搜索使用原始URL,避免参数不断叠加
if (typeof setting.ajax.origUrl == 'undefined') {
if (typeof setting.ajax.origUrl === 'undefined') {
setting.ajax.origUrl = setting.ajax.url;
}

Expand All @@ -18,6 +18,7 @@ $.fn.dataTableExt.oApi.search = function (setting, params) {
params = params.serializeArray();
}

// eslint-disable-next-line babel/new-cap
var table = this.DataTable();
var url = $.appendUrl(setting.ajax.origUrl, params);
table.ajax.url(url).load();
Expand Down
10 changes: 6 additions & 4 deletions modules/jquery-update-event.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
(function ($) {
var DELAY_FAST = 300;

// From http://code.google.com/p/jquery-debounce/
var debounce = function (fn, timeout) {
var timer;
return function () {
var args = arguments;
var ctx = this;
var that = this;
clearTimeout(timer);
timer = setTimeout(function () {
fn.apply(ctx, args);
fn.apply(that, args);
timer = null;
}, timeout);
};
Expand All @@ -21,9 +23,9 @@
});
$this.on('keyup change', 'input', debounce(function () {
$this.trigger('update');
}, 300));
}, DELAY_FAST));
}
};
})(jQuery);
}(jQuery));


0 comments on commit ca69dd3

Please sign in to comment.