diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
commit | ce00a61057535d49aa0e83181a1d317d7842571b (patch) | |
tree | 280243de9ff791449fb2c82f3f0f2b9bd931d5b2 /extensions/BugModal | |
parent | 6367a26da4093a8379e370ef328e9507c98b2e7e (diff) | |
parent | 6657fa9f5210d5b5a9b14c0cba6882bd56232054 (diff) | |
download | bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.gz bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.xz |
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'extensions/BugModal')
-rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl | 4 | ||||
-rw-r--r-- | extensions/BugModal/web/bug_modal.js | 3 | ||||
-rw-r--r-- | extensions/BugModal/web/new_bug.js | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index bcbea3f15..f4cc83c6e 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -391,7 +391,7 @@ <li role="separator"></li> <div class="actions"> <div><a href="buglist.cgi?product=[% bug.product FILTER uri %]&bug_status=__open__" - target="_blank" role="menuitem" tabindex="-1">See All [% terms.Bugs %] in This Product</a></div> + target="_blank" role="menuitem" tabindex="-1">See Open [% terms.Bugs %] in This Product</a></div> <div><a href="enter_bug.cgi?product=[% bug.product FILTER uri %]" target="_blank" role="menuitem" tabindex="-1">File New [% terms.Bug %] in This Product</a></div> <div><button disabled type="button" class="minor component-watching" role="menuitem" tabindex="-1" @@ -449,7 +449,7 @@ <div class="actions"> <div><a href="buglist.cgi?product=[% bug.product FILTER uri %]& [%~ %]component=[% bug.component FILTER uri %]&bug_status=__open__" - target="_blank" role="menuitem" tabindex="-1">See All [% terms.Bugs %] in This Component</a></div> + target="_blank" role="menuitem" tabindex="-1">See Open [% terms.Bugs %] in This Component</a></div> <div><a href="enter_bug.cgi?product=[% bug.product FILTER uri %]& [%~ %]component=[% bug.component FILTER uri %]" target="_blank" role="menuitem" tabindex="-1">File New [% terms.Bug %] in This Component</a></div> diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index a4ae83d72..c15174c8b 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -448,7 +448,7 @@ $(function() { $('#action-history') .click(function(event) { event.preventDefault(); - document.location.href = 'show_activity.cgi?id=' + BUGZILLA.bug_id; + window.open(`show_activity.cgi?id=${BUGZILLA.bug_id}`, '_blank'); }); // use scrollTo for in-page activity links @@ -1323,7 +1323,6 @@ $(function() { // finally switch to edit mode if we navigate back to a page that was editing $(window).on('pageshow', restoreEditMode); $(window).on('pageshow', restoreSavedBugComment); - $(window).on('focus', restoreSavedBugComment); restoreEditMode(); restoreSavedBugComment(); }); diff --git a/extensions/BugModal/web/new_bug.js b/extensions/BugModal/web/new_bug.js index 9c1d00854..23fc842cb 100644 --- a/extensions/BugModal/web/new_bug.js +++ b/extensions/BugModal/web/new_bug.js @@ -33,7 +33,7 @@ var component_load = function(product) { function() { alert("Network issues. Please refresh the page and try again"); } - ); + ); } $(document).ready(function() { @@ -101,7 +101,7 @@ $(document).ready(function() { callback(initial.keywords); } }); - + $("#product").on("change", function () { component_load($("#product").val()); }); |