Skip to content

Commit 13a1d3e

Browse files
committed
prod
1 parent 850cdea commit 13a1d3e

File tree

3 files changed

+71
-140
lines changed

3 files changed

+71
-140
lines changed

dist/react-bootstrap-table.js

Lines changed: 65 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -815,17 +815,19 @@ return /******/ (function(modules) { // webpackBootstrap
815815
onPageChange = _props$options.onPageChange,
816816
pageStartIndex = _props$options.pageStartIndex;
817817

818+
var emptyTable = this.store.isEmpty();
818819
if (onPageChange) {
819820
onPageChange(page, sizePerPage);
820821
}
821822

822-
this.setState({
823-
currPage: page,
823+
var state = {
824824
sizePerPage: sizePerPage,
825825
reset: false
826-
});
826+
};
827+
if (!emptyTable) state.currPage = page;
828+
this.setState(state);
827829

828-
if (this.allowRemote(_Const2.default.REMOTE_PAGE)) {
830+
if (this.allowRemote(_Const2.default.REMOTE_PAGE) || emptyTable) {
829831
return;
830832
}
831833

@@ -14711,18 +14713,21 @@ return /******/ (function(modules) { // webpackBootstrap
1471114713
}, {
1471214714
key: 'filterDate',
1471314715
value: function filterDate(targetVal, filterVal, comparator) {
14714-
// if (!targetVal) {
14715-
// return false;
14716-
// }
14717-
// return (targetVal.getDate() === filterVal.getDate() &&
14718-
// targetVal.getMonth() === filterVal.getMonth() &&
14719-
// targetVal.getFullYear() === filterVal.getFullYear());
14716+
if (!targetVal) return false;
14717+
14718+
var filterDate = filterVal.getDate();
14719+
var filterMonth = filterVal.getMonth();
14720+
var filterYear = filterVal.getFullYear();
14721+
14722+
var targetDate = targetVal.getDate();
14723+
var targetMonth = targetVal.getMonth();
14724+
var targetYear = targetVal.getFullYear();
1472014725

1472114726
var valid = true;
1472214727
switch (comparator) {
1472314728
case '=':
1472414729
{
14725-
if (targetVal != filterVal) {
14730+
if (filterDate !== targetDate || filterMonth !== targetMonth || filterYear !== targetYear) {
1472614731
valid = false;
1472714732
}
1472814733
break;
@@ -14736,7 +14741,11 @@ return /******/ (function(modules) { // webpackBootstrap
1473614741
}
1473714742
case '>=':
1473814743
{
14739-
if (targetVal < filterVal) {
14744+
if (targetYear < filterYear) {
14745+
valid = false;
14746+
} else if (targetYear === filterYear && targetMonth < filterMonth) {
14747+
valid = false;
14748+
} else if (targetYear === filterYear && targetMonth === filterMonth && targetDate < filterDate) {
1474014749
valid = false;
1474114750
}
1474214751
break;
@@ -14750,14 +14759,18 @@ return /******/ (function(modules) { // webpackBootstrap
1475014759
}
1475114760
case '<=':
1475214761
{
14753-
if (targetVal > filterVal) {
14762+
if (targetYear > filterYear) {
14763+
valid = false;
14764+
} else if (targetYear === filterYear && targetMonth > filterMonth) {
14765+
valid = false;
14766+
} else if (targetYear === filterYear && targetMonth === filterMonth && targetDate > filterDate) {
1475414767
valid = false;
1475514768
}
1475614769
break;
1475714770
}
1475814771
case '!=':
1475914772
{
14760-
if (targetVal == filterVal) {
14773+
if (filterDate === targetDate && filterMonth === targetMonth && filterYear === targetYear) {
1476114774
valid = false;
1476214775
}
1476314776
break;
@@ -15216,11 +15229,12 @@ return /******/ (function(modules) { // webpackBootstrap
1521615229
/* 207 */
1521715230
/***/ function(module, exports, __webpack_require__) {
1521815231

15219-
var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;"use strict";
15232+
var __WEBPACK_AMD_DEFINE_RESULT__;"use strict";
1522015233

1522115234
/* FileSaver.js
1522215235
* A saveAs() FileSaver implementation.
15223-
* 1.1.20151003
15236+
* 1.3.2
15237+
* 2016-06-16 18:25:19
1522415238
*
1522515239
* By Eli Grey, http://eligrey.com
1522615240
* License: MIT
@@ -15236,7 +15250,7 @@ return /******/ (function(modules) { // webpackBootstrap
1523615250
"use strict";
1523715251
// IE <10 is explicitly unsupported
1523815252

15239-
if (typeof navigator !== "undefined" && /MSIE [1-9]\./.test(navigator.userAgent)) {
15253+
if (typeof view === "undefined" || typeof navigator !== "undefined" && /MSIE [1-9]\./.test(navigator.userAgent)) {
1524015254
return;
1524115255
}
1524215256
var doc = view.document
@@ -15251,21 +15265,17 @@ return /******/ (function(modules) { // webpackBootstrap
1525115265
var event = new MouseEvent("click");
1525215266
node.dispatchEvent(event);
1525315267
},
15254-
is_safari = /Version\/[\d\.]+.*Safari/.test(navigator.userAgent),
15255-
webkit_req_fs = view.webkitRequestFileSystem,
15256-
req_fs = view.requestFileSystem || webkit_req_fs || view.mozRequestFileSystem,
15268+
is_safari = /constructor/i.test(view.HTMLElement) || view.safari,
15269+
is_chrome_ios = /CriOS\/[\d]+/.test(navigator.userAgent),
1525715270
throw_outside = function throw_outside(ex) {
1525815271
(view.setImmediate || view.setTimeout)(function () {
1525915272
throw ex;
1526015273
}, 0);
1526115274
},
15262-
force_saveable_type = "application/octet-stream",
15263-
fs_min_size = 0
15264-
// See https://code.google.com/p/chromium/issues/detail?id=375297#c7 and
15265-
// https://github.com/eligrey/FileSaver.js/commit/485930a#commitcomment-8768047
15266-
// for the reasoning behind the timeout and revocation flow
15275+
force_saveable_type = "application/octet-stream"
15276+
// the Blob API is fundamentally broken as there is no "downloadfinished" event to subscribe to
1526715277
,
15268-
arbitrary_revoke_timeout = 500 // in ms
15278+
arbitrary_revoke_timeout = 1000 * 40 // in ms
1526915279
,
1527015280
revoke = function revoke(file) {
1527115281
var revoker = function revoker() {
@@ -15277,11 +15287,7 @@ return /******/ (function(modules) { // webpackBootstrap
1527715287
file.remove();
1527815288
}
1527915289
};
15280-
if (view.chrome) {
15281-
revoker();
15282-
} else {
15283-
setTimeout(revoker, arbitrary_revoke_timeout);
15284-
}
15290+
setTimeout(revoker, arbitrary_revoke_timeout);
1528515291
},
1528615292
dispatch = function dispatch(filesaver, event_types, event) {
1528715293
event_types = [].concat(event_types);
@@ -15299,8 +15305,9 @@ return /******/ (function(modules) { // webpackBootstrap
1529915305
},
1530015306
auto_bom = function auto_bom(blob) {
1530115307
// prepend BOM for UTF-8 XML and text/* types (including HTML)
15308+
// note: your browser will automatically convert UTF-16 U+FEFF to EF BB BF
1530215309
if (/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
15303-
return new Blob(["\uFEFF", blob], { type: blob.type });
15310+
return new Blob([String.fromCharCode(0xFEFF), blob], { type: blob.type });
1530415311
}
1530515312
return blob;
1530615313
},
@@ -15311,21 +15318,22 @@ return /******/ (function(modules) { // webpackBootstrap
1531115318
// First try a.download, then web filesystem, then object URLs
1531215319
var filesaver = this,
1531315320
type = blob.type,
15314-
blob_changed = false,
15321+
force = type === force_saveable_type,
1531515322
object_url,
15316-
target_view,
1531715323
dispatch_all = function dispatch_all() {
1531815324
dispatch(filesaver, "writestart progress write writeend".split(" "));
1531915325
}
1532015326
// on any filesys errors revert to saving with object URLs
1532115327
,
1532215328
fs_error = function fs_error() {
15323-
if (target_view && is_safari && typeof FileReader !== "undefined") {
15329+
if ((is_chrome_ios || force && is_safari) && view.FileReader) {
1532415330
// Safari doesn't allow downloading of blob urls
1532515331
var reader = new FileReader();
1532615332
reader.onloadend = function () {
15327-
var base64Data = reader.result;
15328-
target_view.location.href = "data:attachment/file" + base64Data.slice(base64Data.search(/[,;]/));
15333+
var url = is_chrome_ios ? reader.result : reader.result.replace(/^data:[^;]*;/, 'data:attachment/file;');
15334+
var popup = view.open(url, '_blank');
15335+
if (!popup) view.location.href = url;
15336+
url = undefined; // release reference before dispatching
1532915337
filesaver.readyState = filesaver.DONE;
1533015338
dispatch_all();
1533115339
};
@@ -15334,133 +15342,56 @@ return /******/ (function(modules) { // webpackBootstrap
1533415342
return;
1533515343
}
1533615344
// don't create more object URLs than needed
15337-
if (blob_changed || !object_url) {
15345+
if (!object_url) {
1533815346
object_url = get_URL().createObjectURL(blob);
1533915347
}
15340-
if (target_view) {
15341-
target_view.location.href = object_url;
15348+
if (force) {
15349+
view.location.href = object_url;
1534215350
} else {
15343-
var new_tab = view.open(object_url, "_blank");
15344-
if (new_tab == undefined && is_safari) {
15345-
//Apple do not allow window.open, see http://bit.ly/1kZffRI
15351+
var opened = view.open(object_url, "_blank");
15352+
if (!opened) {
15353+
// Apple does not allow window.open, see https://developer.apple.com/library/safari/documentation/Tools/Conceptual/SafariExtensionGuide/WorkingwithWindowsandTabs/WorkingwithWindowsandTabs.html
1534615354
view.location.href = object_url;
1534715355
}
1534815356
}
1534915357
filesaver.readyState = filesaver.DONE;
1535015358
dispatch_all();
1535115359
revoke(object_url);
15352-
},
15353-
abortable = function abortable(func) {
15354-
return function () {
15355-
if (filesaver.readyState !== filesaver.DONE) {
15356-
return func.apply(this, arguments);
15357-
}
15358-
};
15359-
},
15360-
create_if_not_found = { create: true, exclusive: false },
15361-
slice;
15360+
};
1536215361
filesaver.readyState = filesaver.INIT;
15363-
if (!name) {
15364-
name = "download";
15365-
}
15362+
1536615363
if (can_use_save_link) {
1536715364
object_url = get_URL().createObjectURL(blob);
15368-
save_link.href = object_url;
15369-
save_link.download = name;
1537015365
setTimeout(function () {
15366+
save_link.href = object_url;
15367+
save_link.download = name;
1537115368
click(save_link);
1537215369
dispatch_all();
1537315370
revoke(object_url);
1537415371
filesaver.readyState = filesaver.DONE;
1537515372
});
1537615373
return;
1537715374
}
15378-
// Object and web filesystem URLs have a problem saving in Google Chrome when
15379-
// viewed in a tab, so I force save with application/octet-stream
15380-
// http://code.google.com/p/chromium/issues/detail?id=91158
15381-
// Update: Google errantly closed 91158, I submitted it again:
15382-
// https://code.google.com/p/chromium/issues/detail?id=389642
15383-
if (view.chrome && type && type !== force_saveable_type) {
15384-
slice = blob.slice || blob.webkitSlice;
15385-
blob = slice.call(blob, 0, blob.size, force_saveable_type);
15386-
blob_changed = true;
15387-
}
15388-
// Since I can't be sure that the guessed media type will trigger a download
15389-
// in WebKit, I append .download to the filename.
15390-
// https://bugs.webkit.org/show_bug.cgi?id=65440
15391-
if (webkit_req_fs && name !== "download") {
15392-
name += ".download";
15393-
}
15394-
if (type === force_saveable_type || webkit_req_fs) {
15395-
target_view = view;
15396-
}
15397-
if (!req_fs) {
15398-
fs_error();
15399-
return;
15400-
}
15401-
fs_min_size += blob.size;
15402-
req_fs(view.TEMPORARY, fs_min_size, abortable(function (fs) {
15403-
fs.root.getDirectory("saved", create_if_not_found, abortable(function (dir) {
15404-
var save = function save() {
15405-
dir.getFile(name, create_if_not_found, abortable(function (file) {
15406-
file.createWriter(abortable(function (writer) {
15407-
writer.onwriteend = function (event) {
15408-
target_view.location.href = file.toURL();
15409-
filesaver.readyState = filesaver.DONE;
15410-
dispatch(filesaver, "writeend", event);
15411-
revoke(file);
15412-
};
15413-
writer.onerror = function () {
15414-
var error = writer.error;
15415-
if (error.code !== error.ABORT_ERR) {
15416-
fs_error();
15417-
}
15418-
};
15419-
"writestart progress write abort".split(" ").forEach(function (event) {
15420-
writer["on" + event] = filesaver["on" + event];
15421-
});
15422-
writer.write(blob);
15423-
filesaver.abort = function () {
15424-
writer.abort();
15425-
filesaver.readyState = filesaver.DONE;
15426-
};
15427-
filesaver.readyState = filesaver.WRITING;
15428-
}), fs_error);
15429-
}), fs_error);
15430-
};
15431-
dir.getFile(name, { create: false }, abortable(function (file) {
15432-
// delete file if it already exists
15433-
file.remove();
15434-
save();
15435-
}), abortable(function (ex) {
15436-
if (ex.code === ex.NOT_FOUND_ERR) {
15437-
save();
15438-
} else {
15439-
fs_error();
15440-
}
15441-
}));
15442-
}), fs_error);
15443-
}), fs_error);
15375+
15376+
fs_error();
1544415377
},
1544515378
FS_proto = FileSaver.prototype,
1544615379
saveAs = function saveAs(blob, name, no_auto_bom) {
15447-
return new FileSaver(blob, name, no_auto_bom);
15380+
return new FileSaver(blob, name || blob.name || "download", no_auto_bom);
1544815381
};
1544915382
// IE 10+ (native saveAs)
1545015383
if (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob) {
1545115384
return function (blob, name, no_auto_bom) {
15385+
name = name || blob.name || "download";
15386+
1545215387
if (!no_auto_bom) {
1545315388
blob = auto_bom(blob);
1545415389
}
15455-
return navigator.msSaveOrOpenBlob(blob, name || "download");
15390+
return navigator.msSaveOrOpenBlob(blob, name);
1545615391
};
1545715392
}
1545815393

15459-
FS_proto.abort = function () {
15460-
var filesaver = this;
15461-
filesaver.readyState = filesaver.DONE;
15462-
dispatch(filesaver, "abort");
15463-
};
15394+
FS_proto.abort = function () {};
1546415395
FS_proto.readyState = FS_proto.INIT = 0;
1546515396
FS_proto.WRITING = 1;
1546615397
FS_proto.DONE = 2;
@@ -15475,10 +15406,10 @@ return /******/ (function(modules) { // webpackBootstrap
1547515406

1547615407
if (typeof module !== "undefined" && module.exports) {
1547715408
module.exports.saveAs = saveAs;
15478-
} else if ("function" !== "undefined" && __webpack_require__(208) !== null && __webpack_require__(209) != null) {
15479-
!(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_RESULT__ = function () {
15409+
} else if ("function" !== "undefined" && __webpack_require__(208) !== null && __webpack_require__(209) !== null) {
15410+
!(__WEBPACK_AMD_DEFINE_RESULT__ = function () {
1548015411
return saveAs;
15481-
}.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
15412+
}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
1548215413
}
1548315414
;
1548415415

dist/react-bootstrap-table.js.map

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

0 commit comments

Comments
 (0)