bug 850967 fix some js strict fixes that showed up in debug build/tests, r=markh

This commit is contained in:
Shane Caraveo 2013-03-18 12:40:51 -07:00
parent 644793378c
commit 5fae7a7101
3 changed files with 9 additions and 8 deletions

View File

@ -162,6 +162,7 @@
this.cachedWidthOpen = 0;
this.cachedWidthMinimized = 0;
this.cachedWidthNub = 0;
this._selectedChat = null;
</constructor>
<field name="innerbox" readonly="true">

View File

@ -20,7 +20,7 @@ function goOffline() {
BrowserOffline.toggleOfflineStatus();
Services.prefs.setIntPref('network.proxy.type', 0);
// LOAD_FLAGS_BYPASS_CACHE isn't good enough. So clear the cache.
Services.cache.evictEntries(Services.cache.STORE_ANYWHERE);
Services.cache.evictEntries(Components.interfaces.nsICache.STORE_ANYWHERE);
}
function goOnline(callback) {

View File

@ -90,6 +90,12 @@ function runSocialTestWithProvider(manifest, callback, finishcallback) {
removeProvider(m.origin, callback);
});
}
function finishSocialTest(cleanup) {
// disable social before removing the providers to avoid providers
// being activated immediately before we get around to removing it.
Services.prefs.clearUserPref("social.enabled");
removeAddedProviders(cleanup);
}
let providersAdded = 0;
let firstProvider;
@ -111,12 +117,6 @@ function runSocialTestWithProvider(manifest, callback, finishcallback) {
// Set the UI's provider (which enables the feature)
Social.provider = firstProvider;
function finishSocialTest(cleanup) {
// disable social before removing the providers to avoid providers
// being activated immediately before we get around to removing it.
Services.prefs.clearUserPref("social.enabled");
removeAddedProviders(cleanup);
}
registerCleanupFunction(function () {
finishSocialTest(true);
});
@ -169,7 +169,7 @@ function runSocialTests(tests, cbPreTest, cbPostTest, cbFinish) {
// A fairly large hammer which checks all aspects of the SocialUI for
// internal consistency.
function checkSocialUI(win) {
let win = win || window;
win = win || window;
let doc = win.document;
let provider = Social.provider;
let enabled = win.SocialUI.enabled;