Address review concerns.

This commit is contained in:
Brendan Dahl 2012-01-31 17:53:42 -08:00
parent f46b0474ce
commit 6cf3109329
2 changed files with 7 additions and 7 deletions

View File

@ -252,16 +252,16 @@ extension: | production
@cp -r $(EXTENSION_WEB_FILES) $(FIREFOX_BUILD_CONTENT)/web/ @cp -r $(EXTENSION_WEB_FILES) $(FIREFOX_BUILD_CONTENT)/web/
@rm $(FIREFOX_BUILD_CONTENT)/web/viewer-production.html @rm $(FIREFOX_BUILD_CONTENT)/web/viewer-production.html
# Copy over the firefox extension snippet so we can inline pdf.js in it # 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/ @cp web/viewer-snippet-firefox-extension.html $(FIREFOX_BUILD_CONTENT)/web/
# Modify the viewer so it does all the extension only stuff. # Modify the viewer so it does all the extension only stuff.
cd $(FIREFOX_BUILD_CONTENT)/web; \ @cd $(FIREFOX_BUILD_CONTENT)/web; \
sed -i.bak '/PDFJSSCRIPT_INCLUDE_BUNDLE/ r ../build/pdf.js' viewer-snippet-firefox-extension.html; \ sed -i.bak '/PDFJSSCRIPT_INCLUDE_BUNDLE/ r ../build/pdf.js' viewer-snippet-firefox-extension.html; \
sed -i.bak '/PDFJSSCRIPT_REMOVE/d' viewer.html; \ sed -i.bak '/PDFJSSCRIPT_REMOVE/d' viewer.html; \
sed -i.bak '/PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION/d' viewer.html; \ sed -i.bak '/PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION/d' viewer.html; \
sed -i.bak '/PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION/ r viewer-snippet-firefox-extension.html' viewer.html; \ sed -i.bak '/PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION/ r viewer-snippet-firefox-extension.html' viewer.html; \
rm -f *.bak; rm -f *.bak;
# We don't need pdf.js anymore since its inlined # We don't need pdf.js anymore since its inlined
rm -Rf $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR)/; @rm -Rf $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR)/;
# Update the build version number # Update the build version number
@sed -i.bak "s/PDFJSSCRIPT_BUILD/$(BUILD_NUMBER)/" $(FIREFOX_BUILD_DIR)/install.rdf @sed -i.bak "s/PDFJSSCRIPT_BUILD/$(BUILD_NUMBER)/" $(FIREFOX_BUILD_DIR)/install.rdf
@sed -i.bak "s/PDFJSSCRIPT_BUILD/$(BUILD_NUMBER)/" $(FIREFOX_BUILD_DIR)/update.rdf @sed -i.bak "s/PDFJSSCRIPT_BUILD/$(BUILD_NUMBER)/" $(FIREFOX_BUILD_DIR)/update.rdf

View File

@ -35,7 +35,7 @@ ChromeActions.prototype = {
download: function(data) { download: function(data) {
Services.wm.getMostRecentWindow('navigator:browser').saveURL(data); Services.wm.getMostRecentWindow('navigator:browser').saveURL(data);
}, },
setDatabase: function() { setDatabase: function(data) {
if (this.inPrivateBrowswing) if (this.inPrivateBrowswing)
return; return;
application.prefs.setValue(EXT_PREFIX + '.database', data); application.prefs.setValue(EXT_PREFIX + '.database', data);
@ -51,8 +51,8 @@ ChromeActions.prototype = {
function RequestListener(actions) { function RequestListener(actions) {
this.actions = actions; this.actions = actions;
} }
// Recieves an event and synchronously responds. // Receive an event and synchronously responds.
RequestListener.prototype.recieve = function(event) { RequestListener.prototype.receive = function(event) {
var message = event.target; var message = event.target;
var action = message.getUserData('action'); var action = message.getUserData('action');
var data = message.getUserData('data'); var data = message.getUserData('data');
@ -143,7 +143,7 @@ PdfStreamConverter.prototype = {
gb.removeEventListener('DOMContentLoaded', domListener); gb.removeEventListener('DOMContentLoaded', domListener);
var requestListener = new RequestListener(new ChromeActions()); var requestListener = new RequestListener(new ChromeActions());
win.addEventListener(PDFJS_EVENT_ID, function(event) { win.addEventListener(PDFJS_EVENT_ID, function(event) {
requestListener.recieve(event); requestListener.receive(event);
}, false, true); }, false, true);
} }
}; };