Revert "Merge pull request #1711 from erikvold/1098690"

This reverts commit 763e551, reversing changes made to e0d7f42.
mozilla · Nov 21, 2014 · be781bf · be781bf
1 parent 763e551
commit be781bf
Show file tree

Hide file tree

Showing 51 changed files with 406 additions and 441 deletions.
diff --git a/lib/dev/utils.js b/lib/dev/utils.js
@@ -8,7 +8,7 @@ const { Cu } = require("chrome");
 const { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 
-const { getActiveTab } = require("../sdk/tab/utils");
+const { getActiveTab } = require("../sdk/tabs/utils");
 const { getMostRecentBrowserWindow } = require("../sdk/window/utils");
 
 const targetFor = target => {

diff --git a/lib/sdk/content/sandbox.js b/lib/sdk/content/sandbox.js
@@ -17,7 +17,7 @@ const timer = require('../timers');
 const { URL } = require('../url');
 const { sandbox, evaluate, load } = require('../loader/sandbox');
 const { merge } = require('../util/object');
-const { getTabForContentWindow } = require('../tab/utils');
+const { getTabForContentWindow } = require('../tabs/utils');
 const { getInnerId } = require('../window/utils');
 const { PlainTextConsole } = require('../console/plain-text');
 const { data } = require('../self');

diff --git a/lib/sdk/content/worker-parent.js b/lib/sdk/content/worker-parent.js
@@ -15,7 +15,7 @@ const { getInnerId } = require('../window/utils');
 const { EventTarget } = require('../event/target');
 const { when, ensure } = require('../system/unload');
 const { getTabForWindow } = require('../tabs/helpers');
-const { getTabForContentWindow, getBrowserForTab } = require('../tab/utils');
+const { getTabForContentWindow, getBrowserForTab } = require('../tabs/utils');
 const { isPrivate } = require('../private-browsing/utils');
 const { getFrameElement } = require('../window/utils');
 const { attach, detach, destroy } = require('./utils');

diff --git a/lib/sdk/deprecated/traits-worker.js b/lib/sdk/deprecated/traits-worker.js
@@ -28,7 +28,7 @@ const { sandbox, evaluate, load } = require("../loader/sandbox");
 const { merge } = require('../util/object');
 const { getInnerId } = require("../window/utils");
 const { getTabForWindow } = require('../tabs/helpers');
-const { getTabForContentWindow } = require('../tab/utils');
+const { getTabForContentWindow } = require('../tabs/utils');
 
 /* Trick the linker in order to ensure shipping these files in the XPI.
   require('../content/content-worker.js');

diff --git a/lib/sdk/deprecated/unit-test.js b/lib/sdk/deprecated/unit-test.js
@@ -10,7 +10,7 @@ module.metadata = {
 const memory = require("./memory");
 const timer = require("../timers");
 const cfxArgs = require("../test/options");
-const { getTabs, closeTab, getURI } = require("../tab/utils");
+const { getTabs, closeTab, getURI } = require("../tabs/utils");
 const { windows, isBrowser, getMostRecentBrowserWindow } = require("../window/utils");
 const { defer, all, Debugging: PromiseDebugging, resolve } = require("../core/promise");
 const { getInnerId } = require("../window/utils");

diff --git a/lib/sdk/loader/sandbox.js b/lib/sdk/loader/sandbox.js
@@ -12,7 +12,7 @@ const systemPrincipal = CC('@mozilla.org/systemprincipal;1', 'nsIPrincipal')();
 const scriptLoader = Cc['@mozilla.org/moz/jssubscript-loader;1'].
                      getService(Ci.mozIJSSubScriptLoader);
 const self = require('sdk/self');
-const { getTabId, getTabForContentWindow } = require('../tab/utils');
+const { getTabId, getTabForContentWindow } = require('../tabs/utils');
 const { getInnerId } = require('../window/utils');
 
 const { devtools } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});

diff --git a/lib/sdk/page-mod.js b/lib/sdk/page-mod.js
@@ -23,7 +23,7 @@ const { merge } = require('./util/object');
 const { windowIterator } = require('./deprecated/window-utils');
 const { isBrowser, getFrames } = require('./window/utils');
 const { getTabs, getTabContentWindow, getTabForContentWindow,
-        getURI: getTabURI } = require('./tab/utils');
+        getURI: getTabURI } = require('./tabs/utils');
 const { ignoreWindow } = require('./private-browsing/utils');
 const { Style } = require("./stylesheet/style");
 const { attach, detach } = require("./content/mod");
@@ -216,7 +216,7 @@ function createWorker (mod, window) {
     // page-mod's "attach" event needs a worker
     if (event === 'attach')
       emit(mod, event, worker)
-    else
+    else 
       emit(mod, event, ...args);
   })
   once(worker, 'detach', () => worker.destroy());

diff --git a/lib/sdk/preferences/utils.js b/lib/sdk/preferences/utils.js
@@ -7,7 +7,7 @@ module.metadata = {
   "stability": "unstable"
 };
 
-const { openTab, getBrowserForTab, getTabId } = require("sdk/tab/utils");
+const { openTab, getBrowserForTab, getTabId } = require("sdk/tabs/utils");
 const { defer, all } = require("sdk/core/promise");
 const { on, off } = require("sdk/system/events");
 const { setTimeout } = require("sdk/timers");

diff --git a/lib/sdk/selection.js b/lib/sdk/selection.js
@@ -21,7 +21,7 @@ const { Ci, Cc } = require("chrome"),
     { when: unload } = require("./system/unload"),
     { ignoreWindow } = require('./private-browsing/utils'),
     { getTabs, getTabContentWindow, getTabForContentWindow,
-      getAllTabContentWindows } = require('./tab/utils'),
+      getAllTabContentWindows } = require('./tabs/utils'),
     winUtils = require("./window/utils"),
     events = require("./system/events");