Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace value === (value | 0) checks with Number.isInteger(value) #8889

Merged
merged 2 commits into from
Sep 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/core/annotation.js
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ class AnnotationBorderStyle {
* @param {integer} width - The width
*/
setWidth(width) {
if (width === (width | 0)) {
if (Number.isInteger(width)) {
this.width = width;
}
}
Expand Down Expand Up @@ -537,7 +537,7 @@ class AnnotationBorderStyle {
* @param {integer} radius - The horizontal corner radius
*/
setHorizontalCornerRadius(radius) {
if (radius === (radius | 0)) {
if (Number.isInteger(radius)) {
this.horizontalCornerRadius = radius;
}
}
Expand All @@ -550,7 +550,7 @@ class AnnotationBorderStyle {
* @param {integer} radius - The vertical corner radius
*/
setVerticalCornerRadius(radius) {
if (radius === (radius | 0)) {
if (Number.isInteger(radius)) {
this.verticalCornerRadius = radius;
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/core/function.js
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ var PostScriptCompiler = (function PostScriptCompilerClosure() {
return null;
}
n = num1.number;
if (n < 0 || (n | 0) !== n || stack.length < n) {
if (n < 0 || !Number.isInteger(n) || stack.length < n) {
return null;
}
ast1 = stack[stack.length - n - 1];
Expand Down Expand Up @@ -1082,7 +1082,8 @@ var PostScriptCompiler = (function PostScriptCompilerClosure() {
}
j = num2.number;
n = num1.number;
if (n <= 0 || (n | 0) !== n || (j | 0) !== j || stack.length < n) {
if (n <= 0 || !Number.isInteger(n) || !Number.isInteger(j) ||
stack.length < n) {
// ... and integers
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/type1_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ var Type1CharString = (function Type1CharStringClosure() {
var start = stackLength - howManyArgs;
for (var i = start; i < stackLength; i++) {
var value = this.stack[i];
if (value === (value | 0)) { // int
if (Number.isInteger(value)) {
this.output.push(28, (value >> 8) & 0xff, value & 0xff);
} else { // fixed point
value = (65536 * value) | 0;
Expand Down
2 changes: 1 addition & 1 deletion src/display/svg.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ SVGGraphics = (function SVGGraphicsClosure() {
* @returns {string}
*/
function pf(value) {
if (value === (value | 0)) { // integer number
if (Number.isInteger(value)) {
return value.toString();
}
var s = value.toFixed(10);
Expand Down
7 changes: 3 additions & 4 deletions web/pdf_link_service.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PDFLinkService {
});
return;
}
} else if ((destRef | 0) === destRef) { // Integer
} else if (Number.isInteger(destRef)) {
pageNumber = destRef + 1;
} else {
console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` +
Expand Down Expand Up @@ -359,9 +359,8 @@ function isValidExplicitDestination(dest) {
}
let page = dest[0];
if (!(typeof page === 'object' &&
typeof page.num === 'number' && (page.num | 0) === page.num &&
typeof page.gen === 'number' && (page.gen | 0) === page.gen) &&
!(typeof page === 'number' && (page | 0) === page && page >= 0)) {
Number.isInteger(page.num) && Number.isInteger(page.gen)) &&
!(Number.isInteger(page) && page >= 0)) {
return false;
}
let zoom = dest[1];
Expand Down
2 changes: 1 addition & 1 deletion web/pdf_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class PDFViewer {
* @param {number} val - The page number.
*/
set currentPageNumber(val) {
if ((val | 0) !== val) { // Ensure that `val` is an integer.
if (!Number.isInteger(val)) {
throw new Error('Invalid page number.');
}
if (!this.pdfDocument) {
Expand Down
2 changes: 1 addition & 1 deletion web/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class BasePreferences {
`expected a ${defaultType}.`);
}
} else {
if (valueType === 'number' && (value | 0) !== value) {
if (valueType === 'number' && !Number.isInteger(value)) {
throw new Error(`Set preference: "${value}" must be an integer.`);
}
}
Expand Down