[Pkg-mozext-commits] [tabmixplus] 03/34: Move overly files and related JavaScript files to overly folder

David Prévot taffit at moszumanska.debian.org
Mon Jun 27 13:57:55 UTC 2016


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

taffit pushed a commit to branch master
in repository tabmixplus.

commit 8d4f5173e6a5e6c9ab0f4585681049d7bab769ea
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri May 27 21:32:47 2016 +0300

    Move overly files and related JavaScript files to overly folder
---
 chrome.manifest                                      | 6 +++---
 chrome/content/{minit => overlay}/autoReload.js      | 0
 chrome/content/{minit => overlay}/autoReload.xul     | 6 +++---
 chrome/content/{links => overlay}/newTab.js          | 2 +-
 chrome/content/{links => overlay}/newTab.xul         | 2 +-
 chrome/content/{links => overlay}/removeBlankTab.js  | 0
 chrome/content/{links => overlay}/removeBlankTab.xul | 2 +-
 chrome/content/{minit => overlay}/renameTab.xul      | 0
 modules/AutoReload.jsm                               | 2 +-
 modules/ContentClick.jsm                             | 5 ++++-
 modules/RenameTab.jsm                                | 2 +-
 11 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 9f8a3ae..ed20842 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -49,9 +49,9 @@ overlay   chrome://browser/content/preferences/tabs.xul             chrome://tab
 style     chrome://browser/content/preferences/preferences.xul      chrome://tabmixplus/content/preferences/overlay/preferences.css
 
 overlay   chrome://mozapps/content/extensions/extensions.xul        chrome://tabmixplus/content/links/links.xul
-overlay   about:newtab                                              chrome://tabmixplus/content/links/newTab.xul appversion<42.0
-overlay   chrome://mozapps/content/downloads/unknownContentType.xul chrome://tabmixplus/content/links/removeBlankTab.xul
-overlay   chrome://mozapps/content/handling/dialog.xul              chrome://tabmixplus/content/links/removeBlankTab.xul
+overlay   about:newtab                                              chrome://tabmixplus/content/overlay/newTab.xul appversion<42.0
+overlay   chrome://mozapps/content/downloads/unknownContentType.xul chrome://tabmixplus/content/overlay/removeBlankTab.xul
+overlay   chrome://mozapps/content/handling/dialog.xul              chrome://tabmixplus/content/overlay/removeBlankTab.xul
 
 overlay   chrome://browser/content/bookmarks/bookmarksPanel.xul     chrome://tabmixplus/content/places/places.xul
 overlay   chrome://browser/content/history/history-panel.xul        chrome://tabmixplus/content/places/places.xul
diff --git a/chrome/content/minit/autoReload.js b/chrome/content/overlay/autoReload.js
similarity index 100%
rename from chrome/content/minit/autoReload.js
rename to chrome/content/overlay/autoReload.js
diff --git a/chrome/content/minit/autoReload.xul b/chrome/content/overlay/autoReload.xul
similarity index 98%
rename from chrome/content/minit/autoReload.xul
rename to chrome/content/overlay/autoReload.xul
index 1c00f70..ebecbec 100644
--- a/chrome/content/minit/autoReload.xul
+++ b/chrome/content/overlay/autoReload.xul
@@ -15,8 +15,8 @@
         ondialogaccept="accept();"
         onload="load();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript" src="chrome://tabmixplus/content/minit/autoReload.js"/>
+
+  <script type="application/javascript" src="chrome://tabmixplus/content/overlay/autoReload.js"/>
 
   <groupbox orient="horizontal" align="center">
     <caption label="&reloadtime.label1;" />
@@ -37,7 +37,7 @@
 
     <menulist id="autoreload_seconds" editable="true"
              oncommand="disable_OK();"
-             oninput="onInput(this);">
+             oninput="onInput(this);">
              <menupopup>
                   <menuitem value="0" label="0" />
                   <menuitem value="10" label="10" />
diff --git a/chrome/content/links/newTab.js b/chrome/content/overlay/newTab.js
similarity index 91%
rename from chrome/content/links/newTab.js
rename to chrome/content/overlay/newTab.js
index 8768971..c971f6e 100644
--- a/chrome/content/links/newTab.js
+++ b/chrome/content/overlay/newTab.js
@@ -1,4 +1,4 @@
-/* globals gGrid, Cu*/
+/* globals gGrid, Cu, Services */
 "use strict";
 
 // This file is in use for all versions before Firefox 42.0
diff --git a/chrome/content/links/newTab.xul b/chrome/content/overlay/newTab.xul
similarity index 88%
rename from chrome/content/links/newTab.xul
rename to chrome/content/overlay/newTab.xul
index 00c51bc..e5a1c0a 100644
--- a/chrome/content/links/newTab.xul
+++ b/chrome/content/overlay/newTab.xul
@@ -4,6 +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" src="chrome://tabmixplus/content/links/newTab.js"/>
+  <script type="application/javascript" src="chrome://tabmixplus/content/overlay/newTab.js"/>
 
 </overlay>
diff --git a/chrome/content/links/removeBlankTab.js b/chrome/content/overlay/removeBlankTab.js
similarity index 100%
rename from chrome/content/links/removeBlankTab.js
rename to chrome/content/overlay/removeBlankTab.js
diff --git a/chrome/content/links/removeBlankTab.xul b/chrome/content/overlay/removeBlankTab.xul
similarity index 82%
rename from chrome/content/links/removeBlankTab.xul
rename to chrome/content/overlay/removeBlankTab.xul
index 0cf4ff2..ca8e7c5 100644
--- a/chrome/content/links/removeBlankTab.xul
+++ b/chrome/content/overlay/removeBlankTab.xul
@@ -3,6 +3,6 @@
 <overlay id="tabmixplus-removeBlankTab-overlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="chrome://tabmixplus/content/links/removeBlankTab.js"/>
+  <script type="application/javascript" src="chrome://tabmixplus/content/overlay/removeBlankTab.js"/>
 
 </overlay>
diff --git a/chrome/content/minit/renameTab.xul b/chrome/content/overlay/renameTab.xul
similarity index 100%
rename from chrome/content/minit/renameTab.xul
rename to chrome/content/overlay/renameTab.xul
diff --git a/modules/AutoReload.jsm b/modules/AutoReload.jsm
index 79e7f16..d444572 100644
--- a/modules/AutoReload.jsm
+++ b/modules/AutoReload.jsm
@@ -140,7 +140,7 @@ this.AutoReload = {
       aTab = this._currentTab(aTab);
     let result = {ok: false};
     var win = aTab.ownerDocument.defaultView;
-    win.openDialog('chrome://tabmixplus/content/minit/autoReload.xul', '_blank', 'chrome,modal,centerscreen', result);
+    win.openDialog('chrome://tabmixplus/content/overlay/autoReload.xul', '_blank', 'chrome,modal,centerscreen', result);
     if (result.ok) {
       aTab.autoReloadTime = TabmixSvc.prefBranch.getIntPref("reload_time");
       this._enable(aTab);
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index ab434bc..72069ee 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -127,8 +127,11 @@ ContentClickInternal = {
       window.openLinkIn(json.href, where, params);
 
       try {
-        if (!PrivateBrowsingUtils.isWindowPrivate(window))
+        if (!PrivateBrowsingUtils.isWindowPrivate(window)) {
+          // this function is bound to ContentClick that import PlacesUIUtils
+          // eslint-disable-next-line no-undef
           PlacesUIUtils.markPageAsFollowedLink(json.href);
+        }
       } catch (ex) {
         /* Skip invalid URIs. */
       }
diff --git a/modules/RenameTab.jsm b/modules/RenameTab.jsm
index 5bdffcd..053fe2a 100644
--- a/modules/RenameTab.jsm
+++ b/modules/RenameTab.jsm
@@ -60,7 +60,7 @@ this.RenameTab = {
     popup.id = "tabmixRenametab_panel";
     this._element("mainPopupSet").appendChild(popup);
     this.window.document.loadOverlay(
-      "chrome://tabmixplus/content/minit/renameTab.xul", this
+      "chrome://tabmixplus/content/overlay/renameTab.xul", this
     );
   },
 

-- 
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