summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2011-07-26 11:06:11 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2011-07-26 11:06:11 +0200
commit7ae7ccb35d64116573ae2611a752b4fd6a147dce (patch)
tree1b449f409297bf19ad58eff2a54d49dbab2b3b2b
parent2767ac53baac9ddf0ae288f49b120f581abefb63 (diff)
downloadbugzilla-7ae7ccb35d64116573ae2611a752b4fd6a147dce.tar.gz
bugzilla-7ae7ccb35d64116573ae2611a752b4fd6a147dce.tar.xz
Bug 647158: The Error Console in Firefox reports
"unbalanced tree was written using document.write()" when reporting a new bug or when visiting the "User Authentication" panel in the Parameters page r=glob a=LpSolit
-rw-r--r--js/attachment.js15
-rw-r--r--template/en/default/admin/params/common.html.tmpl77
-rw-r--r--template/en/default/admin/params/editparams.html.tmpl2
-rw-r--r--template/en/default/bug/create/create.html.tmpl43
4 files changed, 60 insertions, 77 deletions
diff --git a/js/attachment.js b/js/attachment.js
index dfa6d472d..7861164b1 100644
--- a/js/attachment.js
+++ b/js/attachment.js
@@ -309,7 +309,7 @@ function hideElementById(id)
}
}
-function showElementById(id, val)
+function showElementById(id)
{
var elm = document.getElementById(id);
if (elm) {
@@ -345,3 +345,16 @@ function toggle_attachment_details_visibility ( )
}
}
+/* Used in bug/create.html.tmpl to show/hide the attachment field. */
+
+function handleWantsAttachment(wants_attachment) {
+ if (wants_attachment) {
+ hideElementById('attachment_false');
+ showElementById('attachment_true');
+ }
+ else {
+ showElementById('attachment_false');
+ hideElementById('attachment_true');
+ clearAttachmentFields();
+ }
+}
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
index 3ec38ca56..d86da0dcd 100644
--- a/template/en/default/admin/params/common.html.tmpl
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -62,55 +62,48 @@
[% END %]
</select>
[% ELSIF param.type == "o" %]
- <script type="text/javascript"><!--
- document.write("<span style=\"display: none\">");
- // -->
- </script>
<input id="input_[% param.name FILTER html %]" size="80"
name="[% param.name FILTER html %]"
value="[% Param(param.name) FILTER html %]"><br>
- <script type="text/javascript"><!--
- document.write("<\/span>");
- // -->
- </script>
[% boxSize = 7 %]
[% boxSize = 3 + param.choices.size IF param.choices.size < 7 %]
[% plist = Param(param.name).split(',') %]
- <script type="text/javascript"><!--
- document.write(
- '<table>' +
- ' <tr>' +
- ' <td rowspan="2">' +
- ' <select id="select_[% param.name FILTER html %]"' +
- ' size="[% boxSize FILTER html %]"' +
- ' name="select_[% param.name FILTER html %]">' +
- [% FOREACH item = plist %]
- ' <option value="[% item FILTER html %]">[% item FILTER html %]<\/option>' +
- [% END %]
- ' <option class="sortlist_separator"' +
- ' disabled="disabled"' +
- ' value="[% sortlist_separator %]">active&uarr;&nbsp;&darr;inactive<\/option>' +
- [% FOREACH item = param.choices %]
- [% IF lsearch(plist, item) == -1 %]
- ' <option value="[% item FILTER html %]">[% item FILTER html %]<\/option>' +
- [% END %]
- [% END %]
- ' <\/select>' +
- ' <\/td>' +
- ' <td style="vertical-align: bottom">' +
- ' <button type="button"' +
- ' onClick="sortedList_moveItem(\'[% param.name FILTER html %]\', -1, \'[% sortlist_separator %]\');">&uarr;<\/button>' +
- ' <\/td>' +
- ' <\/tr>' +
- ' <tr>' +
- ' <td style="vertical-align: top">' +
- ' <button type="button"' +
- ' onClick="sortedList_moveItem(\'[% param.name FILTER html %]\', +1, \'[% sortlist_separator %]\');">&darr;<\/button>' +
- ' <\/td>' +
- ' <\/tr>' +
- '<\/table>');
- // -->
+ <table id="table_[% param.name FILTER html %]" class="bz_default_hidden">
+ <tr>
+ <td rowspan="2">
+ <select id="select_[% param.name FILTER html %]"
+ name="select_[% param.name FILTER html %]"
+ size="[% boxSize FILTER html %]">
+ [% FOREACH item = plist %]
+ <option value="[% item FILTER html %]">[% item FILTER html %]</option>
+ [% END %]
+ <option class="sortlist_separator" disabled="disabled"
+ value="[% sortlist_separator %]">active&uarr;&nbsp;&darr;inactive</option>
+ [% FOREACH item = param.choices %]
+ [% IF lsearch(plist, item) == -1 %]
+ <option value="[% item FILTER html %]">[% item FILTER html %]</option>
+ [% END %]
+ [% END %]
+ </select>
+ </td>
+ <td style="vertical-align: bottom">
+ <button type="button"
+ onClick="sortedList_moveItem('[% param.name FILTER html %]', -1, '[% sortlist_separator %]');">&uarr;</button>
+ </td>
+ </tr>
+
+ <tr>
+ <td style="vertical-align: top">
+ <button type="button"
+ onClick="sortedList_moveItem('[% param.name FILTER html %]', +1, '[% sortlist_separator %]');">&darr;</button>
+ </td>
+ </tr>
+ </table>
+
+ <script type="text/javascript">
+ bz_toggleClass("input_[% param.name FILTER html %]", "bz_default_hidden");
+ bz_toggleClass("table_[% param.name FILTER html %]", "bz_default_hidden");
</script>
[% ELSIF param.type == "s" %]
<select name="[% param.name FILTER html %]" id="[% param.name FILTER html %]">
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index e9aeb6e6c..fd38d65f0 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -56,7 +56,7 @@
title = title
message = message
style_urls = ['skins/standard/params.css']
- javascript_urls = ['js/params.js']
+ javascript_urls = ['js/params.js', 'js/util.js']
doc_section = "parameters.html"
%]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 3bb5b3a87..8604f0839 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -35,7 +35,8 @@
'skins/standard/enter_bug.css' ]
javascript_urls = [ "js/attachment.js", "js/util.js",
"js/field.js", "js/TUI.js", "js/bug.js" ]
- onload = 'set_assign_to();'
+ onload = "set_assign_to(); hideElementById('attachment_true');
+ showElementById('attachment_false'); showElementById('btn_no_attachment');"
%]
<script type="text/javascript">
@@ -150,18 +151,6 @@ function set_assign_to() {
}
}
-function handleWantsAttachment(wants_attachment) {
- if (wants_attachment) {
- document.getElementById('attachment_false').style.display = 'none';
- document.getElementById('attachment_true').style.display = 'block';
- }
- else {
- document.getElementById('attachment_false').style.display = 'block';
- document.getElementById('attachment_true').style.display = 'none';
- clearAttachmentFields();
- }
-}
-
var status_comment_required = new Array();
[% FOREACH status = bug_status %]
status_comment_required['[% status.name FILTER js %]'] =
@@ -605,21 +594,13 @@ TUI_hide_default('attachment_text_field');
<tr>
<th>Attachment:</th>
<td colspan="3">
- <script type="text/javascript">
- <!--
- document.write( '<div id="attachment_false">'
- + '<input type="button" value="Add an attachment" '
- + 'onClick="handleWantsAttachment(true)"> '
- + '<em style="display: none">This button has no '
- + 'functionality for you because your browser does '
- + 'not support CSS or does not use it.<\/em>'
- + '<\/div>'
- + '<div id="attachment_true" style="display: none">'
- + '<input type="button" '
- + 'value="Don\'t add an attachment " '
- + 'onClick="handleWantsAttachment(false)">');
- //-->
- </script>
+ <div id="attachment_false" class="bz_default_hidden">
+ <input type="button" value="Add an attachment" onClick="handleWantsAttachment(true)">
+ </div>
+
+ <div id="attachment_true">
+ <input type="button" id="btn_no_attachment" value="Don't add an attachment"
+ class="bz_default_hidden" onClick="handleWantsAttachment(false)">
<fieldset>
<legend>Add an attachment</legend>
<table class="attachment_entry">
@@ -629,11 +610,7 @@ TUI_hide_default('attachment_text_field');
flag_table_id ="attachment_flags" %]
</table>
</fieldset>
- <script type="text/javascript">
- <!--
- document.write('<\/div>');
- //-->
- </script>
+ </div>
</td>
</tr>
[% END %]