From: <fxp...@us...> - 2011-04-27 11:21:33
|
Revision: 7657 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=7657&view=rev Author: fxprunayre Date: 2011-04-27 11:21:26 +0000 (Wed, 27 Apr 2011) Log Message: ----------- Fix JS error in flat mode. Modified Paths: -------------- sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork/lib/GeoNetwork/widgets/editor/EditorTools.js sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork-mini.js sandbox/guiwidgets/web-client/src/main/resources/search/js/App-mini.js Modified: sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork/lib/GeoNetwork/widgets/editor/EditorTools.js =================================================================== --- sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork/lib/GeoNetwork/widgets/editor/EditorTools.js 2011-04-27 11:02:12 UTC (rev 7656) +++ sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork/lib/GeoNetwork/widgets/editor/EditorTools.js 2011-04-27 11:21:26 UTC (rev 7657) @@ -121,6 +121,7 @@ var el = thisElement.insertHtml('afterEnd', html, true); setAddControls(el, orElement); } else if (what == 'before') { // only for orElement = true + // An or element in flat mode may be empty var el = thisElement.insertHtml('beforeBegin', html, true); setAddControls(el, orElement); } else { @@ -390,6 +391,10 @@ * @returns All controls */ function getControlsFromElement(el){ + if (el === null) { + return []; + } + var id = el.getAttribute('id'); var controls = Ext.get('buttons_' + id).query('a'); for (var i = 0; i < controls.length; i++) { @@ -400,10 +405,11 @@ } function topElement(el){ - if (el.prev() == undefined) + if (el.prev() == undefined) { return true; - else + } else { return (!isSameElement(el.prev(), el)); + } } function bottomElement(el){ Modified: sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork-mini.js =================================================================== --- sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork-mini.js 2011-04-27 11:02:12 UTC (rev 7656) +++ sandbox/guiwidgets/web-client/src/main/resources/js/GeoNetwork-mini.js 2011-04-27 11:21:26 UTC (rev 7657) @@ -14820,7 +14820,8 @@ }else{el2Descs[index].hide() }}if(visible2){el1Descs[index].show() }else{el1Descs[index].hide() -}}}function getControlsFromElement(el){var id=el.getAttribute("id"); +}}}function getControlsFromElement(el){if(el===null){return[] +}var id=el.getAttribute("id"); var controls=Ext.get("buttons_"+id).query("a"); for(var i=0; i<controls.length; Modified: sandbox/guiwidgets/web-client/src/main/resources/search/js/App-mini.js =================================================================== --- sandbox/guiwidgets/web-client/src/main/resources/search/js/App-mini.js 2011-04-27 11:02:12 UTC (rev 7656) +++ sandbox/guiwidgets/web-client/src/main/resources/search/js/App-mini.js 2011-04-27 11:21:26 UTC (rev 7657) @@ -14820,7 +14820,8 @@ }else{el2Descs[index].hide() }}if(visible2){el1Descs[index].show() }else{el1Descs[index].hide() -}}}function getControlsFromElement(el){var id=el.getAttribute("id"); +}}}function getControlsFromElement(el){if(el===null){return[] +}var id=el.getAttribute("id"); var controls=Ext.get("buttons_"+id).query("a"); for(var i=0; i<controls.length; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |