gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 06:38:12 +01:00
Code Issues Projects Releases Wiki Activity

undo createFixedURI for now as PlacesUIUtils is firefox only and the IO module is a general liberator thing

Browse Source
This commit is contained in:
Martin Stubenschrott
2008-10-11 16:38:11 +00:00
parent b32728d34a
commit e07b6b8966
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
content/io.js
View File

@@ -758,7 +758,8 @@ lookup:
} }
liberator.echomsg("sourcing \"" + filename + "\"", 2); liberator.echomsg("sourcing \"" + filename + "\"", 2);
let uri = PlacesUIUtils.createFixedURI(file.path).spec
let str = ioManager.readFile(file);
// handle pure javascript files specially // handle pure javascript files specially
if (/\.js$/.test(filename)) if (/\.js$/.test(filename))
@@ -767,7 +768,7 @@ lookup:
.getService(Components.interfaces.mozIJSSubScriptLoader); .getService(Components.interfaces.mozIJSSubScriptLoader);
try try
{ {
loader.loadSubScript(uri, liberator) loader.loadSubScript("file://" + file.path, liberator)
} }
catch (e) catch (e)
{ {
@@ -777,11 +778,10 @@ lookup:
} }
else if (/\.css$/.test(filename)) else if (/\.css$/.test(filename))
{ {
liberator.storage.styles.registerSheet(uri, !silent, true); liberator.storage.styles.registerSheet("file://" + file.path, !silent, true);
} }
else else
{ {
let str = ioManager.readFile(file);
let heredoc = ""; let heredoc = "";
let heredocEnd = null; // the string which ends the heredoc let heredocEnd = null; // the string which ends the heredoc
let lines = str.split("\n"); let lines = str.split("\n");

2
content/muttator.xul
View File

@@ -28,7 +28,7 @@ the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL. the terms of any one of the MPL, the GPL or the LGPL.
}}} ***** END LICENSE BLOCK ***** --> }}} ***** END LICENSE BLOCK ***** -->
<!--?xml-stylesheet href="chrome://browser/skin/" type="text/css"?--> <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<overlay id="muttator" <overlay id="muttator"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"