Merge pull request #545 from kkujala/master

Fix lint warnings.
This commit is contained in:
Chris Jones 2011-09-27 12:22:52 -07:00
commit 6ba8dc7dcb
3 changed files with 56 additions and 42 deletions

View File

@ -1,31 +1,36 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
'use strict';
let Cc = Components.classes; let Cc = Components.classes;
let Ci = Components.interfaces; let Ci = Components.interfaces;
let Cm = Components.manager; let Cm = Components.manager;
let Cu = Components.utils; let Cu = Components.utils;
Cu.import("resource://gre/modules/Services.jsm"); Cu.import('resource://gre/modules/Services.jsm');
function log(str) { function log(str) {
dump(str + "\n"); dump(str + '\n');
}; }
function startup(aData, aReason) { function startup(aData, aReason) {
let manifestPath = "chrome.manifest"; let manifestPath = 'chrome.manifest';
let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile); let file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile);
try { try {
file.initWithPath(aData.installPath.path); file.initWithPath(aData.installPath.path);
file.append(manifestPath); file.append(manifestPath);
Cm.QueryInterface(Ci.nsIComponentRegistrar).autoRegister(file); Cm.QueryInterface(Ci.nsIComponentRegistrar).autoRegister(file);
} catch(e) { } catch (e) {
log(e); log(e);
} }
}; }
function shutdown(aData, aReason) { function shutdown(aData, aReason) {
}; }
function install(aData, aReason) { function install(aData, aReason) {
let url = "chrome://pdf.js/content/web/viewer.html?file=%s"; let url = 'chrome://pdf.js/content/web/viewer.html?file=%s';
Services.prefs.setCharPref("extensions.pdf.js.url", url); Services.prefs.setCharPref('extensions.pdf.js.url', url);
}; }

View File

@ -1,28 +1,33 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
'use strict';
const Cc = Components.classes; const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
const Cr = Components.results; const Cr = Components.results;
const Cu = Components.utils; const Cu = Components.utils;
const PDF_CONTENT_TYPE = "application/pdf"; const PDF_CONTENT_TYPE = 'application/pdf';
Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import("resource://gre/modules/Services.jsm"); Cu.import('resource://gre/modules/Services.jsm');
// TODO // TODO
// Add some download progress event // Add some download progress event
function log(aMsg) { function log(aMsg) {
let msg = "pdfContentHandler.js: " + (aMsg.join ? aMsg.join("") : aMsg); let msg = 'pdfContentHandler.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService) Cc['@mozilla.org/consoleservice;1'].getService(Ci.nsIConsoleService)
.logStringMessage(msg); .logStringMessage(msg);
dump(msg + "\n"); dump(msg + '\n');
}; }
function loadDocument(aWindow, aDocumentUrl) { function loadDocument(aWindow, aDocumentUrl) {
let xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"] let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
.createInstance(Ci.nsIXMLHttpRequest); .createInstance(Ci.nsIXMLHttpRequest);
xhr.open("GET", aDocumentUrl); xhr.open('GET', aDocumentUrl);
xhr.mozResponseType = xhr.responseType = "arraybuffer"; xhr.mozResponseType = xhr.responseType = 'arraybuffer';
xhr.onreadystatechange = function() { xhr.onreadystatechange = function() {
if (xhr.readyState == 4 && xhr.status == 200) { if (xhr.readyState == 4 && xhr.status == 200) {
let data = (xhr.mozResponseArrayBuffer || xhr.mozResponse || let data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
@ -37,16 +42,16 @@ function loadDocument(aWindow, aDocumentUrl) {
var view2 = new window.Uint8Array(arrayBuffer); var view2 = new window.Uint8Array(arrayBuffer);
view2.set(view); view2.set(view);
let evt = window.document.createEvent("CustomEvent"); let evt = window.document.createEvent('CustomEvent');
evt.initCustomEvent("pdfloaded", false, false, arrayBuffer); evt.initCustomEvent('pdfloaded', false, false, arrayBuffer);
window.document.dispatchEvent(evt); window.document.dispatchEvent(evt);
} catch(e) { } catch (e) {
log("Error - " + e); log('Error - ' + e);
} }
} }
}; };
xhr.send(null); xhr.send(null);
}; }
let WebProgressListener = { let WebProgressListener = {
init: function(aWindow, aUrl) { init: function(aWindow, aUrl) {
@ -64,11 +69,12 @@ let WebProgressListener = {
.getInterface(Ci.nsIWebProgress); .getInterface(Ci.nsIWebProgress);
try { try {
webProgress.removeProgressListener(this); webProgress.removeProgressListener(this);
} catch(e) {} } catch (e) {}
webProgress.addProgressListener(this, flags); webProgress.addProgressListener(this, flags);
}, },
onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) { onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags,
aStatus) {
const complete = Ci.nsIWebProgressListener.STATE_IS_WINDOW + const complete = Ci.nsIWebProgressListener.STATE_IS_WINDOW +
Ci.nsIWebProgressListener.STATE_STOP; Ci.nsIWebProgressListener.STATE_STOP;
if ((aStateFlags & complete) == complete && this._locationHasChanged) { if ((aStateFlags & complete) == complete && this._locationHasChanged) {
@ -77,14 +83,17 @@ let WebProgressListener = {
} }
}, },
onProgressChange: function onProgressChange(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) { onProgressChange: function onProgressChange(aWebProgress, aRequest, aCurSelf,
aMaxSelf, aCurTotal, aMaxTotal) {
}, },
onLocationChange: function onLocationChange(aWebProgress, aRequest, aLocationURI) { onLocationChange: function onLocationChange(aWebProgress, aRequest,
aLocationURI) {
this._locationHasChanged = true; this._locationHasChanged = true;
}, },
onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus, aMessage) { onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus,
aMessage) {
}, },
onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) { onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
@ -127,16 +136,16 @@ pdfContentHandler.prototype = {
WebProgressListener.init(window, uri.spec); WebProgressListener.init(window, uri.spec);
try { try {
let url = Services.prefs.getCharPref("extensions.pdf.js.url"); let url = Services.prefs.getCharPref('extensions.pdf.js.url');
url = url.replace("%s", uri.spec); url = url.replace('%s', uri.spec);
window.location = url; window.location = url;
} catch(e) { } catch (e) {
log("Error - " + e); log('Error - ' + e);
} }
}, },
classID: Components.ID("{2278dfd0-b75c-11e0-8257-1ba3d93c9f1a}"), classID: Components.ID('{2278dfd0-b75c-11e0-8257-1ba3d93c9f1a}'),
QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler]), QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler])
}; };
var NSGetFactory = XPCOMUtils.generateNSGetFactory([pdfContentHandler]); var NSGetFactory = XPCOMUtils.generateNSGetFactory([pdfContentHandler]);

2
pdf.js
View File

@ -3844,7 +3844,7 @@ var PDFDoc = (function pdfDoc() {
} }
} }
function init(stream){ function init(stream) {
assertWellFormed(stream.length > 0, 'stream must have data'); assertWellFormed(stream.length > 0, 'stream must have data');
this.stream = stream; this.stream = stream;
this.setup(); this.setup();