From 83778a8e16fc42f12b732b940643199bf78f7601 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 15 Jan 2011 17:56:41 -0500
Subject: [PATCH] Fix some moz-anno: security errors in the Error Console.

---
 common/content/commandline.js | 8 ++++----
 common/skin/dactyl.css        | 7 +++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 6dde07db..80bed94b 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -34,14 +34,14 @@ var CommandWidgets = Class("CommandWidgets", {
                 <vbox id={config.commandContainer}>
 
                     <vbox class="dactyl-container" id="dactyl-multiline-output-container" hidden="false" collapsed="true">
-                        <iframe id="dactyl-multiline-output" src="resource://dactyl-content/buffer.xhtml"
+                        <iframe id="dactyl-multiline-output" src="dactyl://content/buffer.xhtml"
                                 flex="1" hidden="false" collapsed="false"
                                 contextmenu="dactyl-contextmenu"
                                 onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
                     </vbox>
 
                     <vbox class="dactyl-container" hidden="false" collapsed="true">
-                        <iframe class="dactyl-completions" id="dactyl-completions-dactyl-commandline" src="resource://dactyl-content/buffer.xhtml"
+                        <iframe class="dactyl-completions" id="dactyl-completions-dactyl-commandline" src="dactyl://content/buffer.xhtml"
                                 contextmenu="dactyl-contextmenu"
                                 flex="1" hidden="false" collapsed="false"
                                 onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
@@ -75,7 +75,7 @@ var CommandWidgets = Class("CommandWidgets", {
             before: <e4x xmlns={XUL} xmlns:dactyl={NS}>
                 <toolbar id={statusline.statusBar.id}>
                     <vbox id={"dactyl-completions-" + _status + "commandline-container"} class="dactyl-container" hidden="false" collapsed="true">
-                        <iframe class="dactyl-completions" id={"dactyl-completions-" + _status + "commandline"} src="resource://dactyl-content/buffer.xhtml"
+                        <iframe class="dactyl-completions" id={"dactyl-completions-" + _status + "commandline"} src="dactyl://content/buffer.xhtml"
                                 contextmenu="dactyl-contextmenu"
                                 flex="1" hidden="false" collapsed="false"
                                 onclick="dactyl.modules.commandline.onMultilineOutputEvent(event)"/>
@@ -162,7 +162,7 @@ var CommandWidgets = Class("CommandWidgets", {
 
         let fontSize = util.computedStyle(document.documentElement).fontSize;
         styles.registerSheet("resource://dactyl-skin/dactyl.css");
-        styles.system.add("font-size", "resource://dactyl-content/buffer.xhtml",
+        styles.system.add("font-size", "dactyl://content/buffer.xhtml",
                           "body { font-size: " + fontSize + "; }");
     },
     cleanup: function cleanup() {
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index 94296b70..6e611313 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -28,6 +28,7 @@
 
 /* Applied only to completion buffer and MOW */
 @-moz-document
+    url-prefix(dactyl:),
     url-prefix(resource://dactyl) {
 
 *:-moz-loading, *:-moz-broken { display: none !important; }
@@ -75,6 +76,7 @@
 }
 
 @-moz-document
+    url-prefix(dactyl:),
     url-prefix(resource://dactyl) {
 
 *:-moz-any-link:hover {
@@ -84,8 +86,9 @@
 
 /* Applied to completion buffer, MOW, browser window */
 @-moz-document
-    url-prefix(chrome://),
-    url-prefix(resource://) {
+    url-prefix(chrome:),
+    url-prefix(dactyl:),
+    url-prefix(resource:) {
 
 #TabsToolbar .tab-icon-image, .tab-throbber { -moz-box-ordinal-group: 10; }
 [dactyl|highlight~=tab-number]              { -moz-box-ordinal-group: 20; }