[Pkg-mozext-commits] [tabmixplus] 14/47: AMO validation results warning: Please store complex scripts in .js files rather than inline script nodes
David Prévot
taffit at moszumanska.debian.org
Fri Sep 26 20:57:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch upstream
in repository tabmixplus.
commit ab1af87c5857f7dc1f947e38fdd6e6df19038fb5
Author: onemen <tabmix.onemen at gmail.com>
Date: Fri Sep 19 14:13:21 2014 +0300
AMO validation results warning: Please store complex scripts in .js files rather than inline script nodes
---
chrome/content/about.js | 19 +++++++++++++
chrome/content/about.xul | 26 +-----------------
chrome/content/links/newTab.js | 35 ++++++++++++++++++++++++
chrome/content/links/newTab.xul | 36 +------------------------
chrome/content/minit/autoReload.js | 45 +++++++++++++++++++++++++++++++
chrome/content/minit/autoReload.xul | 53 ++-----------------------------------
6 files changed, 103 insertions(+), 111 deletions(-)
diff --git a/chrome/content/about.js b/chrome/content/about.js
new file mode 100644
index 0000000..02c3e59
--- /dev/null
+++ b/chrome/content/about.js
@@ -0,0 +1,19 @@
+"use strict";
+
+function init() {
+ var addon = window.arguments[0];
+ var extensionsStrings = document.getElementById("extensionsStrings");
+ document.title = extensionsStrings.getFormattedString("aboutWindowTitle", ["Tab Mix Plus"]);
+ try {
+ var currentVersion = addon.version;
+ var extensionVersion = document.getElementById("extensionVersion");
+ extensionVersion.value = extensionsStrings.getFormattedString("aboutWindowVersionString", [currentVersion]);
+ } catch(ex) {
+ extensionVersion.hidden = true;
+ }
+ var acceptButton = document.documentElement.getButton("accept");
+ acceptButton.label = extensionsStrings.getString("aboutWindowCloseButton");
+ var descriptionString = document.getElementById("descriptionString");
+ var extensionDescription = document.getElementById("extensionDescription");
+ extensionDescription.value = addon.description;
+}
diff --git a/chrome/content/about.xul b/chrome/content/about.xul
index 0ce0296..3174770 100644
--- a/chrome/content/about.xul
+++ b/chrome/content/about.xul
@@ -15,32 +15,8 @@
onload="init();">
<script type="application/javascript" src="chrome://tabmixplus/content/utils.js"/>
+ <script type="application/javascript" src="chrome://tabmixplus/content/about.js"/>
<script type="application/javascript" src="chrome://tabmixplus/content/links/userInterface.js"/>
- <script type="application/javascript">
- <![CDATA[
- function init() {
- var addon = window.arguments[0];
- updateLabels(addon)
- }
-
- function updateLabels(extensions) {
- var extensionsStrings = document.getElementById("extensionsStrings");
- document.title = extensionsStrings.getFormattedString("aboutWindowTitle", ["Tab Mix Plus"]);
- try {
- var currentVersion = extensions.version;
- var extensionVersion = document.getElementById("extensionVersion");
- extensionVersion.value = extensionsStrings.getFormattedString("aboutWindowVersionString", [currentVersion]);
- } catch(er) {
- extensionVersion.hidden = true;
- }
- var acceptButton = document.documentElement.getButton("accept");
- acceptButton.label = extensionsStrings.getString("aboutWindowCloseButton");
- var descriptionString = document.getElementById("descriptionString");
- var extensionDescription = document.getElementById("extensionDescription");
- extensionDescription.value = extensions.description;
- }
- ]]>
- </script>
<stringbundleset id="aboutSet">
<stringbundle id="extensionsStrings" src="chrome://mozapps/locale/extensions/extensions.properties"/>
diff --git a/chrome/content/links/newTab.js b/chrome/content/links/newTab.js
new file mode 100644
index 0000000..7b34232
--- /dev/null
+++ b/chrome/content/links/newTab.js
@@ -0,0 +1,35 @@
+"use strict";
+
+(function Tabmix_newTab() {
+ function updateTitle() {
+ if (!gGrid.cells)
+ return;
+ let win = Tabmix.getTopWin();
+ if (win)
+ win.TMP_Places._titlefrombookmark = Tabmix.prefs.getBoolPref("titlefrombookmark");
+ gGrid.cells.forEach(function (cell) {
+ let site = cell.site;
+ if (!site)
+ return;
+ let url = site.url;
+ let title = site.title || url;
+ title = win.TMP_Places.getTitleFromBookmark(url, title);
+ let tooltip = (title == url ? title : title + "\n" + url);
+ let link = site._querySelector(".newtab-link");
+ link.setAttribute("title", tooltip);
+ site._querySelector(".newtab-title").textContent = title;
+ });
+ }
+
+ let win = Tabmix.getTopWin()
+ if (win && win.Tabmix && win.Tabmix.initialization.onWindowOpen.initialized) {
+ Services.prefs.addObserver("extensions.tabmix.titlefrombookmark", updateTitle, false);
+ window.addEventListener("unload", function TMP_removeObserver(aEvent) {
+ aEvent.currentTarget.removeEventListener("unload", TMP_removeObserver, false);
+ Services.prefs.removeObserver("extensions.tabmix.titlefrombookmark", updateTitle);
+ }, false);
+ if (Tabmix.prefs.getBoolPref("titlefrombookmark"))
+ updateTitle();
+ }
+
+})()
diff --git a/chrome/content/links/newTab.xul b/chrome/content/links/newTab.xul
index 856f878..00c51bc 100644
--- a/chrome/content/links/newTab.xul
+++ b/chrome/content/links/newTab.xul
@@ -4,40 +4,6 @@
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">
- <![CDATA[
- function updateTitle() {
- if (!gGrid.cells)
- return;
- let win = Tabmix.getTopWin();
- if (win)
- win.TMP_Places._titlefrombookmark = Tabmix.prefs.getBoolPref("titlefrombookmark");
- gGrid.cells.forEach(function (cell) {
- let site = cell.site;
- if (!site)
- return;
- let url = site.url;
- let title = site.title || url;
- title = win.TMP_Places.getTitleFromBookmark(url, title);
- let tooltip = (title == url ? title : title + "\n" + url);
- let link = site._querySelector(".newtab-link");
- link.setAttribute("title", tooltip);
- site._querySelector(".newtab-title").textContent = title;
- });
- }
-
- let win = Tabmix.getTopWin()
- if (win && win.Tabmix && win.Tabmix.initialization.onWindowOpen.initialized) {
- Services.prefs.addObserver("extensions.tabmix.titlefrombookmark", updateTitle, false);
- window.addEventListener("unload", function TMP_removeObserver(aEvent) {
- aEvent.currentTarget.removeEventListener("unload", TMP_removeObserver, false);
- Services.prefs.removeObserver("extensions.tabmix.titlefrombookmark", updateTitle);
- }, false);
- if (Tabmix.prefs.getBoolPref("titlefrombookmark"))
- updateTitle();
- }
- ]]>
- </script>
+ <script type="application/javascript" src="chrome://tabmixplus/content/links/newTab.js"/>
</overlay>
diff --git a/chrome/content/minit/autoReload.js b/chrome/content/minit/autoReload.js
new file mode 100644
index 0000000..9d78ca8
--- /dev/null
+++ b/chrome/content/minit/autoReload.js
@@ -0,0 +1,45 @@
+"use strict";
+
+var gPref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+
+function load(){
+ var customReloadTime = gPref.getIntPref("extensions.tabmix.reload_time");
+ document.getElementById("autoreload_minutes").value = Math.floor(customReloadTime / 60);
+ document.getElementById("autoreload_seconds").value = customReloadTime % 60;
+ disable_OK();
+}
+
+function accept() {
+ var customReloadTime = getCustomReloadTime();
+ gPref.setIntPref("extensions.tabmix.reload_time", customReloadTime);
+ var list = gPref.getCharPref("extensions.tabmix.custom_reload_list");
+ list = list ? list.split(",") : [];
+ let defaultList = [30,60,120,300,900,1800];
+ if (list.concat(defaultList).indexOf(customReloadTime) == -1) {
+ list.push(customReloadTime);
+ if (list.length > 6 )
+ list.shift();
+ gPref.setCharPref("extensions.tabmix.custom_reload_list", list.join(","));
+ }
+
+ window.arguments[0].ok = true;
+}
+
+function getCustomReloadTime() {
+ var minutes;
+ if (document.getElementById("autoreload_minutes").value != '')
+ minutes = parseInt(document.getElementById("autoreload_minutes").value);
+ else
+ minutes = 0;
+
+ var seconds;
+ if (document.getElementById("autoreload_seconds").value != '')
+ seconds = parseInt(document.getElementById("autoreload_seconds").value);
+ else
+ seconds = 0;
+ return minutes*60 + seconds;
+}
+
+function disable_OK() {
+ document.documentElement.getButton("accept").disabled = getCustomReloadTime() == 0;
+}
diff --git a/chrome/content/minit/autoReload.xul b/chrome/content/minit/autoReload.xul
index 06b8c10..a0f6fd1 100644
--- a/chrome/content/minit/autoReload.xul
+++ b/chrome/content/minit/autoReload.xul
@@ -15,57 +15,8 @@
ondialogaccept="accept();"
onload="load();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script type="application/javascript"><![CDATA[
-var gPref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-
-function load(){
- var customReloadTime = gPref.getIntPref("extensions.tabmix.reload_time");
- document.getElementById("autoreload_minutes").value = Math.floor(customReloadTime / 60);
- document.getElementById("autoreload_seconds").value = customReloadTime % 60;
- disable_OK();
-}
-
-function accept() {
- var customReloadTime = getCustomReloadTime();
- gPref.setIntPref("extensions.tabmix.reload_time", customReloadTime);
- var list = gPref.getCharPref("extensions.tabmix.custom_reload_list");
- list = list ? list.split(",") : [];
- let defaultList = [30,60,120,300,900,1800];
- if (list.concat(defaultList).indexOf(customReloadTime) == -1) {
- list.push(customReloadTime);
- if (list.length > 6 )
- list.shift();
- gPref.setCharPref("extensions.tabmix.custom_reload_list", list.join(","));
- }
-
- window.arguments[0].ok = true;
-}
-
-function getCustomReloadTime() {
- var minutes;
- if(document.getElementById("autoreload_minutes").value != ''){
- minutes = parseInt(document.getElementById("autoreload_minutes").value);
- }
- else{
- minutes = 0;
- }
-
- var seconds;
- if(document.getElementById("autoreload_seconds").value != ''){
- seconds = parseInt(document.getElementById("autoreload_seconds").value);
- }
- else{
- seconds = 0;
- }
- return minutes*60 + seconds;
-}
-
-function disable_OK() {
- document.documentElement.getButton("accept").disabled = getCustomReloadTime() == 0;
-}
-
-]]></script>
+
+ <script type="application/javascript" src="chrome://tabmixplus/content/minit/autoReload.js"/>
<groupbox orient="horizontal" align="center">
<caption label="&reloadtime.label1;" />
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list