mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-21 21:17:58 +01:00
Undo certain parts from the unfortunate "service" commit, to unbreak Muttator. @Kris: Please try not to
commit unconnected things at once, as it's much harder to revert such commits :( I'll have to revert the service -> Cc/Ci manually now, as I got lots of conflicts in reverting, and if i didn't, i wouldn't want to undo the other parts of that commit (like VIMPERATOR_RUNTIME or the added comments)
This commit is contained in:
@@ -67,6 +67,7 @@ function IO() //{{{
|
||||
const EXTENSION_NAME = config.name.toLowerCase(); // "vimperator" or "muttator"
|
||||
|
||||
const downloadManager = Cc["@mozilla.org/download-manager;1"].createInstance(Ci.nsIDownloadManager);
|
||||
const ioService = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
|
||||
|
||||
var processDir = service["directory"].get("CurWorkD", Ci.nsIFile);
|
||||
var cwd = processDir;
|
||||
@@ -777,7 +778,7 @@ lookup:
|
||||
liberator.echomsg("sourcing " + filename.quote(), 2);
|
||||
|
||||
let str = ioManager.readFile(file);
|
||||
let uri = service["io"].newFileURI(file);
|
||||
let uri = ioService.newFileURI(file);
|
||||
|
||||
// handle pure javascript files specially
|
||||
if (/\.js$/.test(filename))
|
||||
|
||||
Reference in New Issue
Block a user