mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-01-03 11:54:13 +01:00
Load styles with a chrome security principal. Fix default objects in JS completion. Don't echo during :map <silent>
This commit is contained in:
@@ -73,7 +73,7 @@ function Buffer() //{{{
|
||||
"@namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);\n";
|
||||
const Sheet = new Struct("name", "sites", "css", "ref");
|
||||
|
||||
let cssUri = function (css) "data:text/css," + encodeURI(css);
|
||||
let cssUri = function (css) "chrome-data:text/css," + encodeURI(css);
|
||||
|
||||
let userSheets = [];
|
||||
let systemSheets = [];
|
||||
@@ -259,7 +259,7 @@ function Buffer() //{{{
|
||||
}
|
||||
if (errors.length)
|
||||
{
|
||||
let err = new Error("", errors[0].sourceName.replace(/^(data:text\/css,).*/, "$1..."), errors[0].lineNumber);
|
||||
let err = new Error("", errors[0].sourceName.replace(/^(chrome-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;
|
||||
|
||||
@@ -410,7 +410,7 @@ function Completion() //{{{
|
||||
let end = (frame == -1 ? lastIdx : get(frame + 1)[OFFSET]);
|
||||
|
||||
cacheKey = null;
|
||||
let obj = [liberator, window]; // Default objects;
|
||||
let obj = [modules, window]; // Default objects;
|
||||
/* Is this an object dereference? */
|
||||
if (dot < statement) // No.
|
||||
dot = statement - 1;
|
||||
|
||||
@@ -798,8 +798,11 @@ lookup:
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
e.echoerr = file.path + ":" + e.lineNumber + ": " + e;
|
||||
throw e;
|
||||
let err = new Error();
|
||||
for (let [k, v] in Iterator(e))
|
||||
err[k] = v;
|
||||
err.echoerr = file.path + ":" + e.lineNumber + ": " + e;
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
else if (/\.css$/.test(filename))
|
||||
|
||||
@@ -621,6 +621,8 @@ function CommandLine() //{{{
|
||||
var focused = document.commandDispatcher.focusedElement;
|
||||
if (focused && focused == commandWidget.inputField || focused == multilineInputWidget.inputField)
|
||||
return false;
|
||||
if (silent)
|
||||
return false;
|
||||
|
||||
highlightGroup = highlightGroup || this.HL_NORMAL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user