Skip to content

bugzilla
bugzilla
Commit bfe0ace4 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Bug 480061: Lots of JS was toggling the "display" attribute instead of…

Bug 480061: Lots of JS was toggling the "display" attribute instead of removing/adding the bz_default_hidden class. Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=glob, a=mkanat
parent ba04de6f
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 34 deletions
js/change-columns.js
View file @ bfe0ace4
...@@ -20,12 +20,9 @@ function initChangeColumns() { ...@@ -20,12 +20,9 @@ function initChangeColumns() {
window.onunload = unload; window.onunload = unload;
var av_select = document.getElementById("available_columns"); var av_select = document.getElementById("available_columns");
var sel_select = document.getElementById("selected_columns"); var sel_select = document.getElementById("selected_columns");
document.getElementById("avail_header").style.display = "inline"; YAHOO.util.Dom.removeClass(
document.getElementById("available_columns").style.display = "inline"; ['avail_header', av_select, 'select_button',
document.getElementById("select_button").style.display = "inline"; 'deselect_button', 'up_button', 'down_button'], 'bz_default_hidden');
document.getElementById("deselect_button").style.display = "inline";
document.getElementById("up_button").style.display = "inline";
document.getElementById("down_button").style.display = "inline";
switch_options(sel_select, av_select, false); switch_options(sel_select, av_select, false);
sel_select.selectedIndex = -1; sel_select.selectedIndex = -1;
updateView(); updateView();
......
js/field.js
View file @ bfe0ace4
...@@ -139,8 +139,8 @@ function updateCalendarFromField(date_field) { ...@@ -139,8 +139,8 @@ function updateCalendarFromField(date_field) {
/* Hide input fields and show the text with (edit) next to it */ /* Hide input fields and show the text with (edit) next to it */
function hideEditableField( container, input, action, field_id, original_value ) { function hideEditableField( container, input, action, field_id, original_value ) {
YAHOO.util.Dom.setStyle(container, 'display', 'inline'); YAHOO.util.Dom.removeClass(container, 'bz_default_hidden');
YAHOO.util.Dom.setStyle(input, 'display', 'none'); YAHOO.util.Dom.addClass(input, 'bz_default_hidden');
YAHOO.util.Event.addListener(action, 'click', showEditableField, YAHOO.util.Event.addListener(action, 'click', showEditableField,
new Array(container, input)); new Array(container, input));
if(field_id != ""){ if(field_id != ""){
...@@ -165,8 +165,8 @@ function showEditableField (e, ContainerInputArray) { ...@@ -165,8 +165,8 @@ function showEditableField (e, ContainerInputArray) {
YAHOO.util.Event.preventDefault(e); YAHOO.util.Event.preventDefault(e);
return; return;
} }
YAHOO.util.Dom.setStyle(ContainerInputArray[0], 'display', 'none'); YAHOO.util.Dom.addClass(ContainerInputArray[0], 'bz_default_hidden');
YAHOO.util.Dom.setStyle(inputArea, 'display', 'inline'); YAHOO.util.Dom.removeClass(inputArea, 'bz_default_hidden');
if ( inputArea.tagName.toLowerCase() == "input" ) { if ( inputArea.tagName.toLowerCase() == "input" ) {
inputs.push(inputArea); inputs.push(inputArea);
} else { } else {
...@@ -212,8 +212,8 @@ function checkForChangedFieldValues(e, ContainerInputArray ) { ...@@ -212,8 +212,8 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
} }
} }
if(unhide){ if(unhide){
YAHOO.util.Dom.setStyle(ContainerInputArray[0], 'display', 'none'); YAHOO.util.Dom.addClass(ContainerInputArray[0], 'bz_default_hidden');
YAHOO.util.Dom.setStyle(ContainerInputArray[1], 'display', 'inline'); YAHOO.util.Dom.removeClass(ContainerInputArray[1], 'bz_default_hidden');
} }
} }
...@@ -267,20 +267,25 @@ function showHideStatusItems(e, dupArrayInfo) { ...@@ -267,20 +267,25 @@ function showHideStatusItems(e, dupArrayInfo) {
// finish doing stuff based on the selection. // finish doing stuff based on the selection.
if ( el ) { if ( el ) {
showDuplicateItem(el); showDuplicateItem(el);
YAHOO.util.Dom.setStyle('resolution_settings', 'display', 'none'); YAHOO.util.Dom.addClass('resolution_settings', 'bz_default_hidden');
if (document.getElementById('resolution_settings_warning')) { if (document.getElementById('resolution_settings_warning')) {
YAHOO.util.Dom.setStyle('resolution_settings_warning', 'display', 'none'); YAHOO.util.Dom.addClass('resolution_settings_warning',
'bz_default_hidden');
} }
YAHOO.util.Dom.setStyle('duplicate_display', 'display', 'none'); YAHOO.util.Dom.addClass('duplicate_display', 'bz_default_hidden');
if ( el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate" ) { if ( el.value == dupArrayInfo[1] && dupArrayInfo[0] == "is_duplicate" ) {
YAHOO.util.Dom.setStyle('resolution_settings', 'display', 'inline'); YAHOO.util.Dom.removeClass('resolution_settings',
YAHOO.util.Dom.setStyle('resolution_settings_warning', 'display', 'block'); 'bz_default_hidden');
YAHOO.util.Dom.removeClass('resolution_settings_warning',
'bz_default_hidden');
} }
else if ( bz_isValueInArray(close_status_array, el.value) ) { else if ( bz_isValueInArray(close_status_array, el.value) ) {
// hide duplicate and show resolution // hide duplicate and show resolution
YAHOO.util.Dom.setStyle('resolution_settings', 'display', 'inline'); YAHOO.util.Dom.removeClass('resolution_settings',
YAHOO.util.Dom.setStyle('resolution_settings_warning', 'display', 'block'); 'bz_default_hidden');
YAHOO.util.Dom.removeClass('resolution_settings_warning',
'bz_default_hidden');
} }
} }
} }
...@@ -292,14 +297,16 @@ function showDuplicateItem(e) { ...@@ -292,14 +297,16 @@ function showDuplicateItem(e) {
if (resolution) { if (resolution) {
if (resolution.value == 'DUPLICATE' && bz_isValueInArray( close_status_array, bug_status.value) ) { if (resolution.value == 'DUPLICATE' && bz_isValueInArray( close_status_array, bug_status.value) ) {
// hide resolution show duplicate // hide resolution show duplicate
YAHOO.util.Dom.setStyle('duplicate_settings', 'display', 'inline'); YAHOO.util.Dom.removeClass('duplicate_settings',
YAHOO.util.Dom.setStyle('dup_id_discoverable', 'display', 'none'); 'bz_default_hidden');
YAHOO.util.Dom.addClass('dup_id_discoverable', 'bz_default_hidden');
dup_id.focus(); dup_id.focus();
dup_id.select(); dup_id.select();
} }
else { else {
YAHOO.util.Dom.setStyle('duplicate_settings', 'display', 'none'); YAHOO.util.Dom.addClass('duplicate_settings', 'bz_default_hidden');
YAHOO.util.Dom.setStyle('dup_id_discoverable', 'display', 'block'); YAHOO.util.Dom.removeClass('dup_id_discoverable',
'bz_default_hidden');
dup_id.blur(); dup_id.blur();
} }
} }
...@@ -309,7 +316,7 @@ function showDuplicateItem(e) { ...@@ -309,7 +316,7 @@ function showDuplicateItem(e) {
function setResolutionToDuplicate(e, duplicate_or_move_bug_status) { function setResolutionToDuplicate(e, duplicate_or_move_bug_status) {
var status = document.getElementById('bug_status'); var status = document.getElementById('bug_status');
var resolution = document.getElementById('resolution'); var resolution = document.getElementById('resolution');
YAHOO.util.Dom.setStyle('dup_id_discoverable', 'display', 'none'); YAHOO.util.Dom.addClass('dup_id_discoverable', 'bz_default_hidden');
status.value = duplicate_or_move_bug_status; status.value = duplicate_or_move_bug_status;
resolution.value = "DUPLICATE"; resolution.value = "DUPLICATE";
showHideStatusItems("", ["",""]); showHideStatusItems("", ["",""]);
......
skins/standard/global.css
View file @ bfe0ace4
...@@ -501,7 +501,6 @@ form#Create .comment { ...@@ -501,7 +501,6 @@ form#Create .comment {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
width: 30px; width: 30px;
display: none;
} }
#select_button { #select_button {
......
template/en/default/bug/knob.html.tmpl
View file @ bfe0ace4
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<script type="text/javascript"> <script type="text/javascript">
var close_status_array = new Array("[% closed_status_array.join('", "') FILTER replace(',$', '') var close_status_array = new Array("[% closed_status_array.join('", "') FILTER replace(',$', '')
FILTER none %]"); FILTER none %]");
YAHOO.util.Dom.setStyle('dup_id_discoverable', 'display', 'block'); YAHOO.util.Dom.removeClass('dup_id_discoverable', 'bz_default_hidden');
hideEditableField( "dup_id_container", "dup_id", 'dup_id_edit_action', hideEditableField( "dup_id_container", "dup_id", 'dup_id_edit_action',
'dup_id', '[% bug.dup_id FILTER js %]' ) 'dup_id', '[% bug.dup_id FILTER js %]' )
showHideStatusItems( "", ['[% "is_duplicate" IF bug.dup_id %]', showHideStatusItems( "", ['[% "is_duplicate" IF bug.dup_id %]',
......
template/en/default/list/change-columns.html.tmpl
View file @ bfe0ace4
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
</select> </select>
</td> </td>
<td> <td>
<input class="image_button" type="button" id="select_button" <input class="image_button bz_default_hidden" type="button"
name="select" onclick="move_select()"> id="select_button" name="select" onclick="move_select()">
<br><br> <br><br>
<input class="image_button" type="button" id="deselect_button" <input class="image_button bz_default_hidden" type="button"
name="deselect" onclick="move_deselect()"> id="deselect_button" name="deselect" onclick="move_deselect()">
</td> </td>
<td> <td>
<select name="selected_columns" id="selected_columns" <select name="selected_columns" id="selected_columns"
...@@ -80,11 +80,11 @@ ...@@ -80,11 +80,11 @@
</select> </select>
</td> </td>
<td> <td>
<input class="image_button" type="button" id="up_button" <input class="image_button bz_default_hidden" type="button"
name="up" onclick="move_up()"> id="up_button" name="up" onclick="move_up()">
<br><br> <br><br>
<input class="image_button" type="button" id="down_button" <input class="image_button bz_default_hidden" type="button"
name="down" onclick="move_down()"> id="down_button" name="down" onclick="move_down()">
</td> </td>
</tr> </tr>
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment