From baa84fc4000fb3175bd4e35de442c03127c7cbd2 Mon Sep 17 00:00:00 2001 From: Artur Adib Date: Wed, 25 Apr 2012 11:02:02 -0400 Subject: [PATCH 01/15] removing Makefile, updating README --- Makefile | 344 ------------------------------------------------------ README.md | 9 +- 2 files changed, 5 insertions(+), 348 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index d95841000..000000000 --- a/Makefile +++ /dev/null @@ -1,344 +0,0 @@ -REPO = git@github.com:mozilla/pdf.js.git -BUILD_DIR := build -BUILD_TARGET := $(BUILD_DIR)/pdf.js -DEFAULT_BROWSERS := resources/browser_manifests/browser_manifest.json -DEFAULT_TESTS := test_manifest.json -DEFAULT_PYTHON := python2.7 - -EXTENSION_SRC := ./extensions/ -EXTENSION_BASE_VERSION := f0f0418a9c6637981fe1182b9212c2d592774c7d -FIREFOX_EXTENSION_NAME := pdf.js.xpi -FIREFOX_AMO_EXTENSION_NAME := pdf.js.amo.xpi -CHROME_EXTENSION_NAME := pdf.js.crx - -all: bundle - -# Let folks define custom rules for their clones. --include local.mk - -# JS files needed for pdf.js. -PDF_JS_FILES = \ - core.js \ - util.js \ - api.js \ - canvas.js \ - obj.js \ - function.js \ - charsets.js \ - cidmaps.js \ - colorspace.js \ - crypto.js \ - evaluator.js \ - fonts.js \ - glyphlist.js \ - image.js \ - metrics.js \ - parser.js \ - pattern.js \ - stream.js \ - worker.js \ - ../external/jpgjs/jpg.js \ - jpx.js \ - bidi.js \ - metadata.js \ - $(NULL) - -# make server -# -# This target starts a local web server at localhost:8888. This can be -# used for testing all browsers. -server: - @cd test; $(DEFAULT_PYTHON) test.py --port=8888; - -# make test -# -# This target runs all the tests excluding the unit-test. This can be used for -# testing all browsers. -test: shell-test browser-test - -# -# Create production output (pdf.js, and corresponding changes to web files) -# -production: | bundle - @echo "Preparing web/viewer-production.html"; \ - cd web; \ - sed '/PDFJSSCRIPT_REMOVE_CORE/d' viewer.html > viewer-1.tmp; \ - sed '/PDFJSSCRIPT_INCLUDE_BUILD/ r viewer-snippet.html' viewer-1.tmp > viewer-production.html; \ - rm -f *.tmp; \ - cd .. - -# -# Bundle pdf.js -# -bundle: | $(BUILD_DIR) - @echo "Bundling source files into $(BUILD_TARGET)" - @cd src; \ - cat $(PDF_JS_FILES) > all_files.tmp; \ - sed '/PDFJSSCRIPT_INCLUDE_ALL/ r all_files.tmp' pdf.js > ../$(BUILD_TARGET); \ - cp ../$(BUILD_TARGET) ../$(BUILD_TARGET).bak; \ - sed "s/PDFJSSCRIPT_BUNDLE_VER/`git log --format="%h" -n 1`/" ../$(BUILD_TARGET).bak > ../$(BUILD_TARGET); \ - rm -f ../$(BUILD_TARGET).bak; \ - rm -f *.tmp; \ - cd .. - -# make unit-test -# -# This target runs in-browser unit tests with our test framework and the -# jasmine unit test framework. -unit-test: - cd test; \ - $(DEFAULT_PYTHON) test.py --unitTest \ - --browserManifestFile=$(PDF_BROWSERS) - -# make browser-test -# -# This target runs in-browser tests using two primary arguments: a -# test manifest file, and a browser manifest file. Both are simple -# JSON formats, and examples can be found in the test/ directory. The -# target will inspect the environment for the PDF_TESTS and -# PDF_BROWSERS variables, and use those if found. Otherwise, the -# defaults at the top of this file are used. -ifeq ($(PDF_TESTS),) -PDF_TESTS := $(DEFAULT_TESTS) -endif -ifeq ($(PDF_BROWSERS),) -PDF_BROWSERS := $(DEFAULT_BROWSERS) -endif - -browser-test: - @if [ ! -f "test/$(PDF_BROWSERS)" ]; then \ - echo "Browser manifest file $(PDF_BROWSERS) does not exist."; \ - echo "Try copying one of the examples" \ - "in test/resources/browser_manifests/"; \ - exit 1; \ - fi; - - cd test; \ - $(DEFAULT_PYTHON) test.py --reftest \ - --browserManifestFile=$(PDF_BROWSERS) \ - --manifestFile=$(PDF_TESTS) - -# # make shell-test -# # -# # This target runs all of the tests that can be run in a JS shell. -# # The shell used is taken from the JS_SHELL environment variable. If -# # that variable is not defined, the script will attempt to use the copy -# # of Rhino that comes with the Closure compiler used for producing the -# # website. -# SHELL_TARGET = $(NULL) -# ifeq ($(JS_SHELL),) -# JS_SHELL := "java -cp $(BUILD_DIR)/compiler.jar" -# JS_SHELL += "com.google.javascript.jscomp.mozilla.rhino.tools.shell.Main" -# SHELL_TARGET = compiler -# endif -# -# shell-test: shell-msg $(SHELL_TARGET) font-test -# shell-msg: -# ifeq ($(SHELL_TARGET), compiler) -# @echo "No JS_SHELL env variable present." -# @echo "The default is to find a copy of Rhino and try that." -# endif -# @echo "JS shell command is: $(JS_SHELL)" -# -# font-test: -# @echo "font test stub." - -# make lint -# -# This target runs the Closure Linter on most of our JS files. -# To install gjslint, see: -# -# -SRC_DIRS := src utils web test examples/helloworld extensions/firefox \ - extensions/firefox/components extensions/chrome test/unit -GJSLINT_FILES = $(foreach DIR, $(SRC_DIRS), $(wildcard $(DIR)/*.js)) -lint: - gjslint --nojsdoc $(GJSLINT_FILES) - -# make web -# -# This target produces the website for the project, by checking out -# the gh-pages branch underneath the build directory, and then move -# the various viewer files into place. -# -# TODO: Use the Closure compiler to optimize the pdf.js files. -# -GH_PAGES = $(BUILD_DIR)/gh-pages -web: | production extension compiler pages-repo - @cp $(BUILD_TARGET) $(GH_PAGES)/$(BUILD_TARGET) - @cp -R web/* $(GH_PAGES)/web - @cp web/images/* $(GH_PAGES)/web/images - @cp $(FIREFOX_BUILD_DIR)/$(FIREFOX_EXTENSION_NAME) \ - $(FIREFOX_BUILD_DIR)/$(FIREFOX_AMO_EXTENSION_NAME) \ - $(FIREFOX_BUILD_DIR)/update.rdf \ - $(GH_PAGES)/$(EXTENSION_SRC)/firefox/ - @cp $(GH_PAGES)/web/index.html.template $(GH_PAGES)/index.html; - @mv -f $(GH_PAGES)/web/viewer-production.html $(GH_PAGES)/web/viewer.html; - @cd $(GH_PAGES); git add -A; - @echo - @echo "Website built in $(GH_PAGES)." - @echo "Don't forget to cd into $(GH_PAGES)/ and issue 'git commit' to push changes." - -# make pages-repo -# -# This target clones the gh-pages repo into the build directory. It -# deletes the current contents of the repo, since we overwrite -# everything with data from the master repo. The 'make web' target -# then uses 'git add -A' to track additions, modifications, moves, -# and deletions. -pages-repo: | $(BUILD_DIR) - @if [ ! -d "$(GH_PAGES)" ]; then \ - git clone --depth 1 -b gh-pages $(REPO) $(GH_PAGES); \ - rm -rf $(GH_PAGES)/*; \ - fi; - @mkdir -p $(GH_PAGES)/web; - @mkdir -p $(GH_PAGES)/web/images; - @mkdir -p $(GH_PAGES)/build; - @mkdir -p $(GH_PAGES)/$(EXTENSION_SRC)/firefox; - -# # make compiler -# # -# # This target downloads the Closure compiler, and places it in the -# # build directory. This target is also useful when the user doesn't -# # have a JS shell available--we can have them use the Rhino shell that -# # comes with Closure. -# COMPILER_URL = http://closure-compiler.googlecode.com/files/compiler-latest.zip -# -# compiler: $(BUILD_DIR)/compiler.zip -# $(BUILD_DIR)/compiler.zip: | $(BUILD_DIR) -# curl $(COMPILER_URL) > $(BUILD_DIR)/compiler.zip; -# cd $(BUILD_DIR); unzip compiler.zip compiler.jar; - -# make extension -# -# This target produce a restartless firefox extension containing a -# copy of the pdf.js source. -CONTENT_DIR := content -BUILD_NUMBER := `git log --format=oneline $(EXTENSION_BASE_VERSION).. | wc -l | awk '{print $$1}'` -PDFJSSCRIPT_VERSION := 0.3.$(BUILD_NUMBER) -EXTENSION_WEB_FILES = \ - web/images \ - web/viewer.css \ - web/viewer.js \ - web/viewer.html \ - web/viewer-production.html \ - web/debugger.js \ - $(NULL) - -FIREFOX_BUILD_DIR := $(BUILD_DIR)/firefox -FIREFOX_BUILD_CONTENT := $(FIREFOX_BUILD_DIR)/$(CONTENT_DIR)/ -FIREFOX_CONTENT_DIR := $(EXTENSION_SRC)/firefox/$(CONTENT_DIR)/ -FIREFOX_EXTENSION_FILES_TO_COPY = \ - *.js \ - *.rdf \ - *.png \ - install.rdf.in \ - README.mozilla \ - components \ - ../../LICENSE \ - $(NULL) -FIREFOX_EXTENSION_FILES = \ - bootstrap.js \ - install.rdf \ - icon.png \ - icon64.png \ - components \ - content \ - LICENSE \ - $(NULL) -FIREFOX_MC_EXTENSION_FILES = \ - bootstrap.js \ - icon.png \ - icon64.png \ - components \ - content \ - LICENSE \ - $(NULL) - -CHROME_BUILD_DIR := $(BUILD_DIR)/chrome -CHROME_CONTENT_DIR := $(EXTENSION_SRC)/chrome/$(CONTENT_DIR)/ -CHROME_BUILD_CONTENT := $(CHROME_BUILD_DIR)/$(CONTENT_DIR)/ -CHROME_EXTENSION_FILES = \ - extensions/chrome/*.json \ - extensions/chrome/*.html \ - $(NULL) -extension: | production - # Clear out everything in the firefox extension build directory - @rm -Rf $(FIREFOX_BUILD_DIR) - @mkdir -p $(FIREFOX_BUILD_CONTENT) - @mkdir -p $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR) - @mkdir -p $(FIREFOX_BUILD_CONTENT)/web - @cd extensions/firefox; cp -r $(FIREFOX_EXTENSION_FILES_TO_COPY) ../../$(FIREFOX_BUILD_DIR)/ - # Copy a standalone version of pdf.js inside the content directory - @cp $(BUILD_TARGET) $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR)/ - @cp -r $(EXTENSION_WEB_FILES) $(FIREFOX_BUILD_CONTENT)/web/ - @rm $(FIREFOX_BUILD_CONTENT)/web/viewer-production.html - # Copy over the firefox extension snippet so we can inline pdf.js in it - @cp web/viewer-snippet-firefox-extension.html $(FIREFOX_BUILD_CONTENT)/web/ - # Modify the viewer so it does all the extension only stuff. - @cd $(FIREFOX_BUILD_CONTENT)/web; \ - cp viewer-snippet-firefox-extension.html viewer-snippet-firefox-extension.html.bak; \ - sed '/PDFJSSCRIPT_INCLUDE_BUNDLE/ r ../build/pdf.js' viewer-snippet-firefox-extension.html.bak > viewer-snippet-firefox-extension.html; \ - cp viewer.html viewer.html.bak; \ - sed '/PDFJSSCRIPT_REMOVE_CORE/d' viewer.html.bak > viewer.html; \ - cp viewer.html viewer.html.bak; \ - sed '/PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION/d' viewer.html.bak > viewer.html; \ - cp viewer.html viewer.html.bak; \ - sed '/PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION/ r viewer-snippet-firefox-extension.html' viewer.html.bak > viewer.html; \ - rm -f *.bak; - # We don't need pdf.js anymore since its inlined - @rm -Rf $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR)/; - # Update the build version number - cp $(FIREFOX_BUILD_DIR)/install.rdf $(FIREFOX_BUILD_DIR)/install.rdf.bak - @sed "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/install.rdf.bak > $(FIREFOX_BUILD_DIR)/install.rdf - cp $(FIREFOX_BUILD_DIR)/install.rdf.in $(FIREFOX_BUILD_DIR)/install.rdf.in.bak - @sed "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/install.rdf.in.bak > $(FIREFOX_BUILD_DIR)/install.rdf.in - cp $(FIREFOX_BUILD_DIR)/update.rdf $(FIREFOX_BUILD_DIR)/update.rdf.bak - @sed "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/update.rdf.bak > $(FIREFOX_BUILD_DIR)/update.rdf - cp $(FIREFOX_BUILD_DIR)/README.mozilla $(FIREFOX_BUILD_DIR)/README.mozilla.bak - @sed "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/README.mozilla.bak > $(FIREFOX_BUILD_DIR)/README.mozilla - @rm -f $(FIREFOX_BUILD_DIR)/*.bak - @find $(FIREFOX_BUILD_DIR) -name ".*" -delete - # Create the xpi - @cd $(FIREFOX_BUILD_DIR); zip -r $(FIREFOX_EXTENSION_NAME) $(FIREFOX_EXTENSION_FILES) - @echo "extension created: " $(FIREFOX_EXTENSION_NAME) - # Build the amo extension too (remove the updateUrl) - cp $(FIREFOX_BUILD_DIR)/install.rdf $(FIREFOX_BUILD_DIR)/install.rdf.bak - @sed "/updateURL/d" $(FIREFOX_BUILD_DIR)/install.rdf.bak > $(FIREFOX_BUILD_DIR)/install.rdf - @rm -f $(FIREFOX_BUILD_DIR)/*.bak - @cd $(FIREFOX_BUILD_DIR); zip -r $(FIREFOX_AMO_EXTENSION_NAME) $(FIREFOX_EXTENSION_FILES) - @echo "AMO extension created: " $(FIREFOX_AMO_EXTENSION_NAME) - # List all files for mozilla-central - @cd $(FIREFOX_BUILD_DIR); find $(FIREFOX_MC_EXTENSION_FILES) -type f > extension-files - - # Clear out everything in the chrome extension build directory - @rm -Rf $(CHROME_BUILD_DIR) - @mkdir -p $(CHROME_BUILD_CONTENT) - @mkdir -p $(CHROME_BUILD_CONTENT)/$(BUILD_DIR) - @mkdir -p $(CHROME_BUILD_CONTENT)/web - @cp -R $(CHROME_EXTENSION_FILES) $(CHROME_BUILD_DIR)/ - # Copy a standalone version of pdf.js inside the content directory - @cp $(BUILD_TARGET) $(CHROME_BUILD_CONTENT)/$(BUILD_DIR)/ - @cp -r $(EXTENSION_WEB_FILES) $(CHROME_BUILD_CONTENT)/web/ - @mv -f $(CHROME_BUILD_CONTENT)/web/viewer-production.html $(CHROME_BUILD_CONTENT)/web/viewer.html - - # Create the crx - #TODO - - - -# Make sure there's a build directory. -$(BUILD_DIR): - mkdir -p $(BUILD_DIR) - -clean: - rm -rf $(BUILD_DIR) - -# make help -# -# This target just prints out a message to read these comments. :) -help: - @echo "Read the comments in the Makefile for guidance."; - -.PHONY:: production test browser-test font-test shell-test \ - shell-msg lint clean web compiler help server diff --git a/README.md b/README.md index 4c6fc1e18..9c242d0b8 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Also, note that the development extension is updated on every merge and by defau auto-update extensions on a daily basis (you can change this through the `extensions.update.interval` option in `about:config`). -For an experimental Chrome extension, get the code as explained below and issue `make extension`. +For an experimental Chrome extension, get the code as explained below and issue `node make extension`. Then open Chrome, go to `Tools > Extension` and load the (unpackaged) extension from the directory `build/chrome`. @@ -50,9 +50,10 @@ To get a local copy of the current code, clone it using git: Next, you need to start a local web server as some browsers don't allow opening PDF files for a file:// url: - $ make server + $ node make server -If everything worked out, you can now serve +You can install Node via [nvm](https://github.com/creationix/nvm) or the +[official package](http://nodejs.org). If everything worked out, you can now serve + http://localhost:8888/web/viewer.html @@ -64,7 +65,7 @@ You can also view all the test pdf files on the right side serving In order to bundle all `src/` files into a final `pdf.js`, issue: - $ make + $ node make bundle This will generate the file `build/pdf.js` that can be included in your final project. (WARNING: That's a large file! Consider minifying it). From 2b81f3c2e96e229d2a70fdc530524975cfad5543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20M=C3=A4rcker?= Date: Thu, 26 Apr 2012 13:28:38 +0200 Subject: [PATCH 02/15] changed load order to fix viewer in Opera locally --- src/worker_loader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/worker_loader.js b/src/worker_loader.js index 69eb1414f..6d92a95e7 100644 --- a/src/worker_loader.js +++ b/src/worker_loader.js @@ -23,9 +23,9 @@ var files = [ 'pattern.js', 'stream.js', 'worker.js', - '../external/jpgjs/jpg.js', 'jpx.js', - 'bidi.js' + 'bidi.js', + '../external/jpgjs/jpg.js' ]; // Load all the files. From 69a40ef8d8dcc907e2e288cdaf429309e6787ef1 Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Tue, 1 May 2012 11:43:48 -0500 Subject: [PATCH 03/15] Fixes tab order and focus highlight --- web/viewer.css | 7 +++++++ web/viewer.html | 29 ++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/web/viewer.css b/web/viewer.css index 2397f7ef5..f771fd7e6 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -44,6 +44,7 @@ body { bottom: 0; left: -200px; width: 200px; + visibility: hidden; -moz-transition-property: left; -moz-transition-duration: 200ms; -moz-transition-timing-function: ease; @@ -52,6 +53,7 @@ body { -webkit-transition-timing-function: ease; } #outerContainer.sidebarOpen > #sidebarContainer { + visibility: visible; left: 0px; } @@ -175,6 +177,7 @@ body { } .splitToolbarButton:hover > .toolbarButton, +.splitToolbarButton:focus > .toolbarButton, .splitToolbarButton.toggled > .toolbarButton { background-color: hsla(0,0%,0%,.12); background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); @@ -193,6 +196,7 @@ body { -webkit-transition-timing-function: ease; } .splitToolbarButton > .toolbarButton:hover, +.splitToolbarButton > .toolbarButton:focus, .dropdownToolbarButton:hover { background-color: hsla(0,0%,0%,.2); box-shadow: 0 1px 0 hsla(0,0%,100%,.05) inset, @@ -261,6 +265,7 @@ body { } .toolbarButton:hover, +.toolbarButton:focus, .dropdownToolbarButton { background-color: hsla(0,0%,0%,.12); background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); @@ -515,10 +520,12 @@ body { -moz-transition-duration: 150ms; } +a:focus > .thumbnail > .thumbnailSelectionRing > .thumbnailImage, .thumbnail:hover > .thumbnailSelectionRing > .thumbnailImage { opacity: .9; } +a:focus > .thumbnail > .thumbnailSelectionRing, .thumbnail:hover > .thumbnailSelectionRing { background-color: hsla(0,0%,100%,.15); background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0)); diff --git a/web/viewer.html b/web/viewer.html index 63dbcc608..6711a67d1 100644 --- a/web/viewer.html +++ b/web/viewer.html @@ -43,8 +43,8 @@
- - + +
@@ -61,36 +61,39 @@
- +
- +
- +
Page:
- +
- + - - + + + + + - +
- +
- +
- From 889b3d31687dcf6ccfed55c8ff5841a5001d1beb Mon Sep 17 00:00:00 2001 From: Kalervo Kujala Date: Tue, 1 May 2012 20:48:07 +0300 Subject: [PATCH 04/15] Correct class method names. --- src/api.js | 30 +++++++++++++++--------------- src/obj.js | 2 +- src/pattern.js | 2 +- src/util.js | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/api.js b/src/api.js index 3d97dacd2..32c49c363 100644 --- a/src/api.js +++ b/src/api.js @@ -69,14 +69,14 @@ var PDFDocumentProxy = (function() { * @return {Promise} A promise that is resolved with a {PDFPageProxy} * object. */ - getPage: function(number) { + getPage: function PDFDocumentProxy_getPage(number) { return this.transport.getPage(number); }, /** * @return {Promise} A promise that is resolved with a lookup table for * mapping named destinations to reference numbers. */ - getDestinations: function() { + getDestinations: function PDFDocumentProxy_getDestinations() { var promise = new PDFJS.Promise(); var destinations = this.pdfInfo.destinations; promise.resolve(destinations); @@ -97,7 +97,7 @@ var PDFDocumentProxy = (function() { * ... * ]. */ - getOutline: function() { + getOutline: function PDFDocumentProxy_getOutline() { var promise = new PDFJS.Promise(); var outline = this.pdfInfo.outline; promise.resolve(outline); @@ -109,7 +109,7 @@ var PDFDocumentProxy = (function() { * available in the information dictionary and similarly metadata is a * {Metadata} object with information from the metadata section of the PDF. */ - getMetadata: function() { + getMetadata: function PDFDocumentProxy_getMetadata() { var promise = new PDFJS.Promise(); var info = this.pdfInfo.info; var metadata = this.pdfInfo.metadata; @@ -119,7 +119,7 @@ var PDFDocumentProxy = (function() { }); return promise; }, - destroy: function() { + destroy: function PDFDocumentProxy_destroy() { this.transport.destroy(); } }; @@ -169,7 +169,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { * @return {PageViewport} Contains 'width' and 'height' properties along * with transforms required for rendering. */ - getViewport: function(scale, rotate) { + getViewport: function PDFPageProxy_getViewport(scale, rotate) { if (arguments.length < 2) rotate = this.rotate; return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0); @@ -178,7 +178,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { * @return {Promise} A promise that is resolved with an {array} of the * annotation objects. */ - getAnnotations: function() { + getAnnotations: function PDFPageProxy_getAnnotations() { if (this.annotationsPromise) return this.annotationsPromise; @@ -198,7 +198,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { * @return {Promise} A promise that is resolved when the page finishes * rendering. */ - render: function(params) { + render: function PDFPageProxy_render(params) { this.renderInProgress = true; var promise = new Promise(); @@ -257,8 +257,8 @@ var PDFPageProxy = (function PDFPageProxyClosure() { * For internal use only. */ startRenderingFromOperatorList: - function PDFPageWrapper_startRenderingFromOperatorList(operatorList, - fonts) { + function PDFPageProxy_startRenderingFromOperatorList(operatorList, + fonts) { var self = this; this.operatorList = operatorList; @@ -279,7 +279,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { /** * For internal use only. */ - ensureFonts: function PDFPageWrapper_ensureFonts(fonts, callback) { + ensureFonts: function PDFPageProxy_ensureFonts(fonts, callback) { this.stats.time('Font Loading'); // Convert the font names to the corresponding font obj. for (var i = 0, ii = fonts.length; i < ii; i++) { @@ -299,7 +299,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { /** * For internal use only. */ - display: function PDFPageWrapper_display(gfx, viewport, callback) { + display: function PDFPageProxy_display(gfx, viewport, callback) { var stats = this.stats; stats.time('Rendering'); @@ -331,7 +331,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { /** * Stub for future feature. */ - getTextContent: function() { + getTextContent: function PDFPageProxy_getTextContent() { var promise = new PDFJS.Promise(); var textContent = 'page text'; // not implemented promise.resolve(textContent); @@ -340,7 +340,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { /** * Stub for future feature. */ - getOperationList: function() { + getOperationList: function PDFPageProxy_getOperationList() { var promise = new PDFJS.Promise(); var operationList = { // not implemented dependencyFontsID: null, @@ -352,7 +352,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { /** * Destroys resources allocated by the page. */ - destroy: function() { + destroy: function PDFPageProxy_destroy() { this.destroyed = true; if (!this.renderInProgress) { diff --git a/src/obj.js b/src/obj.js index 47aed8f8a..9b99eb8f7 100644 --- a/src/obj.js +++ b/src/obj.js @@ -39,7 +39,7 @@ var Dict = (function DictClosure() { // Map should only be used internally, use functions below to access. var map = Object.create(null); - this.assignXref = function Dict_assingXref(newXref) { + this.assignXref = function Dict_assignXref(newXref) { xref = newXref; }; diff --git a/src/pattern.js b/src/pattern.js index 7659f5436..8d69d3a92 100644 --- a/src/pattern.js +++ b/src/pattern.js @@ -110,7 +110,7 @@ Shadings.RadialAxial = (function RadialAxialClosure() { var r1 = raw[6]; return { type: 'Pattern', - getPattern: function(ctx) { + getPattern: function RadialAxial_getPattern(ctx) { var curMatrix = ctx.mozCurrentTransform; if (curMatrix) { var userMatrix = ctx.mozCurrentTransformInverse; diff --git a/src/util.js b/src/util.js index 63f6115a7..140b18cf1 100644 --- a/src/util.js +++ b/src/util.js @@ -97,7 +97,7 @@ var Util = PDFJS.Util = (function UtilClosure() { return [xt, yt]; }; - Util.applyInverseTransform = function Util_applyTransform(p, m) { + Util.applyInverseTransform = function Util_applyInverseTransform(p, m) { var d = m[0] * m[3] - m[1] * m[2]; var xt = (p[0] * m[3] - p[1] * m[2] + m[2] * m[5] - m[4] * m[3]) / d; var yt = (-p[0] * m[1] + p[1] * m[0] + m[4] * m[1] - m[5] * m[0]) / d; From 117256ce788cd1c28a9bb39d97e646248624466a Mon Sep 17 00:00:00 2001 From: Kalervo Kujala Date: Tue, 1 May 2012 20:54:16 +0300 Subject: [PATCH 05/15] Correct PDFDocumentProxyClosure name. --- src/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api.js b/src/api.js index 32c49c363..bbab680ce 100644 --- a/src/api.js +++ b/src/api.js @@ -45,7 +45,7 @@ PDFJS.getDocument = function getDocument(source) { * Proxy to a PDFDocument in the worker thread. Also, contains commonly used * properties that can be read synchronously. */ -var PDFDocumentProxy = (function() { +var PDFDocumentProxy = (function PDFDocumentProxyClosure() { function PDFDocumentProxy(pdfInfo, transport) { this.pdfInfo = pdfInfo; this.transport = transport; From b8db3356c395e34f05b8b7d00fbdfa9ec225b5ea Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Tue, 1 May 2012 13:31:23 -0500 Subject: [PATCH 06/15] Fixes visibility of the moving sidebar --- web/viewer.css | 3 +++ web/viewer.js | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/web/viewer.css b/web/viewer.css index f771fd7e6..acaca9865 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -52,6 +52,9 @@ body { -webkit-transition-duration: 200ms; -webkit-transition-timing-function: ease; } +#outerContainer.sidebarMoving > #sidebarContainer { + visibility: visible; +} #outerContainer.sidebarOpen > #sidebarContainer { visibility: visible; left: 0px; diff --git a/web/viewer.js b/web/viewer.js index 9822f07c6..35b00b331 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1353,18 +1353,21 @@ window.addEventListener('load', function webViewerLoad(evt) { thumbsView.addEventListener('scroll', updateThumbViewArea, true); var mainContainer = document.getElementById('mainContainer'); + var outerContainer = document.getElementById('outerContainer'); mainContainer.addEventListener('transitionend', function(e) { if (e.target == mainContainer) { var event = document.createEvent('UIEvents'); event.initUIEvent('resize', false, false, window, 0); window.dispatchEvent(event); + outerContainer.classList.remove('sidebarMoving'); } }, true); document.getElementById('sidebarToggle').addEventListener('click', function() { this.classList.toggle('toggled'); - document.getElementById('outerContainer').classList.toggle('sidebarOpen'); + outerContainer.classList.add('sidebarMoving'); + outerContainer.classList.toggle('sidebarOpen'); updateThumbViewArea(); }); From 72ec5d070b7ab97df8a164d1366b3aee990974fd Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Tue, 1 May 2012 17:08:30 -0500 Subject: [PATCH 07/15] Fixes rtl languages --- web/locale.properties | 64 ++++++++++++------------ web/viewer.css | 110 ++++++++++++++++++++++++++++++++++-------- web/viewer.html | 4 +- web/viewer.js | 4 ++ 4 files changed, 127 insertions(+), 55 deletions(-) diff --git a/web/locale.properties b/web/locale.properties index 3244a54f9..1872e4f0a 100644 --- a/web/locale.properties +++ b/web/locale.properties @@ -3,7 +3,7 @@ bookmark.title=Current view (copy or open in new window) previous.title=Previous next.title=Next print.title=Print -download_label.title=Download +download.title=Download zoom_out.title=Zoom Out zoom_in.title=Zoom In error_more_info=More Information @@ -30,35 +30,35 @@ page_of=of {{pageCount}} no_outline=No Outline Available [ar] -‏‫bookmark.title=الحالية عرض (نسخة أو في فتح نافذة جديدة)‬ -‏‫previous.title=سابق‬ -‏‫next.title=التالي‬ -‏‫print.title=طباعة‬ -‏‫download_label.title=تحميل‬ -‏‫zoom_out.title=التصغير‬ -‏‫zoom_in.title=تكبير‬ -‏‫error_more_info=مزيد من المعلومات‬ -‏‫error_less_info=أقل المعلومات‬ -‏‫error_close=أغلق‬ -‏‫error_build=PDF.JS البناء: ‬{{build}} -‏‫error_message=الرسالة: ‬{{message}} -‏‫error_stack=المكدس: ‬{{stack}} -‏‫error_file=ملف:‬ {{file}} -‏‫error_line=خط: ‬{{line}} -‏‫page_scale_width=صفحة العرض‬ -‏‫page_scale_fit=صفحة صالح‬ -‏‫page_scale_auto=التلقائي تكبير‬ -‏‫page_scale_actual=الحجم الفعلي‬ -‏‫toggle_slider.title=تبديل المتزلج‬ -‏‫thumbs.title=وتظهر الصور المصغرة‬ -‏‫outline.title=عرض المخطط التفصيلي وثيقة‬ -‏‫loading=تحميل ... {{percent}}٪ في المئة‬ -‏‫loading_error_indicator=خطأ‬ -‏‫loading_error=حدث خطأ أثناء تحميل قوات الدفاع الشعبي.‬ -‏‫rendering_error=حدث خطأ في حين جعل صفحة.‬ -‏‫page_label=الصفحة:‬ -‏‫page_of=من {{pageCount}}‬ -‏‫no_outline=لا مخطط متاح‬ +bookmark.title=الحالية عرض (نسخة أو في فتح نافذة جديدة)‬ +previous.title=سابق‬ +next.title=التالي‬ +print.title=طباعة‬ +download.title=تحميل‬ +zoom_out.title=التصغير‬ +zoom_in.title=تكبير‬ +error_more_info=مزيد من المعلومات‬ +error_less_info=أقل المعلومات‬ +error_close=أغلق‬ +error_build=PDF.JS البناء: ‬{{build}} +error_message=الرسالة: ‬{{message}} +error_stack=المكدس: ‬{{stack}} +error_file=ملف:‬ {{file}} +error_line=خط: ‬{{line}} +page_scale_width=صفحة العرض‬ +page_scale_fit=صفحة صالح‬ +page_scale_auto=التلقائي تكبير‬ +page_scale_actual=الحجم الفعلي‬ +toggle_slider.title=تبديل المتزلج‬ +thumbs.title=وتظهر الصور المصغرة‬ +outline.title=عرض المخطط التفصيلي وثيقة‬ +loading=تحميل ... {{percent}}٪ في المئة‬ +loading_error_indicator=خطأ‬ +loading_error=حدث خطأ أثناء تحميل قوات الدفاع الشعبي.‬ +rendering_error=حدث خطأ في حين جعل صفحة.‬ +page_label=الصفحة:‬ +page_of=من {{pageCount}}‬ +no_outline=لا مخطط متاح‬ [ru] bookmark.title=Ссылка на текущий вид (скопировать или открыть в новом окне) @@ -96,7 +96,7 @@ bookmark.title=<<<_¢ȗггεпţ ṿiεẂ (¢OÞӳ Oг OÞεп iп пεẂ Ẃ previous.title=<<<_ÞгεṿiOȗ§_>>> next.title=<<<_пεӾţ_>>> print.title=<<<_Þгiпţ_>>> -download_label.title=<<<_ÐOẂпḻOãÐ_>>> +download.title=<<<_ÐOẂпḻOãÐ_>>> zoom_out.title=<<<_ƩOOм Oȗţ_>>> zoom_in.title=<<<_ƩOOм iп_>>> error_more_info=<<<_мOгε iп£OгмãţiOп_>>> @@ -120,4 +120,4 @@ loading_error=<<<_ãп εггOг O¢¢ȗггεÐ ẂНiḻε ḻOãÐiпģ ţН rendering_error=<<<_ãп εггOг O¢¢ȗггεÐ ẂНiḻε гεпÐεгiпģ ţНε Þãģε._>>> page_label=Þãģε: page_of=<<<_O£ {{pageCount}}_>>> -no_outline=<<<_пO Oȗţḻiпε ãṿãiḻãьḻε_>>> \ No newline at end of file +no_outline=<<<_пO Oȗţḻiпε ãṿãiḻãьḻε_>>> diff --git a/web/viewer.css b/web/viewer.css index 2397f7ef5..3216076de 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -22,16 +22,26 @@ body { } /* outer/inner center provides horizontal center */ -.outerCenter { +html[dir='ltr'] .outerCenter { float: right; position: relative; right: 50%; } -.innerCenter { +html[dir='rtl'] .outerCenter { + float: left; + position: relative; + left: 50%; +} +html[dir='ltr'] .innerCenter { float: right; position: relative; right: -50%; } +html[dir='rtl'] .innerCenter { + float: left; + position: relative; + left: -50%; +} #outerContainer { width: 100%; @@ -42,7 +52,6 @@ body { position: absolute; top: 0; bottom: 0; - left: -200px; width: 200px; -moz-transition-property: left; -moz-transition-duration: 200ms; @@ -51,9 +60,19 @@ body { -webkit-transition-duration: 200ms; -webkit-transition-timing-function: ease; } -#outerContainer.sidebarOpen > #sidebarContainer { +html[dir='ltr'] #sidebarContainer { + left: -200px; +} +html[dir='rtl'] #sidebarContainer { + right: -200px; +} + +html[dir='ltr'] #outerContainer.sidebarOpen > #sidebarContainer { left: 0px; } +html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer { + right: 0px; +} #mainContainer { position: absolute; @@ -68,13 +87,15 @@ body { -webkit-transition-duration: 200ms; -webkit-transition-timing-function: ease; } -#outerContainer.sidebarOpen > #mainContainer { +html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer { left: 200px; } +html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer { + right: 200px; +} #sidebarContent { top: 32px; - left: 0; bottom: 0; overflow: auto; position: absolute; @@ -83,6 +104,12 @@ body { background-color: hsla(0,0%,0%,.1); box-shadow: inset -1px 0 0 hsla(0,0%,0%,.25); } +html[dir='ltr'] #sidebarContent { + left: 0; +} +html[dir='rtl'] #sidebarContent { + right: 0; +} #viewerContainer { overflow: auto; @@ -138,30 +165,46 @@ body { 0 1px 1px hsla(0,0%,0%,.1); } -#toolbarViewerLeft { + +html[dir='ltr'] #toolbarViewerLeft, +html[dir='rtl'] #toolbarViewerRight { position: absolute; top: 0; left: 0; } -#toolbarViewerRight { +html[dir='ltr'] #toolbarViewerRight, +html[dir='rtl'] #toolbarViewerLeft { position: absolute; top: 0; right: 0; } -#toolbarViewerLeft > *, -#toolbarViewerMiddle > *, -#toolbarViewerRight > * { +html[dir='ltr'] #toolbarViewerLeft > *, +html[dir='ltr'] #toolbarViewerMiddle > *, +html[dir='ltr'] #toolbarViewerRight > * { float: left; } +html[dir='rtl'] #toolbarViewerLeft > *, +html[dir='rtl'] #toolbarViewerMiddle > *, +html[dir='rtl'] #toolbarViewerRight > * { + float: right; +} -.splitToolbarButton { +html[dir='ltr'] .splitToolbarButton { margin: 3px 2px 4px 0; display: inline-block; } -.splitToolbarButton > .toolbarButton { +html[dir='rtl'] .splitToolbarButton { + margin: 3px 0 4px 2px; + display: inline-block; +} +html[dir='ltr'] .splitToolbarButton > .toolbarButton { border-radius: 0; float: left; } +html[dir='rtl'] .splitToolbarButton > .toolbarButton { + border-radius: 0; + float: right; +} .toolbarButton { border: 0 none; @@ -200,7 +243,8 @@ body { 0 0 1px hsla(0,0%,0%,.05); z-index: 199; } -.splitToolbarButton > .toolbarButton:first-child { +html[dir='ltr'] .splitToolbarButton > .toolbarButton:first-child, +html[dir='rtl'] .splitToolbarButton > .toolbarButton:last-child { position: relative; margin: 0; margin-right: -1px; @@ -208,7 +252,8 @@ body { border-bottom-left-radius: 2px; border-right-color: transparent; } -.splitToolbarButton > .toolbarButton:last-child { +html[dir='ltr'] .splitToolbarButton > .toolbarButton:last-child, +html[dir='rtl'] .splitToolbarButton > .toolbarButton:first-child { position: relative; margin: 0; margin-left: -1px; @@ -224,8 +269,13 @@ body { box-shadow: 0 0 0 1px hsla(0,0%,100%,.08); display: inline-block; margin: 5px 0; +} +html[dir='ltr'] .splitToolbarButtonSeparator { float:left; } +html[dir='rtl'] .splitToolbarButtonSeparator { + float:right; +} .splitToolbarButton:hover > .splitToolbarButtonSeparator, .splitToolbarButton.toggled > .splitToolbarButtonSeparator { padding: 12px 0; @@ -243,7 +293,6 @@ body { .dropdownToolbarButton { min-width: 16px; padding: 2px 6px 0; - margin: 3px 2px 4px 0; border: 1px solid transparent; border-radius: 2px; color: hsl(0,0%,95%); @@ -260,6 +309,15 @@ body { -webkit-transition-timing-function: ease; } +html[dir='ltr'] .toolbarButton, +html[dir='ltr'] .dropdownToolbarButton { + margin: 3px 2px 4px 0; +} +html[dir='rtl'] .toolbarButton, +html[dir='rtl'] .dropdownToolbarButton { + margin: 3px 0 4px 2px; +} + .toolbarButton:hover, .dropdownToolbarButton { background-color: hsla(0,0%,0%,.12); @@ -321,7 +379,13 @@ body { max-width: 120px; padding: 3px 2px 2px; overflow: hidden; - background: url(images/toolbarButton-menuArrows.png) no-repeat 95%; + background: url(images/toolbarButton-menuArrows.png) no-repeat; +} +html[dir='ltr'] .dropdownToolbarButton { + background-position: 95%; +} +html[dir='rtl'] .dropdownToolbarButton { + background-position: 5%; } .dropdownToolbarButton > select { @@ -344,12 +408,16 @@ body { border-bottom: 1px rgba(255, 255, 255, .5) solid; } -.splitToolbarButton:first-child, -.toolbarButton:first-child { +html[dir='ltr'] .splitToolbarButton:first-child, +html[dir='ltr'] .toolbarButton:first-child, +html[dir='rtl'] .splitToolbarButton:last-child, +html[dir='rtl'] .toolbarButton:last-child { margin-left: 4px; } -.splitToolbarButton:last-child, -.toolbarButton:last-child { +html[dir='ltr'] .splitToolbarButton:last-child, +html[dir='ltr'] .toolbarButton:last-child, +html[dir='rtl'] .splitToolbarButton:first-child, +html[dir='rtl'] .toolbarButton:first-child { margin-right: 4px; } diff --git a/web/viewer.html b/web/viewer.html index b464b09c2..3803fe329 100644 --- a/web/viewer.html +++ b/web/viewer.html @@ -1,5 +1,5 @@ - + PDF.js viewer @@ -114,7 +114,7 @@
-
+
diff --git a/web/viewer.js b/web/viewer.js index bc235aac9..aacf0b5ce 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1541,6 +1541,10 @@ function selectScaleOption(value) { return predefinedValueFound; } +window.addEventListener('localized', function localized(evt) { + document.getElementsByTagName('html')[0].dir = mozL10n.language.direction; +}, true); + window.addEventListener('scalechange', function scalechange(evt) { var customScaleOption = document.getElementById('customScaleOption'); customScaleOption.selected = false; From e7f63e3e5e6d5ebde41bdbed7f7e227757faafeb Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Tue, 1 May 2012 19:39:24 -0500 Subject: [PATCH 08/15] Fixes rtl zoom and page up/down icons --- web/images/toolbarButton-pageDown-rtl.png | Bin 0 -> 558 bytes web/images/toolbarButton-pageUp-rtl.png | Bin 0 -> 426 bytes web/viewer.css | 22 +++++++++++++++++++--- web/viewer.html | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 web/images/toolbarButton-pageDown-rtl.png create mode 100644 web/images/toolbarButton-pageUp-rtl.png diff --git a/web/images/toolbarButton-pageDown-rtl.png b/web/images/toolbarButton-pageDown-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..c0051f8f040826d06f38468fcc4d657cfc69e880 GIT binary patch literal 558 zcmV+}0@3}6P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye$ z03Zn`nXL%`00FK^L_t(I%YBngi_=gPhMzl$*;sW%`~VAs{ROTol+ur1(dlx2L`zCZ zZM*8KYj@SXxDX+Qgia}SrHfe%cH_3FIHNPPNhY~&ZX^xq96021Z{Fu}-nJg z4%Jgr`vGtXTmT**_lcibmUXgPt=@T__en}=$Gu!GUz?`+0yx-nIS)+JJc**{qm=T4 zl=6Mti^bv%@Cvve1N02Qqei1q6hd65560v1Iq)602BLj{!$P58sCjqFah!AD7ZApK zSpdT@j38^a^?H4&%;PqI0Q^1v+@zh?0YiPRhrk`+D1A$!j)1>vyx+iu0PfkgeO#;6 zUM60=+5^bNi|KUwwO+5k)c}1mnRvNe?n$v&ya6`Kq^#Zmo6%_Wv)OFAzzbm~CR4PTc0K$I1AGBJn8So9b(v&G4@W*kSjSwPVE|)XKmSsiVZub;8Q*n;sjQ@wY zuDcDxFkh)uf~2_9>4;vhw@8Xf{3JV&*=*+fzMrpFs{s(T+iiU~9DYuV(|{ewd_E7P wl#gB4m4m_HOO`keO;#PKY&?xam?Z}I2j`s8psXhcZU6uP07*qoM6N<$g6Zn_c>n+a literal 0 HcmV?d00001 diff --git a/web/images/toolbarButton-pageUp-rtl.png b/web/images/toolbarButton-pageUp-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..0d49d8e95e3fd732dfbfc16a12998f20ac337a4d GIT binary patch literal 426 zcmV;b0agBqP)Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye$03R;e zO)_2p00AyZL_t(2&sC8Ae53_1mJ6h^w# zeV-oR^ysH>c;yp?Dznn>JGz9pxG6#$9N?FsB-jk1M=BneHkstGh{u!&Q|tLe=n5=Z z5KK_0&*4R-kRyw)SWp1b(Aw3Shlls$->_wOZsP>eHWjky7-SLn4EW$3n^7eE0S7l~ UzTz2Va{vGU07*qoM6N<$f~2;q$p8QV literal 0 HcmV?d00001 diff --git a/web/viewer.css b/web/viewer.css index d7625a6a7..337614ccf 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -160,7 +160,6 @@ html[dir='rtl'] #sidebarContent { #toolbarViewer { position: relative; - margin-left: -1px; height: 32px; background-image: url(images/texture.png), -moz-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95)); @@ -173,6 +172,12 @@ html[dir='rtl'] #sidebarContent { 0 1px 0 hsla(0,0%,0%,.15), 0 1px 1px hsla(0,0%,0%,.1); } +html[dir='ltr'] #toolbarViewerLeft { + margin-left: -1px; +} +html[dir='rtl'] #toolbarViewerRight { + margin-left: -1px; +} html[dir='ltr'] #toolbarViewerLeft, @@ -450,16 +455,26 @@ html[dir='rtl'] .toolbarButton:first-child { content: url(images/toolbarButton-sidebarToggle.png); } -.toolbarButton.pageUp::before { +html[dir='ltr'] .toolbarButton.pageUp::before { display: inline-block; content: url(images/toolbarButton-pageUp.png); } + +html[dir='rtl'] .toolbarButton.pageUp::before { + display: inline-block; + content: url(images/toolbarButton-pageUp-rtl.png); +} -.toolbarButton.pageDown::before { +html[dir='ltr'] .toolbarButton.pageDown::before { display: inline-block; content: url(images/toolbarButton-pageDown.png); } +html[dir='rtl'] .toolbarButton.pageDown::before { + display: inline-block; + content: url(images/toolbarButton-pageDown-rtl.png); +} + .toolbarButton.zoomOut::before { display: inline-block; content: url(images/toolbarButton-zoomOut.png); @@ -690,6 +705,7 @@ canvas { } .page { + direction: ltr; width: 816px; height: 1056px; margin: 10px auto; diff --git a/web/viewer.html b/web/viewer.html index 545e7405b..b257ec61a 100644 --- a/web/viewer.html +++ b/web/viewer.html @@ -117,7 +117,7 @@
-
+
From 32e9eb35fe20392e5f1bfde5c51871b9d6d0568f Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Tue, 1 May 2012 20:37:03 -0500 Subject: [PATCH 09/15] Using web browsers locale in the extension mode --- extensions/firefox/components/PdfStreamConverter.js | 3 +++ external/webL10n/l10n.js | 8 +++++++- web/viewer.js | 5 ++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js index f4b5b7712..af9cf41b8 100644 --- a/extensions/firefox/components/PdfStreamConverter.js +++ b/extensions/firefox/components/PdfStreamConverter.js @@ -58,6 +58,9 @@ ChromeActions.prototype = { return '{}'; return application.prefs.getValue(EXT_PREFIX + '.database', '{}'); }, + getLocale: function() { + return application.prefs.getValue('general.useragent.locale', 'en-US'); + }, pdfBugEnabled: function() { return application.prefs.getValue(EXT_PREFIX + '.pdfBugEnabled', false); } diff --git a/external/webL10n/l10n.js b/external/webL10n/l10n.js index bb847ee10..832f0819c 100644 --- a/external/webL10n/l10n.js +++ b/external/webL10n/l10n.js @@ -18,7 +18,11 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * IN THE SOFTWARE. */ - +/* + Additional modifications for PDF.js project: + - Loading resources from