AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r11860, which was supposed to just be a whitespace change (argh)

Browse Source 
(SkipBuildbotRuns)

Review URL: https://codereview.chromium.org/29603002

git-svn-id: http://skia.googlecode.com/svn/trunk@11861 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
epoger@google.com 2013-10-18 18:36:25 +00:00
parent 94041c6d8b
commit cce4e09a5c
4 changed files with 44 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gm/rebaseline_server/static/loader.js
View File

@ -45,13 +45,7 @@ Loader.controller(
$scope.categories = data.categories; $scope.categories = data.categories;
$scope.testData = data.testData; $scope.testData = data.testData;
$scope.sortColumn = 'test'; $scope.sortColumn = 'test';
$scope.showTodos = false; $scope.showTodos = true;
$scope.dispositions = [
'Unfiled', 'Hidden', 'Pending Approval'
];
$scope.defaultDisposition = $scope.dispositions[0];
$scope.viewingDisposition = $scope.defaultDisposition;
for (var i = 0; i < $scope.testData.length; i++) { for (var i = 0; i < $scope.testData.length; i++) {
$scope.testData[i].index = i; $scope.testData[i].index = i;
@ -119,10 +113,6 @@ Loader.controller(
$scope.areUpdatesPending = true; $scope.areUpdatesPending = true;
} }
$scope.setViewingDisposition = function(disposition) {
$scope.viewingDisposition = disposition;
}
$scope.localTimeString = function(secondsPastEpoch) { $scope.localTimeString = function(secondsPastEpoch) {
var d = new Date(secondsPastEpoch * 1000); var d = new Date(secondsPastEpoch * 1000);
return d.toString(); return d.toString();

6
gm/rebaseline_server/static/view.css
View File

@ -1,6 +0,0 @@
.disposition-tab-true {
background-color: #ccccff;
}
.disposition-tab-false {
background-color: #8888ff;
}

117
gm/rebaseline_server/static/view.html
View File

@ -6,7 +6,6 @@
<title ng-bind="windowTitle"></title> <title ng-bind="windowTitle"></title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.js"></script>
<script src="loader.js"></script> <script src="loader.js"></script>
<link rel="stylesheet" href="view.css">
</head> </head>
<body> <body>
@ -14,75 +13,16 @@
{{loadingMessage}} {{loadingMessage}}
</em> </em>
<div ng-hide="!categories"><!-- everything: hide until data is loaded --> <div ng-hide="!categories">
<div ng-hide="!(header.isEditable && header.isExported)" <div ng-hide="!(header.isEditable && header.isExported)"
style="background-color:#ffbb00"> style="background-color:#ffbb00">
WARNING! These results are editable and exported, so any user WARNING! These results are editable and exported, so any user
who can connect to this server over the network can modify them. who can connect to this server over the network can modify them.
</div> </div>
<div style="background-color:#bbffbb"><!-- TODOs -->
<p>
TODO(epoger):
<input type="checkbox" name="showTodosCheckbox" value="true"
ng-checked="showTodos == true"
ng-click="showTodos = !showTodos">
show
<ul ng-hide="!showTodos">
<li>
Implement editing of results (we have added the --editable
flag to the server, but it&#39;s not fully implemented yet).
<div ng-hide="!header.isEditable">
Currently selected items are: {{selectedItems}}
</div>
</li><li>
If server was run with --reload flag, automatically check for
new results and tell the user when new results are available
(the user can reload the page if he wants to see them).
</li><li>
Add ability to filter builder and test names
(using a free-form text field, with partial string match)
</li><li>
Add more columns, such as pixel diffs, notes/bugs,
ignoreFailure boolean
</li><li>
Improve the column sorting, as per
<a href="http://jsfiddle.net/vojtajina/js64b/14/">
http://jsfiddle.net/vojtajina/js64b/14/
</a>
</li><li>
Right now, if you change which column is used to
sort the data, the column widths may fluctuate based on the
longest string <i>currently visible</i> within the top {{displayLimit}}
results. Can we fix the column widths to be wide enough to hold
any result, even the currently hidden results?
</li>
</ul>
</div><!-- TODOs -->
<div ng-hide="!(header.timeUpdated)"> <div ng-hide="!(header.timeUpdated)">
Results current as of {{localTimeString(header.timeUpdated)}} Results current as of {{localTimeString(header.timeUpdated)}}
</div> </div>
<table border="1">
<div style="font-size:20px"><!-- tabs -->
<div ng-repeat="disposition in dispositions"
style="display:inline-block">
<div class="disposition-tab-{{disposition == viewingDisposition}}"
style="display:inline-block"
ng-click="setViewingDisposition(disposition)">
&nbsp;{{disposition}}&nbsp;
</div>
<div style="display:inline-block">
&nbsp;
</div>
</div>
</div><!-- tabs -->
<div class="disposition-tab-true"><!-- display of current disposition type -->
<br>
<table ng-hide="viewingDisposition != defaultDisposition" border="1">
<tr> <tr>
<th colspan="2"> <th colspan="2">
Filters Filters
@ -140,19 +80,49 @@
</tr> </tr>
</table> </table>
<p>
TODO(epoger):
<input type="checkbox" name="showTodosCheckbox" value="true"
ng-checked="showTodos == true"
ng-click="showTodos = !showTodos">
show
<ul ng-hide="!showTodos">
<li>
Implement editing of results (we have added the --editable
flag to the server, but it&#39;s not fully implemented yet).
<div ng-hide="!header.isEditable">
Currently selected items are: {{selectedItems}}
</div>
</li><li>
If server was run with --reload flag, automatically check for
new results and tell the user when new results are available
(the user can reload the page if he wants to see them).
</li><li>
Add ability to filter builder and test names
(using a free-form text field, with partial string match)
</li><li>
Add more columns, such as pixel diffs, notes/bugs,
ignoreFailure boolean
</li><li>
Improve the column sorting, as per
<a href="http://jsfiddle.net/vojtajina/js64b/14/">
http://jsfiddle.net/vojtajina/js64b/14/
</a>
</li><li>
Right now, if you change which column is used to
sort the data, the column widths may fluctuate based on the
longest string <i>currently visible</i> within the top {{displayLimit}}
results. Can we fix the column widths to be wide enough to hold
any result, even the currently hidden results?
</li>
</ul>
<p> <p>
Found {{filteredTestData.length}} matches; Found {{filteredTestData.length}} matches, and displaying the first
<span ng-hide="filteredTestData.length <= limitedTestData.length"> {{displayLimit}}: <br>
displaying the first {{limitedTestData.length}} <!-- TODO(epoger): If (displayLimit <= filteredTestData.length),
</span> modify this message to indicate that all results are shown. -->
<span ng-hide="filteredTestData.length > limitedTestData.length">
displaying them all
</span>
<br>
(click on the column header radio buttons to re-sort by that column) (click on the column header radio buttons to re-sort by that column)
<br> <br>
<table border="1"> <table border="1">
<tr> <tr>
<th ng-repeat="categoryName in ['resultType', 'builder', 'test', 'config']"> <th ng-repeat="categoryName in ['resultType', 'builder', 'test', 'config']">
@ -206,8 +176,7 @@
ng-click="toggleItemSelected(result.index)"> ng-click="toggleItemSelected(result.index)">
</tr> </tr>
</table> </table>
</div><!-- display of current disposition type --> </div>
</div><!-- everything: hide until data is loaded -->
<!-- TODO(epoger): Can we get the base URLs (commondatastorage and <!-- TODO(epoger): Can we get the base URLs (commondatastorage and
issues list) from issues list) from

1
whitespace.txt
View File

@ -173,4 +173,3 @@ This file has gotten so boring.