Update to the same version of Popcorn.js as Butter

dseif / slide-drive

Slideshow using audio/video to drive content

45 stars 9 forks source link

Update to the same version of Popcorn.js as Butter #15

Closed banksJeremy closed 12 years ago

banksJeremy commented 12 years ago

Slide Drive is currently using a older version of Popcorn.js than Butter is. This causes fatal errors when one attempts to load the Butter editor in a Slide Drive page.

Butter is including mozilla/popcorn-js@7fc366e as a submodule. I'd like to do the same, but the deck.js plugins aren't in there so I'll just update popcorn.js to match.

dseif commented 12 years ago

It looks like you deleted the parsers :S

banksJeremy commented 12 years ago

I reverted that first commit; I'm thought GitHub would also remove it from here but it didn't.

The second commit is on a different branch and only modifies popcorn.js.

dseif commented 12 years ago

This should be fine now that the submodule have been added