diff options
| author | Stephen Blott | 2016-04-14 08:32:15 +0100 |
|---|---|---|
| committer | Stephen Blott | 2016-04-14 08:32:15 +0100 |
| commit | 39115e921af964a73d49da3085319fc1160009d2 (patch) | |
| tree | 0da8d7af3032b37115650337074ce83fcfb41fa4 /content_scripts | |
| parent | f144c7c9d3f141636ce6a3856db3abf08a4fc063 (diff) | |
| download | vimium-39115e921af964a73d49da3085319fc1160009d2.tar.bz2 | |
Rework UI component init sequence.
In testing global link hints, it seems that UI components can be opened
before they're actually ready, and Vimium hangs with a broken UI
component displayed. This issue seems to be in 1.54 too.
It's not clear what's causing this -- and it's hard to reproduce
systematically. However, it only seems to happen on navigation.
Therefore, it seems likely that there is an issue with the
initialization sequence.
Here, we wait for:
- the DOM content to be ready, and
- the port to be provided
before registering the UI component as ready.
Diffstat (limited to 'content_scripts')
| -rw-r--r-- | content_scripts/ui_component.coffee | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content_scripts/ui_component.coffee b/content_scripts/ui_component.coffee index 92640eb2..d7bdf2a1 100644 --- a/content_scripts/ui_component.coffee +++ b/content_scripts/ui_component.coffee @@ -45,7 +45,8 @@ class UIComponent # Get vimiumSecret so the iframe can determine that our message isn't the page impersonating us. chrome.storage.local.get "vimiumSecret", ({ vimiumSecret }) => { port1, port2 } = new MessageChannel - port1.onmessage = (event) => @handleMessage event + port1.onmessage = (event) => + if event?.data == "uiComponentIsReady" then @uiComponentIsReady = true else @handleMessage event @iframeElement.contentWindow.postMessage vimiumSecret, chrome.runtime.getURL(""), [ port2 ] setIframePort port1 @@ -54,8 +55,6 @@ class UIComponent @postMessage name: "frameFocused", focusFrameId: request.focusFrameId false # Free up the sendResponse handler. - @styleSheetGetter.use => @iframePort.use => Utils.nextTick => @uiComponentIsReady = true - # Posts a message (if one is provided), then calls continuation (if provided). The continuation is only # ever called *after* the message has been posted. postMessage: (message = null, continuation = null) -> |