Типа я (zilogic) wrote in changelog,
Типа я
zilogic
changelog

[ljcom] r11553: LJSUP-10691: Image placeholders in comme...

Committer: amyshkin
LJSUP-10691: Image placeholders in comments
U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/ljcom.pl
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-03-02 13:07:28 UTC (rev 11552)
+++ trunk/bin/upgrading/en_LJ.dat	2012-03-05 06:57:07 UTC (rev 11553)
@@ -7608,10 +7608,14 @@
 
 setting.invisibleguests.option.self=I want to use My Guests to see who visits my journal and to be visible when visiting other journals and communities.
 
+setting.videoplaceholders.option2=Replace inline videos with a placeholder:
+setting.videoplaceholders.option2.checkbox1=In any entry
+setting.videoplaceholders.option2.checkbox2=In comments
+
 setting.ljtimes.label|staleness=1
 setting.ljtimes.label=LJTIMES
 
-setting.lastfm.prompt=Last.fm username
+setting.lastfm.prompt=Enter your username on LastFM
 setting.lastfm.label=Last.FM
 setting.music.label=Music Connect
 setting.trava.label|staleness=1

Modified: trunk/cgi-bin/ljcom.pl
===================================================================
--- trunk/cgi-bin/ljcom.pl	2012-03-02 13:07:28 UTC (rev 11552)
+++ trunk/cgi-bin/ljcom.pl	2012-03-05 06:57:07 UTC (rev 11553)
@@ -1613,8 +1613,8 @@
     my @tags = (
                 ['S', 'lj-template', {
                     name => 'video',
-                    (defined $width     ? ( width  => $width  ) : ()),
-                    (defined $height    ? ( height => $height ) : ()),
+                    (defined $width && ! $opts{remove_video_sizes}    ? ( width  => $width  ) : ()),
+                    (defined $height && ! $opts{remove_video_sizes}   ? ( height => $height ) : ()),
                     (defined $flashvars ? ( flashvars => $flashvars ) : ()),
                 }],
                 [ 'T', $src, {}],
@@ -1744,10 +1744,11 @@
 
     if ( $opts{'video_placeholders'} ) {
         $embed = LJ::placeholder_link(
-            placeholder_html => $embed,
-            width            => $width,
-            height           => $height,
-            img              => "$LJ::IMGPREFIX/videoplaceholder.png",
+            placeholder_html   => $embed,
+            width              => $width,
+            height             => $height,
+            img                => "$LJ::IMGPREFIX/videoplaceholder.png",
+            remove_video_sizes => $opts{remove_video_sizes},
         );
     }
 

Tags: amyshkin, dat, ljcom, pl, zilogic
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments