- Nuiton-rss-commits - mailman.cloud.codelutin.com

[Lutinweb-commits] r43 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude
by tchemit＠users.labs.libre-entreprise.org May 18, 2008

May 18, 2008

Author: tchemit Date: 2008-05-18 11:35:01 +0000 (Sun, 18 May 2008) New Revision: 43 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js Log: utilisation variables de configuration Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 08:37:45 UTC (rev 42) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/fck_rssinclude.js 2008-05-18 11:35:01 UTC (rev 43) @@ -1,35 +1,32 @@ -var dialog = window.parent ; -var oEditor = dialog.InnerDialogLoaded() ; -var FCK = oEditor.FCK ; -var FCKLang = oEditor.FCKLang ; -var FCKConfig = oEditor.FCKConfig ; -var FCKTools = oEditor.FCKTools ; +var dialog = window.parent; +var oEditor = dialog.InnerDialogLoaded(); +var FCK = oEditor.FCK; +var FCKLang = oEditor.FCKLang; +var FCKConfig = oEditor.FCKConfig; +var FCKTools = oEditor.FCKTools; -// L'url du service web permettant de recuperer les Feeds configures -var configSiteURL = '/srvwebsiteworkshop'; - // Set the language direction. -window.document.dir = oEditor.FCKLang.Dir ; +window.document.dir = oEditor.FCKLang.Dir; // Recuperation du feed selectionne -var oRss = dialog.Selection.GetSelectedElement() ; +var oRss = dialog.Selection.GetSelectedElement(); // Un peu de travail au chargement de la page window.onload = function() { - // Translate the dialog box texts. - oEditor.FCKLanguageManager.TranslatePage(document) ; + // Translate the dialog box texts. + oEditor.FCKLanguageManager.TranslatePage(document); - // chargement de la comba avec les feeds configures - LoadCombo(); + // chargement de la comba avec les feeds configures + LoadCombo(); - // Load the selected element information (if any). - LoadSelection() ; + // Load the selected element information (if any). + LoadSelection(); - // Activate the "OK" button. - window.parent.SetOkButton( true ) ; + // Activate the "OK" button. + window.parent.SetOkButton( true ); - SelectField( 'txtFeedName' ) ; + SelectField( 'txtFeedName' ); } /** @@ -37,45 +34,41 @@ * Cela n'est fait que si le serveur peut etre contacte */ function LoadCombo() { - var xhr = null; - if(window.XMLHttpRequest) // Firefox - xhr = new window.XMLHttpRequest(); - else if(window.ActiveXObject) // Internet Explorer - xhr = new window.ActiveXObject("Microsoft.XMLHTTP"); + var xhr = null; + if(window.XMLHttpRequest) // Firefox + xhr = new window.XMLHttpRequest(); + else if(window.ActiveXObject) // Internet Explorer + xhr = new window.ActiveXObject("Microsoft.XMLHTTP"); - if (xhr) { - var url = configSiteURL + "?action=doRss&rssAction=optionList&template=" + escape("<option id='%1' value='%1'>%2</option>"); - xhr.open("GET", url, false); - xhr.onreadystatechange = function() { - if(xhr.readyState == 4) { - if (xhr.status == 200) /* 200 : code HTTP pour OK */ - { - var div = document.getElementById("divFeedName"); - div.innerHTML = '<select style="WIDTH: 100%" id="txtFeedName" onblur="updatePreview();">' - + xhr.responseText - + '</input>'; - if (oRss) { - // on selectionne l'ancienne valeur - GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); - } - } - } - } - xhr.send(null); - } + if (xhr) { + xhr.open("GET", FCKConfig.RssKnownFeedsURL, false); + xhr.onreadystatechange = function() { + if(xhr.readyState == 4 && xhr.status == 200) /* 200 : code HTTP pour OK */ + { + var content = '<select style="WIDTH: 100%" id="txtFeedName" onblur="updatePreview();">'+ + xhr.responseText + '</select>'; + document.getElementById("divFeedName").innerHTML = content; + if (oRss) { + // on selectionne l'ancienne valeur + GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); + } + } + } + xhr.send(null); + } } /** * Chargement du feed que l'on re-edite */ function LoadSelection() { - if (! oRss) return; + if (! oRss) return; - GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); - GetE('txtNbItem').value = GetAttribute( oRss, 'nbItem', '' ); - GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedRepr', '' ); + GetE('txtFeedName').value = GetAttribute( oRss, 'feedName', '' ); + GetE('txtNbItem').value = GetAttribute( oRss, 'nbItem', '' ); + GetE('txtFeedRepr').value = GetAttribute( oRss, 'feedRepr', '' ); - updatePreview(); + updatePreview(); } /** @@ -83,40 +76,41 @@ */ function Ok() { - if ( GetE('txtFeedName').value.length == 0 ) - { - GetE('txtFeedName').focus() ; + if ( GetE('txtFeedName').value.length == 0 ) + { + GetE('txtFeedName').focus() ; - alert( oEditor.FCKLang.DlgRssincludeAlertFeedName ) ; - return false ; - } + alert( oEditor.FCKLang.DlgRssincludeAlertFeedName ) ; + return false ; + } - oEditor.FCKUndo.SaveUndoStep() ; - if ( !oRss ) - { - oRss = FCK.InsertElement( 'DIV' ) ; - oScript = FCK.InsertElement('SCRIPT'); - SetAttribute( oScript, 'src', 'http://rssinclude/lutinrss-1.0/rssinclude_1.js'); - } - updateRss( oRss ) ; + oEditor.FCKUndo.SaveUndoStep() ; + if ( !oRss ) + { + oRss = FCK.InsertElement( 'DIV' ) ; + oScript = FCK.InsertElement('SCRIPT'); + SetAttribute( oScript, 'src', FCKConfig.RssScriptURL); + } + updateRss( oRss ) ; - rssincludeUpdateDiv(oRss, false); - return true ; + rssincludeUpdateDiv(oRss, false); + return true ; } /** * Mise a jour d'un div avec les informations trouvees dans l'interface */ function updateRss(e){ - e.contentEditable = false ; + e.contentEditable = false ; - SetAttribute( e, 'class', 'rssinclude'); - SetAttribute( e, 'name', 'rssinclude'); - SetAttribute( e, 'feedName', GetE('txtFeedName').value ); - SetAttribute( e, 'nbItem', GetE('txtNbItem').value ); - SetAttribute( e, 'feedRepr', GetE('txtFeedRepr').value ); - e.innerHTML = 'RSS ' + GetE('txtFeedName').value; - e.style.backgroundColor = '#ffff00' ; + SetAttribute( e, 'class', 'rssinclude'); + SetAttribute( e, 'name', 'rssinclude'); + SetAttribute( e, 'feedName', GetE('txtFeedName').value ); + SetAttribute( e, 'nbItem', GetE('txtNbItem').value ); + SetAttribute( e, 'feedRepr', GetE('txtFeedRepr').value ); + SetAttribute( e, 'forceReload', 'true' ); + e.innerHTML = 'RSS ' + GetE('txtFeedName').value; + e.style.backgroundColor = '#ffff00' ; } // L'element servant a la preview @@ -127,18 +121,18 @@ */ function updatePreview(){ - if ( !ePreview ) { - ePreview = GetE('rssincludePreview') ; - } + if ( !ePreview ) { + ePreview = GetE('rssincludePreview') ; + } - if ( ! ePreview) { - return; - } + if ( ! ePreview) { + return; + } - if ( GetE('txtFeedName').value.length == 0 ) { - ePreview.innerHTML = 'Invalid RSS' ; - } else { - updateRss(ePreview); - rssincludeUpdateDiv(ePreview, true, true); - } + if ( GetE('txtFeedName').value.length == 0 ) { + ePreview.innerHTML = 'Invalid RSS' ; + } else { + updateRss(ePreview); + rssincludeUpdateDiv(ePreview, true); + } }

1 0

[Lutinweb-commits] r42 - in trunk/lutinrss/src/main: java/org/codelutin/rss webapp
by tchemit＠users.labs.libre-entreprise.org May 18, 2008

May 18, 2008

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); +

1 0

[Lutinweb-commits] r41 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org May 16, 2008

May 16, 2008

Author: tchemit Date: 2008-05-16 19:47:46 +0000 (Fri, 16 May 2008) New Revision: 41 Modified: trunk/lutinrss/src/main/webapp/rssinclude.js Log: le code javascript ne fonctionnait plus (suite ?\195?\160 une erreur de ma part...) sous ff2 et ie6 Modified: trunk/lutinrss/src/main/webapp/rssinclude.js =================================================================== --- trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-16 19:45:37 UTC (rev 40) +++ trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-16 19:47:46 UTC (rev 41) @@ -2,6 +2,7 @@ // 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"; win = window; var xhr = null; var error=null; @@ -24,19 +25,27 @@ if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);} if (!!forceReload) {url += '&forceReload=true';} - xhr.container=div; xhr.open("GET", url, !!background); xhr.onreadystatechange = function() { - if(this.readyState == 1) this.container.innerHTML = "Chargement du flux '"+this.container.getAttribute("feedName")+"'"; - if(this.readyState == 4) this.container.innerHTML = this.responseText; + if(xhr.readyState == 1) div.innerHTML = "Chargement du flux '"+feedName+"'"; + if(xhr.readyState == 4) div.innerHTML = xhr.responseText; } xhr.send(null); } -window.addEventListener( 'load', function () { - var divs = document.getElementsByName("rssinclude"); - var i = 0;var max=divs.length; + +window.onload=function () { + var divs = document.getElementsByTagName("div"); + var i = 0;var max=divs.length; + var toTreate = []; while (i < max) { var div = divs[i++]; - rssincludeUpdateDiv(div, true); + if (div.getAttribute('name')=='rssinclude') { + toTreate[toTreate.length] = div; + } } -},true); + i=0;max = toTreate.length; + while (i<max) { + rssincludeUpdateDiv(toTreate[i++], true); + } +} +//window.addEventListener( 'load', init,false);

1 0

[Lutinweb-commits] r40 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 16, 2008

May 16, 2008

Author: tchemit Date: 2008-05-16 19:45:37 +0000 (Fri, 16 May 2008) New Revision: 40 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: le code javascript ne fonctionnait plus (suite ?\195?\160 une erreur de ma part...) sous ff2 et ie6 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-16 14:55:38 UTC (rev 39) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-16 19:45:37 UTC (rev 40) @@ -71,23 +71,28 @@ " if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);}\n" + " if (!!forceReload) {url += '&forceReload=true';}\n" + "\n" + - " xhr.container=div;\n" + " xhr.open(\"GET\", url, !!background);\n" + " xhr.onreadystatechange = function() {\n" + - " if(this.readyState == 1) this.container.innerHTML = \"Chargement du flux '\"+this.container.getAttribute(\"feedName\")+\"'\";\n" + - " if(this.readyState == 4) this.container.innerHTML = this.responseText;\n" + + " if(xhr.readyState == 1) div.innerHTML = \"Chargement du flux '\"+feedName+\"'\";\n" + + " if(xhr.readyState == 4) div.innerHTML = xhr.responseText;\n" + " }\n" + " xhr.send(null);\n" + "}\n" + - "window.addEventListener( 'load', function () {\n" + - " var divs = document.getElementsByName(\"rssinclude\");\n" + - " var i = 0;var max=divs.length;\n" + + "window.onload=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" + - " rssincludeUpdateDiv(div, true);\n" + + " if (div.getAttribute('name')=='rssinclude') {\n" + + " toTreate[toTreate.length] = div;\n" + + " } \n" + " }\n" + - "},true);\n"; - + " i=0;max = toTreate.length;\n" + + " while (i<max) { \n" + + " rssincludeUpdateDiv(toTreate[i++], true);\n" + + " }\n" + + "}\n"; private static final long serialVersionUID = 1L; /**

1 0

[Lutinweb-commits] r39 - trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang
by bpoussin＠users.labs.libre-entreprise.org May 16, 2008

May 16, 2008

Author: bpoussin Date: 2008-05-16 14:55:38 +0000 (Fri, 16 May 2008) New Revision: 39 Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js Log: correction d'un D qui s'etait glisse par hasard dans le nom de variable Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js 2008-05-15 22:13:28 UTC (rev 38) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/en.js 2008-05-16 14:55:38 UTC (rev 39) @@ -2,7 +2,7 @@ FCKLang["DlgRssincludeTitle"] = "Rss Include"; FCKLang["DlgRssincludeFeedName"] = "name or URL" ; FCKLang["DlgRssincludeFeedNameEdit"] = "Edit" ; -DFCKLang["DlgRssincludeFeedNameAdd"] = "Add" ; +FCKLang["DlgRssincludeFeedNameAdd"] = "Add" ; FCKLang["DlgRssincludeNbItem"] = "item's number" ; FCKLang["DlgRssincludeFeedRepr"] = "Feed representation" ; FCKLang["DlgRssincludeAlertFeedName"] = "Please input the feed name or feed URL" Modified: trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js =================================================================== --- trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js 2008-05-15 22:13:28 UTC (rev 38) +++ trunk/lutinrss/src/main/resources/fckeditor/editor/plugins/rssinclude/lang/fr.js 2008-05-16 14:55:38 UTC (rev 39) @@ -2,7 +2,7 @@ FCKLang["DlgRssincludeTitle"] = "Rss Include"; FCKLang["DlgRssincludeFeedName"] = "nom ou URL" ; FCKLang["DlgRssincludeFeedNameEdit"] = "Edition" ; -DFCKLang["DlgRssincludeFeedNameAdd"] = "Ajout" ; +FCKLang["DlgRssincludeFeedNameAdd"] = "Ajout" ; FCKLang["DlgRssincludeNbItem"] = "nombre d'item" ; FCKLang["DlgRssincludeFeedRepr"] = "Feed representation" ; FCKLang["DlgRssincludeAlertFeedName"] = "Veuillez entrer un nom ou une URL pour le feed"

1 0

[Lutinweb-commits] r38 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org May 15, 2008

May 15, 2008

Author: tchemit Date: 2008-05-15 22:13:28 +0000 (Thu, 15 May 2008) New Revision: 38 Modified: trunk/lutinrss/src/main/webapp/feed.css Log: plus besoin des id dans les divs :) Modified: trunk/lutinrss/src/main/webapp/feed.css =================================================================== --- trunk/lutinrss/src/main/webapp/feed.css 2008-05-15 22:12:24 UTC (rev 37) +++ trunk/lutinrss/src/main/webapp/feed.css 2008-05-15 22:13:28 UTC (rev 38) @@ -1,4 +1,4 @@ -div#content { +.rssinclude { border: 1px dotted black; }

1 0

[Lutinweb-commits] r37 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org May 15, 2008

May 15, 2008

Author: tchemit Date: 2008-05-15 22:12:24 +0000 (Thu, 15 May 2008) New Revision: 37 Modified: trunk/lutinrss/src/main/webapp/test.html Log: plus besoin des id dans les divs :) Modified: trunk/lutinrss/src/main/webapp/test.html =================================================================== --- trunk/lutinrss/src/main/webapp/test.html 2008-05-15 22:11:45 UTC (rev 36) +++ trunk/lutinrss/src/main/webapp/test.html 2008-05-15 22:12:24 UTC (rev 37) @@ -10,14 +10,14 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link href="feed.css" rel="stylesheet" type="text/css" /> <script src="RSSServlet"></script> - </head> +</head> <body> <h1>Test RSS</h1> - <div name="rssinclude" id="lmi" class="rssinclude" feedName="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbItem="5" feedRepre="indat-natd"></div> - <div name="rssinclude" id="lemonde" class="rssinclude" feedName="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="5" feedRepre="indat-natd"></div> - <div name="rssinclude" id="developpez" class="rssinclude" feedName="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="5" feedRepre="indat-natd"></div> - <div name="rssinclude" id="formatouvert" class="rssinclude" feedName="http://formats-ouverts.org/rss.php" nbItem="5" feedRepre="indat-natd"></div> - <div name="rssinclude" id="h2" class="rssinclude" feedName="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5" feedRepre="indat-natd"></div> - <div name="rssinclude" id="opensi" class="rssinclude" feedName="http://www.opensi.org/news.rss" nbItem="5" feedRepre="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.lemondeinformatique.fr/flux-rss/open-source/rss.xml" nbItem="1" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" nbItem="2" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://blog.developpez.com/xmlsrv/rss2.php?blog=42" nbItem="3" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://formats-ouverts.org/rss.php" nbItem="4" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.h2database.com/html/newsfeed-rss.xml" nbItem="5" feedRepr="indat-natd"></div> + <div name="rssinclude" class="rssinclude" feedName="http://www.opensi.org/news.rss" nbItem="6" feedRepr="indat-natd"></div> </body> </html>

1 0

[Lutinweb-commits] r36 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org May 15, 2008

May 15, 2008

Author: tchemit Date: 2008-05-15 22:11:45 +0000 (Thu, 15 May 2008) New Revision: 36 Modified: trunk/lutinrss/src/main/webapp/rssinclude.js Log: mutualisation du code javascript avec la methode getJs amelioration du script : * forceReload est aussi un attribut * permettre ?\195?\160 l'url de contenir un ? * utilisation function anonyme pour le window.load Modified: trunk/lutinrss/src/main/webapp/rssinclude.js =================================================================== --- trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-15 22:11:24 UTC (rev 35) +++ trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-15 22:11:45 UTC (rev 36) @@ -1,54 +1,42 @@ -function rssincludeUpdateDiv(div, background, forceReload) { - // mettre background a false est utile lorsque l'on appelle la methode - // depuis une fenetre que l'on ferme ensuite +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"; + win = window; + var xhr = null; + var error=null; + var feedName = div.getAttribute("feedName"); + if (!feedName) // pas de feed name, fatal error + error = "<span class='feed-error'>Aucun feed name detecte...</span>"; + else if(win.XMLHttpRequest) // Firefox, Opera detected + xhr = new win.XMLHttpRequest(); + else if(win.ActiveXObject) // Internet Explorer detected + xhr = new win.ActiveXObject("Microsoft.XMLHTTP"); + else // XMLHttpRequest non supporte par le navigateur + error = "<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>"; + if (!!error) { div.innerHTML = error; return; } + + var nbItem = div.getAttribute("nbItem"); + var feedRepr = div.getAttribute("feedRepr"); + var forceReload = div.getAttribute("forceReload"); + var url = serlvetUrl+(serlvetUrl.indexOf('?')>-1?'&':'?')+"feedName=" + escape(feedName); + if (!!nbItem) {url += '&nbItem=' + escape(nbItem);} + if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);} + if (!!forceReload) {url += '&forceReload=true';} - var serlvetUrl = "http://rssinclude/lutinrss-1.0/RSSServlet"; - - // if (!win) { - win = window; - // } - - var xhr = null; - if(win.XMLHttpRequest) // Firefox - xhr = new win.XMLHttpRequest(); - else if(win.ActiveXObject) // Internet Explorer - xhr = new win.ActiveXObject("Microsoft.XMLHTTP"); - else { // XMLHttpRequest non supporté par le navigateur - var error = "<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>"; - } - - if (error) { - div.innerHTML = error; - } else { - div.innerHTML = "Loading " + feedName; - - var feedName = div.getAttribute("feedName"); - var url = serlvetUrl + "?feedName=" + escape(feedName); - - var nbItem = div.getAttribute("nbItem"); - if (!!nbItem) {url += '&nbItem=' + escape(nbItem);} - - var feedRepr = div.getAttribute("feedRepr"); - if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);} - if (!!forceReload) {url += '&forceReload=true';} - - xhr.open("GET", url, !!background); - xhr.onreadystatechange = function() { - if(xhr.readyState == 4) { - div.innerHTML = xhr.responseText; - } - } - xhr.send(null); - } + xhr.container=div; + xhr.open("GET", url, !!background); + xhr.onreadystatechange = function() { + if(this.readyState == 1) this.container.innerHTML = "Chargement du flux '"+this.container.getAttribute("feedName")+"'"; + if(this.readyState == 4) this.container.innerHTML = this.responseText; + } + xhr.send(null); } - -function rssinclude() { - var divs = document.getElementsByName("rssinclude"); - var i = 0; - while (i < divs.length) { - var div = divs[i++]; - rssincludeUpdateDiv(div, true); - } -} - -window.addEventListener( 'load', rssinclude, true ); +window.addEventListener( 'load', function () { + var divs = document.getElementsByName("rssinclude"); + var i = 0;var max=divs.length; + while (i < max) { + var div = divs[i++]; + rssincludeUpdateDiv(div, true); + } +},true);

1 0

[Lutinweb-commits] r35 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 15, 2008

May 15, 2008

Author: tchemit Date: 2008-05-15 22:11:24 +0000 (Thu, 15 May 2008) New Revision: 35 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java Log: mutualisation du code javascript avec la methode getJs amelioration du script : * forceReload est aussi un attribut * permettre ?\195?\160 l'url de contenir un ? * utilisation function anonyme pour le window.load Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-15 08:20:56 UTC (rev 34) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSServlet.java 2008-05-15 22:11:24 UTC (rev 35) @@ -34,90 +34,83 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(RSSServlet.class); - /** * L'objet permettant de recupérer la representation HTML d'un feed */ protected transient RSSHelper rss; /** * Le code JavaScript a utilise dans les pages clientes - * - * Provient du fichier rssinclude.js - * cat rssinclude.js |sed 's/"/\\"/g' |sed -re 's/^(.*)$/"\1\\n" +/' + * + * Provient du fichier rssinclude.js + * cat rssinclude.js |sed 's/"/\\"/g' |sed -re 's/^(.*)$/"\1\\n" +/' */ - protected String js = - "function rssincludeUpdateDiv(div, background, forceReload) {\n" + - " // mettre background a false est utile lorsque l'on appelle la methode\n" + - " // depuis une fenetre que l'on ferme ensuite\n" + - "\n" + - " var serlvetUrl = \"%1$s\";\n" + - "\n" + - " var win = window;\n" + - "\n" + - " var xhr = null;\n" + - " if(win.XMLHttpRequest) // Firefox\n" + - " xhr = new win.XMLHttpRequest();\n" + - " else if(win.ActiveXObject) // Internet Explorer\n" + - " xhr = new win.ActiveXObject(\"Microsoft.XMLHTTP\");\n" + - " else { // XMLHttpRequest non supporté par le navigateur\n" + - " var error = \"<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>\";\n" + - " }\n" + - "\n" + - " if (error) {\n" + - " div.innerHTML = error;\n" + - " } else {\n" + - " div.innerHTML = \"Loading \" + feedName;\n" + - "\n" + - " var feedName = div.getAttribute(\"feedName\");\n" + - " var url = serlvetUrl + \"?feedName=\" + escape(feedName);\n" + - "\n" + - " var nbItem = div.getAttribute(\"nbItem\");\n" + - " if (!!nbItem) {url += '&nbItem=' + escape(nbItem);}\n" + - "\n" + - " var feedRepr = div.getAttribute(\"feedRepr\");\n" + - " if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);}\n" + - "\n" + - " if (forceReload) {\n" + - " forceReload = 'true';\n" + - " } else {\n" + - " forceReload = 'false';\n" + - " }\n" + - "\n" + - " xhr.open(\"GET\", url, !!background);\n" + - " xhr.onreadystatechange = function() {\n" + - " if(xhr.readyState == 4) {\n" + - " div.innerHTML = xhr.responseText;\n" + - " }\n" + - " }\n" + - " xhr.send(null);\n" + - " }\n" + - "}\n" + - "\n" + - "function rssinclude() {\n" + - " var divs = document.getElementsByName(\"rssinclude\");\n" + - " var i = 0;\n" + - " while (i < divs.length) {\n" + - " var div = divs[i++];\n" + - " rssincludeUpdateDiv(div, true);\n" + - " }\n" + - "}\n" + - "\n" + - "window.addEventListener( 'load', rssinclude, true );\n"; - + protected static String js = + "function rssincludeUpdateDiv(div, background) {\n" + + " // mettre background a false est utile lorsque l'on appelle la methode\n" + + " // depuis une fenetre que l'on ferme ensuite\n" + + " var serlvetUrl = \"%1$s\"; \n" + + " win = window;\n" + + " var xhr = null;\n" + + " var error=null;\n" + + " var feedName = div.getAttribute(\"feedName\");\n" + + " if (!feedName) // pas de feed name, fatal error\n" + + " error = \"<span class='feed-error'>Aucun feed name detecte...</span>\"; \n" + + " else if(win.XMLHttpRequest) // Firefox, Opera detected\n" + + " xhr = new win.XMLHttpRequest();\n" + + " else if(win.ActiveXObject) // Internet Explorer detected\n" + + " xhr = new win.ActiveXObject(\"Microsoft.XMLHTTP\");\n" + + " else // XMLHttpRequest non supporte par le navigateur\n" + + " error = \"<span class='feed-error'>Votre navigateur ne supporte pas les objets XMLHTTPRequest...</span>\"; \n" + + " if (!!error) { div.innerHTML = error; return; } \n" + + " \n" + + " var nbItem = div.getAttribute(\"nbItem\");\n" + + " var feedRepr = div.getAttribute(\"feedRepr\"); \n" + + " var forceReload = div.getAttribute(\"forceReload\"); \n" + + " var url = serlvetUrl+(serlvetUrl.indexOf('?')>-1?'&':'?')+\"feedName=\" + escape(feedName); \n" + + " if (!!nbItem) {url += '&nbItem=' + escape(nbItem);} \n" + + " if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);}\n" + + " if (!!forceReload) {url += '&forceReload=true';}\n" + + "\n" + + " xhr.container=div;\n" + + " xhr.open(\"GET\", url, !!background);\n" + + " xhr.onreadystatechange = function() {\n" + + " if(this.readyState == 1) this.container.innerHTML = \"Chargement du flux '\"+this.container.getAttribute(\"feedName\")+\"'\";\n" + + " if(this.readyState == 4) this.container.innerHTML = this.responseText;\n" + + " }\n" + + " xhr.send(null);\n" + + "}\n" + + "window.addEventListener( 'load', function () {\n" + + " var divs = document.getElementsByName(\"rssinclude\");\n" + + " var i = 0;var max=divs.length;\n" + + " while (i < max) {\n" + + " var div = divs[i++];\n" + + " rssincludeUpdateDiv(div, true);\n" + + " }\n" + + "},true);\n"; + private static final long serialVersionUID = 1L; + /** + * @param url current url to add in script + * @return the rssinclude script, patched with url + */ + public static String getJs(String url) { + String code = String.format(js, url); + return code; + } @Override public void init(ServletConfig config) throws ServletException { - init(config,true); + init(config, true); } - public void init(ServletConfig config,boolean initRssConfig) throws ServletException { + public void init(ServletConfig config, boolean initRssConfig) throws ServletException { try { super.init(config); if (initRssConfig) { // init depuis la config de servlet new RSSConfig.RSSConfigInitializer<ServletConfig>() { + @Override protected String getConfigValue(ServletConfig config, String fullConfigName) { return config.getInitParameter(fullConfigName); @@ -130,28 +123,28 @@ } catch (Exception eee) { log.warn("Can't configure Servlet", eee); if (eee instanceof ServletException) { - throw (ServletException)eee; + throw (ServletException) eee; } throw new ServletException("Can't configure Servlet", eee); } } /** - * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. - * @param request servlet request - * @param response servlet response + * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. + * @param request servlet request + * @param response servlet response * @throws java.io.IOException TODO * @throws ServletException TODO - */ + */ public void processRequest(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { String feedName = request.getParameter("feedName"); if (feedName == null || "".equals(feedName)) { // on renvoie le code js response.setContentType("text/plain;charset=UTF-8"); PrintWriter out = response.getWriter(); try { - String code = String.format(js, request.getRequestURL().toString()); + String code = getJs(request.getRequestURL().toString()); out.println(code); } finally { out.close(); @@ -174,38 +167,38 @@ Integer result = null; try { result = Integer.parseInt(parameter); - } catch(Exception eee) { - log.debug("Can't convert to int: '" + parameter + "'" , eee); + } catch (Exception eee) { + log.debug("Can't convert to int: '" + parameter + "'", eee); } return result; } - // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code."> + /** - * Handles the HTTP <code>GET</code> method. - * @param request servlet request - * @param response servlet response - */ + * Handles the HTTP <code>GET</code> method. + * @param request servlet request + * @param response servlet response + */ @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } /** - * Handles the HTTP <code>POST</code> method. - * @param request servlet request - * @param response servlet response - */ + * Handles the HTTP <code>POST</code> method. + * @param request servlet request + * @param response servlet response + */ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + throws ServletException, IOException { processRequest(request, response); } /** - * Returns a short description of the servlet. - */ + * Returns a short description of the servlet. + */ @Override public String getServletInfo() { return "RSS Servlet";

1 0

[Lutinweb-commits] r34 - trunk/lutinrss/src/main/webapp
by tchemit＠users.labs.libre-entreprise.org May 15, 2008

May 15, 2008

Author: tchemit Date: 2008-05-15 08:20:56 +0000 (Thu, 15 May 2008) New Revision: 34 Modified: trunk/lutinrss/src/main/webapp/rssinclude.js Log: le parametre forceReload n'?\195?\169tait plus utilis?\195?\169 :), de plus on l'ajoute ?\195?\160 la requete uniquement si necessaire. Modified: trunk/lutinrss/src/main/webapp/rssinclude.js =================================================================== --- trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-15 08:13:04 UTC (rev 33) +++ trunk/lutinrss/src/main/webapp/rssinclude.js 2008-05-15 08:20:56 UTC (rev 34) @@ -30,13 +30,8 @@ var feedRepr = div.getAttribute("feedRepr"); if (!!feedRepr) {url += '&feedRepr=' + escape(feedRepr);} + if (!!forceReload) {url += '&forceReload=true';} - if (forceReload) { - forceReload = 'true'; - } else { - forceReload = 'false'; - } - xhr.open("GET", url, !!background); xhr.onreadystatechange = function() { if(xhr.readyState == 4) {

1 0