From 45e8340492078dbbcba621fc4ea6f23867013fe3 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Thu, 3 Dec 2015 12:01:39 +0000 Subject: [PATCH] Diverse code cleanup naar aanleiding van warnings minifier (voornamelijk unused variabelen) svn path=/Website/trunk/; revision=27261 --- APPL/BES/sel_items_tab.js | 10 +++------- APPL/BEZ/bez_edit_afspraak.js | 1 - APPL/EXP/exp_shared.js | 2 +- APPL/FIN/fin_edit_factuur.js | 2 -- APPL/IMP/imp_shared.js | 2 -- APPL/INS/ins_edit_deel.js | 9 ++++----- APPL/INS/ins_list.js | 2 +- APPL/INS/ins_verbruik.js | 2 +- APPL/Localscripts/FcltJquery.js | 1 - APPL/Localscripts/FcltMgr.js | 1 - APPL/Localscripts/iface.js | 1 - APPL/Localscripts/modal_kenmerken.js | 10 ++-------- APPL/MGT/bes_discipline.js | 7 +++++-- APPL/MLD/mld_list.js | 1 - APPL/PRS/sel_substitute_tab.js | 3 +-- APPL/RES/res_plan.js | 2 -- APPL/SlnkDwf/PrintOptions.js | 2 -- APPL/SlnkDwf/ToonIMG.js | 22 ++++------------------ APPL/facmgtVB/FacmgtTools.js | 10 ---------- UTILS/PutOrders/puo_sendfile.js | 8 ++------ UTILS/PutOrders/puo_sendsms.js | 1 - UTILS/PutOrders/puo_shared.js | 2 +- 22 files changed, 25 insertions(+), 76 deletions(-) diff --git a/APPL/BES/sel_items_tab.js b/APPL/BES/sel_items_tab.js index 7d585a7d39..fd44a6bfb9 100644 --- a/APPL/BES/sel_items_tab.js +++ b/APPL/BES/sel_items_tab.js @@ -34,7 +34,7 @@ function AddAllItems(editable, show_received) function RetourItems(bes_key, urole) { var s = "../bes/bes_retour.asp?bes_key=" + bes_key + "&urole="+ urole; - var retourReturn = FcltMgr.openModalDetail(s, L("lcl_bes_retour"), {callback: FcltMgr.reload}); + FcltMgr.openModalDetail(s, L("lcl_bes_retour"), {callback: FcltMgr.reload}); } window.bes_item_info = null; // forceer global scope @@ -44,7 +44,7 @@ function load_item_info(srtdeel_key, urole, aantal) if (window.bes_item_info && window.bes_item_info.srtdeel_key == srtdeel_key) return; // Laad de gegevens van het artikel. if (srtdeel_key == -1) - var bes_item_info = null; + window.bes_item_info = null; else $.getJSON("get_item_info_ajax.asp?srtdeel_key=" + srtdeel_key, function(data) @@ -191,7 +191,6 @@ function AddItem(bes_item_info, aantal, urole, doCheckAmount) FcltMgr.resized(window); } - var objFlex = false; if (bes_item_info.num_prop>0) { // flexkenmerken vragen var prs_key = document.u2.person.value; @@ -337,7 +336,6 @@ function CreateRow(bes_item_info, aantal, received, editable, objFlex, urole) } var newDiv = document.createElement("div"); newDiv.className = 'besitemflex'; - var builder = []; // Elke regel apart in een span zetten. Een regel met \n werkt niet in FF textContent! for (var spanIndex in cell_arr) { @@ -457,7 +455,6 @@ function checkInput() var filled_lines = 0; var blank_lines = 0; - var table = $("#sel_items")[0]; $("#sel_items>tbody>tr").each( function () { if (this.amount != 0) @@ -575,7 +572,7 @@ function PrsStaffelListResult(prs_bedrijf_key) { var sFeatures="dialogHeight:200px;dialogWidth:400px;status=no;resizable=yes;center=yes;"; var s = "../bes/PrsStaffelInfo.asp?prs_bedrijf_key=" + prs_bedrijf_key; - var retourReturn = window.showModalDialog("ModalForm.asp?title=" + L("lcl_bes_staffel_details"), s, sFeatures); + window.showModalDialog("ModalForm.asp?title=" + L("lcl_bes_staffel_details"), s, sFeatures); } function getTrText(td1, td2, td3, total_text, total_value, tdid) @@ -750,7 +747,6 @@ function checkAmount(aantal_cell) var tr = $(aantal_cell).closest("tr")[0]; var amount = parseInt(aantal_cell.value, 10); var id_key = aantal_cell.id.substring(6); - var retour = tr.retour; if (aantal_cell.value == '') aantal_cell.value = amount = 1; if (aantal_cell.value == '' || isNaN(amount) || !isGoodNumber(aantal_cell.value, true,false,-1,-1) || diff --git a/APPL/BEZ/bez_edit_afspraak.js b/APPL/BEZ/bez_edit_afspraak.js index 7b13b3b646..17b279509f 100644 --- a/APPL/BEZ/bez_edit_afspraak.js +++ b/APPL/BEZ/bez_edit_afspraak.js @@ -265,7 +265,6 @@ function bez_submit() if (!validateForm("u2")) return false; - var t = document.forms.u2; var dt = new Date(parseInt($("#date_from").val(), 10)); var dt2 = new Date(parseInt($("#date_to").val(), 10)); diff --git a/APPL/EXP/exp_shared.js b/APPL/EXP/exp_shared.js index 5820640d53..2f70d61c8a 100644 --- a/APPL/EXP/exp_shared.js +++ b/APPL/EXP/exp_shared.js @@ -201,7 +201,7 @@ function openStreamWriteText(params) // lineseparator: -1=adCRLF, 10=adLF, 13=adCR // streamwrite: 1=adSaveCreateNotExist, 2=adSaveCreateOverWrite // charset: - var streamwrite = (params.streamwrite ? params.streamwrite : 1); + // var streamwrite = (params.streamwrite ? params.streamwrite : 1); var fileStream = new ActiveXObject("ADODB.Stream"); fileStream.CharSet = (params.charset ? params.charset : "Windows-1252"); diff --git a/APPL/FIN/fin_edit_factuur.js b/APPL/FIN/fin_edit_factuur.js index ad0db256b6..fe78026de3 100644 --- a/APPL/FIN/fin_edit_factuur.js +++ b/APPL/FIN/fin_edit_factuur.js @@ -486,12 +486,10 @@ function AddItem(nofocus) // als je hieronder iets aanpast controleer dan ook fi { var sum = 0; var descr = ""; - var BTW = -1; /*DUMMY*/ var sumBTW = 0; var ref = $("#loc_code").val(); var ksrt_key = -1; var ksrt_oms = ""; - var verlegd = 0; var rowIndex = parseInt($("#rowIndex").val()); rowIndex++; diff --git a/APPL/IMP/imp_shared.js b/APPL/IMP/imp_shared.js index 203dd13343..c8d920a98c 100644 --- a/APPL/IMP/imp_shared.js +++ b/APPL/IMP/imp_shared.js @@ -284,7 +284,6 @@ function impProcessStream(import_key, params) var sql = "SELECT ia.fac_import_app_key" + ", fac_import_app_code" + ", fac_import_app_prefix" - + ", fac_import_app_charset" + ", fac_import_app_folder" + ", fac_import_filenaam" + " FROM fac_import_app ia" @@ -295,7 +294,6 @@ function impProcessStream(import_key, params) var import_app_key = oRs("fac_import_app_key").Value; var impcode = oRs("fac_import_app_code").Value; var prefix = oRs("fac_import_app_prefix").Value||"FAC"; - var charset = oRs("fac_import_app_charset").Value||'Windows-1252'; var filenaam = oRs("fac_import_filenaam").Value; var folder = oRs("fac_import_app_folder").Value; oRs.Close(); diff --git a/APPL/INS/ins_edit_deel.js b/APPL/INS/ins_edit_deel.js index 3fafc6f91a..f121716e74 100644 --- a/APPL/INS/ins_edit_deel.js +++ b/APPL/INS/ins_edit_deel.js @@ -75,7 +75,6 @@ function onChangeSrtgroep(srtgroep_key) // alleen/altijd bij nieuwe objecten function onChangeSrtdeel(srtdeel_key) { - var autonum = $("#autonum").val(); if (srtdeel_key > 0) { // Check of er een afbeelding van het object weergegeven dient te worden en @@ -101,10 +100,10 @@ function loadKenmerk() $("#insFlexList").load(s, function(txt) { // Indien geen kenmerken dan is k_all = 0: txt bevat dan de tekst '' - var kall_str = ""; - if (false && txt.indexOf(kall_str) != -1) // TODO: als er alleen een label is zit die tekst er ook in; fout criterium dus! - $("#insFlex").hide(); - else + //var kall_str = ""; + //if (false && txt.indexOf(kall_str) != -1) // TODO: als er alleen een label is zit die tekst er ook in; fout criterium dus! + // $("#insFlex").hide(); + //else $("#insFlex").show(); FcltMgr.resized(window); }); diff --git a/APPL/INS/ins_list.js b/APPL/INS/ins_list.js index 8ee52f366b..f847b994b0 100644 --- a/APPL/INS/ins_list.js +++ b/APPL/INS/ins_list.js @@ -59,7 +59,7 @@ function checkInput(evt) var obj = evt.srcElement || evt.target; var new_val = obj.value; var sk_kenmerktype = obj.value1; - var sk_lengte = parseInt(obj.value2, 10); + //var sk_lengte = parseInt(obj.value2, 10); var sk_nmin = parseInt(obj.value3, 10); var sk_nmax = parseInt(obj.value4, 10); diff --git a/APPL/INS/ins_verbruik.js b/APPL/INS/ins_verbruik.js index 202bd1693a..9645b9d24c 100644 --- a/APPL/INS/ins_verbruik.js +++ b/APPL/INS/ins_verbruik.js @@ -9,7 +9,7 @@ function checkInput(evt) var obj = evt.srcElement || evt.target; var new_val = obj.value; var sk_kenmerktype = obj.getAttribute("value1"); - var sk_lengte = parseInt(obj.getAttribute("value2"),10); + //var sk_lengte = parseInt(obj.getAttribute("value2"),10); var sk_nmin = parseInt(obj.getAttribute("value3"),10); var sk_nmax = parseInt(obj.getAttribute("value4"),10); diff --git a/APPL/Localscripts/FcltJquery.js b/APPL/Localscripts/FcltJquery.js index 7a702d74b5..86ef45d454 100644 --- a/APPL/Localscripts/FcltJquery.js +++ b/APPL/Localscripts/FcltJquery.js @@ -177,7 +177,6 @@ jQuery.extend({ var $this = $(this), minHeight = $this.height(), - lineHeight = $this.css('lineHeight'), self = this; var shadow = $('
').css({ diff --git a/APPL/Localscripts/FcltMgr.js b/APPL/Localscripts/FcltMgr.js index c79baa55dc..9fcc4e3c49 100644 --- a/APPL/Localscripts/FcltMgr.js +++ b/APPL/Localscripts/FcltMgr.js @@ -82,7 +82,6 @@ var FcltMgr = } // FcltMgr heeft voor ons params al met windowname gevuld. params = params || {}; - var active = this._$tabshost.tabs('option', 'active'); var tab = this._$tabshost.find( ".ui-tabs-nav li[aria-controls='"+params.windowname+"']" ); if (title) tab.find("span:first").text(title); diff --git a/APPL/Localscripts/iface.js b/APPL/Localscripts/iface.js index a57d321040..b1de19cfb4 100644 --- a/APPL/Localscripts/iface.js +++ b/APPL/Localscripts/iface.js @@ -142,7 +142,6 @@ var iface = persoonDetails: function (fieldName, info) { var pkey=$('#'+fieldName)[0].value; - var pname=$('#'+fieldName+'_show')[0].value; if (info == 'PRS') { FcltMgr.openDetail("appl/prs/prs_perslid.asp?prs_key=" + pkey, { reuse: true }); diff --git a/APPL/Localscripts/modal_kenmerken.js b/APPL/Localscripts/modal_kenmerken.js index 4bcc3db8b2..668381371f 100644 --- a/APPL/Localscripts/modal_kenmerken.js +++ b/APPL/Localscripts/modal_kenmerken.js @@ -120,13 +120,6 @@ function kenmerkValues(n) function showKenmerkModal(purl, ptitle) { // ***** START INTERNE FUNCTIES ***** - function _dialogClose(result) - { - // Niet verwijderen anders hebben we geen toegang meer tot de kenmerken - //$('div#dkenmmodal').remove(); - } - - function _doOk() { var kenmerkArray = new Array(); @@ -180,7 +173,8 @@ function showKenmerkModal(purl, ptitle) // Open dialog scherm met de kenmerken params = { buttons: { "Ok!": _doOk, "Reset": _doReset }, - //close: _dialogClose, + //close: _dialogClose,// Niet verwijderen anders hebben we geen toegang meer tot de kenmerken + // $('div#dkenmmodal').remove(); xheight: 600, closeOnEscape: true, modal: false, diff --git a/APPL/MGT/bes_discipline.js b/APPL/MGT/bes_discipline.js index 72575736a5..86b66bfd1f 100644 --- a/APPL/MGT/bes_discipline.js +++ b/APPL/MGT/bes_discipline.js @@ -1,3 +1,8 @@ +/* + $Revision$ + $Id$ +*/ + function pre_submit() { var validation_message = ""; @@ -7,8 +12,6 @@ function pre_submit() var herfiat_marge = $("#herfiatmarge").val(); var herfiat = $("#herfiat").val(); - var x = "De waarde in veld [{0}] is niet correct.\n"; - if (kto_perc && ( (parseInt(kto_perc) > 100) || (parseInt(kto_perc) < 0) )) validation_message += L("mgt_validation_error_1").format(L("ins_discipline_ktopercentage")) + "\n"; diff --git a/APPL/MLD/mld_list.js b/APPL/MLD/mld_list.js index 67081ef087..76c3b19723 100644 --- a/APPL/MLD/mld_list.js +++ b/APPL/MLD/mld_list.js @@ -179,7 +179,6 @@ function toggleFlag(evt, mld_key) FcltMgr.stopPropagation(evt); var flagkey = $('#mldflagimg'+mld_key).attr('flagkey'); - var flagimg = $('#mldflagimg'+mld_key).attr('src'); var data = { mld_key: mld_key , flagkey: flagkey }; diff --git a/APPL/PRS/sel_substitute_tab.js b/APPL/PRS/sel_substitute_tab.js index 268e3b9263..8650e149db 100644 --- a/APPL/PRS/sel_substitute_tab.js +++ b/APPL/PRS/sel_substitute_tab.js @@ -148,8 +148,7 @@ function CancelOrder(id_key) function SaveSubstitutes() { // Form substitutes_string of prs_keys - substitutes_string = ""; - var id_key = ""; + var substitutes_string = ""; for (i in selectedItems) { if (selectedItems[i] != null) diff --git a/APPL/RES/res_plan.js b/APPL/RES/res_plan.js index 6f069777cb..0025375876 100644 --- a/APPL/RES/res_plan.js +++ b/APPL/RES/res_plan.js @@ -122,7 +122,6 @@ function room_table_mouse(evt, res_van, hour_px, res_t1) { var theTR = $(ob).parent("TR"); var dagnr = $('td.plantd.reserv', theTR).index(ob); // Hoeveelste TD? - var res_ruimte_key = theTR[0].id; res_van.setDate(res_van.getDate()+dagnr); res_van = res_van.setFloatHours(hours, 0.25); @@ -181,7 +180,6 @@ function checkArtikelen(starttime_room, endtime_room) if (allGood) $(".catline", tbl).each(function () { - var key = parseInt(this.id.substr(3)); // "row180" var objCnt = $("[id^='inpb_c_']",this)[0]; var Cnt = parseInt(objCnt.value,10); var hh = parseInt($("[id^='inpbh1_c_']",this).val(),10); diff --git a/APPL/SlnkDwf/PrintOptions.js b/APPL/SlnkDwf/PrintOptions.js index ec978d4582..220b163e0f 100644 --- a/APPL/SlnkDwf/PrintOptions.js +++ b/APPL/SlnkDwf/PrintOptions.js @@ -275,7 +275,6 @@ function _onMouseMove(evt) var paper = document.getElementById("idPaper"); var dx=(evt.clientX - dragStartX); var dy=(evt.clientY - dragStartY); - var szPaper = GetWindowRect(paper); elemIMG.style.left = $("#idPaper").position().left + 4 + dx + "px"; elemIMG.style.top = $("#idPaper").position().top + 4 + dy + "px"; @@ -304,7 +303,6 @@ function onload(event) { var paper = document.getElementById("idPaper"); - var szPaper = GetWindowRect(paper); elemIMG.style.left = $("#idPaper").position().left + 4 + "px"; elemIMG.style.top = $("#idPaper").position().top + 4 + "px"; elemIMG.style.clip = "rect(auto auto auto auto)"; diff --git a/APPL/SlnkDwf/ToonIMG.js b/APPL/SlnkDwf/ToonIMG.js index 20146b2fc1..a9ff79e702 100644 --- a/APPL/SlnkDwf/ToonIMG.js +++ b/APPL/SlnkDwf/ToonIMG.js @@ -278,7 +278,6 @@ function cssclrhex(num) \************************************************************/ function SetPaperColor(paperColor) { - var tBody = document.getElementById("idBody"); document.body.style.backgroundColor = cssclrhex(paperColor); // zie je bij uitzoomen _gPaperColor = paperColor; @@ -618,21 +617,10 @@ function _refresh(zoomChanged) } else { - if (1) - { // sequence is opgehoogd bij geforceerde refresh - elemIMG.src = qryAll +"&_dt_=" + _sequence; - elemIMG.hasMap = true; - } - else - { - try - { - if (elemIMG.SourcePath != "") - elemIMG.SourcePath = ""; - elemIMG.SourcePath = qryAll + "&AsDWF=1"; - } - catch (e) {;} - } + // sequence is opgehoogd bij geforceerde refresh + elemIMG.src = qryAll +"&_dt_=" + _sequence; + elemIMG.hasMap = true; + _gbPending = true; // Remember settings for when arriving in readystatechange pendScale = dScale @@ -801,7 +789,6 @@ function mapper_onLoad(SLNKEvent) //Plaatje schuift niet zichtbaar tijdens draggen? //$('img[usemap]').maphilight({ fillColor: '8080ff', fillOpacity: 0.05, // stroke: false, shadow: true, shadowRadius: 12 * SLNKEvent.dScale }); - var tBody = document.getElementById("idBody"); document.body.style.backgroundColor = cssclrhex(_gPaperColor>=0?_gPaperColor:SLNKEvent.paperColor); // deze komt uit de tekening. Zie je bij uitzoomen _FireEvent("onMapperLoad", SLNKEvent); @@ -1092,7 +1079,6 @@ function _StartSymbolDragging(evt) _invalidateMap(); symbolDraggingBusy = true; _PickOff(); - var pick = document.getElementById("Pickpoint"); var qryShow = "&sdwgScale=" + gSLNKEvent.scaleY var src = gIMGKeyToSymbol + "?pSymbolKey=" + _symbolKey + qryShow diff --git a/APPL/facmgtVB/FacmgtTools.js b/APPL/facmgtVB/FacmgtTools.js index 4221786649..9bc0862b46 100644 --- a/APPL/facmgtVB/FacmgtTools.js +++ b/APPL/facmgtVB/FacmgtTools.js @@ -28,16 +28,6 @@ function onloadFacMgt(translate_lcls) FcltMgr.openDetail("appl/facmgtvb/"+(this.nameProp||this.getAttribute("href")), this.innerText||this.textContent ) return false; }) - // facmgt annuleren sluit ook tabblad, behalve bij toevoegen - if (0) // niet meer ondersteund - if ($('input[type=submit][value=Toevoegen]').length == 0) - { - $('input[type=submit][value=Annuleren]').click(function() - { - FcltMgr.closeDetail(window) - return false; - }) - } } // (Ook) geen vertaallinkjes als we niet in frames zitten, te lastig diff --git a/UTILS/PutOrders/puo_sendfile.js b/UTILS/PutOrders/puo_sendfile.js index ca58ac8abc..fb0c4ce49e 100644 --- a/UTILS/PutOrders/puo_sendfile.js +++ b/UTILS/PutOrders/puo_sendfile.js @@ -66,9 +66,6 @@ function GetExtension(xmlDoc, xslDoc) // JGL Volgens mij is er juni 2014 geen enkele klant die dit gebruikt. function connectFile(p_connect, p_textstream, p_filename) { - var fsoForReading = 1; - var fsoForWriting = 2; - var filename = p_connect.CurrentAddress + p_filename; Log2File(1, "Sending File as: " + filename + "..."); @@ -127,9 +124,9 @@ function connectHTTP( p_connect if (mode = "SOAP") { resultcode = 0; - // xml maar even eruit gehaald omdat API requests soms falen en deze geven dan geen geldige + // xml maar even eruit gehaald omdat API requests soms falen en deze geven dan geen geldige // xml terug. - if (p_bedrijfadres.extension == "cxml" || p_bedrijfadres.extension == "xxml") + if (p_bedrijfadres.extension == "cxml" || p_bedrijfadres.extension == "xxml") { var XMLresult = new ActiveXObject("Msxml2.DOMDocument.6.0"); var xmlDoc = SafeLoadTextXML(submitResult); @@ -232,7 +229,6 @@ function connectMail( p_connect Log2File(2, "Before SendMail"); var body = "Opdracht nr. " + p_ordernr + " is middels Facilitor bij u geplaatst." + " De specificatie van de bestelling is bijgevoegd als document: " + p_filename; - var bodyHTML = ""; var mailResult = false; var encryptpass = ""; diff --git a/UTILS/PutOrders/puo_sendsms.js b/UTILS/PutOrders/puo_sendsms.js index 17df5e14fb..7868618ccb 100644 --- a/UTILS/PutOrders/puo_sendsms.js +++ b/UTILS/PutOrders/puo_sendsms.js @@ -33,7 +33,6 @@ function sendSMS( p_telnr var xmlHTTP = new ActiveXObject("Msxml2.ServerXMLHTTP.6.0"); - var header = ""; var body = ""; Log2File(1, "SMS bericht: '" + p_msgtxt + "' wordt via " + S("puo_smsprotocol") + " verzonden naar: " + p_telnr); diff --git a/UTILS/PutOrders/puo_shared.js b/UTILS/PutOrders/puo_shared.js index d6b9ab4ba6..6cc299b1f5 100644 --- a/UTILS/PutOrders/puo_shared.js +++ b/UTILS/PutOrders/puo_shared.js @@ -103,7 +103,7 @@ function LogResult(p_path, p_data) // // p_path: relatief pad met bestandsnaam // p_data: tekst string - var fsoForReading = 1; + //var fsoForReading = 1; var fsoForWriting = 2; var fso = new ActiveXObject("Scripting.FileSystemObject");