Include the jquerified files on talkread, when user is in beta.
Patch by fu.
diffs (64 lines):
diff -r 99c8c1c5df98 -r b05985c7a7d2 cgi-bin/LJ/S2/EntryPage.pm
--- a/cgi-bin/LJ/S2/EntryPage.pm Mon Apr 04 22:01:30 2011 +0800
+++ b/cgi-bin/LJ/S2/EntryPage.pm Mon Apr 04 22:19:37 2011 +0800
@@ -90,7 +90,6 @@ sub EntryPage
js/jquery/jquery.ui.widget.min.js
js/jquery.quickreply.js
js/jquery.threadexpander.js
- js/jquery/jquery.busy.min.js
) );
$p->{'entry'} = $s2entry;
diff -r 99c8c1c5df98 -r b05985c7a7d2 htdocs/talkread.bml
--- a/htdocs/talkread.bml Mon Apr 04 22:01:30 2011 +0800
+++ b/htdocs/talkread.bml Mon Apr 04 22:19:37 2011 +0800
@@ -195,7 +195,17 @@ body<=
# See if we should inject QuickReply javascript
LJ::Hooks::run_hooks("need_res_for_journals", $u);
- LJ::need_res( qw( js/thread_expander.js stc/talkpage.css ) );
+ LJ::need_res( qw(
+ js/thread_expander.js
+ stc/talkpage.css
+ ) );
+ LJ::need_res( { group => "jquery" }, qw(
+ js/jquery.threadexpander.js
+ stc/talkpage.css
+ ) );
+
+ LJ::set_active_resource_group( "jquery" )
+ if LJ::BetaFeatures->user_in_beta( $remote => "journaljquery" );
if ( ( $remote && ! $remote->prop( "opt_no_quickreply" ) ) && !
$nocomments ) {
# quickreply js libs
@@ -203,6 +213,12 @@ body<=
js/x_core.js
js/quickreply.js
) );
+
+ LJ::need_res( { group => "jquery" }, qw(
+ js/jquery/jquery.ui.widget.min.js
+ js/jquery.quickreply.js
+ ) );
+
LJ::need_res( LJ::Talk::init_iconbrowser_js( 'stc/lj_base.css' ) )
if $remote->can_use_userpic_select;
}
@@ -702,7 +718,16 @@ body<=
my $do_commentmanage_js = LJ::is_enabled('commentmanage', $remote);
if ($do_commentmanage_js) {
- LJ::need_res('js/commentmanage.js');
+ LJ::need_res('js/commentmanage.js');
+ LJ::need_res( { group => "jquery" }, qw(
+ js/jquery/jquery.ui.widget.min.js
+ js/jquery.ajaxtip.js
+ js/jquery.commentmanage.js
+ js/tooltip.min.js
+ js/tooltip.dynamic.min.js
+ stc/ajaxtip.css
+ stc/popup-form.css
+ ) );
my $js_screen_color = "\"" .
LJ::ejs(BML::get_template_def("screenedbarcolor") ||
BML::get_template_def("emcolor")) . "\"";
my $js_normal_color = "\"" .
LJ::ejs(BML::get_template_def("emcolor")) . "\"";
$$head .= "<script>var LJ_cmtinfo = " .
LJ::js_dumper(\%LJ_cmtinfo) . ";\n" .
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
