Merge remote-tracking branch 'origin/master' into socketAL

This commit is contained in:
Julian Lam
2014-01-10 16:09:04 -05:00

View File

@@ -466,7 +466,7 @@ define(['composer'], function(composer) {
var moveModal = $('#move-post-modal'), var moveModal = $('#move-post-modal'),
moveBtn = moveModal.find('#move_post_commit'), moveBtn = moveModal.find('#move_post_commit'),
topicId = moveModal.find('#topicId'), topicId = moveModal.find('#topicId'),
post = $(this), post = $(this).parents('li'),
pid = $(this).parents('li').attr('data-pid'); pid = $(this).parents('li').attr('data-pid');
moveModal.removeClass('hide'); moveModal.removeClass('hide');