Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8889 from Snuffleupagus/more-Number-isInteger

Browse Source 
Replace `value === (value | 0)` checks with `Number.isInteger(value)`
This commit is contained in:
Tim van der Meij 2017-09-09 15:24:23 +02:00 committed by GitHub
commit bd3f16bffd
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/annotation.js
View File

@ -450,7 +450,7 @@ class AnnotationBorderStyle {
* @param {integer} width - The width * @param {integer} width - The width
*/ */
setWidth(width) { setWidth(width) {
if (width === (width | 0)) { if (Number.isInteger(width)) {
this.width = width; this.width = width;
} }
} }
@ -537,7 +537,7 @@ class AnnotationBorderStyle {
* @param {integer} radius - The horizontal corner radius * @param {integer} radius - The horizontal corner radius
*/ */
setHorizontalCornerRadius(radius) { setHorizontalCornerRadius(radius) {
if (radius === (radius | 0)) { if (Number.isInteger(radius)) {
this.horizontalCornerRadius = radius; this.horizontalCornerRadius = radius;
} }
} }
@ -550,7 +550,7 @@ class AnnotationBorderStyle {
* @param {integer} radius - The vertical corner radius * @param {integer} radius - The vertical corner radius
*/ */
setVerticalCornerRadius(radius) { setVerticalCornerRadius(radius) {
if (radius === (radius | 0)) { if (Number.isInteger(radius)) {
this.verticalCornerRadius = radius; this.verticalCornerRadius = radius;
} }
} }

5
src/core/function.js
View File

@ -1032,7 +1032,7 @@ var PostScriptCompiler = (function PostScriptCompilerClosure() {
return null; return null;
} }
n = num1.number; n = num1.number;
if (n < 0 || (n | 0) !== n || stack.length < n) { if (n < 0 || !Number.isInteger(n) || stack.length < n) {
return null; return null;
} }
ast1 = stack[stack.length - n - 1]; ast1 = stack[stack.length - n - 1];
@ -1082,7 +1082,8 @@ var PostScriptCompiler = (function PostScriptCompilerClosure() {
} }
j = num2.number; j = num2.number;
n = num1.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 // ... and integers
return null; return null;
} }

2
src/core/type1_parser.js
View File

@ -324,7 +324,7 @@ var Type1CharString = (function Type1CharStringClosure() {
var start = stackLength - howManyArgs; var start = stackLength - howManyArgs;
for (var i = start; i < stackLength; i++) { for (var i = start; i < stackLength; i++) {
var value = this.stack[i]; var value = this.stack[i];
if (value === (value | 0)) { // int if (Number.isInteger(value)) {
this.output.push(28, (value >> 8) & 0xff, value & 0xff); this.output.push(28, (value >> 8) & 0xff, value & 0xff);
} else { // fixed point } else { // fixed point
value = (65536 * value) | 0; value = (65536 * value) | 0;

2
src/display/svg.js
View File

@ -359,7 +359,7 @@ SVGGraphics = (function SVGGraphicsClosure() {
* @returns {string} * @returns {string}
*/ */
function pf(value) { function pf(value) {
if (value === (value | 0)) { // integer number if (Number.isInteger(value)) {
return value.toString(); return value.toString();
} }
var s = value.toFixed(10); var s = value.toFixed(10);

7
web/pdf_link_service.js
View File

@ -98,7 +98,7 @@ class PDFLinkService {
}); });
return; return;
} }
} else if ((destRef | 0) === destRef) { // Integer } else if (Number.isInteger(destRef)) {
pageNumber = destRef + 1; pageNumber = destRef + 1;
} else { } else {
console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` + console.error(`PDFLinkService.navigateTo: "${destRef}" is not ` +
@ -359,9 +359,8 @@ function isValidExplicitDestination(dest) {
} }
let page = dest[0]; let page = dest[0];
if (!(typeof page === 'object' && if (!(typeof page === 'object' &&
typeof page.num === 'number' && (page.num | 0) === page.num && Number.isInteger(page.num) && Number.isInteger(page.gen)) &&
typeof page.gen === 'number' && (page.gen | 0) === page.gen) && !(Number.isInteger(page) && page >= 0)) {
!(typeof page === 'number' && (page | 0) === page && page >= 0)) {
return false; return false;
} }
let zoom = dest[1]; let zoom = dest[1];

2
web/pdf_viewer.js
View File

@ -159,7 +159,7 @@ class PDFViewer {
* @param {number} val - The page number. * @param {number} val - The page number.
*/ */
set currentPageNumber(val) { set currentPageNumber(val) {
if ((val | 0) !== val) { // Ensure that `val` is an integer. if (!Number.isInteger(val)) {
throw new Error('Invalid page number.'); throw new Error('Invalid page number.');
} }
if (!this.pdfDocument) { if (!this.pdfDocument) {

2
web/preferences.js
View File

@ -141,7 +141,7 @@ class BasePreferences {
`expected a ${defaultType}.`); `expected a ${defaultType}.`);
} }
} else { } else {
if (valueType === 'number' && (value | 0) !== value) { if (valueType === 'number' && !Number.isInteger(value)) {
throw new Error(`Set preference: "${value}" must be an integer.`); throw new Error(`Set preference: "${value}" must be an integer.`);
} }
} }