Author: sshyrkov Date: Mon Oct 8 12:22:25 2007 New Revision: 18775 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18775&repname= =3Djahia Log: DOC-224: NPE when unselecting a file =
http://www.jahia.net/jira/browse/DOC-224 Resolution: correctly check for the empty (null) value Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e= mbedded_filemanager.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh= ared/embedded_filemanager.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/shared/embedded_filemanager.jsp&r= ev=3D18775&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e= mbedded_filemanager.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/e= mbedded_filemanager.jsp Mon Oct 8 12:22:25 2007 @@ -227,8 +227,8 @@ = function selectCallback(msg) { if (msg) { - var tag =3D "value"; - document.mainForm.selectedFileName.value =3D XmlUtils.getNodeV= alue(msg.getDocXml(), tag); + var value =3D XmlUtils.getNodeValue(msg.getDocXml(), "value"); + document.mainForm.selectedFileName.value =3D value ? value : "= "; checkSelectFileLink(); } } @@ -742,7 +742,7 @@ <div id=3D"currentFile"> <strong><jahia:engineResourceBundle resourceName=3D"org.jahia.engines.filemanager.Filemanager_Engi= ne.selectedFile.label"/>:</strong> - <input type=3D"text" id=3D"selectedFileName" name=3D"selectedFileName"= style=3D"width:45%;" value=3D"<%=3DTableEntry.javascriptDecode(filename) %= >" onchange=3D"alert('onchange')"/> + <input type=3D"text" id=3D"selectedFileName" name=3D"selectedFileName"= style=3D"width:45%;" value=3D"<%=3DTableEntry.javascriptDecode(filename) %= >"/> <span id=3D"selectFileLink" style=3D"display:none;"> - <a href=3D"java= script:go('selectFileEmpty')"><jahia:engineResourceBundle resourceName=3D"o= rg.jahia.engines.filemanager.Filemanager_Engine.unselectFile.label"/></a></= span> </div> <input type=3D"hidden" id=3D"addressBar" name=3D"addressBar" /> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
