2006-12-21 Mark Rowe <bdash@webkit.org>

        Reviewed by Geoff.

        http://bugs.webkit.org/show_bug.cgi?id=11888
        Bug 11888: REGRESSION (r18320): Web Inspector panes broken

        * WebInspector/webInspector/inspector.js: Use removeProperty to reset a style property to its
        initial value.  Bail out early from updateNodePane if Inspector has not yet been set.

2006-12-21  Mark Rowe  <bdash@webkit.org>

        Reviewed by Geoff.

        http://bugs.webkit.org/show_bug.cgi?id=11888
        Bug 11888: REGRESSION (r18320): Web Inspector panes broken

        * Drosera/debugger.js: Use removeProperty to reset a style property to its initial value.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d9d82061b8062036dbe66ad9bd8b9ad284042816..5642c54070554b061a338ee1bfd5dad54dffb7f6 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-21  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Geoff.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11888
+        Bug 11888: REGRESSION (r18320): Web Inspector panes broken
+
+        * WebInspector/webInspector/inspector.js: Use removeProperty to reset a style property to its
+        initial value.  Bail out early from updateNodePane if Inspector has not yet been set.
+
 2006-12-19  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Darin

diff --git a/WebKit/WebInspector/webInspector/inspector.js b/WebKit/WebInspector/webInspector/inspector.js
index ee64430473404cea794e7a9a260ed744bd8c322f..3544129968662e2c1275125b8cb9d43c6c0375a5 100644 (file)
--- a/WebKit/WebInspector/webInspector/inspector.js
+++ b/WebKit/WebInspector/webInspector/inspector.js
@@ -259,7 +259,7 @@ function loaded()
     }
     AppleScrollbar.prototype.show = function() {
         this._track.style.display = "block";
-        this.scrollbar.style.display = null;
+        this.scrollbar.style.removeProperty("display");
         if (this.hidden) {
             this.hidden = false;
             this.refresh();
@@ -295,9 +295,9 @@ function performSearch(query)
         searchField.style.width = "150px";
         searchActive = true;
     } else if (!query.length && searchActive) {
-        treePopup.style.display = null;
-        searchCount.style.display = null;
-        searchField.style.width = null;
+        treePopup.style.removeProperty("display");
+        searchCount.style.removeProperty("display");
+        searchField.style.removeProperty("width");
         searchActive = false;
     }
 
@@ -327,7 +327,7 @@ function toggleNoSelection(state)
     if (noSelection) {
         for (var i = 0; i < tabNames.length; i++)
             document.getElementById(tabNames[i] + "Pane").style.display = "none";
-        document.getElementById("noSelection").style.display = null;
+        document.getElementById("noSelection").style.removeProperty("display");
     } else {
         document.getElementById("noSelection").style.display = "none";
         switchPane(currentPane);
@@ -344,7 +344,7 @@ function switchPane(pane)
             button.originalClassName = button.className;
         if (pane == tabNames[i]) {
             if (!noSelection)
-                paneElement.style.display = null;
+                paneElement.style.removeProperty("display");
             button.className = button.originalClassName + " selected";
         } else {
             paneElement.style.display = "none";
@@ -439,17 +439,19 @@ function updateElementAttributes()
 
 function updateNodePane()
 {
+    if (!Inspector)
+        return;
     var focusedNode = Inspector.focusedDOMNode();
 
     if (focusedNode.nodeType == Node.TEXT_NODE || focusedNode.nodeType == Node.COMMENT_NODE) {
         document.getElementById("nodeNamespaceRow").style.display = "none";
         document.getElementById("elementAttributes").style.display = "none";
-        document.getElementById("nodeContents").style.display = null;
+        document.getElementById("nodeContents").style.removeProperty("display");
 
         document.getElementById("nodeContentsScrollview").textContent = focusedNode.nodeValue;
         nodeContentsScrollArea.refresh();
     } else if (focusedNode.nodeType == Node.ELEMENT_NODE) {
-        document.getElementById("elementAttributes").style.display = null;
+        document.getElementById("elementAttributes").style.removeProperty("display");
         document.getElementById("nodeContents").style.display = "none";
 
         updateElementAttributes();
@@ -457,7 +459,7 @@ function updateNodePane()
         if (focusedNode.namespaceURI.length > 0) {
             document.getElementById("nodeNamespace").textContent = focusedNode.namespaceURI;
             document.getElementById("nodeNamespace").title = focusedNode.namespaceURI;
-            document.getElementById("nodeNamespaceRow").style.display = null;
+            document.getElementById("nodeNamespaceRow").style.removeProperty("display");
         } else {
             document.getElementById("nodeNamespaceRow").style.display = "none";
         }
@@ -492,8 +494,8 @@ function updateStylePane()
     styleProperties = [];
 
     if (focusedNode.nodeType == Node.ELEMENT_NODE) {
-        document.getElementById("styleRules").style.display = null;
-        document.getElementById("styleProperties").style.display = null;
+        document.getElementById("styleRules").style.removeProperty("display");
+        document.getElementById("styleProperties").style.removeProperty("display");
         document.getElementById("noStyle").style.display = "none";
 
         var propertyCount = [];
@@ -670,7 +672,7 @@ function updateStylePane()
         noStyle.textContent = "Can't style " + nodeTypeName(focusedNode) + " nodes.";
         document.getElementById("styleRules").style.display = "none";
         document.getElementById("styleProperties").style.display = "none";
-        noStyle.style.display = null;
+        noStyle.style.removeProperty("display");
     }
 
     styleRulesScrollArea.refresh();
@@ -797,7 +799,7 @@ function toggleStyleShorthand(event)
         expandedStyleShorthands[li.shorthand] = false;
     } else {
         li.className += " expanded";
-        li.nextSibling.style.display = null;
+        li.nextSibling.style.removeProperty("display");
         expandedStyleShorthands[li.shorthand] = true;
     }
 
@@ -863,13 +865,13 @@ function updateMetricsPane()
     if (focusedNode.nodeType == Node.ELEMENT_NODE)
         style = focusedNode.ownerDocument.defaultView.getComputedStyle(focusedNode);
     if (!style || style.length == 0) {
-        document.getElementById("noMetrics").style.display = null;
+        document.getElementById("noMetrics").style.removeProperty("display");
         document.getElementById("marginBoxTable").style.display = "none";
         return;
     }
 
     document.getElementById("noMetrics").style.display = "none";
-    document.getElementById("marginBoxTable").style.display = null;
+    document.getElementById("marginBoxTable").style.removeProperty("display");
 
     setBoxMetrics(style, "margin", "");
     setBoxMetrics(style, "border", "-width");

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 15eba63bad5c4a5794277cf0b1e9da59f918561d..934ced30274a530126f974d872752a58804c6a97 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-21  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Geoff.
+
+        http://bugs.webkit.org/show_bug.cgi?id=11888
+        Bug 11888: REGRESSION (r18320): Web Inspector panes broken
+
+        * Drosera/debugger.js: Use removeProperty to reset a style property to its initial value.
+
 2006-12-18  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Beth Dakin.

diff --git a/WebKitTools/Drosera/debugger.js b/WebKitTools/Drosera/debugger.js
index cfb2a1ca4c665ff2f978682550219b1a93b24df8..1632d23596ce4c9d971b3aa8b906b6e46729b87c 100644 (file)
--- a/WebKitTools/Drosera/debugger.js
+++ b/WebKitTools/Drosera/debugger.js
@@ -158,7 +158,7 @@ function dividerDragEnd(element, dividerDrag, dividerDragEnd, event)
     element.dragging = false;
     document.removeEventListener("mousemove", dividerDrag, true);
     document.removeEventListener("mouseup", dividerDragEnd, true);
-    document.body.style.cursor = null;
+    document.body.style.removeProperty("cursor");
 }
 
 function dividerDrag(event) 
@@ -540,7 +540,7 @@ function breakpointDrag(event)
     if (!draggingBreakpoint) {
         sourcesDocument.removeEventListener("mousemove", breakpointDrag, true);
         sourcesDocument.removeEventListener("mouseup", breakpointDragEnd, true);
-        sourcesDocument.body.style.cursor = null;
+        sourcesDocument.body.style.removeProperty("cursor");
         return;
     }
 
@@ -581,7 +581,7 @@ function breakpointDrag(event)
             if (!dragImage) {
                 sourcesDocument.removeEventListener("mousemove", breakpointDrag, true);
                 sourcesDocument.removeEventListener("mouseup", breakpointDragEnd, true);
-                sourcesDocument.body.style.cursor = null;
+                sourcesDocument.body.style.removeProperty("cursor");
                 return;
             }
 
@@ -590,7 +590,7 @@ function breakpointDrag(event)
             if (x > 40)
                 dragImage.style.visibility = "hidden";
             else
-                dragImage.style.visibility = null;
+                dragImage.style.removeProperty("visibility");
         }
 
         draggingBreakpoint.dragLastX = x;
@@ -603,7 +603,7 @@ function breakpointDragEnd(event)
     var sourcesDocument = document.getElementById("sources").contentDocument;
     sourcesDocument.removeEventListener("mousemove", breakpointDrag, true);
     sourcesDocument.removeEventListener("mouseup", breakpointDragEnd, true);
-    sourcesDocument.body.style.cursor = null;
+    sourcesDocument.body.style.removeProperty("cursor");
 
     var dragImage = sourcesDocument.getElementById("breakpointDrag");
     if (!dragImage)
@@ -1012,7 +1012,7 @@ function loadFile(fileIndex, manageNavLists)
         file.loaded = true;
     }
 
-    file.element.style.display = null;
+    file.element.style.removeProperty("display");
 
     document.getElementById("filesPopupButtonContent").innerText = (file.url ? file.url : "(unknown script)");