Attachment #183586 for bug #330026

Lines 45-51 Link Here

(-)advanced/content.jsp (-1 / +1 lines)
45		45
46	</head>	46	</head>
47	<frameset id="contentFrameset" rows="<%=frameData.getContentAreaFrameSizes()%>" frameborder=0" framespacing="0" border="0" spacing="0">	47	<frameset id="contentFrameset" rows="<%=frameData.getContentAreaFrameSizes()%>" frameborder=0" framespacing="0" border="0" spacing="0">
48	<frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+data.getQuery()%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >	48	<frame name="ContentToolbarFrame" title="<%=ServletResources.getString("topicViewToolbar", request)%>" src='<%="contentToolbar.jsp"+UrlUtil.htmlEncode(data.getQuery())%>' marginwidth="0" marginheight="0" scrolling="no" frameborder="0" >
49	<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" >	49	<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	<%	50	<%
51	AbstractFrame[] frames = frameData.getFrames(AbstractFrame.BELOW_CONTENT);	51	AbstractFrame[] frames = frameData.getFrames(AbstractFrame.BELOW_CONTENT);

Lines 196-203 Link Here

(-)advanced/toolbar.jsp (-2 / +10 lines)
196	function registerMaximizedChangedListener(){	196	function registerMaximizedChangedListener(){
197	// get to the frameset	197	// get to the frameset
198	var p = parent;	198	var p = parent;
199	while (p && !p.registerMaximizeListener)	199	while (p && !p.registerMaximizeListener) {
		200	if (p === p.parent) {
		201	return;
		202	}
200	p = p.parent;	203	p = p.parent;
		204	}
201		205
202	if (p!= null){	206	if (p!= null){
203	p.registerMaximizeListener('<%=UrlUtil.JavaScriptEncode(data.getName())%>Toolbar', maximizedChanged);	207	p.registerMaximizeListener('<%=UrlUtil.JavaScriptEncode(data.getName())%>Toolbar', maximizedChanged);
Lines 227-234 Link Here
227	function toggleFrame(){	231	function toggleFrame(){
228	// get to the frameset	232	// get to the frameset
229	var p = parent;	233	var p = parent;
230	while (p && !p.toggleFrame)	234	while (p && !p.toggleFrame) {
		235	if (p === p.parent) {
		236	return;
		237	}
231	p = p.parent;	238	p = p.parent;
		239	}
232		240
233	if (p!= null){	241	if (p!= null){
234	p.toggleFrame('<%=UrlUtil.JavaScriptEncode(data.getTitle())%>');	242	p.toggleFrame('<%=UrlUtil.JavaScriptEncode(data.getTitle())%>');

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	<%	34	<%
35	if(!("0".equals(data.getFooterHeight()))){	35	if(!("0".equals(data.getFooterHeight()))){
36	%>	36	%>

Return to bug 330026