From cd36ebe910785683d2a9f8d4c70328b556d9383f Mon Sep 17 00:00:00 2001 From: czaks Date: Fri, 27 Dec 2013 15:46:59 +0100 Subject: [PATCH] quick-reply.js: let's settle on disabled floating link by default Conflicts: js/settings.js --- js/quick-reply.js | 4 ++-- js/settings.js | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/quick-reply.js b/js/quick-reply.js index ab452501..06a2660b 100644 --- a/js/quick-reply.js +++ b/js/quick-reply.js @@ -393,7 +393,7 @@ }); var floating_link = function() { - if (!settings.get('floating_link', true)) + if (!settings.get('floating_link', false)) return; $(''+_('Quick Reply')+'') .click(function() { @@ -406,7 +406,7 @@ }); }; - if (settings.get('floating_link', true)) { + if (settings.get('floating_link', false)) { $(window).ready(function() { if($('div.banner').length == 0) return; diff --git a/js/settings.js b/js/settings.js index e98b35ae..0fb80b09 100644 --- a/js/settings.js +++ b/js/settings.js @@ -30,7 +30,11 @@ tb_settings['quick-reply'] = { // Hide form when scrolled to top of page (where original form is visible) hide_at_top: true, // "Quick reply" button floating at the top right hand corner of the page at all times - floating_link: true + floating_link: false, + // Show remote in quick reply + show_remote: false, + // Show embedding in quick reply + show_embed: false }; // ajax.js