From 1ca2e1cfecaeb4bb0f4984edf6921dcefba1407e Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Thu, 2 Feb 2017 13:02:36 +0000 Subject: [PATCH] FSN#39258 Nog missende plaatjes in 2016.3 svn path=/Website/branches/v2016.3/; revision=32674 --- APPL/FAC/fac_user_info_phone.asp | 23 +++++++++-------------- APPL/PRS/pchange.asp | 8 ++++---- APPL/Shared/Suggest/suggest.js | 23 ++++++++++++++++++++--- CUST/SKAF/xsl/cust.xsl | 4 ++-- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/APPL/FAC/fac_user_info_phone.asp b/APPL/FAC/fac_user_info_phone.asp index bbc1eb73cf..65069969c9 100644 --- a/APPL/FAC/fac_user_info_phone.asp +++ b/APPL/FAC/fac_user_info_phone.asp @@ -95,10 +95,7 @@ IFRAMER_HEADER("Facilitor Vinder", buttons);
<% if (S("prs_use_edit_photo") && canChange) {%>
- + <% } %>
@@ -120,11 +117,10 @@ IFRAMER_HEADER("Facilitor Vinder", buttons); %> - - - <%ROFIELD('fldroom', null, wpi.prs_werkplek_aanduiding,{ infoPointer: infoPointer }); %> + + + + <%ROFIELD('fldroom', null, wpi.prs_werkplek_aanduiding,{ infoPointer: infoPointer }); %> <% } else @@ -137,11 +133,10 @@ IFRAMER_HEADER("Facilitor Vinder", buttons); %> - - - <%ROFIELD('fldworklocation', null, wl); %> + + + + <%ROFIELD('fldworklocation', null, wl); %> <% } else diff --git a/APPL/PRS/pchange.asp b/APPL/PRS/pchange.asp index e0c9be5184..3e7f34567b 100644 --- a/APPL/PRS/pchange.asp +++ b/APPL/PRS/pchange.asp @@ -146,12 +146,12 @@ IFACE.FORM_END(); <% var buttons = []; if (!isExpired && (theUser == user_key || xfunc.canWrite("WEB_PRSSYS") || xfunc.canWrite("WEB_FACMGT"))) - buttons.push({title: L("lcl_delete_sessions"), icon:"../Pictures/reject.png", action:"doClearSessions()"}); + buttons.push({title: L("lcl_delete_sessions"), icon:"reject.png", action:"doClearSessions()"}); if (!isExpired && (xfunc.canWrite("WEB_PRSSYS") || xfunc.canWrite("WEB_FACMGT"))) - buttons.push({title: L("lcl_delete_password"), icon:"../Pictures/undo.png", action:"doClearPassword()"}); + buttons.push({title: L("lcl_delete_password"), icon:"undo.png", action:"doClearPassword()"}); - buttons.push({title: L("lcl_submit"), icon:"../Pictures/opslaan.png", action:"doOK()"}); - buttons.push({title: L("lcl_cancel"), icon:"../Pictures/undo.png", action:"doCancel()"}); + buttons.push({title: L("lcl_submit"), icon:"opslaan.png", action:"doOK()"}); + buttons.push({title: L("lcl_cancel"), icon:"undo.png", action:"doCancel()"}); CreateButtons(buttons) %> diff --git a/APPL/Shared/Suggest/suggest.js b/APPL/Shared/Suggest/suggest.js index 7cbbcd8459..71eb3135b8 100644 --- a/APPL/Shared/Suggest/suggest.js +++ b/APPL/Shared/Suggest/suggest.js @@ -242,6 +242,8 @@ function Suggest(inParams) // Anders krijg je ook het verschijnsel dat je 2 keer moet klikken voordat je de lijst krijgt. params.queryField.removeAttribute("checkExist"); $(params.queryField).focus(); // zodat anderen door onblur verbergen + + if (!isAutocompleteDivVisible()) { autoOpen(); @@ -250,10 +252,13 @@ function Suggest(inParams) { setValue(params.queryField.getAttribute("sgKey"), params.queryField.getAttribute("sgCurrentValue"), false, false, - params.queryField.getAttribute("sgExtraParam")); - hideAutocompleteDiv(); - } + params.queryField.getAttribute("sgExtraParam")); + hideAutocompleteDiv(); + } + return; + + } }); params.queryField.onmousemove = function (evt) @@ -1029,9 +1034,21 @@ function Suggest(inParams) doRequest(params.queryField.value, false); if (params.queryField.createTextRange) { + // Alleen IE komt hier, FF niet! +// alert(JSON.stringify(params)); +// var el = document.getElementById("sgRoom"); +// var range = el.createTextRange(); +// range.move("character", 1); +// range.select(); var oRange = params.queryField.createTextRange(); +// alert(JSON.stringify(params.queryField)); // = {"jQuery{blablabla": 103} +// alert(JSON.stringify(oRange)); // oRange = {} +// oRange.collapse(true); +// oRange.moveEnd('character', 1); +// oRange.moveStart('character', 1); oRange.move("character", 1); oRange.select(); +// oRange.setSelectionRange(1,1); } // TODO: else wat voor FireFox? //set focus back to the textbox (when field is not disabled) diff --git a/CUST/SKAF/xsl/cust.xsl b/CUST/SKAF/xsl/cust.xsl index 91b272ee60..c169fe639a 100644 --- a/CUST/SKAF/xsl/cust.xsl +++ b/CUST/SKAF/xsl/cust.xsl @@ -933,7 +933,7 @@ Voor vragen kunt u ook gebruik maken van dit e-mailadres.
- Hier afmelden + Hier afmelden

@@ -1014,7 +1014,7 @@ Voor vragen kunt u ook gebruik maken van dit e-mailadres. openstaande bestellingen
- Hier afmelden + Hier afmelden