You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2011/09/28 15:19:01 UTC

svn commit: r1176873 - /myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_AjaxResponse.js

Author: werpu
Date: Wed Sep 28 13:19:01 2011
New Revision: 1176873

URL: http://svn.apache.org/viewvc?rev=1176873&view=rev
Log:
https://issues.apache.org/jira/browse/MYFACES-3321


Modified:
    myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_AjaxResponse.js

Modified: myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_AjaxResponse.js
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_AjaxResponse.js?rev=1176873&r1=1176872&r2=1176873&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_AjaxResponse.js (original)
+++ myfaces/core/branches/2.0.x/api/src/main/javascript/META-INF/resources/myfaces/_impl/xhrCore/_AjaxResponse.js Wed Sep 28 13:19:01 2011
@@ -556,7 +556,7 @@ myfaces._impl.core._Runtime.singletonExt
                     //for code reduction, speedwise we will take a small hit
                     //there which we will clean up in the future, but for now
                     //this is ok, I guess, since replace body only is a small subcase
-                    bodyData = _Lang.serializeChilds(newBodyData);
+                    //bodyData = _Lang.serializeChilds(newBodyData);
 
                     if (!this._RT.browser.isIEMobile || this._RT.browser.isIEMobile >= 7) {
                         //TODO check what is failing there
@@ -567,8 +567,11 @@ myfaces._impl.core._Runtime.singletonExt
                         }
                     }
                 }
+                //we cannot serialize here, due to escape problems
+                //we must parse, this is somewhat unsafe but should be safe enough
+                var parser = new (this._RT.getGlobalConfig("updateParser", myfaces._impl._util._HtmlStripper))();
+                bodyData = parser.parse(newData, "body");
 
-                //TODO eliminate the serialisation in case of already having a parsed tree
                 var returnedElement = this.replaceHtmlItem(request, context, placeHolder, bodyData);
 
                 if (returnedElement) {