mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-02-18 12:25:46 +01:00
Merge branch 'master' into vimperator-2.1
Conflicts: common/content/io.js
This commit is contained in:
@@ -135,9 +135,9 @@ Highlights.prototype.CSS = <![CDATA[
|
||||
*/
|
||||
function Highlights(name, store, serial)
|
||||
{
|
||||
var self = this;
|
||||
var highlight = {};
|
||||
var styles = storage.styles;
|
||||
let self = this;
|
||||
let highlight = {};
|
||||
let styles = storage.styles;
|
||||
|
||||
const Highlight = Struct("class", "selector", "filter", "default", "value");
|
||||
Highlight.defaultValue("filter", function () "chrome://liberator/content/buffer.xhtml" + "," + config.styleableChrome);
|
||||
@@ -248,8 +248,8 @@ function Styles(name, store, serial)
|
||||
const util = modules.util;
|
||||
const sleep = liberator.sleep;
|
||||
const storage = modules.storage;
|
||||
const consoleService = service["console"];
|
||||
const ios = service["io"];
|
||||
const consoleService = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService);
|
||||
const ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);
|
||||
const sss = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Ci.nsIStyleSheetService);
|
||||
const namespace = '@namespace html "' + XHTML + '";\n' +
|
||||
'@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";\n' +
|
||||
|
||||
Reference in New Issue
Block a user