mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-21 07:38:07 +02:00
Merge pull request #8050 from yurydelendik/systemjs
Replaces RequireJS to SystemJS.
This commit is contained in:
commit
25f772a255
15 changed files with 118 additions and 64 deletions
|
@ -5,7 +5,8 @@
|
|||
|
||||
<link rel="stylesheet" type="text/css" href="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
|
||||
|
||||
<script src="../../node_modules/requirejs/require.js"></script>
|
||||
<script src="../../node_modules/systemjs/dist/system.js"></script>
|
||||
<script src="../../systemjs.config.js"></script>
|
||||
<script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
|
||||
<script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
|
||||
<script src="../unit/testreporter.js"></script>
|
||||
|
|
|
@ -41,9 +41,13 @@
|
|||
'use strict';
|
||||
|
||||
function initializePDFJS(callback) {
|
||||
require.config({paths: {'pdfjs': '../../src'}});
|
||||
require(['pdfjs/core/fonts', 'pdfjs/core/stream', 'pdfjs/core/primitives',
|
||||
'pdfjs/core/cmap'], function (fonts, stream, primitives, cmap) {
|
||||
Promise.all([SystemJS.import('pdfjs/core/fonts'),
|
||||
SystemJS.import('pdfjs/core/stream'),
|
||||
SystemJS.import('pdfjs/core/primitives'),
|
||||
SystemJS.import('pdfjs/core/cmap')])
|
||||
.then(function (modules) {
|
||||
var fonts = modules[0], stream = modules[1],
|
||||
primitives = modules[2], cmap = modules[3];
|
||||
// Expose some of the PDFJS members to global scope for tests.
|
||||
window.Font = fonts.Font;
|
||||
window.ToUnicodeMap = fonts.ToUnicodeMap;
|
||||
|
|
|
@ -18,7 +18,8 @@ limitations under the License.
|
|||
<head>
|
||||
<title>PDF.js test slave</title>
|
||||
<meta charset="utf-8">
|
||||
<script src="../node_modules/requirejs/require.js"></script>
|
||||
<script src="../node_modules/systemjs/dist/system.js"></script>
|
||||
<script src="../systemjs.config.js"></script>
|
||||
<script src="driver.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -31,12 +32,13 @@ limitations under the License.
|
|||
<div id="end"></div>
|
||||
</body>
|
||||
<script>
|
||||
require.config({paths: {'pdfjs': '../src'}});
|
||||
require(['pdfjs/display/api', 'pdfjs/display/text_layer',
|
||||
'pdfjs/display/annotation_layer', 'pdfjs/display/global',
|
||||
'pdfjs/shared/util'],
|
||||
function (api, textLayer, annotationLayer, global, pdfjsSharedUtil) {
|
||||
window.pdfjsSharedUtil = pdfjsSharedUtil;
|
||||
Promise.all([SystemJS.import('pdfjs/display/api'),
|
||||
SystemJS.import('pdfjs/display/text_layer'),
|
||||
SystemJS.import('pdfjs/display/annotation_layer'),
|
||||
SystemJS.import('pdfjs/display/global'),
|
||||
SystemJS.import('pdfjs/shared/util')])
|
||||
.then(function (modules) {
|
||||
window.pdfjsSharedUtil = modules[4];
|
||||
|
||||
var driver = new Driver({
|
||||
disableScrolling: document.getElementById('disableScrolling'),
|
||||
|
|
|
@ -41,28 +41,22 @@
|
|||
'use strict';
|
||||
|
||||
function initializePDFJS(callback) {
|
||||
require.config({paths: {'pdfjs': '../../src', 'pdfjs-web': '../../web',
|
||||
'pdfjs-test': '..'}});
|
||||
require(['pdfjs/display/global', 'pdfjs-test/unit/annotation_spec',
|
||||
'pdfjs-test/unit/api_spec', 'pdfjs-test/unit/bidi_spec',
|
||||
'pdfjs-test/unit/cff_parser_spec', 'pdfjs-test/unit/cmap_spec',
|
||||
'pdfjs-test/unit/crypto_spec', 'pdfjs-test/unit/document_spec',
|
||||
'pdfjs-test/unit/dom_utils_spec', 'pdfjs-test/unit/evaluator_spec',
|
||||
'pdfjs-test/unit/fonts_spec', 'pdfjs-test/unit/function_spec',
|
||||
'pdfjs-test/unit/metadata_spec', 'pdfjs-test/unit/murmurhash3_spec',
|
||||
'pdfjs-test/unit/network_spec', 'pdfjs-test/unit/parser_spec',
|
||||
'pdfjs-test/unit/primitives_spec', 'pdfjs-test/unit/stream_spec',
|
||||
'pdfjs-test/unit/type1_parser_spec',
|
||||
'pdfjs-test/unit/ui_utils_spec', 'pdfjs-test/unit/unicode_spec',
|
||||
'pdfjs-test/unit/util_spec'],
|
||||
function (displayGlobal, testUnitAnnotationSpec, testUnitApiSpec,
|
||||
testUnitBidiSpec, testUnitCFFParserSpec, testUnitCMapSpec,
|
||||
testUnitCryptoSpec, testUnitDocumentSpec, testUnitDOMUtilsSpec,
|
||||
testUnitEvaluatorSpec, testUnitFontsSpec, testUnitFunctionSpec,
|
||||
testUnitMetadataSpec, testUnitMurmurHash3Spec,
|
||||
testUnitNetworkSpec, testUnitParserSpec, testUnitPrimitivesSpec,
|
||||
testUnitStreamSpec, testUnitType1ParserSpec, testUnitUiUtilsSpec,
|
||||
testUnitUnicodeSpec, testUnitUtilSpec) {
|
||||
Promise.all([
|
||||
'pdfjs/display/global', 'pdfjs-test/unit/annotation_spec',
|
||||
'pdfjs-test/unit/api_spec', 'pdfjs-test/unit/bidi_spec',
|
||||
'pdfjs-test/unit/cff_parser_spec', 'pdfjs-test/unit/cmap_spec',
|
||||
'pdfjs-test/unit/crypto_spec', 'pdfjs-test/unit/document_spec',
|
||||
'pdfjs-test/unit/dom_utils_spec', 'pdfjs-test/unit/evaluator_spec',
|
||||
'pdfjs-test/unit/fonts_spec', 'pdfjs-test/unit/function_spec',
|
||||
'pdfjs-test/unit/metadata_spec', 'pdfjs-test/unit/murmurhash3_spec',
|
||||
'pdfjs-test/unit/network_spec', 'pdfjs-test/unit/parser_spec',
|
||||
'pdfjs-test/unit/primitives_spec', 'pdfjs-test/unit/stream_spec',
|
||||
'pdfjs-test/unit/type1_parser_spec', 'pdfjs-test/unit/ui_utils_spec',
|
||||
'pdfjs-test/unit/unicode_spec', 'pdfjs-test/unit/util_spec'
|
||||
].map(function (moduleName) {
|
||||
return SystemJS.import(moduleName);
|
||||
})).then(function (modules) {
|
||||
var displayGlobal = modules[0];
|
||||
|
||||
// Configure the worker.
|
||||
displayGlobal.PDFJS.workerSrc = '../../src/worker_loader.js';
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
|
||||
<link rel="stylesheet" type="text/css" href="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
|
||||
|
||||
<script src="../../node_modules/requirejs/require.js"></script>
|
||||
<script src="../../node_modules/systemjs/dist/system.js"></script>
|
||||
<script src="../../systemjs.config.js"></script>
|
||||
<script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
|
||||
<script src="../../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
|
||||
<script src="testreporter.js"></script>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue