Index: lams_tool_chat/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_chat/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -18,15 +18,11 @@
 		
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
-				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
+				} else if (window.top && window.top.hideConditionMessage) {
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_chat/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_chat/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_chat/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -83,14 +83,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
-	} 
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -69,14 +69,14 @@
 <%-- This script will work when a new question is submited in order to refresh "Question List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideQuestionInputArea) { 
-		win = window;
-	} else if (window.parent && window.parent.hideQuestionInputArea) {
+	if (window.parent && window.parent.hideQuestionInputArea) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideQuestionInputArea) {
 		win = window.top;
 	}
-	win.hideQuestionInputArea();
-	var obj = win.document.getElementById('questionListArea');
-	obj.innerHTML= document.getElementById("questionList").innerHTML;
+	if (win) {
+		win.hideQuestionInputArea();
+		var obj = win.document.getElementById('questionListArea');
+		obj.innerHTML= document.getElementById("questionList").innerHTML;
+	}
 </script>
\ No newline at end of file
Index: lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -9,15 +9,11 @@
 		
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
 				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_eadventure/web/pages/authoring/parts/conditionlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -84,14 +84,14 @@
 
 <script lang="javascript">
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
 	}
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_eadventure/web/pages/authoring/parts/editexpression-vieja.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/editexpression-vieja.jsp	(.../editexpression-vieja.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/editexpression-vieja.jsp	(.../editexpression-vieja.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -9,15 +9,11 @@
 		
 		<script type="text/javascript"> 
 			function callHideExpressionMessage() {
-				var win = null;
-				if (window.hideExpressionMessage) {
-					win = window;
+				if (window.parent && window.parent.hideExpressionMessage) {
+					window.parent.hideExpressionMessage();
 				} else if (window.parent && window.parent.hideExpressionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideExpressionMessage();
 				}
-				win.hideExpressionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_eadventure/web/pages/authoring/parts/editgame.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/editgame.jsp	(.../editgame.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/editgame.jsp	(.../editgame.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -18,15 +18,11 @@
 	<body class="tabpart">
 
 	<script lang="javascript">
-		var win = null;
-		if (window.hideShowGame) {
-			win = window;
-		} else if (window.parent && window.parent.hideShowGame) {
-			win = window.parent;
-		} else {
-			win = window.top;
+		if (window.parent && window.parent.hideShowGame) {
+			window.parent.hideShowGame();
+		} else if (window.top && window.top.hideShowGame){
+			window.top.hideShowGame();
 		}
-		win.hideShowGame();
 	</script>
 		<!-- Basic Info Form-->
 		<%@ include file="/common/messages.jsp"%>
Index: lams_tool_eadventure/web/pages/authoring/parts/expressionlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/expressionlist.jsp	(.../expressionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/expressionlist.jsp	(.../expressionlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -100,14 +100,16 @@
 
 
 <script lang="javascript">
-	var area = window.document.getElementById('conditionInputArea');
-	if (!area && window.parent) {
+	var area = null;
+	if (window.parent) {
 		area = window.parent.document.getElementById('conditionInputArea');
-	}  
-	if (!area) {
+	}
+	if (!area && window.top) {
 		area = window.top.document.getElementById('conditionInputArea');
 	}
-	area.contentWindow.hideExpressionMessage();
-	var obj = area.contentDocument.getElementById("expressionArea");
-	obj.innerHTML = document.getElementById("expressionList").innerHTML;
+	if (area) {
+		area.contentWindow.hideExpressionMessage();
+		var obj = area.contentDocument.getElementById("expressionArea");
+		obj.innerHTML = document.getElementById("expressionList").innerHTML;
+	}
 </script>
\ No newline at end of file
Index: lams_tool_eadventure/web/pages/authoring/parts/gamearea.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/gamearea.jsp	(.../gamearea.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/gamearea.jsp	(.../gamearea.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -8,15 +8,11 @@
 	<!-- No se xk no coge el atrubuto delete, ver que pasa-->
 	<c:if test="${gameDelete == 1}">
 	<script lang="javascript">
-		var win = null;
-		if (window.forceEmptyTable) { 
-			win = window;
-		} else if (window.parent && window.parent.forceEmptyTable) {
-			win = window.parent;
-		} else {
-			win = window.top;
+		if (window.parent && window.parent.forceEmptyTable) {
+			window.parent.forceEmptyTable();
+		} else if (window.top && window.top.forceEmptyTable) {
+			window.top.forceEmptyTable();
 		}
-		win.forceEmptyTable();
 	</script>
 	
 	
@@ -26,15 +22,11 @@
 			
 		<!-- show the conditions add button -->
 		<script lang="javascript">
-			var win = null;
-			if (window.showConditionsAddButton) { 
-				win = window;
-			} else if (window.parent && window.parent.showConditionsAddButton) {
-				win = window.parent;
-			} else {
-				win = window.top;
+			if (window.parent && window.parent.showConditionsAddButton) {
+				window.parent.showConditionsAddButton();
+			} else if (window.top && window.top.showConditionsAddButton) {
+				window.top.showConditionsAddButton();
 			}
-			win.showConditionsAddButton();
 		</script>
 			
 		<table border="0" style="align:left;width:400px">
@@ -61,11 +53,9 @@
 				<!-- show the conditions add button -->
 				<script lang="javascript">
 					var win = null;
-					if (window.hideConditionsAddButton) {
-						win = window;
-					} else if (window.parent && window.parent.hideConditionsAddButton) {
+					if (window.parent && window.parent.hideConditionsAddButton) {
 						win = window.parent;
-					} else {
+					} else window.top && window.top.hideConditionsAddButton) {
 						win = window.top;
 					}
 					win.hideConditionsAddButton();
@@ -81,16 +71,16 @@
 </div>			
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage){
 		win = window.top;
 	}
-	win.hideMessage();
-	win.showGame();
-	var obj = win.document.getElementById('addGame');
-	obj.innerHTML= document.getElementById("showGame").innerHTML;
+	if (win) {
+		win.hideMessage();
+		win.showGame();
+		var obj = win.document.getElementById('addGame');
+		obj.innerHTML= document.getElementById("showGame").innerHTML;
+	}
 	
 </script>
\ No newline at end of file
Index: lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_eadventure/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -40,16 +40,16 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Eadventure List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('eadventureListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
-	win.document.getElementById('addGame').hide();
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('eadventureListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+		win.document.getElementById('addGame').hide();
+	}
 </script>
 
Index: lams_tool_forum/web/jsps/authoring/conditionList.jsp
===================================================================
diff -u -r74865706e83891b502e67d75cad229ca6d6ddcd9 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_forum/web/jsps/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 74865706e83891b502e67d75cad229ca6d6ddcd9)
+++ lams_tool_forum/web/jsps/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -80,14 +80,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
 	}
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_forum/web/jsps/authoring/message/topiclist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_forum/web/jsps/authoring/message/topiclist.jsp	(.../topiclist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -65,14 +65,14 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('messageListArea');
-	obj.innerHTML= document.getElementById("topiclist").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('messageListArea');
+		obj.innerHTML= document.getElementById("topiclist").innerHTML;
+	}
 </script>
\ No newline at end of file
Index: lams_tool_images/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_images/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -79,18 +79,17 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "ImageGallery List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('imageGalleryListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
-	
-	//call it from parent window as this one was just hidden
-	win.initLytebox();
-	
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('imageGalleryListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+		
+		//call it from parent window as this one was just hidden
+		win.initLytebox();
+	}
 </script>
Index: lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_imscc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -125,14 +125,14 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "CommonCartridge List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('commonCartridgeListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('commonCartridgeListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
Index: lams_tool_lamc/web/monitoring/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_lamc/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_lamc/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -97,14 +97,14 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -8,15 +8,11 @@
 		<lams:css style="tabbed" />
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
-				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
+				} else if (window.top && window.top.hideConditionMessage) {
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_laqa/web/authoring/conditionList.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_laqa/web/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_laqa/web/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -84,14 +84,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
 	}
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
\ No newline at end of file
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -r576b9721c0326b36cfbb25c61a047e7bae41334d -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 576b9721c0326b36cfbb25c61a047e7bae41334d)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -107,10 +107,12 @@
 	var win = null;
 	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_laqa/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -101,15 +101,12 @@
                                 heightOffSet = document.getElementById('wizardDiv').offsetHeight;
                             }
                             
-                        	var win = null;
-                        	if (window.resizeIframe) { 
-                        		win = window;
-                        	} else if (window.parent && window.parent.resizeIframe) {
-                        		win = window.parent;
-                        	} else {
-                        		win = window.top;
-                        	}
-                        	win.resizeIframe(heightOffSet);
+            				if (window.parent && window.parent.resizeIframe) {
+            					window.parent.resizeIframe(heightOffSet);
+            				} else if (window.top && window.top.resizeIframe) {
+            					window.top.resizeIframe(heightOffSet);
+            				} 
+                        	
                         	heightOffSet = heightOffSet * -1;
                         });
                     });
Index: lams_tool_laqa/web/monitoring/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_laqa/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_laqa/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -95,15 +95,15 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
 
Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -249,14 +249,14 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_notebook/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -17,15 +17,11 @@
 		
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
 				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_notebook/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_notebook/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_notebook/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -83,14 +83,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
 	}
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_scribe/web/pages/authoring/headingForm.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_scribe/web/pages/authoring/headingForm.jsp	(.../headingForm.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -2,15 +2,11 @@
 
 <script type="text/javascript"> 
 	function callHideMessage() {
-		var win = null;
-		if (window.hideMessage) {
-			win = window;
+		if (window.parent && window.parent.hideMessage) {
+			window.parent.hideMessage();
 		} else if (window.parent && window.parent.hideMessage) {
-			win = window.parent;
-		} else {
-			win = window.top;
+			window.top.hideMessage();
 		}
-		win.hideMessage();
 	}
 </script>
 
Index: lams_tool_scribe/web/pages/authoring/headingResponse.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_scribe/web/pages/authoring/headingResponse.jsp	(.../headingResponse.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -8,16 +8,16 @@
 
 	<script type="text/javascript">
 		var win = null;
-		if (window.hideMessage) { 
-			win = window;
-		} else if (window.parent && window.parent.hideMessage) {
+		if (window.parent && window.parent.hideMessage) {
 			win = window.parent;
-		} else {
+		} else if (window.top && window.top.hideMessage) {
 			win = window.top;
 		}
-		win.hideMessage();
-		var obj = win.document.getElementById('itemListArea');
-		obj.innerHTML= document.getElementById("itemList").innerHTML;	
+		if (win) {
+			win.hideMessage();
+			var obj = win.document.getElementById('itemListArea');
+			obj.innerHTML= document.getElementById("itemList").innerHTML;
+		}
 	</script>
 
 </div>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp	(.../editmark.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -8,15 +8,11 @@
 		<lams:css style="tabbed" />
 		<script type="text/javascript"> 
 			function callHideMessage() {
-				var win = null;
-				if (window.hideMessage) {
-					win = window;
+				if (window.parent && window.parent.hideMessage) {
+					window.parent.hideMessage();
 				} else if (window.parent && window.parent.hideMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideMessage();
 				}
-				win.hideMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -153,14 +153,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('summariesArea');
-	obj.innerHTML= document.getElementById("summaryList2").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('summariesArea');
+		obj.innerHTML= document.getElementById("summaryList2").innerHTML;
+	}
 </script>
Index: lams_tool_survey/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_survey/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -8,15 +8,11 @@
 		<lams:css style="tabbed" />
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
 				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_survey/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_survey/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_survey/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -84,14 +84,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -93,14 +93,14 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Survey List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('surveyListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('surveyListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp	(.../addcondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -8,15 +8,11 @@
 		<lams:css style="tabbed" />
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
 				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -13,15 +13,11 @@
 	}
 	
 	function callHideMessage() {
-		var win = null;
-		if (window.hideMessage) {
-			win = window;
+		if (window.parent && window.parent.hideMessage) {
+			window.parent.hideMessage();
 		} else if (window.parent && window.parent.hideMessage) {
-			win = window.parent;
-		} else {
-			win = window.top;
+			window.top.hideMessage();
 		}
-		win.hideMessage();
 	}
 </script>
 
Index: lams_tool_task/web/pages/authoring/parts/conditionlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_task/web/pages/authoring/parts/conditionlist.jsp	(.../conditionlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -84,14 +84,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript"> 
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
 	}
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_task/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_task/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -70,14 +70,14 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "TaskList List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('taskListListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;	
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('taskListListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
Index: lams_tool_videorecorder/web/pages/authoring/addCondition.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_videorecorder/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_videorecorder/web/pages/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -16,15 +16,11 @@
 		<lams:css style="tabbed" />
 		<script type="text/javascript"> 
 			function callHideConditionMessage() {
-				var win = null;
-				if (window.hideConditionMessage) {
-					win = window;
+				if (window.parent && window.parent.hideConditionMessage) {
+					window.parent.hideConditionMessage();
 				} else if (window.parent && window.parent.hideConditionMessage) {
-					win = window.parent;
-				} else {
-					win = window.top;
+					window.top.hideConditionMessage();
 				}
-				win.hideConditionMessage();
 			}
 		</script>
 	</lams:head>
Index: lams_tool_videorecorder/web/pages/authoring/conditionList.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_videorecorder/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_videorecorder/web/pages/authoring/conditionList.jsp	(.../conditionList.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -83,14 +83,14 @@
 <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
 <script type="text/javascript">
 	var win = null;
-	if (window.hideConditionMessage) {
-		win = window;
-	} else if (window.parent && window.parent.hideConditionMessage) {
+	if (window.parent && window.parent.hideConditionMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideConditionMessage) {
 		win = window.top;
 	}
-	win.hideConditionMessage();
-	var obj = win.document.getElementById('conditionsArea');
-	obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	if (win) {
+		win.hideConditionMessage();
+		var obj = win.document.getElementById('conditionsArea');
+		obj.innerHTML= document.getElementById("conditionList").innerHTML;
+	}
 </script>
Index: lams_tool_vote/web/authoring/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_vote/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -106,15 +106,15 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>
 
Index: lams_tool_vote/web/monitoring/itemlist.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -rc2ba0dc3e2d99441897de8d185e83c419a416f2d
--- lams_tool_vote/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_vote/web/monitoring/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
@@ -95,15 +95,15 @@
 <%-- This script will works when a new resoruce item submit in order to refresh "Resource List" panel. --%>
 <script lang="javascript">
 	var win = null;
-	if (window.hideMessage) { 
-		win = window;
-	} else if (window.parent && window.parent.hideMessage) {
+	if (window.parent && window.parent.hideMessage) {
 		win = window.parent;
-	} else {
+	} else if (window.top && window.top.hideMessage) {
 		win = window.top;
 	}
-	win.hideMessage();
-	var obj = win.document.getElementById('resourceListArea');
-	obj.innerHTML= document.getElementById("itemList").innerHTML;
+	if (win) {
+		win.hideMessage();
+		var obj = win.document.getElementById('resourceListArea');
+		obj.innerHTML= document.getElementById("itemList").innerHTML;
+	}
 </script>