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

whitespace fixes

Browse Source
This commit is contained in:
Doug Kearns
2008-09-01 09:22:47 +00:00
parent 1fe5b5c8b3
commit 6ea8b75298
15 changed files with 90 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
content/addressbook.js
View File

@@ -33,9 +33,9 @@ liberator.Addressbook = function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
const abManager = Components.classes["@mozilla.org/abmanager;1"] const abManager = Components.classes["@mozilla.org/abmanager;1"]
.getService(Components.interfaces.nsIAbManager); .getService(Components.interfaces.nsIAbManager);
const rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"] const rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
.getService(Components.interfaces.nsIRDFService); .getService(Components.interfaces.nsIRDFService);
const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab"; const kPersonalAddressbookURI = "moz-abmdbdirectory://abook.mab";
@@ -146,7 +146,7 @@ liberator.Addressbook = function () //{{{
{ {
var directory = getDirectoryFromURI(kPersonalAddressbookURI); var directory = getDirectoryFromURI(kPersonalAddressbookURI);
var card = Components.classes["@mozilla.org/addressbook/cardproperty;1"] var card = Components.classes["@mozilla.org/addressbook/cardproperty;1"]
.createInstance(Components.interfaces.nsIAbCard); .createInstance(Components.interfaces.nsIAbCard);
if (!address || !directory || !card) if (!address || !directory || !card)
return false; return false;

12
content/bookmarks.js
View File

@@ -34,15 +34,15 @@ liberator.Bookmarks = function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
const historyService = Components.classes["@mozilla.org/browser/nav-history-service;1"] const historyService = Components.classes["@mozilla.org/browser/nav-history-service;1"]
.getService(Components.interfaces.nsINavHistoryService); .getService(Components.interfaces.nsINavHistoryService);
const bookmarksService = Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"] const bookmarksService = Components.classes["@mozilla.org/browser/nav-bookmarks-service;1"]
.getService(Components.interfaces.nsINavBookmarksService); .getService(Components.interfaces.nsINavBookmarksService);
const taggingService = Components.classes["@mozilla.org/browser/tagging-service;1"] const taggingService = Components.classes["@mozilla.org/browser/tagging-service;1"]
.getService(Components.interfaces.nsITaggingService); .getService(Components.interfaces.nsITaggingService);
const searchService = Components.classes["@mozilla.org/browser/search-service;1"] const searchService = Components.classes["@mozilla.org/browser/search-service;1"]
.getService(Components.interfaces.nsIBrowserSearchService); .getService(Components.interfaces.nsIBrowserSearchService);
const ioService = Components.classes["@mozilla.org/network/io-service;1"] const ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService); .getService(Components.interfaces.nsIIOService);
var bookmarks = null; var bookmarks = null;
var keywords = null; var keywords = null;
@@ -484,7 +484,7 @@ liberator.History = function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
const historyService = Components.classes["@mozilla.org/browser/nav-history-service;1"] const historyService = Components.classes["@mozilla.org/browser/nav-history-service;1"]
.getService(Components.interfaces.nsINavHistoryService); .getService(Components.interfaces.nsINavHistoryService);
var history = []; var history = [];
var cachedHistory = []; // add pages here after loading the initial Places history var cachedHistory = []; // add pages here after loading the initial Places history

6
content/buffer.js
View File

@@ -1139,7 +1139,8 @@ liberator.Buffer = function () //{{{
// get file size // get file size
const nsICacheService = Components.interfaces.nsICacheService; const nsICacheService = Components.interfaces.nsICacheService;
const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ; const ACCESS_READ = Components.interfaces.nsICache.ACCESS_READ;
const cacheService = Components.classes["@mozilla.org/network/cache-service;1"].getService(nsICacheService); const cacheService = Components.classes["@mozilla.org/network/cache-service;1"]
.getService(nsICacheService);
var httpCacheSession = cacheService.createSession("HTTP", 0, true); var httpCacheSession = cacheService.createSession("HTTP", 0, true);
var ftpCacheSession = cacheService.createSession("FTP", 0, true); var ftpCacheSession = cacheService.createSession("FTP", 0, true);
httpCacheSession.doomEntriesIfExpired = false; httpCacheSession.doomEntriesIfExpired = false;
@@ -1342,7 +1343,8 @@ liberator.Buffer = function () //{{{
{ {
// TODO: make that a helper function // TODO: make that a helper function
// TODO: save return value in v:shell_error // TODO: save return value in v:shell_error
var newThread = Components.classes["@mozilla.org/thread-manager;1"].getService().newThread(0); var newThread = Components.classes["@mozilla.org/thread-manager;1"]
.getService().newThread(0);
var editor = liberator.options["editor"]; var editor = liberator.options["editor"];
var args = liberator.commands.parseArgs(editor, [], "*", true).arguments; var args = liberator.commands.parseArgs(editor, [], "*", true).arguments;
if (args.length < 1) if (args.length < 1)

8
content/completion.js
View File

@@ -357,7 +357,7 @@ liberator.Completion = function () //{{{
var engineList = (engineAliases || liberator.options["suggestengines"]).split(","); var engineList = (engineAliases || liberator.options["suggestengines"]).split(",");
var responseType = "application/x-suggestions+json"; var responseType = "application/x-suggestions+json";
var ss = Components.classes["@mozilla.org/browser/search-service;1"] var ss = Components.classes["@mozilla.org/browser/search-service;1"]
.getService(Components.interfaces.nsIBrowserSearchService); .getService(Components.interfaces.nsIBrowserSearchService);
var completions = []; var completions = [];
engineList.forEach (function (name) engineList.forEach (function (name)
@@ -380,7 +380,7 @@ liberator.Completion = function () //{{{
xhr.send(null); xhr.send(null);
var json = Components.classes["@mozilla.org/dom/json;1"] var json = Components.classes["@mozilla.org/dom/json;1"]
.createInstance(Components.interfaces.nsIJSON); .createInstance(Components.interfaces.nsIJSON);
var results = json.decode(xhr.responseText)[1]; var results = json.decode(xhr.responseText)[1];
if (!results) if (!results)
return [0, []]; return [0, []];
@@ -454,8 +454,8 @@ liberator.Completion = function () //{{{
completions = completions.concat(this.searchEngineSuggest(filter, suggestEngineAlias)[1]); completions = completions.concat(this.searchEngineSuggest(filter, suggestEngineAlias)[1]);
else if (autoCompletions && cpt[i] == "l") // add completions like Firefox's smart location bar else if (autoCompletions && cpt[i] == "l") // add completions like Firefox's smart location bar
{ {
var completionService = Components.classes["@mozilla.org/browser/global-history;2"]. var completionService = Components.classes["@mozilla.org/browser/global-history;2"]
getService(Components.interfaces.nsIAutoCompleteSearch); .getService(Components.interfaces.nsIAutoCompleteSearch);
completionService.startSearch(filter, "", urlResultsCache, { completionService.startSearch(filter, "", urlResultsCache, {
onSearchResult: function (search, result) { onSearchResult: function (search, result) {
//if (result.searchResult != result.RESULT_SUCCESS) //if (result.searchResult != result.RESULT_SUCCESS)

3
content/editor.js
View File

@@ -836,7 +836,8 @@ liberator.Editor = function () //{{{
textBox.style.backgroundColor = "#bbbbbb"; textBox.style.backgroundColor = "#bbbbbb";
} }
var newThread = Components.classes["@mozilla.org/thread-manager;1"].getService().newThread(0); var newThread = Components.classes["@mozilla.org/thread-manager;1"]
.getService().newThread(0);
// TODO: save return value in v:shell_error // TODO: save return value in v:shell_error
liberator.callFunctionInThread(newThread, liberator.io.run, [prog, args, true]); liberator.callFunctionInThread(newThread, liberator.io.run, [prog, args, true]);

6
content/events.js
View File

@@ -489,8 +489,8 @@ liberator.Events = function () //{{{
function waitForPageLoaded() function waitForPageLoaded()
{ {
dump("start waiting in loaded state: " + liberator.buffer.loaded + "\n"); dump("start waiting in loaded state: " + liberator.buffer.loaded + "\n");
var mainThread = Components.classes["@mozilla.org/thread-manager;1"]. var mainThread = Components.classes["@mozilla.org/thread-manager;1"]
getService(Components.interfaces.nsIThreadManager).mainThread; .getService(Components.interfaces.nsIThreadManager).mainThread;
while (mainThread.hasPendingEvents()) // clear queue while (mainThread.hasPendingEvents()) // clear queue
mainThread.processNextEvent(true); mainThread.processNextEvent(true);
@@ -1487,7 +1487,7 @@ liberator.Events = function () //{{{
register: function () register: function ()
{ {
var prefService = Components.classes["@mozilla.org/preferences-service;1"] var prefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService); .getService(Components.interfaces.nsIPrefService);
this._branch = prefService.getBranch(""); // better way to monitor all changes? this._branch = prefService.getBranch(""); // better way to monitor all changes?
this._branch.QueryInterface(Components.interfaces.nsIPrefBranch2); this._branch.QueryInterface(Components.interfaces.nsIPrefBranch2);
this._branch.addObserver("", this, false); this._branch.addObserver("", this, false);

3
content/hints.js
View File

@@ -655,7 +655,8 @@ liberator.Hints = function () //{{{
generate(); generate();
// get all keys from the input queue // get all keys from the input queue
var mt = Components.classes["@mozilla.org/thread-manager;1"].getService().mainThread; var mt = Components.classes["@mozilla.org/thread-manager;1"]
.getService().mainThread;
while (mt.hasPendingEvents()) while (mt.hasPendingEvents())
mt.processNextEvent(true); mt.processNextEvent(true);

33
content/io.js
View File

@@ -34,7 +34,7 @@ liberator.IO = function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
var environmentService = Components.classes["@mozilla.org/process/environment;1"] var environmentService = Components.classes["@mozilla.org/process/environment;1"]
.getService(Components.interfaces.nsIEnvironment); .getService(Components.interfaces.nsIEnvironment);
const WINDOWS = navigator.platform == "Win32"; const WINDOWS = navigator.platform == "Win32";
var cwd = null, oldcwd = null; var cwd = null, oldcwd = null;
@@ -321,8 +321,8 @@ liberator.IO = function () //{{{
getCurrentDirectory: function () getCurrentDirectory: function ()
{ {
var file = Components.classes["@mozilla.org/file/local;1"]. var file = Components.classes["@mozilla.org/file/local;1"]
createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
var dirs = [cwd, "$PWD", "~"]; var dirs = [cwd, "$PWD", "~"];
for (var i = 0; i < dirs.length; i++) for (var i = 0; i < dirs.length; i++)
@@ -407,8 +407,8 @@ liberator.IO = function () //{{{
// also expands relative paths // also expands relative paths
getFile: function (path) getFile: function (path)
{ {
var file = Components.classes["@mozilla.org/file/local;1"]. var file = Components.classes["@mozilla.org/file/local;1"]
createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
// convert relative to absolute pathname // convert relative to absolute pathname
path = ioManager.expandPath(path); path = ioManager.expandPath(path);
@@ -425,8 +425,8 @@ liberator.IO = function () //{{{
// returns a nsILocalFile or null if it could not be created // returns a nsILocalFile or null if it could not be created
createTempFile: function () createTempFile: function ()
{ {
var file = Components.classes["@mozilla.org/file/local;1"]. var file = Components.classes["@mozilla.org/file/local;1"]
createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
var tmpname = liberator.config.name.toLowerCase() + ".tmp"; var tmpname = liberator.config.name.toLowerCase() + ".tmp";
if (liberator.config.name == "Muttator") if (liberator.config.name == "Muttator")
@@ -479,9 +479,9 @@ liberator.IO = function () //{{{
readFile: function (file) readFile: function (file)
{ {
var ifstream = Components.classes["@mozilla.org/network/file-input-stream;1"] var ifstream = Components.classes["@mozilla.org/network/file-input-stream;1"]
.createInstance(Components.interfaces.nsIFileInputStream); .createInstance(Components.interfaces.nsIFileInputStream);
var icstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"] var icstream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
.createInstance(Components.interfaces.nsIConverterInputStream); .createInstance(Components.interfaces.nsIConverterInputStream);
var charset = "UTF-8"; var charset = "UTF-8";
if (typeof file == "string") if (typeof file == "string")
@@ -510,9 +510,9 @@ liberator.IO = function () //{{{
writeFile: function (file, buf, mode, perms) writeFile: function (file, buf, mode, perms)
{ {
var ofstream = Components.classes["@mozilla.org/network/file-output-stream;1"] var ofstream = Components.classes["@mozilla.org/network/file-output-stream;1"]
.createInstance(Components.interfaces.nsIFileOutputStream); .createInstance(Components.interfaces.nsIFileOutputStream);
var ocstream = Components.classes["@mozilla.org/intl/converter-output-stream;1"] var ocstream = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
.createInstance(Components.interfaces.nsIConverterOutputStream); .createInstance(Components.interfaces.nsIConverterOutputStream);
var charset = "UTF-8"; // Can be any character encoding name that Mozilla supports var charset = "UTF-8"; // Can be any character encoding name that Mozilla supports
if (typeof file == "string") if (typeof file == "string")
@@ -538,8 +538,8 @@ liberator.IO = function () //{{{
run: function (program, args, blocking) run: function (program, args, blocking)
{ {
var file = Components.classes["@mozilla.org/file/local;1"]. var file = Components.classes["@mozilla.org/file/local;1"]
createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
if (!args) if (!args)
args = []; args = [];
@@ -588,8 +588,8 @@ lookup:
return -1; return -1;
} }
var process = Components.classes["@mozilla.org/process/util;1"]. var process = Components.classes["@mozilla.org/process/util;1"]
createInstance(Components.interfaces.nsIProcess); .createInstance(Components.interfaces.nsIProcess);
process.init(file); process.init(file);
process.run(blocking, args, args.length); process.run(blocking, args, args.length);
@@ -648,12 +648,14 @@ lookup:
try try
{ {
var file = ioManager.getFile(filename); var file = ioManager.getFile(filename);
if (!file.exists()) if (!file.exists())
{ {
if (!silent) if (!silent)
liberator.echoerr("E484: Can't open file " + filename); liberator.echoerr("E484: Can't open file " + filename);
return false; return false;
} }
var str = ioManager.readFile(filename); var str = ioManager.readFile(filename);
// handle pure javascript files specially // handle pure javascript files specially
@@ -665,6 +667,7 @@ lookup:
{ {
var heredoc = ""; var heredoc = "";
var heredocEnd = null; // the string which ends the heredoc var heredocEnd = null; // the string which ends the heredoc
str.split("\n").forEach(function (line) str.split("\n").forEach(function (line)
{ {
if (heredocEnd) // we already are in a heredoc if (heredocEnd) // we already are in a heredoc

31
content/liberator.js
View File

@@ -583,8 +583,8 @@ const liberator = (function () //{{{
} }
else else
{ {
var soundService = Components.classes["@mozilla.org/sound;1"]. var soundService = Components.classes["@mozilla.org/sound;1"]
getService(Components.interfaces.nsISound); .getService(Components.interfaces.nsISound);
soundService.beep(); soundService.beep();
} }
return false; // so you can do: if (...) return liberator.beep(); return false; // so you can do: if (...) return liberator.beep();
@@ -632,8 +632,8 @@ const liberator = (function () //{{{
// if clearFocusedElement, also blur a focused link // if clearFocusedElement, also blur a focused link
focusContent: function (clearFocusedElement) focusContent: function (clearFocusedElement)
{ {
var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]. var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
getService(Components.interfaces.nsIWindowWatcher); .getService(Components.interfaces.nsIWindowWatcher);
if (window == ww.activeWindow && document.commandDispatcher.focusedElement && clearFocusedElement) if (window == ww.activeWindow && document.commandDispatcher.focusedElement && clearFocusedElement)
document.commandDispatcher.focusedElement.blur(); document.commandDispatcher.focusedElement.blur();
@@ -811,8 +811,8 @@ const liberator = (function () //{{{
if (typeof msg == "object") if (typeof msg == "object")
msg = liberator.util.objectToString(msg, false); msg = liberator.util.objectToString(msg, false);
var consoleService = Components.classes["@mozilla.org/consoleservice;1"]. var consoleService = Components.classes["@mozilla.org/consoleservice;1"]
getService(Components.interfaces.nsIConsoleService); .getService(Components.interfaces.nsIConsoleService);
consoleService.logStringMessage("vimperator: " + msg); consoleService.logStringMessage("vimperator: " + msg);
}, },
@@ -865,7 +865,7 @@ const liberator = (function () //{{{
case liberator.NEW_WINDOW: case liberator.NEW_WINDOW:
window.open(); window.open();
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator); .getService(Components.interfaces.nsIWindowMediator);
whichwindow = wm.getMostRecentWindow("navigator:browser"); whichwindow = wm.getMostRecentWindow("navigator:browser");
whichwindow.loadURI(url, null, postdata); whichwindow.loadURI(url, null, postdata);
break; break;
@@ -913,9 +913,9 @@ const liberator = (function () //{{{
// notify all windows that an application quit has been requested. // notify all windows that an application quit has been requested.
var os = Components.classes["@mozilla.org/observer-service;1"] var os = Components.classes["@mozilla.org/observer-service;1"]
.getService(Components.interfaces.nsIObserverService); .getService(Components.interfaces.nsIObserverService);
var cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"] var cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"]
.createInstance(Components.interfaces.nsISupportsPRBool); .createInstance(Components.interfaces.nsISupportsPRBool);
os.notifyObservers(cancelQuit, "quit-application-requested", null); os.notifyObservers(cancelQuit, "quit-application-requested", null);
// something aborted the quit process. // something aborted the quit process.
@@ -927,7 +927,7 @@ const liberator = (function () //{{{
// enumerate all windows and call shutdown handlers // enumerate all windows and call shutdown handlers
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator); .getService(Components.interfaces.nsIWindowMediator);
var windows = wm.getEnumerator(null); var windows = wm.getEnumerator(null);
while (windows.hasMoreElements()) while (windows.hasMoreElements())
{ {
@@ -935,8 +935,9 @@ const liberator = (function () //{{{
if (("tryToClose" in win) && !win.tryToClose()) if (("tryToClose" in win) && !win.tryToClose())
return; return;
} }
Components.classes["@mozilla.org/toolkit/app-startup;1"].getService(nsIAppStartup) Components.classes["@mozilla.org/toolkit/app-startup;1"]
.quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit); .getService(nsIAppStartup)
.quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
}, },
@@ -1056,8 +1057,8 @@ const liberator = (function () //{{{
sleep: function (ms) sleep: function (ms)
{ {
var threadManager = Components.classes["@mozilla.org/thread-manager;1"]. var threadManager = Components.classes["@mozilla.org/thread-manager;1"]
getService(Components.interfaces.nsIThreadManager); .getService(Components.interfaces.nsIThreadManager);
var mainThread = threadManager.mainThread; var mainThread = threadManager.mainThread;
var then = new Date().getTime(), now = then; var then = new Date().getTime(), now = then;
@@ -1069,7 +1070,7 @@ const liberator = (function () //{{{
get windows() get windows()
{ {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator); .getService(Components.interfaces.nsIWindowMediator);
var wa = []; var wa = [];
var enumerator = wm.getEnumerator("navigator:browser"); var enumerator = wm.getEnumerator("navigator:browser");
while (enumerator.hasMoreElements()) while (enumerator.hasMoreElements())

8
content/mail.js
View File

@@ -84,7 +84,7 @@ liberator.Mail = function () //{{{
}; };
var mailSession = Components.classes[mailSessionContractID] var mailSession = Components.classes[mailSessionContractID]
.getService(Components.interfaces.nsIMsgMailSession); .getService(Components.interfaces.nsIMsgMailSession);
var nsIFolderListener = Components.interfaces.nsIFolderListener; var nsIFolderListener = Components.interfaces.nsIFolderListener;
var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event; var notifyFlags = nsIFolderListener.intPropertyChanged | nsIFolderListener.event;
mailSession.AddFolderListener(folderListener, notifyFlags); mailSession.AddFolderListener(folderListener, notifyFlags);
@@ -756,9 +756,9 @@ liberator.Mail = function () //{{{
composeNewMail: function (args) composeNewMail: function (args)
{ {
var params = Components.classes["@mozilla.org/messengercompose/composeparams;1"] var params = Components.classes["@mozilla.org/messengercompose/composeparams;1"]
.createInstance(Components.interfaces.nsIMsgComposeParams); .createInstance(Components.interfaces.nsIMsgComposeParams);
params.composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"] params.composeFields = Components.classes["@mozilla.org/messengercompose/composefields;1"]
.createInstance(Components.interfaces.nsIMsgCompFields); .createInstance(Components.interfaces.nsIMsgCompFields);
if (args) if (args)
{ {
@@ -790,7 +790,7 @@ liberator.Mail = function () //{{{
} }
attachment = Components.classes["@mozilla.org/messengercompose/attachment;1"] attachment = Components.classes["@mozilla.org/messengercompose/attachment;1"]
.createInstance(Components.interfaces.nsIMsgAttachment); .createInstance(Components.interfaces.nsIMsgAttachment);
attachment.url = "file://" + file.path; attachment.url = "file://" + file.path;
params.composeFields.addAttachment(attachment); params.composeFields.addAttachment(attachment);
} }

4
content/options.js
View File

@@ -139,7 +139,7 @@ liberator.Options = function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{ /////////////////////////////////////////////////////////////////////////////{{{
var prefService = Components.classes["@mozilla.org/preferences-service;1"] var prefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch); .getService(Components.interfaces.nsIPrefBranch);
var options = []; var options = [];
function storePreference(name, value) function storePreference(name, value)
@@ -630,7 +630,7 @@ liberator.Options = function () //{{{
if (special) // list completions for about:config entries if (special) // list completions for about:config entries
{ {
var prefs = Components.classes["@mozilla.org/preferences-service;1"] var prefs = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch); .getService(Components.interfaces.nsIPrefBranch);
var prefArray = prefs.getChildList("", { value: 0 }); var prefArray = prefs.getChildList("", { value: 0 });
prefArray.sort(); prefArray.sort();

18
content/tabs.js
View File

@@ -96,8 +96,8 @@ liberator.Tabs = function () //{{{
function copyTab(to, from) function copyTab(to, from)
{ {
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]. var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
if (!from) if (!from)
from = getBrowser().mTabContainer.selectedItem; from = getBrowser().mTabContainer.selectedItem;
@@ -530,8 +530,8 @@ liberator.Tabs = function () //{{{
if (args) if (args)
{ {
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]. var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
for (var i = 0; i < undoItems.length; i++) for (var i = 0; i < undoItems.length; i++)
{ {
@@ -548,8 +548,8 @@ liberator.Tabs = function () //{{{
completer: function (filter) completer: function (filter)
{ {
// get closed-tabs from nsSessionStore // get closed-tabs from nsSessionStore
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]. var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
var completions = []; var completions = [];
for (var i = 0; i < undoItems.length; i++) for (var i = 0; i < undoItems.length; i++)
@@ -578,8 +578,8 @@ liberator.Tabs = function () //{{{
return; return;
} }
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]. var ss = Components.classes["@mozilla.org/browser/sessionstore;1"]
getService(Components.interfaces.nsISessionStore); .getService(Components.interfaces.nsISessionStore);
var undoItems = eval("(" + ss.getClosedTabData(window) + ")"); var undoItems = eval("(" + ss.getClosedTabData(window) + ")");
for (var i = 0; i < undoItems.length; i++) for (var i = 0; i < undoItems.length; i++)
undoCloseTab(); // doesn't work with i as the index to undoCloseTab undoCloseTab(); // doesn't work with i as the index to undoCloseTab
@@ -922,7 +922,7 @@ liberator.Tabs = function () //{{{
window.open(); window.open();
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator); .getService(Components.interfaces.nsIWindowMediator);
var win = wm.getMostRecentWindow("navigator:browser"); var win = wm.getMostRecentWindow("navigator:browser");
copyTab(win.getBrowser().mCurrentTab, tab); copyTab(win.getBrowser().mCurrentTab, tab);

6
content/ui.js
View File

@@ -306,7 +306,7 @@ liberator.CommandLine = function () //{{{
validator: function (value) validator: function (value)
{ {
var ss = Components.classes["@mozilla.org/browser/search-service;1"] var ss = Components.classes["@mozilla.org/browser/search-service;1"]
.getService(Components.interfaces.nsIBrowserSearchService); .getService(Components.interfaces.nsIBrowserSearchService);
return value.split(",").every(function (item) return value.split(",").every(function (item)
{ {
var e = ss.getEngineByAlias(item); var e = ss.getEngineByAlias(item);
@@ -481,8 +481,8 @@ liberator.CommandLine = function () //{{{
{ {
// if we are modifing the GUI while we are not in the main thread // if we are modifing the GUI while we are not in the main thread
// Firefox will hang up // Firefox will hang up
var threadManager = Components.classes["@mozilla.org/thread-manager;1"]. var threadManager = Components.classes["@mozilla.org/thread-manager;1"]
getService(Components.interfaces.nsIThreadManager); .getService(Components.interfaces.nsIThreadManager);
if (!threadManager.isMainThread) if (!threadManager.isMainThread)
return false; return false;

8
content/util.js
View File

@@ -82,7 +82,7 @@ liberator.util = { //{{{
copyToClipboard: function (str, verbose) copyToClipboard: function (str, verbose)
{ {
var clipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"] var clipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"]
.getService(Components.interfaces.nsIClipboardHelper); .getService(Components.interfaces.nsIClipboardHelper);
clipboardHelper.copyString(str); clipboardHelper.copyString(str);
if (verbose) if (verbose)
@@ -252,8 +252,10 @@ liberator.util = { //{{{
var url; var url;
try try
{ {
var clipboard = Components.classes['@mozilla.org/widget/clipboard;1'].getService(Components.interfaces.nsIClipboard); var clipboard = Components.classes['@mozilla.org/widget/clipboard;1']
var trans = Components.classes['@mozilla.org/widget/transferable;1'].createInstance(Components.interfaces.nsITransferable); .getService(Components.interfaces.nsIClipboard);
var trans = Components.classes['@mozilla.org/widget/transferable;1']
.createInstance(Components.interfaces.nsITransferable);
trans.addDataFlavor("text/unicode"); trans.addDataFlavor("text/unicode");
if (clipboard.supportsSelectionClipboard()) if (clipboard.supportsSelectionClipboard())
clipboard.getData(trans, clipboard.kSelectionClipboard); clipboard.getData(trans, clipboard.kSelectionClipboard);

8
content/vimperator.js
View File

@@ -371,8 +371,8 @@ liberator.config = { //{{{
{ {
setter: function (value) setter: function (value)
{ {
var ioService = Components.classes['@mozilla.org/network/io-service;1']. var ioService = Components.classes['@mozilla.org/network/io-service;1']
getService(Components.interfaces.nsIIOService2); .getService(Components.interfaces.nsIIOService2);
ioService.offline = !value; ioService.offline = !value;
gPrefService.setBoolPref("browser.offline", ioService.offline); gPrefService.setBoolPref("browser.offline", ioService.offline);
@@ -380,8 +380,8 @@ liberator.config = { //{{{
getter: function () getter: function ()
{ {
return Components.classes['@mozilla.org/network/io-service;1']. return Components.classes['@mozilla.org/network/io-service;1']
getService(Components.interfaces.nsIIOService2).offline; .getService(Components.interfaces.nsIIOService2).offline;
} }
}); });