From 26a974586f4608e46e70d194f9090f63ac036bd1 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Thu, 20 Nov 2014 13:47:52 -0600
Subject: [PATCH] Bug 1100944 - Nudge WebIDE timeout higher. r=paul

--HG--
extra : transplant_source : %B0%F4%14%AD%24%DF%AB%A0%26%1D%07%DE5%7D%A8.%2BN%FB%CF
---
 browser/devtools/webide/content/webide.js | 2 +-
 browser/devtools/webide/webide-prefs.js   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js
index d4943c9062a..f3618742aca 100644
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -259,7 +259,7 @@ let UI = {
     this._busyTimeout = setTimeout(() => {
       this.unbusy();
       UI.reportError("error_operationTimeout", this._busyOperationDescription);
-    }, 6000);
+    }, Services.prefs.getIntPref("devtools.webide.busyTimeout"));
   },
 
   cancelBusyTimeout: function() {
diff --git a/browser/devtools/webide/webide-prefs.js b/browser/devtools/webide/webide-prefs.js
index 8b3c64c7440..15fae4dac3b 100644
--- a/browser/devtools/webide/webide-prefs.js
+++ b/browser/devtools/webide/webide-prefs.js
@@ -32,3 +32,4 @@ pref("devtools.webide.widget.enabled", false);
 pref("devtools.webide.widget.inNavbarByDefault", false);
 #endif
 pref("devtools.webide.zoom", "1");
+pref("devtools.webide.busyTimeout", 10000);