diff options
| author | czaks <marcin@6irc.net> | 2013-12-27 15:46:59 +0100 |
|---|---|---|
| committer | Michael Foster <savetheinterpod@gmail.com> | 2014-01-19 14:49:44 -0500 |
| commit | 0c449f32db7e98e76f27a22dee1f5953202d0071 (patch) | |
| tree | 614aad961bab7c411e7f3536efe62295ee92670c | |
| parent | d7bcdfa81afd803e899648eb31c85fe92d5b1e49 (diff) | |
quick-reply.js: let's settle on disabled floating link by default
Conflicts:
js/settings.js
| -rw-r--r-- | js/quick-reply.js | 4 | ||||
| -rw-r--r-- | 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; $('<a href="javascript:void(0)" class="quick-reply-btn">'+_('Quick Reply')+'</a>') .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 |