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

Add search keyword-history completion (try typing a keyword), better JS completion, better errors in :so, check "preload" before preloading history/bookmarks, Object/Function highlighting, some other bug fixes.

Browse Source
This commit is contained in:
Kris Maglione
2008-10-08 02:56:11 +00:00
parent 02c1d2fbdf
commit 10376ecb77
12 changed files with 168 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
content/buffer.js
View File

@@ -35,7 +35,7 @@ liberator.Buffer = function () //{{{
/////////////////////////////////////////////////////////////////////////////{{{
const highlightClasses = ["Boolean", "ErrorMsg", "Filter", "Function", "InfoMsg", "Keyword",
"LineNr", "ModeMsg", "MoreMsg", "Normal", "Null", "Number", "Question",
"LineNr", "ModeMsg", "MoreMsg", "Normal", "Null", "Number", "Object", "Question",
"StatusLine", "StatusLineBroken", "StatusLineSecure", "String", "Tag",
"Title", "URL", "WarningMsg",
["Hint", ".liberator-hint", "*"],
@@ -84,18 +84,18 @@ liberator.Buffer = function () //{{{
{
let sheets = system ? systemSheets : userSheets;
if (!force)
{
let errors = checkSyntax(css);
if (errors.length)
return errors.map(function (e) "CSS: " + filter + ": " + e).join("\n");
}
if (sheets.some(function (s) s[0] == filter && s[1] == css))
return null;
filter = filter.split(",");
try
{
this.registerSheet(cssUri(wrapCSS(filter, css)), !force);
}
catch (e)
{
return e.echoerr || e;
}
sheets.push([filter, css]);
this.registerSheet(cssUri(wrapCSS(filter, css)));
return null;
}
@@ -136,8 +136,10 @@ liberator.Buffer = function () //{{{
return matches.length;
}
this.registerSheet = function (uri)
this.registerSheet = function (uri, doCheckSyntax)
{
if (doCheckSyntax)
checkSyntax(uri);
uri = ios.newURI(uri, null, null);
if (!sss.sheetRegistered(uri, sss.USER_SHEET))
sss.loadAndRegisterSheet(uri, sss.USER_SHEET);
@@ -166,9 +168,8 @@ liberator.Buffer = function () //{{{
let queryinterface = XPCOMUtils.generateQI([Components.interfaces.nsIConsoleListener]);
/* What happens if more than one thread tries to use this? */
let testDoc = document.implementation.createDocument(XHTML, "doc", null);
function checkSyntax(css)
function checkSyntax(uri)
{
let uri = cssUri(namespace + css);
let errors = [];
let listener = {
QueryInterface: queryinterface,
@@ -178,7 +179,7 @@ liberator.Buffer = function () //{{{
{
message = message.QueryInterface(Components.interfaces.nsIScriptError);
if (message.sourceName == uri)
errors.push(message.errorMessage);
errors.push(message);
}
catch (e) {}
}
@@ -212,7 +213,14 @@ liberator.Buffer = function () //{{{
{
consoleService.unregisterListener(listener);
}
return errors;
if (errors.length)
{
let err = new Error("", errors[0].sourceName.replace(/^(data:text\/css,).*/, "$1..."), errors[0].lineNumber);
err.name = "CSSError"
err.message = errors.reduce(function (msg, e) msg + "; " + e.lineNumber + ": " + e.errorMessage, errors.shift().errorMessage);
err.echoerr = err.fileName + ":" + err.lineNumber + ": " + err.message;
throw err;
}
}
}
Styles.prototype = {