From a1f75179967e9416089c812e6c75978430a0e141 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sat, 23 Feb 2019 15:41:02 +0100 Subject: [PATCH] Rename the `src/display/dom_utils.js` file to `src/display/display_utils.js` This file (currently) contains not only DOM-specific helper functions/classes, but is used generally for various helper code relevant for main-thread functionality. --- src/display/annotation_layer.js | 2 +- src/display/api.js | 2 +- src/display/{dom_utils.js => display_utils.js} | 0 src/display/svg.js | 2 +- src/pdf.js | 12 ++++++------ test/unit/api_spec.js | 2 +- test/unit/clitests.json | 2 +- test/unit/cmap_spec.js | 2 +- test/unit/custom_spec.js | 2 +- .../{dom_utils_spec.js => display_utils_spec.js} | 6 ++++-- test/unit/jasmine-boot.js | 2 +- 11 files changed, 18 insertions(+), 16 deletions(-) rename src/display/{dom_utils.js => display_utils.js} (100%) rename test/unit/{dom_utils_spec.js => display_utils_spec.js} (95%) diff --git a/src/display/annotation_layer.js b/src/display/annotation_layer.js index 5b66faba9..b568731d7 100644 --- a/src/display/annotation_layer.js +++ b/src/display/annotation_layer.js @@ -15,7 +15,7 @@ import { addLinkAttributes, DOMSVGFactory, getFilenameFromUrl, LinkTarget -} from './dom_utils'; +} from './display_utils'; import { AnnotationBorderStyleType, AnnotationType, stringToPDFString, unreachable, Util, warn diff --git a/src/display/api.js b/src/display/api.js index 271aaead3..04eda7517 100644 --- a/src/display/api.js +++ b/src/display/api.js @@ -25,7 +25,7 @@ import { import { DOMCanvasFactory, DOMCMapReaderFactory, DummyStatTimer, loadScript, PageViewport, RenderingCancelledException, StatTimer -} from './dom_utils'; +} from './display_utils'; import { FontFaceObject, FontLoader } from './font_loader'; import { apiCompatibilityParams } from './api_compatibility'; import { CanvasGraphics } from './canvas'; diff --git a/src/display/dom_utils.js b/src/display/display_utils.js similarity index 100% rename from src/display/dom_utils.js rename to src/display/display_utils.js diff --git a/src/display/svg.js b/src/display/svg.js index e36e2c73b..755c87b9f 100644 --- a/src/display/svg.js +++ b/src/display/svg.js @@ -18,7 +18,7 @@ import { createObjectURL, FONT_IDENTITY_MATRIX, IDENTITY_MATRIX, ImageKind, isNum, OPS, TextRenderingMode, Util, warn } from '../shared/util'; -import { DOMSVGFactory } from './dom_utils'; +import { DOMSVGFactory } from './display_utils'; import isNodeJS from '../shared/is_node'; var SVGGraphics = function() { diff --git a/src/pdf.js b/src/pdf.js index 7681115c4..3b84f475c 100644 --- a/src/pdf.js +++ b/src/pdf.js @@ -25,7 +25,7 @@ var pdfjsSharedUtil = require('./shared/util.js'); var pdfjsDisplayAPI = require('./display/api.js'); var pdfjsDisplayTextLayer = require('./display/text_layer.js'); var pdfjsDisplayAnnotationLayer = require('./display/annotation_layer.js'); -var pdfjsDisplayDOMUtils = require('./display/dom_utils.js'); +var pdfjsDisplayDisplayUtils = require('./display/display_utils.js'); var pdfjsDisplaySVG = require('./display/svg.js'); let pdfjsDisplayWorkerOptions = require('./display/worker_options.js'); let pdfjsDisplayAPICompatibility = require('./display/api_compatibility.js'); @@ -107,11 +107,11 @@ exports.Util = pdfjsSharedUtil.Util; exports.ReadableStream = pdfjsSharedUtil.ReadableStream; exports.URL = pdfjsSharedUtil.URL; exports.RenderingCancelledException = - pdfjsDisplayDOMUtils.RenderingCancelledException; -exports.getFilenameFromUrl = pdfjsDisplayDOMUtils.getFilenameFromUrl; -exports.LinkTarget = pdfjsDisplayDOMUtils.LinkTarget; -exports.addLinkAttributes = pdfjsDisplayDOMUtils.addLinkAttributes; -exports.loadScript = pdfjsDisplayDOMUtils.loadScript; + pdfjsDisplayDisplayUtils.RenderingCancelledException; +exports.getFilenameFromUrl = pdfjsDisplayDisplayUtils.getFilenameFromUrl; +exports.LinkTarget = pdfjsDisplayDisplayUtils.LinkTarget; +exports.addLinkAttributes = pdfjsDisplayDisplayUtils.addLinkAttributes; +exports.loadScript = pdfjsDisplayDisplayUtils.loadScript; exports.GlobalWorkerOptions = pdfjsDisplayWorkerOptions.GlobalWorkerOptions; exports.apiCompatibilityParams = pdfjsDisplayAPICompatibility.apiCompatibilityParams; diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js index 83bb8edf4..56d744d6b 100644 --- a/test/unit/api_spec.js +++ b/test/unit/api_spec.js @@ -23,7 +23,7 @@ import { } from '../../src/shared/util'; import { DOMCanvasFactory, RenderingCancelledException, StatTimer -} from '../../src/display/dom_utils'; +} from '../../src/display/display_utils'; import { getDocument, PDFDataRangeTransport, PDFDocumentProxy, PDFPageProxy, PDFWorker } from '../../src/display/api'; diff --git a/test/unit/clitests.json b/test/unit/clitests.json index 9aa5a7b12..45e558b0b 100644 --- a/test/unit/clitests.json +++ b/test/unit/clitests.json @@ -14,8 +14,8 @@ "colorspace_spec.js", "crypto_spec.js", "display_svg_spec.js", + "display_utils_spec.js", "document_spec.js", - "dom_utils_spec.js", "encodings_spec.js", "evaluator_spec.js", "function_spec.js", diff --git a/test/unit/cmap_spec.js b/test/unit/cmap_spec.js index 981f695a1..88b0cefd1 100644 --- a/test/unit/cmap_spec.js +++ b/test/unit/cmap_spec.js @@ -14,7 +14,7 @@ */ import { CMap, CMapFactory, IdentityCMap } from '../../src/core/cmap'; -import { DOMCMapReaderFactory } from '../../src/display/dom_utils'; +import { DOMCMapReaderFactory } from '../../src/display/display_utils'; import isNodeJS from '../../src/shared/is_node'; import { Name } from '../../src/core/primitives'; import { NodeCMapReaderFactory } from './test_utils'; diff --git a/test/unit/custom_spec.js b/test/unit/custom_spec.js index e729dc37b..d44cc5bab 100644 --- a/test/unit/custom_spec.js +++ b/test/unit/custom_spec.js @@ -14,7 +14,7 @@ */ import { buildGetDocumentParams, NodeCanvasFactory } from './test_utils'; -import { DOMCanvasFactory } from '../../src/display/dom_utils'; +import { DOMCanvasFactory } from '../../src/display/display_utils'; import { getDocument } from '../../src/display/api'; import isNodeJS from '../../src/shared/is_node'; diff --git a/test/unit/dom_utils_spec.js b/test/unit/display_utils_spec.js similarity index 95% rename from test/unit/dom_utils_spec.js rename to test/unit/display_utils_spec.js index 938aafd83..474cefe8e 100644 --- a/test/unit/dom_utils_spec.js +++ b/test/unit/display_utils_spec.js @@ -13,10 +13,12 @@ * limitations under the License. */ -import { DOMSVGFactory, getFilenameFromUrl } from '../../src/display/dom_utils'; +import { + DOMSVGFactory, getFilenameFromUrl +} from '../../src/display/display_utils'; import isNodeJS from '../../src/shared/is_node'; -describe('dom_utils', function() { +describe('display_utils', function() { describe('DOMSVGFactory', function() { let svgFactory; diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js index baff368da..dc94a4444 100644 --- a/test/unit/jasmine-boot.js +++ b/test/unit/jasmine-boot.js @@ -56,8 +56,8 @@ function initializePDFJS(callback) { 'pdfjs-test/unit/crypto_spec', 'pdfjs-test/unit/custom_spec', 'pdfjs-test/unit/display_svg_spec', + 'pdfjs-test/unit/display_utils_spec', 'pdfjs-test/unit/document_spec', - 'pdfjs-test/unit/dom_utils_spec', 'pdfjs-test/unit/encodings_spec', 'pdfjs-test/unit/evaluator_spec', 'pdfjs-test/unit/function_spec',