summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbbaetz%acm.org <>2009-05-29 02:59:39 +0200
committerbbaetz%acm.org <>2009-05-29 02:59:39 +0200
commit405e90c5d5ef383f1034e64ad3780d0e012a8927 (patch)
tree57ab7ad1c80aad57ddfe20c8cfd08aff57bed36b
parent3caf30c1d8b45aa1e5b49ddb094ea6e7cd8c613f (diff)
downloadbugzilla-405e90c5d5ef383f1034e64ad3780d0e012a8927.tar.gz
bugzilla-405e90c5d5ef383f1034e64ad3780d0e012a8927.tar.xz
Bug 494751 - Toggling Add/Don't add attachment doesn't reset JS state
r/a=mkanat
-rw-r--r--js/attachment.js7
-rw-r--r--template/en/default/attachment/create.html.tmpl3
-rw-r--r--template/en/default/attachment/createformcontents.html.tmpl6
3 files changed, 13 insertions, 3 deletions
diff --git a/js/attachment.js b/js/attachment.js
index c05d1d3ea..254331679 100644
--- a/js/attachment.js
+++ b/js/attachment.js
@@ -100,7 +100,12 @@ function clearAttachmentFields() {
URLFieldHandler();
}
document.getElementById('description').value = '';
- document.getElementById('ispatch').checked = '';
+ /* Fire onchange so that the disabled state of the content-type
+ * radio buttons are also reset
+ */
+ element = document.getElementById('ispatch');
+ element.checked = '';
+ bz_fireEvent(element, 'change');
if ((element = document.getElementById('isprivate')))
element.checked = '';
}
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 10648159b..687cd7cbf 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -33,9 +33,8 @@
title = title
header = header
subheader = subheader
- onload="setContentTypeDisabledState(document.entryform);"
style_urls = [ 'skins/standard/create_attachment.css' ]
- javascript_urls = [ "js/attachment.js" ]
+ javascript_urls = [ "js/attachment.js", "js/util.js" ]
doc_section = "attachments.html"
%]
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 2fc80a518..2cef632d1 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -70,6 +70,12 @@
<input type="checkbox" id="ispatch" name="ispatch" value="1"
onchange="setContentTypeDisabledState(this.form);">
<label for="ispatch">patch</label><br><br>
+ [%# Reset this whenever the page loads so that the JS state is up to date %]
+ <script type="text/javascript">
+ YAHOO.util.Event.onDOMReady(function() {
+ bz_fireEvent(document.getElementById('ispatch'), 'change');
+ });
+ </script>
<em>Otherwise, choose a method for determining the content type.</em><br>
<input type="radio" id="autodetect"