diff --git a/extensions/b2g/viewer.html b/extensions/b2g/viewer.html index 573d04685..6c1da5818 100644 --- a/extensions/b2g/viewer.html +++ b/extensions/b2g/viewer.html @@ -22,8 +22,8 @@ limitations under the License. - - + + diff --git a/extensions/b2g/viewer.js b/extensions/b2g/viewer.js index fdf049c39..795117410 100644 --- a/extensions/b2g/viewer.js +++ b/extensions/b2g/viewer.js @@ -17,8 +17,8 @@ PDFJS.useOnlyCssZoom = true; PDFJS.disableTextLayer = true; -PDFJS.workerSrc = '../build/pdf.worker.js'; -PDFJS.cMapUrl = '../web/cmaps/'; +PDFJS.workerSrc = './bower_components/pdfjs_dist/build/pdf.worker.js'; +PDFJS.cMapUrl = './bower_components/pdfjs_dist/cmaps/'; PDFJS.cMapPacked = true; var DEFAULT_SCALE_DELTA = 1.1; diff --git a/make.js b/make.js index 3ebe1e518..e64f94016 100644 --- a/make.js +++ b/make.js @@ -986,7 +986,7 @@ target.b2g = function() { mkdir('-p', B2G_BUILD_CONTENT_DIR); mkdir('-p', B2G_BUILD_CONTENT_DIR + BUILD_DIR); mkdir('-p', B2G_BUILD_CONTENT_DIR + '/web'); - mkdir('-p', B2G_BUILD_CONTENT_DIR + '/web/cmaps'); + mkdir('-p', B2G_BUILD_CONTENT_DIR + '/web/bower_components'); var setup = { defines: defines, @@ -995,11 +995,7 @@ target.b2g = function() { ['extensions/b2g/viewer.html', B2G_BUILD_CONTENT_DIR + '/web'], ['extensions/b2g/viewer.css', B2G_BUILD_CONTENT_DIR + '/web'], ['extensions/b2g/viewer.js', B2G_BUILD_CONTENT_DIR + '/web'], - ['external/bcmaps/*', B2G_BUILD_CONTENT_DIR + '/web/cmaps'] - ], - preprocess: [ - ['build/components/pdf_viewer.js', B2G_BUILD_CONTENT_DIR + '/build'], - [BUILD_TARGETS, B2G_BUILD_CONTENT_DIR + BUILD_DIR] + ['build/dist/*', B2G_BUILD_CONTENT_DIR + '/web/bower_components'] ] }; builder.build(setup);