Attachment 62312 Details for Bug 172915 – Patch for Eclipse 3.2.2

[patch] Patch for Eclipse 3.2.2

patch172915_3.2.txt (text/plain), 20.49 KB, created by Chris Goldthorpe

on 2007-03-28 19:22:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Goldthorpe

Created: 2007-03-28 19:22:34 EDT

Size: 20.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.help.webapp
>Index: advanced/searchScoped.jsp
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchScoped.jsp,v
>retrieving revision 1.13
>diff -u -r1.13 searchScoped.jsp
>--- advanced/searchScoped.jsp	23 Feb 2005 19:12:50 -0000	1.13
>+++ advanced/searchScoped.jsp	28 Mar 2007 23:22:08 -0000
>@@ -118,16 +118,38 @@
> var isMozilla = navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && parseInt(navigator.appVersion.substring(0,1)) >= 5;
> 
> var advancedDialog;
>-var w = 300;
>-var h = 300;
> 
>-function openAdvanced()
>-{
>-	var scope = document.getElementById("scope").firstChild;
>-	var workingSet = "";
>-	if (scope != null)
>-	 	workingSet = document.getElementById("scope").firstChild.nodeValue;
>-	 	
>+function openAdvanced() 
>+{ 
>+    var scope = document.getElementById("scope").firstChild;
>+    var workingSet = ""; 
>+    if (scope != null) 
>+              workingSet = document.getElementById("scope").firstChild.nodeValue;                
>+    var minSize = 300; 
>+    var maxHeight= 500;  
>+    var maxWidth = 600;       
>+    var w = minSize; 
>+    var h = minSize; 
>+      
>+    // If we have large fonts make the dialog larger, up to 500 pixels high, 600 wide
>+    try {         
>+        var letterHeight = document.getElementById("searchWord").offsetHeight; 
>+        var requiredSize = 16 * letterHeight; 
>+        if (requiredSize > minSize) { 
>+            if (requiredSize < maxWidth) { 
>+                w = requiredSize; 
>+            } else { 
>+                w =  maxWidth; 
>+            }
>+            if (requiredSize < maxHeight) { 
>+                h = requiredSize; 
>+            } else {               
>+                h = maxHeight;
>+            }
>+        } 
>+             
>+    } catch (e) {} 
>+    
> <%
> if (data.isIE()){
> %>
>Index: advanced/workingSetManager.jsp
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/workingSetManager.jsp,v
>retrieving revision 1.50
>diff -u -r1.50 workingSetManager.jsp
>--- advanced/workingSetManager.jsp	23 Feb 2005 19:12:50 -0000	1.50
>+++ advanced/workingSetManager.jsp	28 Mar 2007 23:22:08 -0000
>@@ -1,5 +1,5 @@
> <%--
>- Copyright (c) 2000, 2004 IBM Corporation and others.
>+ Copyright (c) 2000, 2006 IBM Corporation and others.
>  All rights reserved. This program and the accompanying materials 
>  are made available under the terms of the Eclipse Public License v1.0
>  which accompanies this distribution, and is available at
>@@ -39,12 +39,15 @@
> }
> 
> BODY {
>+    font:<%=prefs.getViewFont()%>;
> 	background-color: <%=prefs.getToolbarBackground()%>;
> 	color:WindowText; 	
> }
> 
> TABLE {
> 	width:auto;
>+	margin:0px;
>+	padding:0px;
> }
> 
> TD, TR {
>@@ -58,19 +61,36 @@
> 
> BUTTON {
> 	font:<%=prefs.getViewFont()%>;
>+	margin:5px;
>+}
>+
>+BUTTON {
>+    font-size:1.0em; 
>+}
>+
>+FORM {
>+    margin: 0px;
>+    border: 0px;
> }
> 
> #workingSetContainer {
>-	background:Window;
> 	color:WindowText; 
> 	border: 2px inset ThreeDHighlight;
> 	margin:0px 5px;
> 	padding:5px;
> 	overflow:auto;
>+	height:140px;
>+	background:<%=prefs.getViewBackground()%>;
>+}
>+
>+#buttonArea {
>+    height:4em; 
> }
> 
> </style>
> 
>+<script language="JavaScript" src="resize.js"></script>
>+<script language="JavaScript" src="utils.js"></script>
> <script language="JavaScript" src="list.js"></script>
> <script language="JavaScript">
> 
>@@ -94,6 +114,7 @@
> 	sizeButtons();
> <%}%>
> 	enableButtons();
>+	sizeList();
> 	document.getElementById("alldocs").focus();
> }
> 
>@@ -170,6 +191,12 @@
> 
> function removeWorkingSet() {
> 	window.location.replace("workingSetManager.jsp?operation=remove&workingSet="+encodeURIComponent(getWorkingSet()));
>+	if (getWorkingSet()==window.opener.document.getElementById("scope").firstChild.nodeValue){
>+		window.opener.document.getElementById("scope").firstChild.nodeValue=
>+		    "<%=UrlUtil.JavaScriptEncode(ServletResources.getString("All", request))%>";
>+		window.opener.document.forms["searchForm"].workingSet.value=
>+		    "<%=UrlUtil.JavaScriptEncode(ServletResources.getString("All", request))%>";
>+	}
> }
> 
> var workingSetDialog;
>@@ -193,7 +220,7 @@
> 	// move the dialog just a bit higher than the middle
> 	if (t-50 > 0) t = t-50;
> 	window.location="javascript://needModal";
>-	workingSetDialog = window.open("workingSet.jsp?operation=add&workingSet="+encodeURIComponent(getWorkingSet()), "workingSetDialog", "resizeable=no,height="+h+",width="+w +",left="+l+",top="+t);
>+	workingSetDialog = window.open("workingSet.jsp?operation=add&workingSet="+encodeURIComponent(getWorkingSet()), "workingSetDialog", "resizable=yes,height="+h+",width="+w +",left="+l+",top="+t);
> 	workingSetDialog.focus(); 
> }
> 
>@@ -216,7 +243,7 @@
> 	if (t-50 > 0) t = t-50;
> 		
> 	window.location="javascript://needModal";
>-	workingSetDialog = window.open("workingSet.jsp?operation=edit&workingSet="+encodeURIComponent(getWorkingSet()), "workingSetDialog", "resizeable=no,height="+h+",width="+w+",left="+l+",top="+t );
>+	workingSetDialog = window.open("workingSet.jsp?operation=edit&workingSet="+encodeURIComponent(getWorkingSet()), "workingSetDialog", "resizable=no,height="+h+",width="+w+",left="+l+",top="+t );
> 	workingSetDialog.focus(); 
> }
> 
>@@ -229,22 +256,25 @@
> 	catch(e) {}
> }
> 
>+function sizeList() {
>+    resizeVertical("workingSetContainer", "filterTable", "buttonArea", 100, 30);
>+}
>+
> </script>
> 
> </head>
> 
>-<body dir="<%=direction%>" onload="onloadHandler()" onunload="closeWorkingSetDialog()">
>+<body dir="<%=direction%>" onload="onloadHandler()" onunload="closeWorkingSetDialog()" onresize = "sizeList()">
> <form onsubmit="selectWorkingSet();return false;">
>-<div style="overflow:auto;height:250px;width:100%;">
>-  	<table id="filterTable" cellspacing=0 cellpading=0 border=0 align=center  style="background:<%=prefs.getToolbarBackground()%>; font:<%=prefs.getToolbarFont()%>;margin-top:5px;width:100%;">
>+  	<table id="filterTable" cellspacing=0 cellpadding=0 border=0 align=center  style="background:<%=prefs.getToolbarBackground()%>; font:<%=prefs.getToolbarFont()%>;margin-top:5px;width:100%;">
> 		<tr><td class="radio">
> 			<input id="alldocs" type="radio" name="workingSet" onclick="enableButtons()"><label for="alldocs" accesskey="<%=ServletResources.getAccessKey("selectAll", request)%>"><%=ServletResources.getLabel("selectAll", request)%></label>
> 		</td></tr>
> 		<tr><td class="radio">
> 			<input id="selectws" type="radio" name="workingSet"  onclick="enableButtons()"><label for="selectws" accesskey="<%=ServletResources.getAccessKey("selectWorkingSet", request)%>"><%=ServletResources.getLabel("selectWorkingSet", request)%>:</label>	
> 		</td></tr>
>-		<tr><td>
>-			<div id="workingSetContainer" style="overflow:auto; height:140px; background:<%=prefs.getViewBackground()%>;">
>+	</table>
>+<div id="workingSetContainer" >
> 
> <table id='list'  cellspacing='0' style="width:100%;">
> <% 
>@@ -272,10 +302,10 @@
> %>
> 
> </table>
>-			</div>
>-		</td></tr>
>-		<tr id="actionsTable" valign="bottom"><td>
>-  			<table cellspacing=10 cellpading=0 border=0 style="background:transparent;">
>+</div>
>+			
>+<div id="buttonArea">
>+  			<table cellspacing=0 cellpadding=0 border=0 style="background:transparent;">
> 				<tr>
> 					<td>
> 						<button type="button" onclick="newWorkingSet()" id="new" accesskey="<%=ServletResources.getAccessKey("NewWorkingSetButton", request)%>"><%=ServletResources.getLabel("NewWorkingSetButton", request)%>...</button>
>@@ -288,13 +318,9 @@
> 					</td>
> 				</tr>
>   			</table>
>-		</td></tr>
>-	</table>
>-</div>
>-<div style="height:50px;">
>-	<table valign="bottom" align="<%=isRTL?"left":"right"%>" style="background:<%=prefs.getToolbarBackground()%>">
>-		<tr id="buttonsTable" valign="bottom"><td valign="bottom" align="<%=isRTL?"left":"right"%>">
>-  			<table cellspacing=10 cellpading=0 border=0 style="background:transparent;">
>+	<table align="<%=isRTL?"left":"right"%>" style="background:<%=prefs.getToolbarBackground()%>">
>+		<tr id="buttonsTable"><td align="<%=isRTL?"left":"right"%>">
>+  			<table cellspacing=0 cellpadding=0 border=0 style="background:transparent;">
> 				<tr>
> 					<td>
> 						<button type="submit" id="ok"><%=ServletResources.getString("OK", request)%></button>
>Index: advanced/workingSet.jsp
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/workingSet.jsp,v
>retrieving revision 1.45
>diff -u -r1.45 workingSet.jsp
>--- advanced/workingSet.jsp	23 Feb 2005 19:12:50 -0000	1.45
>+++ advanced/workingSet.jsp	28 Mar 2007 23:22:08 -0000
>@@ -1,5 +1,5 @@
> <%--
>- Copyright (c) 2000, 2004 IBM Corporation and others.
>+ Copyright (c) 2000, 2006 IBM Corporation and others.
>  All rights reserved. This program and the accompanying materials 
>  are made available under the terms of the Eclipse Public License v1.0
>  which accompanies this distribution, and is available at
>@@ -52,10 +52,13 @@
> 	border:0px;
> }
> 
>+INPUT {
>+    font:<%=prefs.getViewFont()%>;
>+}
> 
> #workingSet {
> 	width:100%;
>-	font:<%=prefs.getViewFont()%>;
>+	font-size:1.0em;
> }
> 
> #booksContainer {
>@@ -67,13 +70,21 @@
> 	padding-<%=isRTL?"right":"left"%>:5px;
> 	overflow:auto;
> 	height:350px;
>-<%if (data.isIE()) {%>
>-	width:100%;
>-<%}%>
>+<%
>+if (data.isIE()) {
>+%>
>+    width:100%; 
>+<%
>+}
>+%>
>+}
>+
>+#buttonBar {
>+    height:3em; 
> }
> 
> .book {
>-	margin:0xp;
>+	margin:0px;
> 	border:0px;
> 	padding:0px;
> 	white-space: nowrap;
>@@ -90,6 +101,10 @@
> 	font:<%=prefs.getViewFont()%>;
> }
> 
>+BUTTON {	
>+	font-size:1.0em; 
>+}
>+
> .expanded {
> 	display:block;
> }
>@@ -107,7 +122,7 @@
> %>
> input[type="checkbox"] {
> 	border:2px solid WindowText; 
>-	margin:0xp; 
>+	margin:0px; 
> 	padding:0px;	
> 	height:12px;
> 	width:12px;
>@@ -120,7 +135,7 @@
> }
> %>
> </style>
>-
>+<script language="JavaScript" src="resize.js"></script>
> <script language="JavaScript">
> 
> // Preload images
>@@ -139,6 +154,7 @@
> %>
> 	sizeButtons();
> <%}%>
>+    sizeBookContainer();
> 	document.getElementById("workingSet").focus();
> 	enableOK();
> <%-- event handlers that call enableOK() are not invoked properly on Japanese --%>
>@@ -157,6 +173,10 @@
> 	}
> }
> 
>+function sizeBookContainer() {
>+    resizeVertical("booksContainer", "wsTable", "buttonBar", 100, 20);
>+}
>+
> function doSubmit()
> {
> 	try
>@@ -216,10 +236,12 @@
> 		node.className = "collapsed";
> 		img.src = plus.src;
> 		img.alt = altBookClosed;
>+		img.title = altBookClosed;
> 	} else {
> 		node.className = "expanded";
> 		img.src = minus.src;
> 		img.alt = altBookOpen;
>+		img.title = altBookOpen;
> 	}
> }
> 
>@@ -230,6 +252,7 @@
> 	node.className = "collapsed";
> 	img.src = plus.src;
> 	img.alt = altBookClosed;
>+	img.title = altBookClosed;
> }
> 
> function expand(nodeId) {
>@@ -239,6 +262,7 @@
> 	node.className = "expanded";
> 	img.src = minus.src;
> 	img.alt = altBookOpen;
>+	img.title = altBookOpen;
> }
> 
> function getParent(child) {
>@@ -248,7 +272,7 @@
> }
> 
> function updateParentState(checkbox,parentDiv) {
>-
>+	enableOK();
> 	if (checkbox == null)
> 		return;
> 
>@@ -271,6 +295,7 @@
> }
> 
> function setSubtreeChecked(checkbox, parentDiv) {
>+	enableOK();
> 	var state = checkbox.checked;
> 	var children = document.getElementById(parentDiv).getElementsByTagName("INPUT");
> 	for (var i = children.length - 1; i >= 0; i--) {
>@@ -332,9 +357,17 @@
>   	return false;
> }
> 
>+function hasSelections() {
>+		var hrefs = getSelectedResources();
>+		if (!hrefs || hrefs == "")
>+			return false;
>+		else
>+			return true;
>+}
>+
> function enableOK() {
> 	var value = document.getElementById("workingSet").value;
>-	if (!value || value.length == 0 || value.charAt(0) == " ")
>+	if (!value || value.length == 0 || value.charAt(0) == " " || !hasSelections())
> 		document.getElementById("ok").disabled = true;
> 	else
> 		document.getElementById("ok").disabled = false;
>@@ -344,7 +377,7 @@
> 
> </head>
> 
>-<body dir="<%=direction%>" onload="onloadHandler()">
>+<body dir="<%=direction%>" onload="onloadHandler()"  onresize = "sizeBookContainer()">
> <form onsubmit="doSubmit();return false;">
> 	<table id="wsTable" width="100%" cellspacing=0 cellpading=0 border=0 align=center >
> 		<tr><td style="padding:5px 10px 0px 10px;"><label for="workingSet" accesskey="<%=ServletResources.getAccessKey("WorkingSetName", request)%>"><%=ServletResources.getLabel("WorkingSetName", request)%>:</label>
>@@ -370,7 +403,7 @@
> 	String className = state == WorkingSetData.STATE_GRAYED ? "grayed" : "checkbox";
> %>
> 				<div class="book" id='<%="id"+i%>' >
>-					<img id='<%="img"+i%>' alt="<%=ServletResources.getString("bookClosed", request)%>" src="<%=prefs.getImagesDirectory()%>/plus.gif" onclick="collapseOrExpand('<%=i%>')">
>+					<img id='<%="img"+i%>' alt="<%=ServletResources.getString("bookClosed", request)%>" title="<%=ServletResources.getString("bookClosed", request)%>" src="<%=prefs.getImagesDirectory()%>/plus.gif" onclick="collapseOrExpand('<%=i%>')">
> 					<input 	class='<%=className%>' 
> 							type="checkbox" 
> 							id='<%=data.getTocHref(i)%>' 
>@@ -408,7 +441,7 @@
> %>
> 
> </div>
>-<div style="height:50px;">
>+<div id="buttonBar" >
> 	<table valign="bottom" align="<%=isRTL?"left":"right"%>">
> 		<tr id="buttonsTable" valign="bottom"><td valign="bottom" align="<%=isRTL?"left":"right"%>">
>   			<table cellspacing=10 cellpading=0 border=0 style="background:transparent;">
>Index: advanced/utils.js
>===================================================================
>RCS file: advanced/utils.js
>diff -N advanced/utils.js
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ advanced/utils.js	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,170 @@
>+/*******************************************************************************
>+ * Copyright (c) 2006, 2007 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials 
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+
>+// Utility functions used by multiple jsp pages. This contains most of
>+// the functions that have different behavior on different browsers
>+
>+// Constants used in flags, the const keyword is not supported in IE 6 and earlier
>+// so they are declared as var
>+
>+var SCROLL_LEFT = 1;
>+var SCROLL_RIGHT = 2;
>+var SCROLL_UP = 4;
>+var SCROLL_DOWN = 8;
>+var SCROLL_HORIZONTAL = SCROLL_LEFT + SCROLL_RIGHT;
>+var SCROLL_VERTICAL = SCROLL_UP + SCROLL_DOWN;
>+var SCROLL_HORIZONTAL_AND_VERTICAL = SCROLL_HORIZONTAL + SCROLL_VERTICAL;
>+
>+var isInternetExplorer = navigator.userAgent.indexOf('MSIE') != -1;
>+var isSafari = (navigator.userAgent.indexOf('Safari/') != -1)
>+			|| (navigator.userAgent.indexOf('AppleWebKit/') != -1);
>+
>+/**
>+ * Scrolls the page to show the specified element
>+ * If the entire element can be show scroll the minimum amount necessary to 
>+ * show the entire element.
>+ * If the element is larger than the client area align it at the top or left of the page.
>+ */
>+function scrollUntilVisible(node, flags)
>+{
>+    if (node === null) { 
>+        return; 
>+    }
>+	var nodeTop = node.offsetTop;
>+	var nodeBottom = nodeTop + node.offsetHeight;
>+	var nodeLeft = node.offsetLeft;
>+	var nodeRight = nodeLeft + node.offsetWidth;
>+	var pageTop = 0;
>+	var pageBottom = 0;
>+	var pageLeft = 0;
>+	var pageRight = 0;
>+	var isScrollLeft = flags & SCROLL_LEFT;
>+	var isScrollRight = flags & SCROLL_RIGHT;
>+	var isScrollUp = flags & SCROLL_UP;
>+	var isScrollDown = flags & SCROLL_DOWN;
>+	
>+	if (isInternetExplorer)
>+	{
>+		pageTop = document.body.scrollTop; 
>+		pageBottom = pageTop + document.body.clientHeight;	
>+		pageLeft = document.body.scrollLeft;
>+		pageRight = document.body.scrollRight;
>+	} 
>+	else 
>+	{
>+		pageTop = window.pageYOffset;
>+		pageBottom = pageTop + window.innerHeight - node.offsetHeight;
>+		pageLeft = window.pageXOffset;
>+		pageRight = pageLeft + window.innerWidth - node.offsetWidth;
>+	}
>+	
>+	var vScroll = 0;
>+	var hScroll = 0;
>+	
>+	if (flags & SCROLL_VERTICAL) {
>+	    if (nodeTop < pageTop && isScrollUp) {
>+	        // Scroll up so node is at the top of the view
>+		    vScroll = nodeTop - pageTop;
>+	    } else {
>+	        if (nodeBottom > pageBottom && isScrollDown) {	
>+		        vScroll = Math.min(nodeTop - pageTop, nodeBottom - pageBottom);
>+		    } else {
>+		        vScroll = 0; // already in view
>+		    } 
>+	    }
>+	}
>+	
>+	if (flags & SCROLL_HORIZONTAL && isScrollLeft) {
>+	    if (nodeLeft < pageLeft) {
>+		    hScroll = nodeLeft - pageLeft; 
>+	    } else {
>+	        if (nodeRight > pageRight && isScrollRight) {
>+		        hScroll = Math.min(nodeLeft - pageLeft, nodeRight - pageRight);
>+		    } else {
>+		        hScroll = 0; // already in view
>+		    } 	
>+	    }
>+	}
>+		
>+	if (hScroll != 0 || vScroll != 0) {	
>+	    window.scrollBy(hScroll, vScroll);
>+	}
>+}
>+
>+function cancelEventBubble(e) {
>+  	if (isInternetExplorer) {
>+  		window.event.cancelBubble = true; 	 
>+  	} 
>+  	if (e && e.preventDefault) {
>+  		e.preventDefault();
>+    }
>+}
>+
>+/**
>+ * Returns the target node of an event
>+ */
>+function getEventTarget(e) {
>+	var target;
>+  	if (isIE) {
>+   		target = window.event.srcElement; 
>+   	} else {  	
>+  		target = e.target;
>+  	}
>+
>+	return target;
>+}
>+
>+function getKeycode(e) {
>+    if (isInternetExplorer) {
>+		return window.event.keyCode;
>+	} else {
>+		return e.keyCode;
>+	}
>+}
>+
>+function getCookie(name) {
>+	var nameEquals = name + "=";
>+	var cookies = document.cookie.split(";");
>+	for (var i=0;i<cookies.length;++i) {
>+		var cookie = cookies[i];
>+		if (cookie.charAt(0) == ' ') {
>+			cookie = cookie.substring(1, cookie.length);
>+		}
>+		if (cookie.indexOf(nameEquals) == 0) {
>+			return cookie.substring(nameEquals.length, cookie.length);
>+		}
>+	}
>+	return null;
>+}
>+
>+function setCookie(name, value) {
>+	var date = new Date();
>+	date.setTime(date.getTime()+(365*24*60*60*1000));
>+	document.cookie = name + "=" + value + "; expires=" + date.toGMTString() + ";path=/";
>+}
>+
>+function setCSSRule(selector, property, value) {
>+	var theRules = new Array();
>+	for (var i=0;i<document.styleSheets.length;i++) {
>+		if (document.styleSheets[i].cssRules) {
>+			theRules = document.styleSheets[i].cssRules;
>+		}
>+		else {
>+			theRules = document.styleSheets[i].rules;
>+		}
>+		for (var j=theRules.length-1;j>=0;j--) {
>+			if (theRules[j].selectorText == selector) {
>+				theRules[j].style[property] = value;
>+				return;
>+			}
>+		}
>+	}
>+}
>Index: advanced/resize.js
>===================================================================
>RCS file: advanced/resize.js
>diff -N advanced/resize.js
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ advanced/resize.js	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,44 @@
>+/*******************************************************************************
>+ * Copyright (c) 2006 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials 
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+ 
>+ /*
>+Expands or contracts the control "expandable" to be the height of
>+the window less the size of fixed1, fixed2 and padding. fixed1 and fixed2 may be null
>+*/
>+
>+function resizeVertical(expandableId, fixed1Id, fixed2Id, minSize, padding) {
>+    var isSafari = (navigator.userAgent.indexOf('Safari/') != -1);
>+    if (isSafari) padding += 20;  // newHeight gets computed too large on Safari	
>+	var newHeight;
>+	if (window.innerHeight) {
>+		newHeight = window.innerHeight;
>+	} else {
>+        newHeight = document.body.clientHeight;
>+	}
>+	if (fixed1Id) {
>+	    var fixed1 = document.getElementById(fixed1Id);
>+	    if (fixed1) newHeight -= fixed1.offsetHeight;
>+	}
>+	if (fixed2Id) {
>+	    var fixed2 = document.getElementById(fixed2Id);
>+	    if (fixed2) newHeight -= fixed2.offsetHeight;
>+	}
>+	if (padding) {
>+	    newHeight = newHeight - padding;
>+	}
>+	if (newHeight < minSize) {
>+	    newHeight = minSize;
>+	}
>+	var expandable = document.getElementById(expandableId);
>+	if (expandable) {
>+	    expandable.style.height = newHeight + "px";
>+	}
>+}

Actions: View | Diff

Attachments on bug 172915: 58280 | 58281 | 58282 | 61719 | 62312