[1.10] Move external editors logic under "firebug/firefox" folder. Th…

…is folder should be all about XUL and overlays. The "firebug/editor" folder should be all about Firebug inline editors. http://code.google.com/p/fbug/source/detail?r=12762
firebug · Jan 25, 2012 · 800e7c5 · 800e7c5
1 parent 14e44da
commit 800e7c5
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 9 deletions.
diff --git a/extension/chrome.manifest b/extension/chrome.manifest
@@ -48,7 +48,7 @@ locale  firebug zh-TW       locale/zh-TW/
 
 #overlay chrome://browser/content/browser.xul                   chrome://firebug/content/browserOverlay.xul
 #overlay chrome://browser/content/browser.xul                    chrome://firebug/content/firefox/browserOverlayWithFrame.xul
-#overlay chrome://browser/content/browser.xul                    chrome://firebug/content/editor/external/editorsBrowserOverlay.xul
+#overlay chrome://browser/content/browser.xul                    chrome://firebug/content/firefox/external-editors/editorsBrowserOverlay.xul
 
 #overlay chrome://global/content/customizeToolbar.xul            chrome://firebug/content/firefox/start-button/customizeToolbarOverlay.xul
 #overlay chrome://mozapps/content/extensions/about.xul           chrome://firebug/content/firefox/aboutOverlay.xul

diff --git a/...t/firebug/editor/external/changeeditor.js → .../firefox/external-editors/changeeditor.js b/...t/firebug/editor/external/changeeditor.js → .../firefox/external-editors/changeeditor.js
diff --git a/.../firebug/editor/external/changeeditor.xul → ...firefox/external-editors/changeeditor.xul b/.../firebug/editor/external/changeeditor.xul → ...firefox/external-editors/changeeditor.xul
@@ -14,7 +14,8 @@
         class="fbInternational">
 
     <script type="application/x-javascript" src="chrome://firebug/content/trace.js"/>
-    <script type="application/x-javascript" src="chrome://firebug/content/editor/external/changeeditor.js"/>
+    <script type="application/x-javascript"
+        src="chrome://firebug/content/firefox/external-editors/changeeditor.js"/>
 
     <vbox flex="1">
         <hbox align="center">

diff --git a/...ug/editor/external/editorToContextMenu.js → ...x/external-editors/editorToContextMenu.js b/...ug/editor/external/editorToContextMenu.js → ...x/external-editors/editorToContextMenu.js
diff --git a/...ontent/firebug/editor/external/editors.js → ...rebug/firefox/external-editors/editors.js b/...ontent/firebug/editor/external/editors.js → ...rebug/firefox/external-editors/editors.js
@@ -104,7 +104,10 @@ var gEditorManager =
             item: item,
             FBL: this._FBL
         };
-        openDialog("chrome://firebug/content/editor/external/changeeditor.xul",  "_blank", "modal,centerscreen,resizable", args, result);
+
+        openDialog("chrome://firebug/content/firefox/external-editors/changeeditor.xul",
+            "_blank", "modal,centerscreen,resizable", args, result);
+
         if (result.saveChanges)
         {
             item.id = item.label.replace(/\W/g, "_");
@@ -167,7 +170,10 @@ var gEditorManager =
             FBL: this._FBL
         };
         var result = {};
-        openDialog("chrome://firebug/content/editor/external/changeeditor.xul",  "_blank", "modal,centerscreen", args, result);
+
+        openDialog("chrome://firebug/content/firefox/external-editors/changeeditor.xul",
+            "_blank", "modal,centerscreen", args, result);
+
         if (result.saveChanges)
         {
             this._saveItem(item);

diff --git a/...ntent/firebug/editor/external/editors.xul → ...ebug/firefox/external-editors/editors.xul b/...ntent/firebug/editor/external/editors.xul → ...ebug/firefox/external-editors/editors.xul
@@ -14,7 +14,8 @@
         persist="screenX screenY width height">
 
     <script type="application/x-javascript" src="chrome://firebug/content/xpcom.js"/>
-    <script type="application/x-javascript" src="chrome://firebug/content/editor/external/editors.js"/>
+    <script type="application/x-javascript"
+        src="chrome://firebug/content/firefox/external-editors/editors.js"/>
 
     <vbox flex="1" class="contentPane">
         <label id="actionsIntro" control="editorsList"

diff --git a/...editor/external/editorsBrowserOverlay.xul → ...xternal-editors/editorsBrowserOverlay.xul b/...editor/external/editorsBrowserOverlay.xul → ...xternal-editors/editorsBrowserOverlay.xul
diff --git a/...irebug/editor/external/editorsOverlay.xul → ...refox/external-editors/editorsOverlay.xul b/...irebug/editor/external/editorsOverlay.xul → ...refox/external-editors/editorsOverlay.xul
@@ -3,7 +3,8 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script type="application/x-javascript" src="chrome://firebug/content/editor/external/editorToContextMenu.js"/>
+    <script type="application/x-javascript"
+        src="chrome://firebug/content/firefox/external-editors/editorToContextMenu.js"/>
 
     <!-- Basic editing related commands -->
     <commandset id="mainCommandSet">

diff --git a/...irebug/editor/external/externalEditors.js → ...refox/external-editors/externalEditors.js b/...irebug/editor/external/externalEditors.js → ...refox/external-editors/externalEditors.js
@@ -183,7 +183,7 @@ Firebug.ExternalEditors = Obj.extend(Firebug.Module,
         };
 
         Firefox.openWindow("Firebug:ExternalEditors",
-            "chrome://firebug/content/editor/external/editors.xul",
+            "chrome://firebug/content/firefox/external-editors/editors.xul",
             "", args);
     },
 

diff --git a/extension/content/firebug/firefox/firebugMenuOverlay.xul b/extension/content/firebug/firefox/firebugMenuOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- See license.txt for terms of usage -->
 
-<?xul-overlay href="chrome://firebug/content/editor/external/editorsOverlay.xul"?>
+<?xul-overlay href="chrome://firebug/content/firefox/external-editors/editorsOverlay.xul"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:html="http://www.w3.org/1999/xhtml">

diff --git a/extension/content/firebug/moduleConfig.js b/extension/content/firebug/moduleConfig.js
@@ -40,7 +40,7 @@ Firebug.getModuleLoaderConfig = function(baseConfig)
         "firebug/js/sourceFile",
         "firebug/chrome/shortcuts",
         "firebug/firefox/start-button/startButtonOverlay",
-        "firebug/editor/external/externalEditors",
+        "firebug/firefox/external-editors/externalEditors",
         "firebug/firefox/firebugMenu",
         "firebug/chrome/panelActivation",
         "firebug/console/memoryProfiler",