diff --git a/client/aboutdebugging/aboutdebugging.xhtml b/client/aboutdebugging/aboutdebugging.xhtml index 05440ae..24c05fd 100644 --- a/client/aboutdebugging/aboutdebugging.xhtml +++ b/client/aboutdebugging/aboutdebugging.xhtml @@ -12,20 +12,20 @@ &aboutDebugging.title; - + - - - + + +
- +
&aboutDebugging.addons;
- +
&aboutDebugging.workers;
diff --git a/client/aboutdebugging/components/addons.js b/client/aboutdebugging/components/addons.js index 1e37059..e72785b 100644 --- a/client/aboutdebugging/components/addons.js +++ b/client/aboutdebugging/components/addons.js @@ -12,7 +12,7 @@ const { Services } = require("devtools/sham/services"); const { AddonManager } = require("devtools/sham/addonmanager"); -const ExtensionIcon = "/devtools/client/chrome/mozapps/skin/extensions/extensionGeneric.svg"; +const ExtensionIcon = "/client/chrome/mozapps/skin/extensions/extensionGeneric.svg"; const Strings = Services.strings.createBundle( require("l10n/aboutdebugging.properties")); diff --git a/client/aboutdebugging/components/workers.js b/client/aboutdebugging/components/workers.js index 98c2071..d00f9ad 100644 --- a/client/aboutdebugging/components/workers.js +++ b/client/aboutdebugging/components/workers.js @@ -13,7 +13,7 @@ const { Services } = require("devtools/sham/services"); const Strings = Services.strings.createBundle( require("l10n/aboutdebugging.properties")); -const WorkerIcon = "/devtools/client/themes/images/debugging-workers.svg"; +const WorkerIcon = "/client/themes/images/debugging-workers.svg"; exports.WorkersComponent = React.createClass({ displayName: "WorkersComponent", diff --git a/client/canvasdebugger/canvasdebugger.xul b/client/canvasdebugger/canvasdebugger.xul index 6d63596..02b5834 100644 --- a/client/canvasdebugger/canvasdebugger.xul +++ b/client/canvasdebugger/canvasdebugger.xul @@ -3,17 +3,17 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - + + + + %canvasDebuggerDTD; ]> - diff --git a/client/framework/dev-edition-promo/dev-edition-promo.css b/client/framework/dev-edition-promo/dev-edition-promo.css index 5a3e8d5..7c692cf 100644 --- a/client/framework/dev-edition-promo/dev-edition-promo.css +++ b/client/framework/dev-edition-promo/dev-edition-promo.css @@ -48,7 +48,7 @@ window { } #icon { - background-image: url("/devtools/client/framework/dev-edition-promo/dev-edition-logo.png"); + background-image: url("/client/framework/dev-edition-promo/dev-edition-logo.png"); background-size: 64px 64px; background-repeat: no-repeat; width: 64px; diff --git a/client/framework/dev-edition-promo/dev-edition-promo.xul b/client/framework/dev-edition-promo/dev-edition-promo.xul index c9b0723..9995a5e 100644 --- a/client/framework/dev-edition-promo/dev-edition-promo.xul +++ b/client/framework/dev-edition-promo/dev-edition-promo.xul @@ -7,7 +7,7 @@ %toolboxDTD; ]> - + diff --git a/client/framework/gDevTools.js b/client/framework/gDevTools.js index bb08c1a..0a1490a 100644 --- a/client/framework/gDevTools.js +++ b/client/framework/gDevTools.js @@ -679,7 +679,7 @@ var gDevToolsBrowser = { * Open a tab to allow connects to a remote browser */ openConnectScreen: function(gBrowser) { - gBrowser.selectedTab = gBrowser.addTab("/devtools/client/framework/connect/connect.xhtml"); + gBrowser.selectedTab = gBrowser.addTab("/client/framework/connect/connect.xhtml"); }, /** @@ -690,7 +690,7 @@ var gDevToolsBrowser = { if (win) { win.focus(); } else { - Services.ww.openWindow(null, "/devtools/client/webide/content/", "webide", "chrome,centerscreen,resizable", null); + Services.ww.openWindow(null, "/client/webide/content/", "webide", "chrome,centerscreen,resizable", null); } }, diff --git a/client/framework/toolbox-hosts.js b/client/framework/toolbox-hosts.js index a68a253..2a76a24 100644 --- a/client/framework/toolbox-hosts.js +++ b/client/framework/toolbox-hosts.js @@ -278,7 +278,7 @@ function WindowHost() { WindowHost.prototype = { type: "window", - WINDOW_URL: "/devtools/client/framework/toolbox-window.xul", + WINDOW_URL: "/client/framework/toolbox-window.xul", /** * Create a new xul window to contain the toolbox. diff --git a/client/framework/toolbox-options.xul b/client/framework/toolbox-options.xul index 705be94..bc45f87 100644 --- a/client/framework/toolbox-options.xul +++ b/client/framework/toolbox-options.xul @@ -7,12 +7,12 @@ %toolboxDTD; ]> - + diff --git a/client/netmonitor/netmonitor.xul b/client/netmonitor/netmonitor.xul index 6de36de..a3df130 100644 --- a/client/netmonitor/netmonitor.xul +++ b/client/netmonitor/netmonitor.xul @@ -3,11 +3,11 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - - + + + + + %netmonitorDTD; @@ -19,7 +19,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"> + diff --git a/client/projecteditor/chrome/content/projecteditor.xul b/client/projecteditor/chrome/content/projecteditor.xul index 2c2dfd3..b5dea1b 100644 --- a/client/projecteditor/chrome/content/projecteditor.xul +++ b/client/projecteditor/chrome/content/projecteditor.xul @@ -2,12 +2,12 @@ - - - - - - + + + + + + @@ -22,7 +22,7 @@ - diff --git a/client/responsivedesign/responsivedesign-child.js b/client/responsivedesign/responsivedesign-child.js index e1559ce..5ac58f7 100644 --- a/client/responsivedesign/responsivedesign-child.js +++ b/client/responsivedesign/responsivedesign-child.js @@ -5,7 +5,7 @@ const { Ci, Cr } = require("devtools/sham/chrome"); const gDeviceSizeWasPageSize = docShell.deviceSizeIsPageSize; -const gFloatingScrollbarsStylesheet = Services.io.newURI("/devtools/client/themes/floating-scrollbars.css", null, null); +const gFloatingScrollbarsStylesheet = Services.io.newURI("/client/themes/floating-scrollbars.css", null, null); var gRequiresFloatingScrollbars; var active = false; diff --git a/client/responsivedesign/responsivedesign.js b/client/responsivedesign/responsivedesign.js index 3d43c79..86f7742 100644 --- a/client/responsivedesign/responsivedesign.js +++ b/client/responsivedesign/responsivedesign.js @@ -142,7 +142,7 @@ function ResponsiveUI(aWindow, aTab) this.mm.addMessageListener("ResponsiveMode:Start:Done", childOn); let requiresFloatingScrollbars = !this.mainWindow.matchMedia("(-moz-overlay-scrollbars)").matches; - this.mm.loadFrameScript("resource://devtools/client/responsivedesign/responsivedesign-child.js", true); + this.mm.loadFrameScript("resource://client/responsivedesign/responsivedesign-child.js", true); this.mm.addMessageListener("ResponsiveMode:ChildScriptReady", () => { this.mm.sendAsyncMessage("ResponsiveMode:Start", { requiresFloatingScrollbars: requiresFloatingScrollbars diff --git a/client/scratchpad/scratchpad-manager.js b/client/scratchpad/scratchpad-manager.js index 1694a94..5fd163a 100644 --- a/client/scratchpad/scratchpad-manager.js +++ b/client/scratchpad/scratchpad-manager.js @@ -7,7 +7,7 @@ const { Cc, Ci, Cu} = require("devtools/sham/chrome"); -const SCRATCHPAD_WINDOW_URL = "/devtools/client/scratchpad/scratchpad.xul"; +const SCRATCHPAD_WINDOW_URL = "/client/scratchpad/scratchpad.xul"; const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no"; const { Services } = require("devtools/sham/services"); diff --git a/client/scratchpad/scratchpad.js b/client/scratchpad/scratchpad.js index 9e56141..e154e6f 100644 --- a/client/scratchpad/scratchpad.js +++ b/client/scratchpad/scratchpad.js @@ -38,7 +38,7 @@ const ENABLE_AUTOCOMPLETION = "devtools.scratchpad.enableAutocompletion"; const TAB_SIZE = "devtools.editor.tabsize"; const FALLBACK_CHARSET_LIST = "intl.fallbackCharsetList.ISO-8859-1"; -const VARIABLES_VIEW_URL = "/devtools/client/shared/widgets/VariablesView.xul"; +const VARIABLES_VIEW_URL = "/client/shared/widgets/VariablesView.xul"; const {loader} = require("devtools/shared/Loader"); diff --git a/client/scratchpad/scratchpad.xul b/client/scratchpad/scratchpad.xul index 79ac91f..ee5d17b 100644 --- a/client/scratchpad/scratchpad.xul +++ b/client/scratchpad/scratchpad.xul @@ -13,9 +13,9 @@ %sourceEditorStrings; ]> - - - + + + + + + diff --git a/client/shared/widgets/filter-widget.css b/client/shared/widgets/filter-widget.css index 3422769..642cb48 100644 --- a/client/shared/widgets/filter-widget.css +++ b/client/shared/widgets/filter-widget.css @@ -200,7 +200,7 @@ input { .remove-button { width: 16px; height: 16px; - background: url(/devtools/client/themes/images/close@2x.png); + background: url(/client/themes/images/close@2x.png); background-size: cover; font-size: 0; border: none; @@ -236,14 +236,14 @@ input { } .add { - background: url(/devtools/client/themes/images/add.svg); + background: url(/client/themes/images/add.svg); } #toggle-presets { - background: url(/devtools/client/themes/images/pseudo-class.svg#pseudo-class); + background: url(/client/themes/images/pseudo-class.svg#pseudo-class); } .show-presets #toggle-presets { - background: url(/devtools/client/themes/images/pseudo-class.svg#pseudo-class-checked); + background: url(/client/themes/images/pseudo-class.svg#pseudo-class-checked); filter: none; } diff --git a/client/shared/widgets/graphs-frame.xhtml b/client/shared/widgets/graphs-frame.xhtml index c4dd073..9078ded 100644 --- a/client/shared/widgets/graphs-frame.xhtml +++ b/client/shared/widgets/graphs-frame.xhtml @@ -7,9 +7,9 @@ - - - + diff --git a/client/webide/content/monitor.xhtml b/client/webide/content/monitor.xhtml index a9f5c0e..c4a0fd4 100644 --- a/client/webide/content/monitor.xhtml +++ b/client/webide/content/monitor.xhtml @@ -15,7 +15,7 @@ - + diff --git a/client/webide/content/newapp.xul b/client/webide/content/newapp.xul index 02f879e..f84b0ed 100644 --- a/client/webide/content/newapp.xul +++ b/client/webide/content/newapp.xul @@ -9,7 +9,7 @@ %webideDTD; ]> - + - - + + - + diff --git a/client/webide/modules/app-manager.js b/client/webide/modules/app-manager.js index 4e165f0..a0a7177 100644 --- a/client/webide/modules/app-manager.js +++ b/client/webide/modules/app-manager.js @@ -28,7 +28,7 @@ const Strings = Services.strings.createBundle(require("l10n/webide.properties")) var AppManager = exports.AppManager = { - DEFAULT_PROJECT_ICON: "/devtools/client/webide/skin/default-app-icon.png", + DEFAULT_PROJECT_ICON: "/client/webide/skin/default-app-icon.png", DEFAULT_PROJECT_NAME: "--", _initialized: false, diff --git a/client/webide/modules/project-list.js b/client/webide/modules/project-list.js index 38e9786..7a97327 100644 --- a/client/webide/modules/project-list.js +++ b/client/webide/modules/project-list.js @@ -74,7 +74,7 @@ ProjectList.prototype = { return this._UI.busyUntil(Task.spawn(function*() { // Open newapp.xul, which will feed ret.location let ret = {location: null, testOptions: testOptions}; - parentWindow.openDialog("/devtools/client/webide/content/newapp.xul", "newapp", "chrome,modal", ret); + parentWindow.openDialog("/client/webide/content/newapp.xul", "newapp", "chrome,modal", ret); if (!ret.location) return; diff --git a/client/webide/modules/runtimes.js b/client/webide/modules/runtimes.js index 53975e6..d499a7c 100644 --- a/client/webide/modules/runtimes.js +++ b/client/webide/modules/runtimes.js @@ -564,7 +564,7 @@ WiFiRuntime.prototype = { let win = Services.wm.getMostRecentWindow("devtools:webide"); let width = win.outerWidth * 0.8; let height = Math.max(win.outerHeight * 0.5, MIN_HEIGHT); - win.openDialog("/devtools/client/webide/content/wifi-auth.xhtml", + win.openDialog("/client/webide/content/wifi-auth.xhtml", WINDOW_ID, "modal=yes,width=" + width + ",height=" + height, session); }); diff --git a/client/webide/themes/panel-listing.css b/client/webide/themes/panel-listing.css index 2abc61c..fd583a1 100644 --- a/client/webide/themes/panel-listing.css +++ b/client/webide/themes/panel-listing.css @@ -92,7 +92,7 @@ button.panel-item { } .refresh-icon { - background-image: url("/devtools/client/themes/images/reload.svg"); + background-image: url("/client/themes/images/reload.svg"); height: 14px; width: 14px; border: 0; diff --git a/server/actors/csscoverage.js b/server/actors/csscoverage.js index 9885a75..4997af7 100644 --- a/server/actors/csscoverage.js +++ b/server/actors/csscoverage.js @@ -14,7 +14,7 @@ const protocol = require("devtools/server/protocol"); const { method, custom, RetVal, Arg } = protocol; /*loader.lazyGetter(this, "gDevTools", () => { - return require("resource://devtools/client/framework/gDevTools.jsm").gDevTools; + return require("resource://client/framework/gDevTools.jsm").gDevTools; }); loader.lazyGetter(this, "DOMUtils", () => { return Cc["@mozilla.org/inspector/dom-utils;1"].getService(Ci.inIDOMUtils) diff --git a/shared/Loader.js b/shared/Loader.js index 2a778b6..efdb1c8 100644 --- a/shared/Loader.js +++ b/shared/Loader.js @@ -226,7 +226,7 @@ SrcdirProvider.prototype = { pathComponents.unshift(clientDir); let path = OS.Path.join.apply(OS.Path, pathComponents); let uri = this.fileURI(path); - let chromeURI = "/devtools/client/" + match[1]; + let chromeURI = "/client/" + match[1]; let entry = "override " + chromeURI + "\t" + uri; entries.push(entry); } diff --git a/shared/performance/process-communication.js b/shared/performance/process-communication.js index b66aa1e..0d47c6a 100644 --- a/shared/performance/process-communication.js +++ b/shared/performance/process-communication.js @@ -10,7 +10,7 @@ * the parent process. */ -const FRAME_SCRIPT_UTILS_URL = "/devtools/client/shared/frame-script-utils.js"; +const FRAME_SCRIPT_UTILS_URL = "/client/shared/frame-script-utils.js"; const { Task } = require("devtools/sham/task"); const { uuid } = require("sdk/util/uuid"); diff --git a/shared/worker/worker.js b/shared/worker/worker.js index c5dcc49..b3b7387 100644 --- a/shared/worker/worker.js +++ b/shared/worker/worker.js @@ -13,7 +13,7 @@ var MESSAGE_COUNTER = 0; * communication to offload demanding tasks. The corresponding URL * must implement the interface provided by `devtools/shared/worker/helper`. * - * @see `./devtools/client/shared/widgets/GraphsWorker.js` + * @see `/client/shared/widgets/GraphsWorker.js` * * @param {string} url * The URL of the worker.