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

Merge pull request #1901 from brendandahl/ff16_sync

Browse Source 
Sync up a few files with mozcentral.  Address mozcentral review comments.
This commit is contained in:
Yury Delendik 2012-07-13 17:19:59 -07:00
commit 2965bad38c
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/firefox/components/PdfStreamConverter.js
View File

@ -132,16 +132,13 @@ ChromeActions.prototype = {
var originalUrl = data.originalUrl; var originalUrl = data.originalUrl;
// The data may not be downloaded so we need just retry getting the pdf with // The data may not be downloaded so we need just retry getting the pdf with
// the original url. // the original url.
var blobUrl = data.blobUrl || originalUrl; var originalUri = NetUtil.newURI(data.originalUrl);
var originalUri = NetUtil.newURI(originalUrl); var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri;
var blobUri = NetUtil.newURI(blobUrl);
var extHelperAppSvc = var extHelperAppSvc =
Cc['@mozilla.org/uriloader/external-helper-app-service;1']. Cc['@mozilla.org/uriloader/external-helper-app-service;1'].
getService(Ci.nsIExternalHelperAppService); getService(Ci.nsIExternalHelperAppService);
var frontWindow = Cc['@mozilla.org/embedcomp/window-watcher;1']. var frontWindow = Cc['@mozilla.org/embedcomp/window-watcher;1'].
getService(Ci.nsIWindowWatcher).activeWindow; getService(Ci.nsIWindowWatcher).activeWindow;
var ioService = Services.io;
var channel = ioService.newChannel(originalUrl, null, null);
NetUtil.asyncFetch(blobUri, function(aInputStream, aResult) { NetUtil.asyncFetch(blobUri, function(aInputStream, aResult) {
if (!Components.isSuccessCode(aResult)) { if (!Components.isSuccessCode(aResult)) {

1
l10n/en-US/chrome.properties
View File

@ -1,3 +1,4 @@
# Chrome notification bar messages and buttons # Chrome notification bar messages and buttons
unsupported_feature=This PDF document might not be displayed correctly. unsupported_feature=This PDF document might not be displayed correctly.
open_with_different_viewer=Open With Different Viewer open_with_different_viewer=Open With Different Viewer
open_with_different_viewer.accessKey=o

6
test/mozcentral/Makefile.in
View File

@ -9,13 +9,11 @@ VPATH = @srcdir@
relativesrcdir = browser/extensions/pdfjs/test relativesrcdir = browser/extensions/pdfjs/test
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_BROWSER_TEST_FILES = \ MOCHITEST_BROWSER_FILES = \
browser_pdfjs_main.js \ browser_pdfjs_main.js \
browser_pdfjs_savedialog.js \ browser_pdfjs_savedialog.js \
file_pdfjs_test.pdf \ file_pdfjs_test.pdf \
$(NULL) $(NULL)
libs:: $(_BROWSER_TEST_FILES) include $(topsrcdir)/config/rules.mk
$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)