Title: [108076] trunk/Source/WebCore
- Revision
- 108076
- Author
- [email protected]
- Date
- 2012-02-17 08:17:45 -0800 (Fri, 17 Feb 2012)
Log Message
Web Inspector: hide color picker on selected node update.
https://bugs.webkit.org/show_bug.cgi?id=78896
Reviewed by Vsevolod Vlasov.
* inspector/front-end/Spectrum.js:
(WebInspector.Spectrum.prototype.get visible):
(WebInspector.Spectrum.prototype.toggle):
(WebInspector.Spectrum.prototype.show):
* inspector/front-end/StylesSidebarPane.js:
(WebInspector.StylesSidebarPane.prototype.update):
(WebInspector.StylePropertyTreeElement.prototype.updateTitle.):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108075 => 108076)
--- trunk/Source/WebCore/ChangeLog 2012-02-17 16:13:59 UTC (rev 108075)
+++ trunk/Source/WebCore/ChangeLog 2012-02-17 16:17:45 UTC (rev 108076)
@@ -1,5 +1,20 @@
2012-02-17 Pavel Feldman <[email protected]>
+ Web Inspector: hide color picker on selected node update.
+ https://bugs.webkit.org/show_bug.cgi?id=78896
+
+ Reviewed by Vsevolod Vlasov.
+
+ * inspector/front-end/Spectrum.js:
+ (WebInspector.Spectrum.prototype.get visible):
+ (WebInspector.Spectrum.prototype.toggle):
+ (WebInspector.Spectrum.prototype.show):
+ * inspector/front-end/StylesSidebarPane.js:
+ (WebInspector.StylesSidebarPane.prototype.update):
+ (WebInspector.StylePropertyTreeElement.prototype.updateTitle.):
+
+2012-02-17 Pavel Feldman <[email protected]>
+
Web Inspector: check undo-redo boundaries based on current action index, not history size.
https://bugs.webkit.org/show_bug.cgi?id=78895
Modified: trunk/Source/WebCore/inspector/front-end/Spectrum.js (108075 => 108076)
--- trunk/Source/WebCore/inspector/front-end/Spectrum.js 2012-02-17 16:13:59 UTC (rev 108075)
+++ trunk/Source/WebCore/inspector/front-end/Spectrum.js 2012-02-17 16:17:45 UTC (rev 108076)
@@ -308,7 +308,7 @@
this._displayElement.textContent = text;
},
- get isVisible()
+ get visible()
{
return this._popover.visible;
},
@@ -365,17 +365,17 @@
toggle: function(element, color, format)
{
- if (this.isVisible)
+ if (this.visible)
this.hide();
else
this.show(element, color, format);
- return this.isVisible;
+ return this.visible;
},
show: function(element, color, format)
{
- if (this.isVisible) {
+ if (this.visible) {
if (this.anchorElement === element)
return false;
Modified: trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js (108075 => 108076)
--- trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-02-17 16:13:59 UTC (rev 108075)
+++ trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js 2012-02-17 16:17:45 UTC (rev 108076)
@@ -206,6 +206,9 @@
update: function(node, forceUpdate)
{
+ if (this._spectrum.visible)
+ this._spectrum.hide();
+
var refresh = false;
if (forceUpdate)
@@ -1744,9 +1747,9 @@
if (!spectrum || e.shiftKey)
changeColorDisplay(e);
else {
- var isVisible = spectrum.toggle(swatchElement, color, format);
+ var visible = spectrum.toggle(swatchElement, color, format);
- if (isVisible) {
+ if (visible) {
spectrum.displayText = color.toString(format);
self._parentPane._isEditingStyle = true;
spectrum.addEventListener(WebInspector.Spectrum.Events.ColorChanged, spectrumChanged);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
