diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-01-25 21:04:07 +0100 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2017-01-25 21:04:21 +0100 |
| commit | 6a727b70a9f7d3deb690dffd818d7bb5e9eb7bf5 (patch) | |
| tree | 28aea39d85e63a901744c6319f6dc06884040daf /extensions/BugModal | |
| parent | ec963661fb29c191fec645a956cbddc670cfa3da (diff) | |
| download | bugzilla-6a727b70a9f7d3deb690dffd818d7bb5e9eb7bf5.tar.gz bugzilla-6a727b70a9f7d3deb690dffd818d7bb5e9eb7bf5.tar.xz | |
Bug 1286290 - CSP compliant bug modal
Diffstat (limited to 'extensions/BugModal')
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl | 2 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/user.html.tmpl | 7 | ||||
| -rw-r--r-- | extensions/BugModal/web/bug_modal.js | 7 |
3 files changed, 12 insertions, 4 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 fe0a7d4fe..acdd55ee2 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -1194,7 +1194,7 @@ [%# === initialise module visibility === %] -<script> +<script [% script_nonce FILTER none %]> init_module_visibility(); </script> diff --git a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl index 4c28936cc..5c630ba07 100644 --- a/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/user.html.tmpl @@ -41,11 +41,12 @@ END; width="[% gravatar_size FILTER none %]" height="[% gravatar_size FILTER none %]"> [% END %] [% UNLESS gravatar_only %] - <a class="email [%= "disabled" UNLESS u.is_enabled %]" + <a class="email [%= "disabled" UNLESS u.is_enabled %] [%= "show_usermenu" IF user.id %]" [% IF user.id %] href="mailto:[% u.email FILTER html %]" - onclick="return show_usermenu([% u.id FILTER none %], '[% u.email FILTER js %]', - [% user.in_group('editusers') || user.bless_groups.size > 0 ? "true" : "false" %])" + data-user-id="[% u.id FILTER html %]" + data-user-email="[% u.email FILTER html %]" + data-show-edit="[% user.in_group('editusers') || user.bless_groups.size > 9 ? 'true' : 'false' %]" title="[% u.identity FILTER html %]" [% ELSE %] href="user_profile?user_id=[% u.id FILTER none %]" diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js index d77821929..01be1fd2c 100644 --- a/extensions/BugModal/web/bug_modal.js +++ b/extensions/BugModal/web/bug_modal.js @@ -1483,6 +1483,13 @@ function lb_close(event) { $('#lb_overlay, #lb_overlay2, #lb_close_btn, #lb_img, #lb_text').remove(); } +$(function() { + $("button.button-link").on("click", function (event) { + event.preventDefault(); + window.location = $(this).data("href"); + }); +}); + // extensions (function($) { |