Committer: sbelyaev
LJSUP-12509: There is no Repost button in reposted entryU trunk/cgi-bin/ljviews.pl U trunk/cgi-bin/weblib.pl U trunk/htdocs/view/index.bml
Modified: trunk/cgi-bin/ljviews.pl =================================================================== --- trunk/cgi-bin/ljviews.pl 2012-06-07 16:00:17 UTC (rev 22206) +++ trunk/cgi-bin/ljviews.pl 2012-06-08 05:39:28 UTC (rev 22207) @@ -1270,11 +1270,6 @@ my $ljcut_disable = $remote ? $remote->prop("opt_ljcut_disable_lastn") : undef; my $replace_video = $remote ? $remote->opt_embedplaceholders : 0; - # spit out the S1 - LJ::need_string(qw/confirm.bubble.yes - confirm.bubble.no/); - - ENTRY: foreach my $item (@items) { my ($posterid, $itemid, $security, $alldatepart) = @@ -1696,6 +1691,7 @@ }); LJ::control_strip_js_inject( user => $u->{user} ); } + LJ::journal_js_inject(); LJ::run_hooks("need_res_for_journals", $u); @@ -1851,10 +1847,6 @@ my $lastday = -1; my $eventnum = 0; - LJ::need_string(qw/confirm.bubble.yes - confirm.bubble.no/); - - ENTRY: foreach my $item (@items) { @@ -2417,9 +2409,6 @@ LJ::fill_var_props($vars, 'CALENDAR_YEAR_LINKS', { "years" => $yearlinks }); } - LJ::need_string(qw/confirm.bubble.yes - confirm.bubble.no/); - foreach my $year (@years) { $$months .= LJ::fill_var_props($vars, 'CALENDAR_NEW_YEAR', { Modified: trunk/cgi-bin/weblib.pl =================================================================== --- trunk/cgi-bin/weblib.pl 2012-06-07 16:00:17 UTC (rev 22206) +++ trunk/cgi-bin/weblib.pl 2012-06-08 05:39:28 UTC (rev 22207) @@ -2135,6 +2135,11 @@ js/journal.js )); + + LJ::need_res(qw{js/jquery/jquery.lj.repostbutton.js + templates/CleanHtml/reposted.tmpl + templates/CleanHtml/Repost.tmpl}); + LJ::run_hooks('extra_journal_js'); } Modified: trunk/htdocs/view/index.bml =================================================================== --- trunk/htdocs/view/index.bml 2012-06-07 16:00:17 UTC (rev 22206) +++ trunk/htdocs/view/index.bml 2012-06-08 05:39:28 UTC (rev 22207) @@ -181,7 +181,6 @@ my $entry = LJ::Entry->new($u, jitemid => $itemid); - warn "it1: $itemid"; my $journalu = $u; my ($repost_entry_obj, $subject); my $content = { 'original_post_obj' => \$entry, @@ -196,7 +195,7 @@ 'allowmask' => \$allowmask, 'reply_count' => \$replycount, }; - if (LJ::EntryReference->substitute_content( $entry, $content )) { + if (LJ::Entry::Repost->substitute_content( $entry, $content )) { next unless $entry->visible_to($remote); $apu{$posterid} = $entry->poster; } @@ -263,7 +262,6 @@ LJ::CleanHTML::clean_subject_all(\$subject); - warn "it2: $itemid " . LJ::item_link($journalu, $itemid, $anum); $body .= "<td><a href='" . LJ::item_link($journalu, $itemid, $anum) . "'>$subject</a>$sec$rep</td></tr>\n"; } if ($lday) { $body .= "</table></dd>\n"; }