Skip to content

fix One-Click Postage to work on pop out video player and Tumblr radar#582

Open
finagle29 wants to merge 4 commits intonew-xkit:masterfrom
finagle29:floating-video_interface-post_fix
Open

fix One-Click Postage to work on pop out video player and Tumblr radar#582
finagle29 wants to merge 4 commits intonew-xkit:masterfrom
finagle29:floating-video_interface-post_fix

Conversation

@finagle29
Copy link
Member

fixes #575

@homu
Copy link

homu commented Dec 1, 2015

☔ The latest upstream changes (presumably #718) made this pull request unmergeable. Please resolve the merge conflicts.

@finagle29 finagle29 force-pushed the floating-video_interface-post_fix branch from a3991e9 to 9be20b6 Compare January 16, 2016 21:13
@finagle29 finagle29 force-pushed the floating-video_interface-post_fix branch from 9be20b6 to ed66311 Compare January 16, 2016 21:59
@homu
Copy link

homu commented Jan 20, 2016

☔ The latest upstream changes (presumably #832) made this pull request unmergeable. Please resolve the merge conflicts.

@finagle29 finagle29 force-pushed the floating-video_interface-post_fix branch from ed66311 to cde8367 Compare February 6, 2016 14:51
post: function(obj) {

var m_return = {};
var post_data = JSON.parse($(obj).attr('data-json'));
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer this to have a fallback like line 1073 above where it's JSON.parse(asdf || "{}"). This would make the following if-statement detect the error where 'data-json' is undefined instead of having the parse throw an uncaught exception.

@finagle29
Copy link
Member Author

Pushed a commit that address review comments.

@homu
Copy link

homu commented Feb 23, 2016

☔ The latest upstream changes (presumably #973) made this pull request unmergeable. Please resolve the merge conflicts.

@finagle29 finagle29 force-pushed the floating-video_interface-post_fix branch from 5a474b3 to 68141d9 Compare February 25, 2016 00:35
@homu
Copy link

homu commented May 8, 2016

☔ The latest upstream changes (presumably #1024) made this pull request unmergeable. Please resolve the merge conflicts.

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

One-Click Postage doesn't work in the video popout

4 participants