<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20711] branches/WebInspectorRefresh/WebKit/WebInspector/webInspector</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20711">20711</a></dd>
<dt>Author</dt> <dd>thatcher</dd>
<dt>Date</dt> <dd>2007-04-04 21:26:29 -0700 (Wed, 04 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move our override scrollbar and scroll-area code to our copies of AppleScrollbar.js and AppleScrollArea.js.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesWebInspectorRefreshWebKitWebInspectorwebInspectorAppleScrollAreajs">branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollArea.js</a></li>
<li><a href="#branchesWebInspectorRefreshWebKitWebInspectorwebInspectorAppleScrollbarjs">branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollbar.js</a></li>
<li><a href="#branchesWebInspectorRefreshWebKitWebInspectorwebInspectorinspectorjs">branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/inspector.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesWebInspectorRefreshWebKitWebInspectorwebInspectorAppleScrollAreajs"></a>
<div class="modfile"><h4>Modified: branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollArea.js (20710 => 20711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollArea.js 2007-04-05 03:43:43 UTC (rev 20710)
+++ branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollArea.js 2007-04-05 04:26:29 UTC (rev 20711)
</span><span class="lines">@@ -213,22 +213,31 @@
</span><span class="cx"> {
</span><span class="cx"> var offsetY = 0;
</span><span class="cx"> var obj = element;
</span><del>- do
- {
</del><ins>+ do {
</ins><span class="cx"> offsetY += obj.offsetTop;
</span><span class="cx"> obj = obj.offsetParent;
</span><span class="cx"> } while (obj && obj != this.content);
</span><del>-
</del><ins>+
</ins><span class="cx"> var offsetX = 0;
</span><span class="cx"> obj = element;
</span><del>- do
- {
</del><ins>+ do {
</ins><span class="cx"> offsetX += obj.offsetLeft;
</span><span class="cx"> obj = obj.offsetParent;
</span><span class="cx"> } while (obj && obj != this.content);
</span><del>-
- this.verticalScrollTo(offsetY);
- this.horizontalScrollTo(offsetX);
</del><ins>+
+ var top = this.content.scrollTop;
+ var height = this.viewHeight;
+ if ((top + height) < (offsetY + element.clientHeight))
+ this.verticalScrollTo(offsetY - height + element.clientHeight);
+ else if (top > offsetY)
+ this.verticalScrollTo(offsetY);
+
+ var left = this.content.scrollLeft;
+ var width = this.viewWidth;
+ if ((left + width) < (offsetX + element.clientWidth))
+ this.horizontalScrollTo(offsetX - width + element.clientWidth);
+ else if (left > offsetX)
+ this.horizontalScrollTo(offsetX);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchesWebInspectorRefreshWebKitWebInspectorwebInspectorAppleScrollbarjs"></a>
<div class="modfile"><h4>Modified: branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollbar.js (20710 => 20711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollbar.js 2007-04-05 03:43:43 UTC (rev 20710)
+++ branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/AppleScrollbar.js 2007-04-05 04:26:29 UTC (rev 20711)
</span><span class="lines">@@ -361,13 +361,16 @@
</span><span class="cx"> AppleScrollbar.prototype.hide = function()
</span><span class="cx"> {
</span><span class="cx"> this._track.style.display = "none";
</span><ins>+ this.scrollbar.style.display = "none";
</ins><span class="cx"> this.hidden = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AppleScrollbar.prototype.show = function()
</span><span class="cx"> {
</span><span class="cx"> this._track.style.display = "block";
</span><ins>+ this.scrollbar.style.removeProperty("display");
</ins><span class="cx"> this.hidden = false;
</span><ins>+ this.refresh();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AppleScrollbar.prototype.setSize = function(size)
</span><span class="lines">@@ -560,7 +563,10 @@
</span><span class="cx"> { object.style.width = size + "px"; }
</span><span class="cx">
</span><span class="cx"> AppleVerticalScrollbar.prototype._setObjectLength = function(object, length)
</span><del>-{ object.style.height = length + "px"; }
</del><ins>+{
+ if (!isNaN(length))
+ object.style.height = length + "px";
+}
</ins><span class="cx">
</span><span class="cx"> AppleVerticalScrollbar.prototype._setObjectStart = function(object, start)
</span><span class="cx"> { object.style.top = start + "px"; }
</span><span class="lines">@@ -709,7 +715,10 @@
</span><span class="cx"> { object.style.height = size + "px"; }
</span><span class="cx">
</span><span class="cx"> AppleHorizontalScrollbar.prototype._setObjectLength = function(object, length)
</span><del>-{ object.style.width = length + "px"; }
</del><ins>+{
+ if (!isNaN(length))
+ object.style.height = length + "px";
+}
</ins><span class="cx">
</span><span class="cx"> AppleHorizontalScrollbar.prototype._setObjectStart = function(object, start)
</span><span class="cx"> { object.style.left = start + "px"; }
</span></span></pre></div>
<a id="branchesWebInspectorRefreshWebKitWebInspectorwebInspectorinspectorjs"></a>
<div class="modfile"><h4>Modified: branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/inspector.js (20710 => 20711)</h4>
<pre class="diff"><span>
<span class="info">--- branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/inspector.js 2007-04-05 03:43:43 UTC (rev 20710)
+++ branches/WebInspectorRefresh/WebKit/WebInspector/webInspector/inspector.js 2007-04-05 04:26:29 UTC (rev 20711)
</span><span class="lines">@@ -510,53 +510,6 @@
</span><span class="cx"> jsPropertiesScrollArea = new AppleScrollArea(document.getElementById("jsPropertiesScrollview"),
</span><span class="cx"> setUpScrollbar("jsPropertiesScrollbar"));
</span><span class="cx">
</span><del>- // much better AppleScrollArea reveal
- AppleScrollArea.prototype.reveal = function(node) {
- var offsetY = 0;
- var obj = node;
- do {
- offsetY += obj.offsetTop;
- obj = obj.offsetParent;
- } while (obj && obj != this.content);
-
- var offsetX = 0;
- obj = node;
- do {
- offsetX += obj.offsetLeft;
- obj = obj.offsetParent;
- } while (obj && obj != this.content);
-
- var top = this.content.scrollTop;
- var height = this.viewHeight;
- if ((top + height) < (offsetY + node.clientHeight))
- this.verticalScrollTo(offsetY - height + node.clientHeight);
- else if (top > offsetY)
- this.verticalScrollTo(offsetY);
-
- var left = this.content.scrollLeft;
- var width = this.viewWidth;
- if ((left + width) < (offsetX + node.clientWidth))
- this.horizontalScrollTo(offsetX - width + node.clientWidth);
- else if (left > offsetX)
- this.horizontalScrollTo(offsetX);
- }
-
- // Change the standard show/hide to include the entire scrollbar.
- // This lets the content reflow to use the additional space when the scrollbar is hidden.
- AppleScrollbar.prototype.hide = function() {
- this._track.style.display = "none";
- this.scrollbar.style.display = "none";
- this.hidden = true;
- }
- AppleScrollbar.prototype.show = function() {
- this._track.style.display = "block";
- this.scrollbar.style.removeProperty("display");
- if (this.hidden) {
- this.hidden = false;
- this.refresh();
- }
- }
-
</del><span class="cx"> window.addEventListener("resize", refreshScrollbars, true);
</span><span class="cx"> document.addEventListener("click", changeFocus, true);
</span><span class="cx"> document.addEventListener("keypress", documentKeypress, true);
</span><span class="lines">@@ -1564,10 +1517,3 @@
</span><span class="cx">
</span><span class="cx"> jsPropertiesScrollArea.refresh();
</span><span class="cx"> }
</span><del>-
-// This is a workaround for rdar://4901491 - Dashboard AppleClasses try to set a NaN value and break the scrollbar.
-AppleVerticalScrollbar.prototype._setObjectLength = function(object, length)
-{
- if (!isNaN(length))
- object.style.height = length + "px";
-}
</del></span></pre>
</div>
</div>
</body>
</html>