From: S C. <sl...@us...> - 2010-01-19 23:29:35
|
Update of /cvsroot/dlsciences/sms-server-project/jsapi/api_v1/interactive_map In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24198 Modified Files: strand_map_implementation.js strand_map_public_js_api.js Log Message: bug fix: only populate tab on normal view. Index: strand_map_public_js_api.js =================================================================== RCS file: /cvsroot/dlsciences/sms-server-project/jsapi/api_v1/interactive_map/strand_map_public_js_api.js,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** strand_map_public_js_api.js 19 Jan 2010 18:02:04 -0000 1.21 --- strand_map_public_js_api.js 19 Jan 2010 23:29:27 -0000 1.22 *************** *** 5,9 **** var alignedResComplete = false; var alignedResExists = false; ! var nsdlAlignedLabel = false; EventHandler.prototype = { --- 5,9 ---- var alignedResComplete = false; var alignedResExists = false; ! var nsdlAlignedLabel = ''; EventHandler.prototype = { *************** *** 279,283 **** alignedResExists = false; ! _nsdlalignedTab.setContent('<img src="'+baseJsapiUrl+'/api_v1/interactive_map/images/spinner.gif" id="bmk-ld-img" width="16" height="16" style="vertical-align: middle; display:none" onload="$(\'bmk-ld-img\').show();"/> Loading...'); var mainContent = ''; --- 279,285 ---- alignedResExists = false; ! if(displaytype != 'print'){ ! _nsdlalignedTab.setContent('<img src="'+baseJsapiUrl+'/api_v1/interactive_map/images/spinner.gif" id="bmk-ld-img" width="16" height="16" style="vertical-align: middle; display:none" onload="$(\'bmk-ld-img\').show();"/> Loading...'); ! } var mainContent = ''; *************** *** 328,332 **** alignedResExists = true; } else { ! _nsdlalignedTab.setContent("There are no resources aligned with this benchmark."); alignedResComplete = true; alignedResExists = false; --- 330,336 ---- alignedResExists = true; } else { ! if(displaytype != 'print'){ ! _nsdlalignedTab.setContent("There are no resources aligned with this benchmark."); ! } alignedResComplete = true; alignedResExists = false; Index: strand_map_implementation.js =================================================================== RCS file: /cvsroot/dlsciences/sms-server-project/jsapi/api_v1/interactive_map/strand_map_implementation.js,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** strand_map_implementation.js 19 Jan 2010 18:02:04 -0000 1.12 --- strand_map_implementation.js 19 Jan 2010 23:29:27 -0000 1.13 *************** *** 282,286 **** } ! var nsdlAlignedHtml = StrandMap.getNsdlAlignedResources('0','print'); var relatedBenchmarkImg = $('relatedBenchmarkImg'); --- 282,288 ---- } ! if(_nsdlalignedTab){ ! var nsdlAlignedHtml = StrandMap.getNsdlAlignedResources('0','print'); ! } var relatedBenchmarkImg = $('relatedBenchmarkImg'); |