mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge commit '920df48d1d' into 3.0

Browse source
This commit is contained in:
Simon Kornblith 2012-11-12 00:09:23 -05:00
commit f6c3f58bc2
3 changed files with 1339 additions and 1398 deletions
Download patch file Download diff file Expand all files Collapse all files

1193
chrome/content/zotero/webpagedump/common.js
View file

File diff suppressed because it is too large Load diff

1539
chrome/content/zotero/webpagedump/domsaver.js
View file

File diff suppressed because it is too large Load diff

5
components/zotero-protocol-handler.js
View file

@ -819,6 +819,11 @@ function ChromeExtensionHandler() {
var fileURI = ph.newFileURI(file); var fileURI = ph.newFileURI(file);
} }
var channel = ioService.newChannelFromURI(fileURI); var channel = ioService.newChannelFromURI(fileURI);
//set originalURI so that it seems like we're serving from zotero:// protocol
//this is necessary to allow url() links to work from within css files
//otherwise they try to link to files on the file:// protocol, which is not allowed
channel.originalURI = uri;
return channel; return channel;
} }
catch (e) { catch (e) {