diff options
author | Gehad elrobey <gehadelrobey@gmail.com> | 2014-06-27 22:31:03 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-30 07:59:53 -0700 |
commit | a110b2858d91a3b998ddd93f99f2e108fbe7e021 (patch) | |
tree | daff56d28dccb0df40e2121b6cb8186e7802e49c /theme | |
parent | 023187a73ebb219e0b31ee6afb821e902de012a7 (diff) | |
download | subsurface-a110b2858d91a3b998ddd93f99f2e108fbe7e021.tar.gz |
HTML: Fix listlib whitespace errors.
Fix some code style and whitespace errors.
[Dirk Hohndel: one hunk didn't apply as there was no such code...?]
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'theme')
-rw-r--r-- | theme/list_lib.js | 161 |
1 files changed, 88 insertions, 73 deletions
diff --git a/theme/list_lib.js b/theme/list_lib.js index fb77535aa..a5368bd58 100644 --- a/theme/list_lib.js +++ b/theme/list_lib.js @@ -666,15 +666,7 @@ function rgb(r, g, b) r = Math.floor(r * 255); g = Math.floor(g * 255); b = Math.floor(b * 255); - return[ - "rgb(", - r, - ",", - g, - ",", - b, - ")" - ].join(""); + return["rgb(", r, ",", g, ",", b, ")"].join(""); } /** @@ -876,12 +868,14 @@ function mkelvin_to_C(mkelvin) return (mkelvin - ZERO_C_IN_MKELVIN) / 1000.0; } -function mbar_to_bar(mbar){ - return mbar/1000; +function mbar_to_bar(mbar) +{ + return mbar / 1000; } -function mm_to_meter(mm){ - return mm/(1000); +function mm_to_meter(mm) +{ + return mm / (1000); } var plot1; @@ -890,66 +884,86 @@ var plot1; *Main canvas draw function *this calls the axis and grid initialization functions. */ -function canvas_draw(){ - document.getElementById("chart1").innerHTML=""; +function canvas_draw() +{ + document.getElementById("chart1").innerHTML = ""; var d1 = new Array(); var d2 = new Array(); - for (var i =0; i< items[dive_id].samples.length;i++){ - d1.push([items[dive_id].samples[i][0]/60,-1*mm_to_meter(items[dive_id].samples[i][1])]); - if (items[dive_id].samples[i][2]!=0) { - d2.push([items[dive_id].samples[i][0]/60,mbar_to_bar(items[dive_id].samples[i][2])]); + for (var i = 0; i < items[dive_id].samples.length; i++) { + d1.push([ + items[dive_id].samples[i][0] / 60, + -1 * mm_to_meter(items[dive_id].samples[i][1]) + ]); + if (items[dive_id].samples[i][2] != 0) { + d2.push([ + items[dive_id].samples[i][0] / 60, + mbar_to_bar(items[dive_id].samples[i][2]) + ]); } } - plot1 = $.jqplot('chart1', [d1,d2], { - grid: { - drawBorder: true, - shadow: false, - background: 'rgba(0,0,0,0)' - }, - highlighter: { show: true }, - seriesDefaults: { - shadowAlpha: 0.1, - shadowDepth: 2, - fillToZero: true - }, - series: [{ - color: 'rgba(35,58,58,.6)', - negativeColor: 'rgba(35,58,58,.6)', - showMarker: true, - showLine: true, - fill: true, - yaxis:'yaxis', - },{ - color: 'rgba(44, 190, 160, 0.7)', - showMarker: false, - rendererOptions: { - smooth: true, - }, - yaxis:'y2axis', - },], - axes: { - xaxis: { - pad: 1.0, - tickRenderer: $.jqplot.CanvasAxisTickRenderer , - tickOptions: { - showGridline: false, - formatString:'%i min', - angle: -30 - } - }, - yaxis: { - max: 0, - tickRenderer: $.jqplot.CanvasAxisTickRenderer , - tickOptions:{ formatString:'%.2f'}, - pad: 2.05 - }, - y2axis: { - tickRenderer: $.jqplot.CanvasAxisTickRenderer , - tickOptions:{ formatString:'%ibar'}, - pad: 3.05 - }, - } - }); + plot1 = $.jqplot('chart1', [ + d1, + d2 + ], + { + grid : { + drawBorder : true, + shadow : false, + background : 'rgba(0,0,0,0)' + }, + highlighter : { + show : true + }, + seriesDefaults : { + shadowAlpha : 0.1, + shadowDepth : 2, + fillToZero : true + }, + series :[ + { + color : 'rgba(35,58,58,.6)', + negativeColor : 'rgba(35,58,58,.6)', + showMarker : true, + showLine : true, + fill : true, + yaxis : 'yaxis', + }, + { + color : 'rgba(44, 190, 160, 0.7)', + showMarker : false, + rendererOptions : { + smooth : true, + }, + yaxis : 'y2axis', + }, + ], + axes : { + xaxis : { + pad : 1.0, + tickRenderer : $.jqplot.CanvasAxisTickRenderer, + tickOptions : { + showGridline : false, + formatString : '%i min', + angle : -30 + } + }, + yaxis : { + max : 0, + tickRenderer : $.jqplot.CanvasAxisTickRenderer, + tickOptions : { + formatString : '%.2f' + }, + pad : 2.05 + }, + y2axis : { + tickRenderer : $.jqplot.CanvasAxisTickRenderer, + tickOptions : { + formatString : '%ibar' + }, + pad : 3.05 + }, + } + }); } /** @@ -970,7 +984,7 @@ function showDiveDetails(dive) //draw the canvas and initialize the view document.getElementById("diveinfo").innerHTML = get_dive_HTML(items[dive_id]); document.getElementById("dive_equipments").innerHTML = get_cylinders_HTML(items[dive_id]); - document.getElementById("bookmarks").innerHTML=get_bookmarks_HTML(items[dive_id]); + document.getElementById("bookmarks").innerHTML = get_bookmarks_HTML(items[dive_id]); setDiveTitle(items[dive_id]); //hide the list of dives and show the canvas. @@ -979,10 +993,11 @@ function showDiveDetails(dive) canvas_draw(); } -function setDiveTitle(dive){ - document.getElementById("dive_no").innerHTML="Dive No. "+(settings.subsurfaceNumbers === '0'? +function setDiveTitle(dive) +{ + document.getElementById("dive_no").innerHTML="Dive No. " + (settings.subsurfaceNumbers === '0'? dive.number : dive.subsurface_number); - document.getElementById("dive_location").innerHTML=dive.location; + document.getElementById("dive_location").innerHTML = dive.location; } /** |