Module: nagvis Branch: master Commit: 8c300351f1a5e53c5c6977e9a3038e91a47d22e5 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=8c300351f1a5e53c5c6977e9a3038e91a47d22e5
Author: Lars Michelsen <[email protected]> Date: Sat Oct 30 23:31:51 2010 +0200 Cleanup after js cleanups --- share/frontend/nagvis-js/js/hover.js | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/frontend/nagvis-js/js/hover.js b/share/frontend/nagvis-js/js/hover.js index d0549b0..9b46dd4 100644 --- a/share/frontend/nagvis-js/js/hover.js +++ b/share/frontend/nagvis-js/js/hover.js @@ -161,7 +161,7 @@ function replaceHoverTemplateDynamicMacros(replaceChild, oObj, sTemplateCode) { // Replace child macros // FIXME: Check if this can be moved to static hover template macro replacements - if(replaceChild == true && oObj.conf.hover_childs_show + if(replaceChild === false && oObj.conf.hover_childs_show && oObj.conf.hover_childs_show == '1' && typeof oObj.conf.num_members != 'undefined' && oObj.conf.num_members > 0) sTemplateCode = replaceHoverTemplateChildMacros(oObj, sTemplateCode); @@ -198,7 +198,7 @@ function replaceHoverTemplateStaticMacros(replaceChild, oObj, sTemplateCode) { // On child service objects in hover menu replace obj_name with // service_description - if(replaceChild == true && oObj.conf.type === 'service') + if(replaceChild === true && oObj.conf.type === 'service') oMacros.obj_name = oObj.conf.service_description; else oMacros.obj_name = oObj.conf.name; @@ -218,7 +218,7 @@ function replaceHoverTemplateStaticMacros(replaceChild, oObj, sTemplateCode) { else oMacros.obj_notes = ''; - if(replaceChild != '1' && oObj.conf.type !== 'map') { + if(replaceChild === false && oObj.conf.type !== 'map') { oMacros.obj_backendid = oObj.conf.backend_id; oMacros.obj_backend_instancename = oObj.conf.backend_instancename; oMacros.html_cgi = oObj.conf.htmlcgi; @@ -265,9 +265,9 @@ function replaceHoverTemplateStaticMacros(replaceChild, oObj, sTemplateCode) { oSectionMacros.map = '<!--\\sBEGIN\\smap\\s-->.+?<!--\\sEND\\smap\\s-->'; // Macros which are only for servicegroup childs - if(replaceChild == true && oObj.parent_type === 'servicegroup' && oObj.conf.type === 'service') + if(replaceChild === true && oObj.parent_type === 'servicegroup' && oObj.conf.type === 'service') oMacros.obj_name1 = oObj.conf.name; - else if(replaceChild == false && oObj.conf.type !== 'servicegroup') + else if(replaceChild === false && oObj.conf.type !== 'servicegroup') oSectionMacros.servicegroupChild = '<!--\\sBEGIN\\sservicegroup_child\\s-->.+?<!--\\sEND\\sservicegroup_child\\s-->'; // Replace child section when unwanted ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
