Author: tchemit Date: 2008-05-18 08:37:45 +0000 (Sun, 18 May 2008) New Revision: 42 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java trunk/lutinrss/src/main/webapp/rssinclude.js Log: ne pas utiliser l'ancienne methode pour un evenment load car sinon on emp?\195?\168che l'utilisation ult?\195?\169rieur d'un tel m?\195?\169canisme (dans FCK par exemple...) Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-16 19:47:46 UTC (rev 41) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-18 08:37:45 UTC (rev 42) @@ -78,21 +78,20 @@ " }\n" + " xhr.send(null);\n" + "}\n" + - "window.onload=function () {\n" + + "var initRss =function () {\n" + " var divs = document.getElementsByTagName(\"div\"); \n" + " var i = 0;var max=divs.length; \n" + " var toTreate = [];\n" + " while (i < max) {\n" + " var div = divs[i++];\n" + - " if (div.getAttribute('name')=='rssinclude') {\n" + - " toTreate[toTreate.length] = div;\n" + - " } \n" + + " if (div.getAttribute('name')=='rssinclude') toTreate[toTreate.length] = div;\n"+ " }\n" + " i=0;max = toTreate.length;\n" + - " while (i<max) { \n" + - " rssincludeUpdateDiv(toTreate[i++], true);\n" + - " }\n" + - "}\n"; + " while (i<max) rssincludeUpdateDiv(toTreate[i++], true);"+ + "}\n"+ + "if (window.addEventListener) window.addEventListener( 'load', initRss,false);\n"+ + "else if (window.attachEvent) window.attachEvent( 'onload', initRss);"; + private static final long serialVersionUID = 1L; /** Modified: trunk/lutinrss/src/main/webapp/rssinclude.js =================================================================== --- trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-16 19:47:46 UTC (rev 41) +++ trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-18 08:37:45 UTC (rev 42) @@ -1,8 +1,8 @@ function rssincludeUpdateDiv(div, background) { // mettre background a false est utile lorsque l'on appelle la methode // depuis une fenetre que l'on ferme ensuite - var serlvetUrl = "%1$1"; - //var serlvetUrl = "http://localhost:8083/lutinrss-2.0/RSSServlet"; + //var serlvetUrl = "%1$1"; + var serlvetUrl = "http://localhost:8083/lutinrss-2.0/RSSServlet"; win = window; var xhr = null; var error=null; @@ -27,25 +27,23 @@ xhr.open("GET", url, !!background); xhr.onreadystatechange = function() { - if(xhr.readyState == 1) div.innerHTML = "Chargement du flux '"+feedName+"'"; + if(xhr.readyState == 1) div.innerHTML = "Chargement du flux '"+feedName+"' en cours..."; if(xhr.readyState == 4) div.innerHTML = xhr.responseText; } xhr.send(null); } -window.onload=function () { +var initRss =function () { var divs = document.getElementsByTagName("div"); var i = 0;var max=divs.length; var toTreate = []; while (i < max) { var div = divs[i++]; - if (div.getAttribute('name')=='rssinclude') { - toTreate[toTreate.length] = div; - } + if (div.getAttribute('name')=='rssinclude') toTreate[toTreate.length] = div; } i=0;max = toTreate.length; - while (i<max) { - rssincludeUpdateDiv(toTreate[i++], true); - } + while (i<max) rssincludeUpdateDiv(toTreate[i++], true); } -//window.addEventListener( 'load', init,false); +if (window.addEventListener) window.addEventListener( 'load', initRss,false); +else if (window.attachEvent) window.attachEvent( 'onload', initRss); +