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

svn commit: r1207887 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js

Author: lofwyr
Date: Tue Nov 29 14:36:18 2011
New Revision: 1207887

URL: http://svn.apache.org/viewvc?rev=1207887&view=rev
Log:
TOBAGO-1056: JavaScript error while CODE_RELOAD_REQUIRED
 avoid exception

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1207887&r1=1207886&r2=1207887&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Tue Nov 29 14:36:18 2011
@@ -2371,7 +2371,8 @@ Tobago.Updater = {
       Tobago.submitAction(null, Tobago.page.id);
     } else if (requestOptions.resultData.responseCode == Tobago.Updater.CODE_RELOAD_REQUIRED) {
       // update required do full page reload
-      if (requestionObjects.resultData.jsfState) {
+      // XXX todo: check if the second call of this code (aprox. 10 lines later) is okay.
+      if (requestOptions.resultData.jsfState) {
         Tobago.replaceJsfState(requestOptions.resultData.jsfState);
       }
       LOG.info('full reload requested'); // @DEV_ONLY
@@ -2384,7 +2385,9 @@ Tobago.Updater = {
       return;
     }
 
-    Tobago.replaceJsfState(requestOptions.resultData.jsfState);
+    if (requestOptions.resultData.jsfState) {
+      Tobago.replaceJsfState(requestOptions.resultData.jsfState);
+    }
 
     var doneIds = {};
     for (var partId in requestOptions.resultData) {