Attachment #189137 for bug #329582

Lines 186-193 Link Here

(-)advanced/toolbar.jsp (-2 / +10 lines)
186	function registerMaximizedChangedListener(){	186	function registerMaximizedChangedListener(){
187	// get to the frameset	187	// get to the frameset
188	var p = parent;	188	var p = parent;
189	while (p && !p.registerMaximizeListener)	189	while (p && !p.registerMaximizeListener) {
		190	if (p === p.parent) {
		191	return;
		192	}
190	p = p.parent;	193	p = p.parent;
		194	}
191		195
192	if (p!= null){	196	if (p!= null){
193	p.registerMaximizeListener('<%=UrlUtil.JavaScriptEncode(data.getName())%>Toolbar', maximizedChanged);	197	p.registerMaximizeListener('<%=UrlUtil.JavaScriptEncode(data.getName())%>Toolbar', maximizedChanged);
Lines 217-224 Link Here
217	function toggleFrame(){	221	function toggleFrame(){
218	// get to the frameset	222	// get to the frameset
219	var p = parent;	223	var p = parent;
220	while (p && !p.toggleFrame)	224	while (p && !p.toggleFrame) {
		225	if (p === p.parent) {
		226	return;
		227	}
221	p = p.parent;	228	p = p.parent;
		229	}
222		230
223	if (p!= null){	231	if (p!= null){
224	p.toggleFrame('<%=UrlUtil.JavaScriptEncode(data.getTitle())%>');	232	p.toggleFrame('<%=UrlUtil.JavaScriptEncode(data.getTitle())%>');

Lines 46-52 Link Here

(-)advanced/content.jsp (-1 / +1 lines)
46		46
47		47
48	<frameset id="contentFrameset" rows="24,*" frameborder="0" framespacing="0" border=0 spacing=0>	48	<frameset id="contentFrameset" rows="24,*" frameborder="0" framespacing="0" border=0 spacing=0>
49	<frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+data.getQuery()%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize=0>	49	<frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" noresize=0>
50	<frame ACCESSKEY="K" name="ContentViewFrame" title="<%=ServletResources.getString("topicView", request)%>" src='<%=UrlUtil.htmlEncode(data.getContentURL())%>' marginwidth="10"<%=(data.isIE() && "6.0".compareTo(data.getIEVersion()) <=0)?"scrolling=\"yes\"":""%> marginheight="0" frameborder="0" >	50	<frame ACCESSKEY="K" name="ContentViewFrame" title="<%=ServletResources.getString("topicView", request)%>" src='<%=UrlUtil.htmlEncode(data.getContentURL())%>' marginwidth="10"<%=(data.isIE() && "6.0".compareTo(data.getIEVersion()) <=0)?"scrolling=\"yes\"":""%> marginheight="0" frameborder="0" >
51	</frameset>	51	</frameset>
52		52

Lines 29-36 Link Here

(-)basic/index.jsp (-2 / +2 lines)
29	<%	29	<%
30	}	30	}
31	%>	31	%>
32	<frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+data.getQuery()%>' marginwidth="5" marginheight="5" scrolling="no">	32	<frame name="TabsFrame" title="<%=ServletResources.getString("helpToolbarFrame", request)%>" src='<%="basic/tabs.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="5" marginheight="5" scrolling="no">
33	<frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+data.getQuery()%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">	33	<frame name="HelpFrame" title="<%=ServletResources.getString("ignore", "HelpFrame", request)%>" src='<%="basic/help.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' frameborder="no" marginwidth="0" marginheight="0" scrolling="no">
34	</frameset>	34	</frameset>
35		35
36	</html>	36	</html>

Return to bug 329582