Permalink
Browse files

Merge branch 'firebug_bugfix'

  • Loading branch information...
2 parents c990e25 + 891efda commit 7101ecadff445d47cf5c737630242be8ad082260 @marcelduran committed Jul 17, 2012
Showing with 8 additions and 2 deletions.
  1. +7 −1 src/firefox/chrome/content/yslow-firefox.js
  2. +1 −1 src/firefox/install.rdf
@@ -100,7 +100,8 @@ YSLOW.firefox = {
// "YSLOW.firefox.startup():TypeError: FBL.extend is not a
// function". Hack around this by retrying the call to
// YSLOW.FBYSlow.init() if it fails.
- if (typeof FBL.extend !== 'function') {
+ if (typeof FBL === 'undefined' || (typeof FBL !== 'undefined' &&
+ typeof FBL.extend !== 'function')) {
YSLOW.util.setTimer(function() {
YSLOW.firefox.startup(wmode);
}, 10);
@@ -119,6 +120,11 @@ YSLOW.firefox = {
YSLOW.util.dump("YSLOW.firefox.startup():" + err);
}
return;
+ } else {
+ YSLOW.util.setTimer(function() {
+ YSLOW.firefox.startup(wmode);
+ }, 10);
+ return;
}
YSLOW.firefox.init();
@@ -18,7 +18,7 @@ Copyrights licensed under the New BSD License. See the accompanying LICENSE file
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>3.0</em:minVersion>
- <em:maxVersion>13.*</em:maxVersion>
+ <em:maxVersion>16.*</em:maxVersion>
</Description>
</em:targetApplication>

0 comments on commit 7101eca

Please sign in to comment.