Committer: amyshkin
LJSUP-8857: Updating commenting formU trunk/cgi-bin/LJ/S2/RecentPage.pm U trunk/cgi-bin/LJ/S2/ReplyPage.pm
Modified: trunk/cgi-bin/LJ/S2/RecentPage.pm =================================================================== --- trunk/cgi-bin/LJ/S2/RecentPage.pm 2011-09-02 03:56:47 UTC (rev 19937) +++ trunk/cgi-bin/LJ/S2/RecentPage.pm 2011-09-02 04:56:03 UTC (rev 19938) @@ -50,7 +50,7 @@ $opts->{'badargs'} = 1; return 1; } - + my $itemshow = S2::get_property_value($opts->{'ctx'}, "page_recent_items")+0; if ($itemshow < 1) { $itemshow = 20; } elsif ($itemshow > 50 && !$LJ::S2_TRUSTED{ $u->{'userid'} } ) { $itemshow = 50; } @@ -70,7 +70,7 @@ $viewsome = $viewall || LJ::check_priv($remote, 'canview', 'suspended'); } - + ## load the itemids my @itemids; my $err; @@ -135,7 +135,7 @@ my $ditemid = $itemid * 256 + $item->{'anum'}; my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid); - + next ENTRY unless $entry_obj->visible_to($remote, {'viewall' => $viewall, 'viewsome' => $viewsome}); $entry_obj->handle_prefetched_props($logprops{$itemid}); @@ -262,17 +262,17 @@ 'skip' => $skip, 'count' => $itemnum, }; - + # if we've skipped down, then we can skip back up if ($skip) { my $newskip = $skip - $itemshow; $newskip = 0 if $newskip <= 0; $nav->{'forward_skip'} = $newskip; - $nav->{'forward_url'} = LJ::make_link("$p->{base_url}/", { + $nav->{'forward_url'} = LJ::make_link("$p->{base_url}/", { skip => ($newskip || ""), tag => (LJ::eurl($get->{tag}) || ""), security => (LJ::eurl($get->{security}) || ""), - mode => (LJ::eurl($get->{mode}) || ""), + mode => (LJ::eurl($get->{mode}) || ""), poster => (LJ::eurl($get->{'poster'}) || ""), }); $nav->{'forward_count'} = $itemshow; @@ -289,11 +289,11 @@ $nav->{'backward_url'} = "$p->{'base_url'}/$date_slashes"; } elsif ($is_prev_exist) { my $newskip = $skip + $itemshow; - $nav->{'backward_url'} = LJ::make_link("$p->{'base_url'}/", { + $nav->{'backward_url'} = LJ::make_link("$p->{'base_url'}/", { skip => ($newskip || ""), tag => (LJ::eurl($get->{tag}) || ""), security => (LJ::eurl($get->{security}) || ""), - mode => (LJ::eurl($get->{mode}) || ""), + mode => (LJ::eurl($get->{mode}) || ""), poster => (LJ::eurl($get->{'poster'}) || ""), }); $nav->{'backward_skip'} = $newskip; Modified: trunk/cgi-bin/LJ/S2/ReplyPage.pm =================================================================== --- trunk/cgi-bin/LJ/S2/ReplyPage.pm 2011-09-02 03:56:47 UTC (rev 19937) +++ trunk/cgi-bin/LJ/S2/ReplyPage.pm 2011-09-02 04:56:03 UTC (rev 19938) @@ -14,6 +14,12 @@ $opts->{'redir'} = LJ::bad_password_redirect({ 'returl' => 1 }); # Get the URL back return 1 if $opts->{'redir'}; + LJ::need_res(qw( + js/jquery/jquery.lj.subjecticons.js + js/jquery/jquery.lj.commentator.js + js/jquery/jquery.lj.quotescreator.js + )); + my $p = Page($u, $opts); $p->{'_type'} = "ReplyPage"; $p->{'view'} = "reply";