ssafronova (ssafronova) wrote in changelog,
ssafronova
ssafronova
changelog

[livejournal] r18829: LJSUP-8539: Contextual popup (hover menu...

Committer: ssafronova
LJSUP-8539: Contextual popup (hover menu) - disable in settings
U   trunk/cgi-bin/ljlib.pl
U   trunk/cgi-bin/weblib.pl
U   trunk/htdocs/manage/settings/index.bml
Modified: trunk/cgi-bin/ljlib.pl
===================================================================
--- trunk/cgi-bin/ljlib.pl	2011-04-08 09:20:48 UTC (rev 18828)
+++ trunk/cgi-bin/ljlib.pl	2011-04-08 09:22:52 UTC (rev 18829)
@@ -2122,7 +2122,7 @@
 
 sub show_contextual_hover {
     my %args = LJ::Request->args;
-    return $LJ::CTX_POPUP and !$LJ::IS_SSL and $args{ctxpp} ne 'no';
+    return $LJ::CTX_POPUP and !$LJ::IS_SSL;
 }
 
 # <LJFUNC>

Modified: trunk/cgi-bin/weblib.pl
===================================================================
--- trunk/cgi-bin/weblib.pl	2011-04-08 09:20:48 UTC (rev 18828)
+++ trunk/cgi-bin/weblib.pl	2011-04-08 09:22:52 UTC (rev 18829)
@@ -1336,7 +1336,6 @@
 
     # ctxpopup prop
     my $ctxpopup = 1;
-    $ctxpopup = 0 if $remote && ! $remote->prop("opt_ctxpopup");
 
     # poll for esn inbox updates?
     my $inbox_update_poll = $LJ::DISABLED{inbox_update_poll} ? 0 : 1;

Modified: trunk/htdocs/manage/settings/index.bml
===================================================================
--- trunk/htdocs/manage/settings/index.bml	2011-04-08 09:20:48 UTC (rev 18828)
+++ trunk/htdocs/manage/settings/index.bml	2011-04-08 09:22:52 UTC (rev 18829)
@@ -59,7 +59,6 @@
                 LJ::Setting::EntryEditor
                 LJ::Setting::StyleAlwaysMine
                 LJ::Setting::StyleMine
-                LJ::Setting::CtxPopup
                 LJ::Setting::GettingStarted
                 LJ::Setting::SiteScheme
                 LJ::Setting::AdultContent

Tags: bml, livejournal, pl, ssafronova
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