<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176203] trunk/Websites/perf.webkit.org</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176203">176203</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-17 09:07:13 -0800 (Mon, 17 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>App.Manifest shouldn't use App.__container__.lookup
https://bugs.webkit.org/show_bug.cgi?id=138768

Reviewed by Andreas Kling.

Removed the hack to find the store object via App.__container__.lookup.
Pass around the store object instead.

* public/v2/app.js:
(App.DashboardRow._createPane): Add &quot;store&quot; property to the pane.
(App.DashboardPaneProxyForPicker._platformOrMetricIdChanged): Ditto.
(App.IndexController.gridChanged): Ditto.
(App.IndexController.actions.addRow): Ditto.
(App.IndexController.init): Ditto.
(App.Pane._fetch): Ditto.
(App.ChartsController._parsePaneList): Ditto.
(App.ChartsController._updateQueryString): Ditto.
(App.ChartsController.actions.addPaneByMetricAndPlatform): Ditto.
(App.BuildPopup): Ditto.
(App.AnalysisTaskRoute.model): Ditto.
(App.AnalysisTaskViewModel._taskUpdated): Ditto.

* public/v2/manifest.js:
(App.Manifest.fetch): Removed the code to find the store object.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv2appjs">trunk/Websites/perf.webkit.org/public/v2/app.js</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicv2manifestjs">trunk/Websites/perf.webkit.org/public/v2/manifest.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (176202 => 176203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog        2014-11-17 16:43:59 UTC (rev 176202)
+++ trunk/Websites/perf.webkit.org/ChangeLog        2014-11-17 17:07:13 UTC (rev 176203)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-11-17  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        App.Manifest shouldn't use App.__container__.lookup
+        https://bugs.webkit.org/show_bug.cgi?id=138768
+
+        Reviewed by Andreas Kling.
+
+        Removed the hack to find the store object via App.__container__.lookup.
+        Pass around the store object instead.
+
+        * public/v2/app.js:
+        (App.DashboardRow._createPane): Add &quot;store&quot; property to the pane.
+        (App.DashboardPaneProxyForPicker._platformOrMetricIdChanged): Ditto.
+        (App.IndexController.gridChanged): Ditto.
+        (App.IndexController.actions.addRow): Ditto.
+        (App.IndexController.init): Ditto.
+        (App.Pane._fetch): Ditto.
+        (App.ChartsController._parsePaneList): Ditto.
+        (App.ChartsController._updateQueryString): Ditto.
+        (App.ChartsController.actions.addPaneByMetricAndPlatform): Ditto.
+        (App.BuildPopup): Ditto.
+        (App.AnalysisTaskRoute.model): Ditto.
+        (App.AnalysisTaskViewModel._taskUpdated): Ditto.
+
+        * public/v2/manifest.js:
+        (App.Manifest.fetch): Removed the code to find the store object.
+
</ins><span class="cx"> 2014-11-08  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix Ember.js warnings the new perf dashboard
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv2appjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v2/app.js (176202 => 176203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v2/app.js        2014-11-17 16:43:59 UTC (rev 176202)
+++ trunk/Websites/perf.webkit.org/public/v2/app.js        2014-11-17 17:07:13 UTC (rev 176203)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">             paneInfo = null;
</span><span class="cx"> 
</span><span class="cx">         var pane = App.Pane.create({
</span><ins>+            store: this.get('store'),
</ins><span class="cx">             platformId: paneInfo ? paneInfo[0] : null,
</span><span class="cx">             metricId: paneInfo ? paneInfo[1] : null,
</span><span class="cx">         });
</span><span class="lines">@@ -45,7 +46,7 @@
</span><span class="cx">     _platformOrMetricIdChanged: function ()
</span><span class="cx">     {
</span><span class="cx">         var self = this;
</span><del>-        App.BuildPopup('choosePane', this)
</del><ins>+        App.BuildPopup(this.get('store'), 'choosePane', this)
</ins><span class="cx">             .then(function (platforms) { self.set('pickerData', platforms); });
</span><span class="cx">     }.observes('platformId', 'metricId').on('init'),
</span><span class="cx">     paneList: function () {
</span><span class="lines">@@ -87,8 +88,10 @@
</span><span class="cx">             return {label:name, index: index};
</span><span class="cx">         }));
</span><span class="cx"> 
</span><ins>+        var store = this.store;
</ins><span class="cx">         this.set('rows', table.slice(1).map(function (rowParam) {
</span><span class="cx">             return App.DashboardRow.create({
</span><ins>+                store: store,
</ins><span class="cx">                 header: rowParam[0],
</span><span class="cx">                 cellsInfo: rowParam.slice(1),
</span><span class="cx">                 columnCount: columnCount,
</span><span class="lines">@@ -170,6 +173,7 @@
</span><span class="cx">         addRow: function ()
</span><span class="cx">         {
</span><span class="cx">             this.get('rows').pushObject(App.DashboardRow.create({
</span><ins>+                store: this.store,
</ins><span class="cx">                 header: this.get('newRowHeader'),
</span><span class="cx">                 columnCount: this.get('columnCount'),
</span><span class="cx">             }));
</span><span class="lines">@@ -195,7 +199,7 @@
</span><span class="cx">     init: function ()
</span><span class="cx">     {
</span><span class="cx">         this._super();
</span><del>-        App.Manifest.fetch();
</del><ins>+        App.Manifest.fetch(this.get('store'));
</ins><span class="cx">     }
</span><span class="cx"> });
</span><span class="cx"> 
</span><span class="lines">@@ -340,7 +344,7 @@
</span><span class="cx">         else {
</span><span class="cx">             var self = this;
</span><span class="cx"> 
</span><del>-            App.Manifest.fetchRunsWithPlatformAndMetric(this.store, platformId, metricId).then(function (result) {
</del><ins>+            App.Manifest.fetchRunsWithPlatformAndMetric(this.get('store'), platformId, metricId).then(function (result) {
</ins><span class="cx">                 self.set('platform', result.platform);
</span><span class="cx">                 self.set('metric', result.metric);
</span><span class="cx">                 self.set('chartData', result.runs);
</span><span class="lines">@@ -510,6 +514,7 @@
</span><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx">             return App.Pane.create({
</span><ins>+                store: self.store,
</ins><span class="cx">                 info: paneInfo,
</span><span class="cx">                 platformId: paneInfo[0],
</span><span class="cx">                 metricId: paneInfo[1],
</span><span class="lines">@@ -561,6 +566,7 @@
</span><span class="cx">         addPaneByMetricAndPlatform: function (param)
</span><span class="cx">         {
</span><span class="cx">             this.addPane(App.Pane.create({
</span><ins>+                store, this.store,
</ins><span class="cx">                 platformId: param.platform.get('id'),
</span><span class="cx">                 metricId: param.metric.get('id'),
</span><span class="cx">                 showingDetails: false
</span><span class="lines">@@ -572,15 +578,15 @@
</span><span class="cx">     {
</span><span class="cx">         this._super();
</span><span class="cx">         var self = this;
</span><del>-        App.BuildPopup('addPaneByMetricAndPlatform').then(function (platforms) {
</del><ins>+        App.BuildPopup(this.store, 'addPaneByMetricAndPlatform').then(function (platforms) {
</ins><span class="cx">             self.set('platforms', platforms);
</span><span class="cx">         });
</span><span class="cx">     },
</span><span class="cx"> });
</span><span class="cx"> 
</span><del>-App.BuildPopup = function(action, position)
</del><ins>+App.BuildPopup = function(store, action, position)
</ins><span class="cx"> {
</span><del>-    return App.Manifest.fetch().then(function () {
</del><ins>+    return App.Manifest.fetch(store).then(function () {
</ins><span class="cx">         return App.Manifest.get('platforms').map(function (platform) {
</span><span class="cx">             return App.PlatformProxyForPopup.create({content: platform,
</span><span class="cx">                 action: action, position: position});
</span><span class="lines">@@ -1592,9 +1598,8 @@
</span><span class="cx"> 
</span><span class="cx"> App.AnalysisTaskRoute = Ember.Route.extend({
</span><span class="cx">     model: function (param) {
</span><del>-        var store = this.store;
-        return this.store.find('analysisTask', param.taskId).then(function (task) {
-            return App.AnalysisTaskViewModel.create({content: task});
</del><ins>+        return store.find('analysisTask', param.taskId).then(function (task) {
+            return App.AnalysisTaskViewModel.create({content: task, store: store});
</ins><span class="cx">         });
</span><span class="cx">     },
</span><span class="cx"> });
</span><span class="lines">@@ -1606,7 +1611,7 @@
</span><span class="cx">     {
</span><span class="cx">         var platformId = this.get('platform').get('id');
</span><span class="cx">         var metricId = this.get('metric').get('id');
</span><del>-        App.Manifest.fetchRunsWithPlatformAndMetric(this.store, platformId, metricId).then(this._fetchedRuns.bind(this));
</del><ins>+        App.Manifest.fetchRunsWithPlatformAndMetric(this.get('store'), platformId, metricId).then(this._fetchedRuns.bind(this));
</ins><span class="cx">     }.observes('platform', 'metric').on('init'),
</span><span class="cx">     _fetchedRuns: function (data) {
</span><span class="cx">         var runs = data.runs;
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicv2manifestjs"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/v2/manifest.js (176202 => 176203)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/v2/manifest.js        2014-11-17 16:43:59 UTC (rev 176202)
+++ trunk/Websites/perf.webkit.org/public/v2/manifest.js        2014-11-17 17:07:13 UTC (rev 176203)
</span><span class="lines">@@ -160,14 +160,10 @@
</span><span class="cx">     _builderById: {},
</span><span class="cx">     _repositoryById: {},
</span><span class="cx">     _fetchPromise: null,
</span><del>-    fetch: function ()
</del><ins>+    fetch: function (store)
</ins><span class="cx">     {
</span><del>-        if (this._fetchPromise)
-            return this._fetchPromise;
-        // FIXME: We shouldn't use DS.Store at all.
-        var store = App.__container__.lookup('store:main');
-        var promise = store.findAll('platform');
-        this._fetchPromise = promise.then(this._fetchedManifest.bind(this, store));
</del><ins>+        if (!this._fetchPromise)
+            this._fetchPromise = store.findAll('platform').then(this._fetchedManifest.bind(this, store));
</ins><span class="cx">         return this._fetchPromise;
</span><span class="cx">     },
</span><span class="cx">     isFetched: function () { return !!this.get('platforms'); }.property('platforms'),
</span></span></pre>
</div>
</div>

</body>
</html>