[Pkg-mozext-commits] [requestpolicy] 25/280: [refactoring] move xul files to subfolder

[David Prévot]

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit 5c44b0482ae842b768cf0409d4dd24a3684ee9c7
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Nov 25 06:10:25 2014 +0100

    [refactoring] move xul files to subfolder
---
 Makefile                                   | 2 +-
 src/chrome.manifest                        | 6 +++---
 src/content/{ => ui}/classicmenu.js        | 0
 src/content/{ => ui}/menu.js               | 0
 src/content/{ => ui}/overlay.js            | 2 +-
 src/content/{ => ui}/overlay.xul           | 2 +-
 src/content/{ => ui}/requestLog.js         | 0
 src/content/{ => ui}/requestLog.xul        | 0
 src/content/{ => ui}/requestLogTreeView.js | 0
 9 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index b272098..58e1301 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ source_files := $(shell find $(source_dirname) -type f -regex ".*\.jsm?") \
 		$(source_dirname)/README \
 		$(wildcard $(source_dirname)/content/settings/*.css) \
 		$(wildcard $(source_dirname)/content/settings/*.html) \
-		$(wildcard $(source_dirname)/content/*.xul) \
+		$(wildcard $(source_dirname)/content/ui/*.xul) \
 		$(wildcard $(source_dirname)/locale/*/*.dtd) \
 		$(wildcard $(source_dirname)/locale/*/*.properties) \
 		$(wildcard $(source_dirname)/skin/*.css) \
diff --git a/src/chrome.manifest b/src/chrome.manifest
index d44e6aa..94beb84 100644
--- a/src/chrome.manifest
+++ b/src/chrome.manifest
@@ -24,11 +24,11 @@ locale     requestpolicy    zh-TW          locale/zh-TW/
 style      chrome://global/content/customizeToolbar.xul            chrome://requestpolicy/skin/requestpolicy.css
 
 # Firefox
-overlay    chrome://browser/content/browser.xul                    chrome://requestpolicy/content/overlay.xul
+overlay    chrome://browser/content/browser.xul                    chrome://requestpolicy/content/ui/overlay.xul
 # Seamonkey
-overlay    chrome://navigator/content/navigatorOverlay.xul         chrome://requestpolicy/content/overlay.xul
+overlay    chrome://navigator/content/navigatorOverlay.xul         chrome://requestpolicy/content/ui/overlay.xul
 # Songbird
-overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul    chrome://requestpolicy/content/overlay.xul
+overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul    chrome://requestpolicy/content/ui/overlay.xul
 
 # Gecko 2 requires component and category registration via chrome.manifest.
 component {14027e96-1afb-4066-8846-e6c89b5faf3b} components/requestpolicyService.js
diff --git a/src/content/classicmenu.js b/src/content/ui/classicmenu.js
similarity index 100%
rename from src/content/classicmenu.js
rename to src/content/ui/classicmenu.js
diff --git a/src/content/menu.js b/src/content/ui/menu.js
similarity index 100%
rename from src/content/menu.js
rename to src/content/ui/menu.js
diff --git a/src/content/overlay.js b/src/content/ui/overlay.js
similarity index 99%
rename from src/content/overlay.js
rename to src/content/ui/overlay.js
index e9e8252..143a26e 100644
--- a/src/content/overlay.js
+++ b/src/content/ui/overlay.js
@@ -1718,7 +1718,7 @@ requestpolicy.overlay = {
 
     if (requestLog.hidden) {
       requestLogFrame.setAttribute("src",
-          "chrome://requestpolicy/content/requestLog.xul");
+          "chrome://requestpolicy/content/ui/requestLog.xul");
       requestLog.hidden = requestLogSplitter.hidden = closeRequestLog.hidden = false;
       //openRequestLog.hidden = true;
     } else {
diff --git a/src/content/overlay.xul b/src/content/ui/overlay.xul
similarity index 99%
rename from src/content/overlay.xul
rename to src/content/ui/overlay.xul
index 47ebac8..2f709c6 100644
--- a/src/content/overlay.xul
+++ b/src/content/ui/overlay.xul
@@ -148,7 +148,7 @@
           <toolbarbutton id="requestpolicy-requestLog-close" align="right" oncommand="requestpolicy.overlay.toggleRequestLog()"/>
         </toolbar>
       </toolbox>
-      <!-- The src of this iframe is set to chrome://requestpolicy/content/requestLog.xul in overlay.js -->
+      <!-- The src of this iframe is set to chrome://requestpolicy/content/ui/requestLog.xul in overlay.js -->
       <iframe id="requestpolicy-requestLog-frame" type="chrome" flex="1"/>
     </vbox>
   </vbox>
diff --git a/src/content/requestLog.js b/src/content/ui/requestLog.js
similarity index 100%
rename from src/content/requestLog.js
rename to src/content/ui/requestLog.js
diff --git a/src/content/requestLog.xul b/src/content/ui/requestLog.xul
similarity index 100%
rename from src/content/requestLog.xul
rename to src/content/ui/requestLog.xul
diff --git a/src/content/requestLogTreeView.js b/src/content/ui/requestLogTreeView.js
similarity index 100%
rename from src/content/requestLogTreeView.js
rename to src/content/ui/requestLogTreeView.js

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