diff options
| -rw-r--r-- | Bugzilla/Install.pm | 6 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/header.html.tmpl | 3 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 23 | ||||
| -rw-r--r-- | template/en/default/global/setting-descs.none.tmpl | 3 |
4 files changed, 26 insertions, 9 deletions
diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm index 885571020..3f8d4bdfb 100644 --- a/Bugzilla/Install.pm +++ b/Bugzilla/Install.pm @@ -181,6 +181,12 @@ sub SETTINGS { default => 'off', category => 'Searching' }, + { + name => 'autosize_comments', + options => ['on', 'off'], + default => 'on', + category => 'User Interface' + }, ]; }; diff --git a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl index db9bbeb7a..a91d11576 100644 --- a/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/header.html.tmpl @@ -107,7 +107,8 @@ settings: { quote_replies: '[% user.settings.quote_replies.value FILTER js %]', zoom_textareas: [% user.settings.zoom_textareas.value == "on" ? "true" : "false" %], - remember_collapsed: [% user.settings.ui_remember_collapsed.value == "on" ? "true" : "false" %] + remember_collapsed: [% user.settings.ui_remember_collapsed.value == "on" ? "true" : "false" %], + autosize_comments: [% user.settings.autosize_comments.value == "on" ? "true" : "false" %] } }; [% IF user.id %] diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index 6004c255b..5ca0148e7 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -458,7 +458,7 @@ $(function() { var rbs = $("#readable-bug-status"); var rbs_text = bugzillaReadableStatus.readable(rbs.data('readable-bug-status')); rbs.text(rbs_text); - + if (BUGZILLA.user.id === 0) return; // @@ -853,8 +853,7 @@ $(function() { if (BUGZILLA.user.settings.quote_replies == 'quoted_reply') { var text = $('#ct-' + comment_id).text(); reply_text = prefix + wrapReplyText(text); - } - else if (BUGZILLA.user.settings.quote_replies == 'simply_reply') { + } else if (BUGZILLA.user.settings.quote_replies == 'simply_reply') { reply_text = prefix; } @@ -868,12 +867,22 @@ $(function() { if ($('#comment').val() != reply_text) { $('#comment').val($('#comment').val() + reply_text); } - autosize.update($('#comment')); - $.scrollTo($('#comment'), function() { $('#comment').focus(); }); + if (BUGZILLA.user.settings.autosize_comments) { + autosize.update($('#comment')); + } + $.scrollTo($('#comment'), function() { + $('#comment').focus(); + }); }); - // auto-enlarge comment area (up to its max-height) - autosize($('#comment')); + if (BUGZILLA.user.settings.autosize_comments) { + autosize($('#comment')); + } else if (BUGZILLA.user.settings.zoom_textareas) { + // add comment --> enlarge on focus + $('#comment').focus(function(event) { + $(event.target).attr('rows', 25); + }); + } // add comment --> private $('#add-comment-private-cb') diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl index ba001ab6d..b6800d22d 100644 --- a/template/en/default/global/setting-descs.none.tmpl +++ b/template/en/default/global/setting-descs.none.tmpl @@ -18,7 +18,7 @@ [% PROCESS global/variables.none.tmpl %] -[% setting_descs = { +[% setting_descs = { "comment_sort_order" => "When viewing $terms.abug, show comments in this order", "csv_colsepchar" => "Field separator character for CSV files", "display_quips" => "Show a quip at the top of each $terms.bug list", @@ -43,6 +43,7 @@ "quote_replies" => "Quote the associated comment when you click on its reply link", "quoted_reply" => "Quote the full comment", "simple_reply" => "Reference the comment number only", + "autosize_comments" => "Expand the comment box dynamically", "comment_box_position" => "Position of the Additional Comments box", "before_comments" => "Before other comments", "after_comments" => "After other comments", |