From c586c144e8ef94d706ca33c6e00c0b7dc1fe262d Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Mon, 7 Mar 2011 05:36:32 -0500 Subject: [PATCH] indentation, trailing whitespace, and minor refactoring --- .../staff_client/server/cat/volume_copy_creator.js | 130 +++++++++++---------- 1 file changed, 71 insertions(+), 59 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js index b7a55ffc40..2433f1e44c 100644 --- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js +++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js @@ -69,13 +69,13 @@ function my_init() { dojo.require('fieldmapper.OrgUtils'); var label_class = g.data.hash.aous['cat.default_classification_scheme']; //fieldmapper.aou.fetchOrgSettingDefault(ses('ws_ou'), 'cat.default_classification_scheme'); - // Assign a default value if none was returned + // Assign a default value if none was returned if (!label_class) { label_class = 1; } /***********************************************************************************************************/ - /* If we're passed existing_copies, rig up a copy_shortcut object to leverage existing code for rendering the volume labels, etc. + /* If we're passed existing_copies, rig up a copy_shortcut object to leverage existing code for rendering the volume labels, etc. * Also make a lookup object for existing copies keyed on org id and callnumber label, and another keyed on copy id. */ // g.org_label_existing_copy_map = { ou_id : { callnumber_label : [ copy1, copy2, ... ] }, ... } @@ -173,7 +173,7 @@ g.render_volume_count_entry = function(row,ou_id) { tb.select(); } tb.setAttribute('ou_id',ou_id); tb.setAttribute('size','3'); tb.setAttribute('cols','3'); - tb.setAttribute('rel_vert_pos','1'); + tb.setAttribute('rel_vert_pos','1'); if ( (!g.copy_shortcut) && (!g.last_focus) ) { tb.focus(); g.last_focus = tb; } var node; function render_copy_count_entry(ev) { @@ -189,8 +189,8 @@ g.render_volume_count_entry = function(row,ou_id) { node = g.render_callnumber_copy_count_entry(row,ou_id,ev.target.value); } } - util.widgets.apply_vertical_tab_on_enter_handler( - tb, + util.widgets.apply_vertical_tab_on_enter_handler( + tb, function() { render_copy_count_entry({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); } ); tb.addEventListener( 'change', render_copy_count_entry, false); @@ -232,11 +232,14 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) { var rows = grid.lastChild; var r = document.createElement('row'); rows.appendChild( r ); var x = document.createElement('label'); r.appendChild(x); - x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.call_nums')); x.setAttribute('style','font-weight: bold'); + x.setAttribute('value', $("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.call_nums')); + x.setAttribute('style','font-weight: bold'); x = document.createElement('label'); r.appendChild(x); - x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.num_of_copies')); x.setAttribute('style','font-weight: bold'); + x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.num_of_copies')); + x.setAttribute('style','font-weight: bold'); x = document.createElement('label'); r.appendChild(x); - x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.barcodes_and_parts')); x.setAttribute('style','font-weight: bold'); + x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.barcodes_and_parts')); + x.setAttribute('style','font-weight: bold'); function handle_change(call_number_column_textbox,number_of_copies_column_textbox,barcode_column_box) { if (call_number_column_textbox.value == '') return; @@ -267,7 +270,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) { } function handle_change_call_number_column_textbox(ev) { - var _call_number_column_textbox = ev.target; + var _call_number_column_textbox = ev.target; var _call_number_column_box = _call_number_column_textbox.parentNode; var _number_of_copies_column_box = _call_number_column_box.nextSibling; var _number_of_copies_column_textbox = _number_of_copies_column_box.firstChild; @@ -276,7 +279,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) { } function handle_change_number_of_copies_column_textbox(ev) { - var _number_of_copies_column_textbox = ev.target; + var _number_of_copies_column_textbox = ev.target; var _number_of_copies_column_box = _number_of_copies_column_textbox.parentNode; var _call_number_column_box = _number_of_copies_column_box.previousSibling; var _call_number_column_textbox = _call_number_column_box.firstChild; @@ -286,42 +289,52 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) { for (var i = 0; i < count; i++) { var r = document.createElement('row'); rows.appendChild(r); - var call_number_column_box = document.createElement('vbox'); r.appendChild(call_number_column_box); - var number_of_copies_column_box = document.createElement('vbox'); r.appendChild(number_of_copies_column_box); - var barcode_column_box = document.createElement('vbox'); r.appendChild(barcode_column_box); - var call_number_column_textbox = document.createElement('textbox'); call_number_column_box.appendChild(call_number_column_textbox); - if (g.use_defaults && $('marc_cn').firstChild) { - // default to first value from batch callnumber menu - call_number_column_textbox.value = $('marc_cn').firstChild.value; - call_number_column_textbox.select(); - } - call_number_column_textbox.setAttribute('rel_vert_pos','2'); - call_number_column_textbox.setAttribute('ou_id',ou_id); - util.widgets.apply_vertical_tab_on_enter_handler( - call_number_column_textbox, - function() { handle_change_call_number_column_textbox({'target':call_number_column_textbox}); setTimeout(function(){util.widgets.vertical_tab(call_number_column_textbox);},0); } - ); - var number_of_copies_column_textbox = document.createElement('textbox'); number_of_copies_column_box.appendChild(number_of_copies_column_textbox); - if (g.use_defaults) { - // default to one copy per call number - number_of_copies_column_textbox.value = 1; - number_of_copies_column_textbox.select(); - } - number_of_copies_column_textbox.setAttribute('size','3'); number_of_copies_column_textbox.setAttribute('cols','3'); - number_of_copies_column_textbox.setAttribute('rel_vert_pos','3'); - number_of_copies_column_textbox.setAttribute('ou_id',ou_id); - util.widgets.apply_vertical_tab_on_enter_handler( - number_of_copies_column_textbox, - function() { handle_change_number_of_copies_column_textbox({'target':number_of_copies_column_textbox}); setTimeout(function(){util.widgets.vertical_tab(number_of_copies_column_textbox);},0); } - ); - call_number_column_textbox.addEventListener( 'change', handle_change_call_number_column_textbox, false); - call_number_column_textbox.addEventListener( 'change', g.gather_copies_soon, false); - call_number_column_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false ); - number_of_copies_column_textbox.addEventListener( 'change', handle_change_number_of_copies_column_textbox, false); - number_of_copies_column_textbox.addEventListener( 'change', g.gather_copies_soon, false); - number_of_copies_column_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false ); - if ( !g.last_focus ) { number_of_copies_column_textbox.focus(); g.last_focus = number_of_copies_column_textbox; } + /**** CALLNUMBER COLUMN ****/ + var call_number_column_box = document.createElement('vbox'); + r.appendChild(call_number_column_box); + var call_number_column_textbox = document.createElement('textbox'); + call_number_column_box.appendChild(call_number_column_textbox); + if (g.use_defaults && $('marc_cn').firstChild) { + // default to first value from batch callnumber menu + call_number_column_textbox.value = $('marc_cn').firstChild.value; + call_number_column_textbox.select(); + } + call_number_column_textbox.setAttribute('rel_vert_pos','2'); + call_number_column_textbox.setAttribute('ou_id',ou_id); + util.widgets.apply_vertical_tab_on_enter_handler( + call_number_column_textbox, + function() { handle_change_call_number_column_textbox({'target':call_number_column_textbox}); setTimeout(function(){util.widgets.vertical_tab(call_number_column_textbox);},0); } + ); + call_number_column_textbox.addEventListener( 'change', handle_change_call_number_column_textbox, false); + call_number_column_textbox.addEventListener( 'change', g.gather_copies_soon, false); + call_number_column_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false ); + + /**** NUMBER OF COPIES COLUMN ****/ + var number_of_copies_column_box = document.createElement('vbox'); + r.appendChild(number_of_copies_column_box); + var number_of_copies_column_textbox = document.createElement('textbox'); + number_of_copies_column_box.appendChild(number_of_copies_column_textbox); + if (g.use_defaults) { + // default to one copy per call number + number_of_copies_column_textbox.value = 1; + number_of_copies_column_textbox.select(); + } + number_of_copies_column_textbox.setAttribute('size','3'); number_of_copies_column_textbox.setAttribute('cols','3'); + number_of_copies_column_textbox.setAttribute('rel_vert_pos','3'); + number_of_copies_column_textbox.setAttribute('ou_id',ou_id); + util.widgets.apply_vertical_tab_on_enter_handler( + number_of_copies_column_textbox, + function() { handle_change_number_of_copies_column_textbox({'target':number_of_copies_column_textbox}); setTimeout(function(){util.widgets.vertical_tab(number_of_copies_column_textbox);},0); } + ); + number_of_copies_column_textbox.addEventListener( 'change', handle_change_number_of_copies_column_textbox, false); + number_of_copies_column_textbox.addEventListener( 'change', g.gather_copies_soon, false); + number_of_copies_column_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false ); + if ( !g.last_focus ) { number_of_copies_column_textbox.focus(); g.last_focus = number_of_copies_column_textbox; } + + /**** BARCODE COLUMN ****/ + var barcode_column_box = document.createElement('vbox'); + r.appendChild(barcode_column_box); setTimeout( function(idx,call_number_column_textbox,number_of_copies_column_textbox){ @@ -342,7 +355,7 @@ g.render_callnumber_copy_count_entry = function(row,ou_id,count) { number_of_copies_column_textbox.disabled = true; } } - call_number_column_textbox.value = label; + call_number_column_textbox.value = label; handle_change_call_number_column_textbox({'target':call_number_column_textbox}); } else { @@ -423,7 +436,7 @@ g.render_part_menu = function(barcode_tb) { false ); menulist.addEventListener('command',g.gather_copies_soon,false); - + return hbox; } @@ -453,7 +466,7 @@ g.render_barcode_entry = function(node,callnumber,count,ou_id) { } } - JSAN.use('util.barcode'); + JSAN.use('util.barcode'); for (var i = 0; i < count; i++) { var tb_part_box; @@ -488,8 +501,8 @@ g.render_barcode_entry = function(node,callnumber,count,ou_id) { tb.focus(); } if (set_handlers) { - util.widgets.apply_vertical_tab_on_enter_handler( - tb, + util.widgets.apply_vertical_tab_on_enter_handler( + tb, function() { ready_to_create({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); } ); util.widgets.apply_vertical_tab_on_enter_handler( @@ -511,8 +524,8 @@ g.render_barcode_entry = function(node,callnumber,count,ou_id) { tb.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false ); } } - - setTimeout( function() { if (g.first_focus) { g.first_focus.focus(); } }, 0 ); + + setTimeout( function() { if (g.first_focus) { g.first_focus.focus(); } }, 0 ); } catch(E) { g.error.sdump('D_ERROR','g.render_barcode_entry: ' + E); @@ -580,7 +593,7 @@ g.gather_copies = function() { var volumes_hash = {}; var barcodes = []; - + for (var i = 0; i < nl.length; i++) { if ( nl[i].getAttribute('rel_vert_pos') == 4 ) barcodes.push( nl[i] ); if ( nl[i].getAttribute('rel_vert_pos') == 2 ) { @@ -590,7 +603,7 @@ g.gather_copies = function() { if (typeof volumes_hash[ou_id][callnumber] == 'undefined') { volumes_hash[ou_id][callnumber] = [] } } }; - + for (var i = 0; i < barcodes.length; i++) { var acp_id = barcodes[i].getAttribute('acp_id') || g.new_node_id--; var ou_id = barcodes[i].getAttribute('ou_id'); @@ -717,7 +730,7 @@ g.stash_and_close = function(param) { urls.XUL_SPINE_LABEL, { 'tab_name' : $("catStrings").getString('staff.cat.util.spine_editor.tab_name') }, { - 'barcodes' : util.functional.map_list( copies, function(o){return o.barcode();}) + 'barcodes' : util.functional.map_list( copies, function(o){return o.barcode();}) } ); } @@ -768,7 +781,6 @@ g.load_prefs = function() { } } catch(E) { g.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.volume_copy_creator.load_prefs.err_retrieving_prefs'),E); - } } @@ -818,15 +830,15 @@ g.list_callnumbers = function(doc_id, label_class) { function() { var nl = document.getElementsByTagName('textbox'); for (var i = 0; i < nl.length; i++) { - if (nl[i].getAttribute('rel_vert_pos')==2 - && !nl[i].disabled) + if (nl[i].getAttribute('rel_vert_pos')==2 + && !nl[i].disabled) { nl[i].value = ml.value; util.widgets.dispatch('change',nl[i]); } } if (g.last_focus) setTimeout( function() { g.last_focus.focus(); }, 0 ); - }, + }, false ); } -- 2.11.0