Track the object element during init and remove it if the tech is dispos... #1340
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…posed before onReady. For videojs#1339. If dispose() was called before the SWF triggered onReady(), the placeholder div would be cleaned up but the actual object element would be left behind to mess things up in the future. Keep track of the object element during initialization and make sure it is removed if flash is unloaded early.
| @@ -244,12 +244,19 @@ vjs.Flash = vjs.MediaTechController.extend({ | |||
|
|
|||
| // If not using iFrame mode, embed as normal object | |||
| } else { | |||
| vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes); | |||
| this.obj = vjs.Flash.embed(options['swf'], placeHolder, flashVars, params, attributes); | |||
There was a problem hiding this comment.
What if we just set this.el_ = obj here? Then component would remove that instead of the placeholder.
I think the main reason for not doing that before was that we were using swfobj which uses an object or embed depending on the platform, but now we built a custom object that works across platforms. I'm trying to remember if there were any other reasons. Either way if it works on IE8 we should be good, and that should simplify this.
There was a problem hiding this comment.
Sounds like an improvement to me. I'll update the PR.
The flash tech doesn't need to hold onto a reference to the placeholder element after the embed code has been generated. Set this.el_ to the embed code immediately instead of using another property to track it during init. Tested in IE8.
|
Awesome. Did it work in IE8? |
|
Yep-- noted it at the bottom of my extended commit comment. |
heff
added a commit
that referenced
this pull request
Jul 28, 2014
|
Thanks for contributing! :) |
| @@ -96,3 +96,19 @@ test('currentTime is the seek target during seeking', function() { | |||
| seeking = true; | |||
| strictEqual(7, tech.currentTime(), 'during seeks the target time is returned'); | |||
| }); | |||
|
|
|||
| test('dispose removes the object element even before ready fires', function() { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
...ed before onReady. For #1339.
If dispose() was called before the SWF triggered onReady(), the placeholder div would be cleaned up but the actual object element would be left behind to mess things up in the future. Keep track of the object element during initialization and make sure it is removed if flash is unloaded early.