Changeset 142745 in webkit

Timestamp:

Feb 13, 2013 7:25:00 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Fixed colorpicker editing and scrolling.
​https://bugs.webkit.org/show_bug.cgi?id=109434.

Patch by Vladislav Kaznacheev <​kaznacheev@chromium.org> on 2013-02-13
Reviewed by Alexander Pavlov.

The color picker scrolling logic relied on the fixed DOM structure which changed with the introduction of
SidebarPaneStack (​https://bugs.webkit.org/show_bug.cgi?id=108183).
Added a special CSS class to mark the scroll target.

No new tests.

• inspector/front-end/SplitView.js:

(WebInspector.SplitView):

• inspector/front-end/StylesSidebarPane.js:

(WebInspector.StylePropertyTreeElement.prototype.updateTitle.):

• inspector/front-end/TabbedPane.js:

(WebInspector.TabbedPane):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/SplitView.js (modified) (1 diff)
• inspector/front-end/StylesSidebarPane.js (modified) (3 diffs)
• inspector/front-end/TabbedPane.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-13  Vladislav Kaznacheev  <kaznacheev@chromium.org>
+
+        Web Inspector: Fixed colorpicker editing and scrolling.
+        https://bugs.webkit.org/show_bug.cgi?id=109434.
+
+        Reviewed by Alexander Pavlov.
+
+        The color picker scrolling logic relied on the fixed DOM structure which changed with the introduction of
+        SidebarPaneStack (https://bugs.webkit.org/show_bug.cgi?id=108183).
+        Added a special CSS class to mark the scroll target.
+
+        No new tests.
+
+        * inspector/front-end/SplitView.js:
+        (WebInspector.SplitView):
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylePropertyTreeElement.prototype.updateTitle.):
+        * inspector/front-end/TabbedPane.js:
+        (WebInspector.TabbedPane):
+ 
 2013-02-13  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/SplitView.js

@@ -43 +43 @@
     this.element.className = "split-view";
 
-    this._firstElement = this.element.createChild("div", "split-view-contents");
-    this._firstElement.addStyleClass("split-view-contents-first");
-
-    this._secondElement = this.element.createChild("div", "split-view-contents");
-    this._secondElement.addStyleClass("split-view-contents-second");
+    this._firstElement = this.element.createChild("div", "split-view-contents scroll-target split-view-contents-first");
+    this._secondElement = this.element.createChild("div", "split-view-contents scroll-target split-view-contents-second");
 
     this._resizerElement = this.element.createChild("div", "split-view-resizer");

trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js

@@ -1772 +1772 @@
                 colorSwatch.element.addEventListener("click", swatchClick, false);
 
-                var scrollerElement = hasSpectrum ? self._parentPane._computedStylePane.element.parentElement : null;
+                var scrollerElement;
 
                 function spectrumChanged(e)
@@ -1786 +1786 @@
                 function spectrumHidden(event)
                 {
-                    scrollerElement.removeEventListener("scroll", repositionSpectrum, false);
+                    if (scrollerElement)
+                        scrollerElement.removeEventListener("scroll", repositionSpectrum, false);
                     var commitEdit = event.data;
                     var propertyText = !commitEdit && self.originalPropertyText ? self.originalPropertyText : (nameElement.textContent + ": " + valueElement.textContent);
@@ -1818 +1819 @@
                             spectrumHelper.addEventListener(WebInspector.SpectrumPopupHelper.Events.Hidden, spectrumHidden);
 
-                            scrollerElement.addEventListener("scroll", repositionSpectrum, false);
+                            scrollerElement = colorSwatch.element.enclosingNodeOrSelfWithClass("scroll-target");
+                            if (scrollerElement)
+                                scrollerElement.addEventListener("scroll", repositionSpectrum, false);
+                            else
+                                console.error("Unable to handle color picker scrolling");
                         }
                     }

trunk/Source/WebCore/inspector/front-end/TabbedPane.js

@@ -41 +41 @@
     this._headerContentsElement = this._headerElement.createChild("div", "tabbed-pane-header-contents");
     this._tabsElement = this._headerContentsElement.createChild("div", "tabbed-pane-header-tabs");
-    this._contentElement = this.element.createChild("div", "tabbed-pane-content");
+    this._contentElement = this.element.createChild("div", "tabbed-pane-content scroll-target");
     this._tabs = [];
     this._tabsHistory = [];