[ljcom] r12892: Reverse merged 12887
Committer: vtroitsky
Reverse merged 12887_U branches/r98.3/ U branches/r98.3/cgi-bin/LJ/PartnerSite.pm
Property changes on: branches/r98.3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/faq-refactor:12682-12702
/branches/mobile:10279-10711
/branches/oauth:8215-9310
/trunk:12762-12774,12776-12787,12790,12793-12795,12797-12805,12807,12809-12812,12818-12819,12821,12825-12826,12830-12831,12833-12835,12837-12841,12843-12844,12846-12847,12850-12852,12855,12862,12868,12878,12887
+ /branches/faq-refactor:12682-12702
/branches/mobile:10279-10711
/branches/oauth:8215-9310
/trunk:12762-12774,12776-12787,12790,12793-12795,12797-12805,12807,12809-12812,12818-12819,12821,12825-12826,12830-12831,12833-12835,12837-12841,12843-12844,12846-12847,12850-12852,12855,12862,12868,12878
Modified: branches/r98.3/cgi-bin/LJ/PartnerSite.pm
===================================================================
--- branches/r98.3/cgi-bin/LJ/PartnerSite.pm 2012-11-13 16:02:03 UTC (rev 12891)
+++ branches/r98.3/cgi-bin/LJ/PartnerSite.pm 2012-11-13 16:08:15 UTC (rev 12892)
@@ -650,35 +650,27 @@
LJ::need_res( { 'clean_list' => 1 } );
- LJ::need_res(qw{
+ LJ::need_res(qw(
js/jquery.js
-
+
js/jquery/jquery.ui.core.min.js
js/jquery/jquery.ui.widget.min.js
- js/core/console.js
- js/core/template.js
-
js/jquery/jquery.lj.basicWidget.js
js/jquery/jquery.lj.bubble.js
- js/jquery/jquery.tmpl.min.js
js/partners/placeholder.js
stc/lj_base.css
- stc/identity/identity.css
+ stc/identity/identity.css ),
+ 'stc/partners/login/v' . $self->widget_version . '.css'
+ );
- templates/Widgets/contextualhover.jqtmpl
- templates/Widgets/bubble.tmpl
- });
-
- LJ::need_res(join $self->widget_version, 'stc/partners/login/v', '.css');
-
my $additional_lj_resources = $self->lj_resources;
LJ::need_res(@$additional_lj_resources) if $additional_lj_resources;
- return join '',
- LJ::res_includes({ only_needed => 1 } ) || '',
- LJ::res_includes({ only_tmpl => 1 }) || '',
- $self->raw_resources($opts) || '';
+ my $res = LJ::res_includes( {'only_needed' => 1} ) || '';
+ my $raw_res = $self->raw_resources($opts) || '';
+ return $res . $raw_res;
+
}
sub raw_resources {
