diff options
Diffstat (limited to 'libre/iceweasel/devtools-appmanager-webide.patch')
| -rw-r--r-- | libre/iceweasel/devtools-appmanager-webide.patch | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/libre/iceweasel/devtools-appmanager-webide.patch b/libre/iceweasel/devtools-appmanager-webide.patch index 373c34ceb..4dbf43dee 100644 --- a/libre/iceweasel/devtools-appmanager-webide.patch +++ b/libre/iceweasel/devtools-appmanager-webide.patch @@ -1,7 +1,7 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2014-11-26 00:17:06.000000000 -0200 -+++ mozilla-release/browser/app/profile/firefox.js 2014-12-19 13:30:18.447609374 -0200 -@@ -1303,12 +1303,14 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2015-01-16 14:43:55.583334174 -0200 ++++ mozilla-release/browser/app/profile/firefox.js 2015-01-16 14:46:24.440893562 -0200 +@@ -1344,12 +1344,14 @@ pref("devtools.commands.dir", ""); // Enable the app manager @@ -21,9 +21,9 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br // Toolbox preferences pref("devtools.toolbox.footer.height", 250); diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-release/browser/devtools/webide/webide-prefs.js ---- mozilla-release.orig/browser/devtools/webide/webide-prefs.js 2014-11-26 00:17:07.000000000 -0200 -+++ mozilla-release/browser/devtools/webide/webide-prefs.js 2014-12-19 13:30:28.444671229 -0200 -@@ -2,16 +2,17 @@ +--- mozilla-release.orig/browser/devtools/webide/webide-prefs.js 2015-01-09 02:38:16.000000000 -0200 ++++ mozilla-release/browser/devtools/webide/webide-prefs.js 2015-01-16 14:51:30.686269793 -0200 +@@ -2,32 +2,24 @@ # This Source Code Form is subject to the terms of the Mozilla Public # 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/. @@ -32,22 +32,41 @@ diff -Nur mozilla-release.orig/browser/devtools/webide/webide-prefs.js mozilla-r -pref("devtools.webide.showProjectEditor", true); -pref("devtools.webide.templatesURL", "https://code.cdn.mozilla.net/templates/list.json"); -pref("devtools.webide.autoinstallADBHelper", true); +-#ifdef MOZ_DEV_EDITION +-pref("devtools.webide.autoinstallFxdtAdapters", true); +-#else +pref("devtools.webide.showProjectEditor", false); +pref("devtools.webide.templatesURL", ""); +pref("devtools.webide.autoinstallADBHelper", false); - pref("devtools.webide.lastprojectlocation", ""); + pref("devtools.webide.autoinstallFxdtAdapters", false); +-#endif -pref("devtools.webide.restoreLastProject", true); -+pref("devtools.webide.restoreLastProject", false); - pref("devtools.webide.enableLocalRuntime", false); -pref("devtools.webide.addonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/index.json"); -pref("devtools.webide.simulatorAddonsURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/#VERSION#/#OS#/fxos_#SLASHED_VERSION#_simulator-#OS#-latest.xpi"); -pref("devtools.webide.simulatorAddonID", "fxos_#SLASHED_VERSION#_simulator@mozilla.org"); -pref("devtools.webide.adbAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxos-simulator/adb-helper/#OS#/adbhelper-#OS#-latest.xpi"); -pref("devtools.webide.adbAddonID", "adbhelper@mozilla.org"); +-pref("devtools.webide.adaptersAddonURL", "https://ftp.mozilla.org/pub/mozilla.org/labs/fxdt-adapters/#OS#/fxdt-adapters-#OS#-latest.xpi"); +-pref("devtools.webide.adaptersAddonID", "fxdevtools-adapters@mozilla.org"); -pref("devtools.webide.monitorWebSocketURL", "ws://localhost:9000"); ++pref("devtools.webide.restoreLastProject", false); +pref("devtools.webide.addonsURL", ""); +pref("devtools.webide.simulatorAddonsURL", ""); +pref("devtools.webide.simulatorAddonID", ""); +pref("devtools.webide.adbAddonURL", ""); +pref("devtools.webide.adbAddonID", ""); ++pref("devtools.webide.adaptersAddonURL", ""); ++pref("devtools.webide.adaptersAddonID", ""); +pref("devtools.webide.monitorWebSocketURL", ""); + pref("devtools.webide.lastConnectedRuntime", ""); + pref("devtools.webide.lastSelectedProject", ""); +-pref("devtools.webide.widget.autoinstall", true); +-#ifdef MOZ_DEV_EDITION +-pref("devtools.webide.widget.enabled", true); +-pref("devtools.webide.widget.inNavbarByDefault", true); +-#else ++pref("devtools.webide.widget.autoinstall", false); + pref("devtools.webide.widget.enabled", false); + pref("devtools.webide.widget.inNavbarByDefault", false); +-#endif + pref("devtools.webide.busyTimeout", 10000); |