Module: nagvis Branch: master Commit: f5b36188aa7f6b3e2fa8aaa51ab41a3b8d304675 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=f5b36188aa7f6b3e2fa8aaa51ab41a3b8d304675
Author: Lars Michelsen <[email protected]> Date: Tue Oct 19 20:25:29 2010 +0200 #375 setting correct object name in alle cases when opening the addmodify dialog for editing --- share/frontend/wui/js/addmodify.js | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/share/frontend/wui/js/addmodify.js b/share/frontend/wui/js/addmodify.js index ded80da..38cffab 100644 --- a/share/frontend/wui/js/addmodify.js +++ b/share/frontend/wui/js/addmodify.js @@ -27,10 +27,11 @@ var bFormIsValid = true; -function printObjects(aObjects,oOpt) { +function printObjects(aObjects, oOpt) { var type = oOpt.type; var field = oOpt.field; var selected = oOpt.selected; + var bSelected = false; var oField = document.getElementById(field); @@ -40,8 +41,6 @@ function printObjects(aObjects,oOpt) { oField.options[i] = null; if(aObjects && aObjects.length > 0) { - var bSelected = false; - // fill with new options for(i = 0; i < aObjects.length; i++) { var oName = ''; @@ -69,8 +68,10 @@ function printObjects(aObjects,oOpt) { // Fallback to input field when configured value could not be selected or // the list is empty - if((selected != '' && !bSelected) || !aObjects || aObjects.length <= 0) { - toggleFieldType(oField.name, oField.value) + if((selected != '' && !bSelected) || !aObjects || aObjects.length == 0) { + toggleFieldType(oOpt.field, lang['manualInput']); + document.getElementById(oOpt.field).value = lang['manualInput']; + document.getElementById('_inp_'+oOpt.field).value = selected; } } @@ -79,9 +80,8 @@ function printObjects(aObjects,oOpt) { function validateMapCfgForm() { // Terminate fast when validateMapConfigFieldValue marked the form contents // as invalid - if(bFormIsValid === false) { + if(bFormIsValid === false) return false; - } for(var i=0, len = document.addmodify.elements.length; i < len; i++) { if(document.addmodify.elements[i].type != 'submit' && document.addmodify.elements[i].type != 'hidden') { @@ -210,12 +210,10 @@ function validateMapCfgForm() { */ function validateMapConfigFieldValue(oField) { var sName; - var bInputHelper = false; var bChanged; if(oField.name.indexOf('_inp_') !== -1) { sName = oField.name.replace('_inp_', ''); - bInputHelper = true; } else { sName = oField.name; } ------------------------------------------------------------------------------ Download new Adobe(R) Flash(R) Builder(TM) 4 The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly Flex(R) Builder(TM)) enable the development of rich applications that run across multiple browsers and platforms. Download your free trials today! http://p.sf.net/sfu/adobe-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
