Permalink
Browse files

fixes display url bug and label area bug

  • Loading branch information...
1 parent 4477ece commit b24d709f378909fb2dde859d40596300dd2a922a @jeads jeads committed Mar 15, 2013
@@ -59,7 +59,8 @@ var AppsPage = new Class( {
this.history.pushState(
{state:paramData},
"Perf-o-Matic",
- this.refData.project + '?' + paramData['params_str']
+ //this.refData.project + '?' + paramData['params_str']
+ '?' + paramData['params_str']
);
},
@@ -137,6 +138,10 @@ var AppsPage = new Class( {
var urlObj = jQuery.url(window.location).data;
this.refData.project = urlObj.seg.path[0];
+ if(urlObj.attr.directory.search(/\/$/) === -1){
+ urlObj.attr.directory += '/';
+ }
+
this.urlBase = urlObj.attr.base + urlObj.attr.directory;
this.defaults = {};
@@ -207,7 +207,7 @@ var GraphControlsComponent = new Class({
for(j=0; j<inputEls.length; j++){
- idAttr = $(inputEls[j]).parent().parent().attr('id');
+ idAttr = $(inputEls[j]).parent().attr('id');
id = this.view.getId(idAttr);
if( checkedAllowed[id] === undefined ){
@@ -239,7 +239,7 @@ var GraphControlsComponent = new Class({
},
toggleAppSeries: function(event){
- var idAttr = $(event.currentTarget).parent().parent().attr('id');
+ var idAttr = $(event.currentTarget).parent().attr('id');
var id = this.view.getId(idAttr);
$(APPS_PAGE.appContainerSel).trigger(
@@ -250,7 +250,7 @@ var GraphControlsComponent = new Class({
},
toggleTestSeries: function(event){
- var idAttr = $(event.currentTarget).parent().parent().attr('id');
+ var idAttr = $(event.currentTarget).parent().attr('id');
var id = this.view.getId(idAttr);
var eventData = this.testLookup[id];
@@ -388,7 +388,7 @@ var GraphControlsView = new Class({
for(var i=0; i<inputEls.length; i++){
inputEl = inputEls[i];
- idAttr = $(inputEl).parent().parent().attr('id');
+ idAttr = $(inputEl).parent().attr('id');
checked = $(inputEl).attr('checked');
id = this.getId(idAttr);
@@ -430,12 +430,13 @@ var GraphControlsView = new Class({
label = seriesDatum.name;
}
- var legendClone = $(legendIdSel).clone();
+ var labelClone = $(legendIdSel).parent().clone();
+ var legendClone = $(labelClone).children();
+
$(legendClone).attr(
'id', idPrefix + seriesDatum.id
);
-
var inputEl = $(legendClone).find('input');
$(inputEl).bind('click', _.bind( fnCallback, context ) );
@@ -464,7 +465,7 @@ var GraphControlsView = new Class({
}
);
- $(containerSel).append(legendClone);
+ $(containerSel).append(labelClone);
},
getId: function(idAttr){
@@ -515,7 +516,7 @@ var GraphControlsModel = new Class({
getBranches: function(context, fnSuccess){
- var uri = APPS_PAGE.urlBase + '/refdata/perftest/ref_data/products';
+ var uri = APPS_PAGE.urlBase + 'refdata/perftest/ref_data/products';
jQuery.ajax( uri, {
accepts:'application/json',
@@ -529,7 +530,7 @@ var GraphControlsModel = new Class({
},
getApps: function(context, fnSuccess){
- var uri = APPS_PAGE.urlBase + '/refdata/perftest/ref_data/tests';
+ var uri = APPS_PAGE.urlBase + 'refdata/perftest/ref_data/tests';
jQuery.ajax( uri, {
accepts:'application/json',
@@ -544,7 +545,7 @@ var GraphControlsModel = new Class({
getTests: function(context, fnSuccess){
- var uri = APPS_PAGE.urlBase + '/refdata/perftest/ref_data/pages';
+ var uri = APPS_PAGE.urlBase + 'refdata/perftest/ref_data/pages';
jQuery.ajax( uri, {
accepts:'application/json',
@@ -484,7 +484,7 @@ var PerformanceGraphModel = new Class({
getAppData: function(context, fnSuccess, testIds, pageName, range, branch){
- var uri = APPS_PAGE.urlBase + '/testdata/test_values?' +
+ var uri = APPS_PAGE.urlBase + 'testdata/test_values?' +
'branch=BRANCH&test_ids=TEST_IDS&page_name=PAGE_NAME&range=RANGE';
uri = uri.replace('BRANCH', branch);
@@ -391,7 +391,7 @@ var ReplicateGraphModel = new Class({
){
var uri = APPS_PAGE.urlBase +
- '/refdata/objectstore/json_blob/revisions?branch=' + branch +
+ 'refdata/objectstore/json_blob/revisions?branch=' + branch +
'&gaia_revision=' + gaiaRevision +
'&gecko_revision=' + geckoRevision +
'&test_id=' + testId + '&test_type=' + testType;
Oops, something went wrong.
@@ -22,18 +22,19 @@
</div>
</div>
-<div id="su_legend" class="ui-state-highlight ui-corner-all su-data-series-panel" style="display:none;">
- <label>
+<label>
+ <div id="su_legend" class="ui-state-highlight ui-corner-all su-data-series-panel" style="display:none;">
<input type="checkbox" title="toggle" style="margin-left:2px; margin-right:5px; float:left;" />
<div name="su_dataset_title" class="su-wordwrap css-left" style="width:100px; margin-top:4px;"></div>
- </label>
-</div>
-<div id="su_test_legend" class="ui-state-highlight ui-corner-all su-data-series-panel" style="display:none;">
- <label>
+ </div>
+</label>
+
+<label>
+ <div id="su_test_legend" class="ui-state-highlight ui-corner-all su-data-series-panel" style="display:none;">
<input type="radio" name="test_type" style="margin-left:2px; margin-right:5px; float:left;" />
<div name="su_dataset_title" class="su-wordwrap css-left" style="width:100px; margin-top:4px;"></div>
- </label>
-</div>
+ </div>
+</label>
<div id="app_container" class="ui-widget ui-widget-header ui-corner-top app-container">
<div id="test_series" class="ui-widget ui-widget-header ui-corner-all app-list-two">
@@ -43,12 +44,12 @@
</div>
<div id="app_series" class="ui-widget ui-widget-header ui-corner-all app-list">
</div>
- <div class="ui-widget ui-widget-header ui-corner-all app-list-controls">
- <label>
+ <label>
+ <div class="ui-widget ui-widget-header ui-corner-all app-list-controls">
<input id="app_select_apps" type="checkbox" style="margin-top:5px; margin-left:5px; margin-right:5px; float:left;" title="Select/Unselect all applications" checked>
<div style="padding:5px;" class="su-large-text">Applications</div>
- </label>
- </div>
+ </div>
+ </label>
<div class="ui-widget ui-widget-header ui-corner-all app-control-container">
<div style="display:inline;">
<div style="width:280px;" class="app-control-element su-large-text">Firefox OS Application Performance</div>

0 comments on commit b24d709

Please sign in to comment.