[Pkg-mozext-commits] [tabmixplus] 59/73: Fix Webstorm inspection errors - Unclosed string literal

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 185f3db67484e689245fb086e63838c5a885a9f3
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Apr 22 17:10:44 2016 +0300

    Fix Webstorm inspection errors - Unclosed string literal
---
 .../content/preferences/overlay/overlaySanitizeUI.js |  4 ++++
 .../preferences/overlay/overlaySanitizeUI.xul        | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/chrome/content/preferences/overlay/overlaySanitizeUI.js b/chrome/content/preferences/overlay/overlaySanitizeUI.js
index c2b8685..5e4fd16 100644
--- a/chrome/content/preferences/overlay/overlaySanitizeUI.js
+++ b/chrome/content/preferences/overlay/overlaySanitizeUI.js
@@ -3,6 +3,10 @@
 Tabmix.setSanitizer = {
   init: function() {
     this.isPromptDialog = typeof window.gSanitizePromptDialog == "object";
+    let dialog = document.getElementById("SanitizeDialog");
+    ["_label", "_accesskey", "_confirm"].forEach(att => {
+      this[att] = dialog.getAttribute("tabmix" + att);
+    });
     this.addSanitizeItem();
     this.addMenuItem();
     if (this.isPromptDialog) {
diff --git a/chrome/content/preferences/overlay/overlaySanitizeUI.xul b/chrome/content/preferences/overlay/overlaySanitizeUI.xul
index 2f87206..e014414 100644
--- a/chrome/content/preferences/overlay/overlaySanitizeUI.xul
+++ b/chrome/content/preferences/overlay/overlaySanitizeUI.xul
@@ -11,18 +11,20 @@
 %tabmixDTD;
 ]>
 
- <overlay id="tabmix-sanitize-ui" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+<overlay id="tabmix-sanitize-ui" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-   <script type="application/javascript" src="chrome://tabmixplus/content/utils.js"/>
-   <script type="application/javascript" src="overlaySanitizeUI.js"/>
-   <script type="application/javascript">
-    Tabmix.setSanitizer._label = "&sanitizer.entry;";
-    Tabmix.setSanitizer._accesskey = "&sanitizer.entry.accesskey;";
-    Tabmix.setSanitizer._confirm = "&sanitizer.entry.confirm;";
+  <script type="application/javascript" src="chrome://tabmixplus/content/utils.js"/>
+  <script type="application/javascript" src="overlaySanitizeUI.js"/>
+  <script type="application/javascript"><![CDATA[
     window.addEventListener("load", function TMP_onLoad_sanitizeOverlay(aEvent) {
       aEvent.currentTarget.removeEventListener("load", TMP_onLoad_sanitizeOverlay, true);
       Tabmix.setSanitizer.init();
     }, true);
-   </script>
+  ]]></script>
 
- </overlay>
+  <prefpane id="SanitizeDialog"
+            tabmix_label="&sanitizer.entry;"
+            tabmix_accesskey="&sanitizer.entry.accesskey;"
+            tabmix_confirm="&sanitizer.entry.confirm;"/>
+
+</overlay>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git