New perf dashboard erroneously clears zoom when poping history items

https://bugs.webkit.org/show_bug.cgi?id=141278

Reviewed by Chris Dumez.

The bug was caused by _sharedZoomChanged updating overviewSelection without updating mainPlotDomain.

Updating overviewSelection resulted in _overviewSelectionChanged, which observes changes to overviewSelection,
to schedule a call to propagateZoom, which in turn overrode "sharedZoom" we just parsed from the query string.

* public/v2/app.js:
(App.PaneController._overviewSelectionChanged): Don't schedule propagateZoom if the selected domain is already
shown in the main plot.
(App.PaneController._sharedZoomChanged): Set both overviewSelection and mainPlotDomain to avoid overriding
"sharedZoom" via propagateZoom inside _overviewSelectionChanged.

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

diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
index 56d51bf9c8cf907619cc4f108fb6f67fffd7ca6d..12388031d2ff02269fafd56cadbd7330b1fb047c 100644 (file)
--- a/Websites/perf.webkit.org/ChangeLog
+++ b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,21 @@
+2015-02-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        New perf dashboard erroneously clears zoom when poping history items
+        https://bugs.webkit.org/show_bug.cgi?id=141278
+
+        Reviewed by Chris Dumez.
+
+        The bug was caused by _sharedZoomChanged updating overviewSelection without updating mainPlotDomain.
+
+        Updating overviewSelection resulted in _overviewSelectionChanged, which observes changes to overviewSelection,
+        to schedule a call to propagateZoom, which in turn overrode "sharedZoom" we just parsed from the query string.
+
+        * public/v2/app.js:
+        (App.PaneController._overviewSelectionChanged): Don't schedule propagateZoom if the selected domain is already
+        shown in the main plot.
+        (App.PaneController._sharedZoomChanged): Set both overviewSelection and mainPlotDomain to avoid overriding
+        "sharedZoom" via propagateZoom inside _overviewSelectionChanged.
+
 2015-02-04  Ryosuke Niwa  <rniwa@webkit.org>
 
         New perf dashboard shows null as the aggregator name if no aggregation is done

diff --git a/Websites/perf.webkit.org/public/v2/app.js b/Websites/perf.webkit.org/public/v2/app.js
index 0e7114f8558462df184843f4f37be0debd68521d..0ed6dac5588768c10586d111ae042881c511c431 100755 (executable)
--- a/Websites/perf.webkit.org/public/v2/app.js
+++ b/Websites/perf.webkit.org/public/v2/app.js
@@ -680,6 +680,8 @@ App.PaneController = Ember.ObjectController.extend({
     _overviewSelectionChanged: function ()
     {
         var overviewSelection = this.get('overviewSelection');
+        if (App.domainsAreEqual(overviewSelection, this.get('mainPlotDomain')))
+            return;
         this.set('mainPlotDomain', overviewSelection || this.get('overviewDomain'));
         Ember.run.debounce(this, 'propagateZoom', 100);
     }.observes('overviewSelection'),
@@ -701,6 +703,7 @@ App.PaneController = Ember.ObjectController.extend({
         var newSelection = this.get('parentController').get('sharedZoom');
         if (App.domainsAreEqual(newSelection, this.get('mainPlotDomain')))
             return;
+        this.set('mainPlotDomain', newSelection);
         this.set('overviewSelection', newSelection);
     }.observes('parentController.sharedZoom').on('init'),
     _updateDetails: function ()