[gatein-commits] gatein SVN: r4983 - portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal.

[do-not-reply at jboss.org]

Author: phuong_vu
Date: 2010-11-09 06:09:25 -0500 (Tue, 09 Nov 2010)
New Revision: 4983

Modified:
   portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js
Log:
GTNPORTAL-1637 Javascript error when delete Gadget

Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js	2010-11-09 10:56:23 UTC (rev 4982)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js	2010-11-09 11:09:25 UTC (rev 4983)
@@ -423,13 +423,15 @@
 	} ;
 	
 	instance.updateHtmlHead = function(response) {
+      if (!response) return;      
 		cleanHtmlHead(response);
 		
 		var DOMUtil = eXo.core.DOMUtil;
 		var head = document.getElementsByTagName("head")[0]; 								
-		var markupHeadElements = response.markupHeadElements;		
+		var markupHeadElements = response.markupHeadElements;
+      if (!markupHeadElements) return;
 		
-		if (markupHeadElements.titles.length != 0) {
+		if (markupHeadElements.titles && markupHeadElements.titles.length != 0) {
 			var oldTitle = DOMUtil.getChildrenByTagName(head, "title")[0];
 			var newTitle = markupHeadElements.titles[markupHeadElements.titles.length - 1];
 			if (oldTitle) {
@@ -440,7 +442,7 @@
 		}			
 		
 		appendElementsToHead(markupHeadElements.metas);
-    		appendElementsToHead(markupHeadElements.bases);
+      appendElementsToHead(markupHeadElements.bases);
 		appendElementsToHead(markupHeadElements.links);				
 		appendElementsToHead(markupHeadElements.styles);
 		appendElementsToHead(markupHeadElements.scripts);
@@ -451,17 +453,19 @@
 		var head = document.getElementsByTagName("head")[0];		
 		
 		var portletResponses = response.portletResponses;
-		if (portletResponses != null) {
+		if (portletResponses) {
 			for (var i = 0; i < portletResponses.length; i++) {
 				removeExtraHead(portletResponses[i].portletId);
 			}
 		}
+
+      if (response.data) {
+         var portletFragments = DOMUtil.findDescendantsByClass(response.data, "div", "PORTLET-FRAGMENT");
+         for (var i = 0; i < portletFragments.length; i++) {
+            removeExtraHead(portletFragments[i].parentNode.id);
+         }
+      }
 		
-		var portletFragments = DOMUtil.findDescendantsByClass(response.data, "div", "PORTLET-FRAGMENT");
-		for (var i = 0; i < portletFragments.length; i++) {
-			removeExtraHead(portletFragments[i].parentNode.id);
-		}
-		
 		var uiWorkingWorkspace = document.getElementById("UIWorkingWorkspace") ;
 		var portletFragsInWS = DOMUtil.findDescendantsByClass(uiWorkingWorkspace, "div", "PORTLET-FRAGMENT");		
 		var exHeads = DOMUtil.getElementsBy(function(elem) {
@@ -497,6 +501,7 @@
 	}
 	
 	function appendElementsToHead(elements) {
+      if (!elements) return;
 		var head = document.getElementsByTagName("head")[0]; 
 		
 		for (var i = 0; i < elements.length; i++) {