Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Bug 795490 #594

Merged
merged 1 commit into from

3 participants

Jeff Griffiths Irakli Gozalishvili Erik Vold
Jeff Griffiths

A pull request with Brian's suggested patch from https://bugzilla.mozilla.org/show_bug.cgi?id=795490

I've tested this, seems to work fine

Irakli Gozalishvili Gozala was assigned
packages/addon-kit/lib/panel.js
@@ -354,6 +354,7 @@ const Panel = Symbiont.resolve({
},
_onChange: function _onChange(e) {
+ this._frameLoadersSwapped = false;
Erik Vold Owner
erikvold added a note

this should be in the if statement to match byran's diff, but I'm not sure this is the best way to go yet anyhow.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Jeff Griffiths

@Gozala @erikvold as discussed today in triage, I updated this pull request for merge.

Irakli Gozalishvili
Owner

I'm working on getting tree back to green, I'd love to defer landing this until tree is green.

Jeff Griffiths

Sounds good to me!

Irakli Gozalishvili Gozala merged commit 41d3fd8 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 14, 2012
  1. Jeff Griffiths
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 0 deletions.
  1. +1 −0  lib/sdk/panel.js
1  lib/sdk/panel.js
View
@@ -354,6 +354,7 @@ const Panel = Symbiont.resolve({
},
_onChange: function _onChange(e) {
+ this._frameLoadersSwapped = false;
if ('contentURL' in e && this._frame) {
// Cleanup the worker before injecting the content script in the new
// document
Something went wrong with that request. Please try again.