Title: [143183] branches/chromium/1410/Source/WebCore/inspector/front-end
- Revision
- 143183
- Author
- [email protected]
- Date
- 2013-02-18 02:35:58 -0800 (Mon, 18 Feb 2013)
Log Message
Merge 142745
> Web Inspector: Fixed colorpicker editing and scrolling.
> https://bugs.webkit.org/show_bug.cgi?id=109434.
>
> Patch by Vladislav Kaznacheev <[email protected]> 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):
[email protected]
Review URL: https://codereview.chromium.org/12301008
Modified Paths
Diff
Modified: branches/chromium/1410/Source/WebCore/inspector/front-end/SplitView.js (143182 => 143183)
--- branches/chromium/1410/Source/WebCore/inspector/front-end/SplitView.js 2013-02-18 10:31:19 UTC (rev 143182)
+++ branches/chromium/1410/Source/WebCore/inspector/front-end/SplitView.js 2013-02-18 10:35:58 UTC (rev 143183)
@@ -42,8 +42,8 @@
this.element.className = "split-view";
- this._firstElement = this.element.createChild("div", "split-view-contents");
- this._secondElement = this.element.createChild("div", "split-view-contents");
+ this._firstElement = this.element.createChild("div", "split-view-contents scroll-target");
+ this._secondElement = this.element.createChild("div", "split-view-contents scroll-target");
this._resizerElement = this.element.createChild("div", "split-view-resizer");
this.installResizer(this._resizerElement);
Modified: branches/chromium/1410/Source/WebCore/inspector/front-end/StylesSidebarPane.js (143182 => 143183)
--- branches/chromium/1410/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2013-02-18 10:31:19 UTC (rev 143182)
+++ branches/chromium/1410/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2013-02-18 10:35:58 UTC (rev 143183)
@@ -1771,7 +1771,7 @@
colorSwatch.setColorString(text);
colorSwatch.element.addEventListener("click", swatchClick, false);
- var scrollerElement = hasSpectrum ? self._parentPane._computedStylePane.element.parentElement : null;
+ var scrollerElement;
function spectrumChanged(e)
{
@@ -1785,7 +1785,8 @@
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);
self.applyStyleText(propertyText, true, true, false);
@@ -1817,7 +1818,11 @@
spectrum.addEventListener(WebInspector.Spectrum.Events.ColorChanged, spectrumChanged);
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");
}
}
e.consume(true);
Modified: branches/chromium/1410/Source/WebCore/inspector/front-end/TabbedPane.js (143182 => 143183)
--- branches/chromium/1410/Source/WebCore/inspector/front-end/TabbedPane.js 2013-02-18 10:31:19 UTC (rev 143182)
+++ branches/chromium/1410/Source/WebCore/inspector/front-end/TabbedPane.js 2013-02-18 10:35:58 UTC (rev 143183)
@@ -40,7 +40,7 @@
this._headerElement = this.element.createChild("div", "tabbed-pane-header");
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 = [];
this._tabsById = {};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
