[PATCH 3/4] HTML: Wide Javascript code cleaning
Miika Turkia
miika.turkia at gmail.com
Tue Jun 24 06:01:51 PDT 2014
From: Gehad elrobey <gehadelrobey at gmail.com>
list_lib Javascript code cleaning, Now it looks like subsurface code.
Signed-off-by: Gehad elrobey <gehadelrobey at gmail.com>
Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
theme/list_lib.js | 829 ++++++++++++++++++++++++++++++------------------------
1 file changed, 458 insertions(+), 371 deletions(-)
diff --git a/theme/list_lib.js b/theme/list_lib.js
index bf5ad01..20dc5a7 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -1,9 +1,9 @@
-var itemsToShow = new Array(); //list of indexes to all dives to view
+var itemsToShow = new Array(); //list of indexes to all dives to view
var items = new Array();
-var start; //index of first element viewed in itemsToShow
-var sizeofpage; //size of viewed page
-var numberofwords=0; //just for stats
-var olditemstoshow; //to reference the indexes to all dives if changed
+var start; //index of first element viewed in itemsToShow
+var sizeofpage; //size of viewed page
+var numberofwords = 0; //just for stats
+var olditemstoshow; //to reference the indexes to all dives if changed
//////////////////////////////////
// //
// View Model //
@@ -15,12 +15,13 @@ var olditemstoshow; //to reference the indexes to all dives if changed
*View N pages each of sizeofpage size items.
*starting from zero
*/
-function showAllDives(){
- for(var i=0 ; i < items.length ; i++){
+function showAllDives()
+{
+ for (var i = 0; i < items.length; i++) {
itemsToShow.push(i);
}
olditemstoshow = itemsToShow;
- start=0;
+ start = 0;
viewInPage();
}
@@ -29,36 +30,40 @@ function showAllDives(){
*It start from 'start' variable.
*It showes N pages each of sizeofpage size.
*/
-function viewInPage(){
- var end = start + sizeofpage -1;
- if(end >= itemsToShow.length ) end = itemsToShow.length-1;
- updateView(start,end);
+function viewInPage()
+{
+ var end = start + sizeofpage - 1;
+ if (end >= itemsToShow.length)
+ end = itemsToShow.length - 1;
+ updateView(start, end);
}
/**
*addHTML this Method puts the HTML of items of given indexes
*@param {array} indexes array of indexes to put in HTML
*/
-function updateView(start,end){
+function updateView(start, end)
+{
var divelist = document.getElementById('diveslist');
- divelist.innerHTML="";
- for(var i=start;i<=end;i++){
- divelist.innerHTML+='<ul id="'+itemsToShow[i]+'" onclick="toggleExpantion(this)"</ul>';
+ divelist.innerHTML = "";
+ for (var i = start; i <= end; i++) {
+ divelist.innerHTML += '<ul id="' + itemsToShow[i] + '" onclick="toggleExpantion(this)"</ul>';
expand(document.getElementById(itemsToShow[i]));
items[itemsToShow[i]].expanded = true;
};
- view_pagging(start,end);
+ view_pagging(start, end);
}
/**
*addHTML this Method puts the HTML of items of given indexes
*@param {array} indexes array of indexes to put in HTML
*/
-function addHTML(indexes){
+function addHTML(indexes)
+{
var divelist = document.getElementById('diveslist');
- divelist.innerHTML="";
- for(var i=0;i<indexes.length;i++){
- divelist.innerHTML+='<ul id="'+indexes[i]+'" onclick="toggleExpantion(this)"</ul>';
+ divelist.innerHTML = "";
+ for (var i = 0; i < indexes.length; i++) {
+ divelist.innerHTML += '<ul id="' + indexes[i] + '" onclick="toggleExpantion(this)"</ul>';
expand(document.getElementById(indexes[i]));
itemsToShow[indexes[i]].expanded = true;
};
@@ -69,98 +74,107 @@ function addHTML(indexes){
*@param {integer} start start from this index
*@param {integer} finish at this index.
*/
-function view_in_range(start,end){
+function view_in_range(start, end)
+{
var ind = new Array();
- if(end>=itemsToShow.length)end=itemsToShow.length-1;
- for(var i=start ; i <= end ; i++){
+ if (end >= itemsToShow.length)
+ end = itemsToShow.length - 1;
+ for (var i = start; i <= end; i++) {
ind.push(i);
}
addHTML(ind);
- view_pagging(start,end);
+ view_pagging(start, end);
}
-function prev_page(){
- var end = start+sizeofpage-1;
- if(start-sizeofpage>0){
- start-=sizeofpage;
+function prev_page()
+{
+ var end = start + sizeofpage - 1;
+ if (start - sizeofpage > 0) {
+ start -= sizeofpage;
+ } else {
+ start = 0;
}
- else{
- start=0;
+ if (end - sizeofpage > 0) {
+ end -= sizeofpage;
}
- if(end-sizeofpage>0){
- end-=sizeofpage;
+ if (end >= itemsToShow.length) {
+ end = itemsToShow.length - 1;
}
- if(end>=itemsToShow.length){
- end = itemsToShow.length-1;
- }
- updateView(start,end)
+ updateView(start, end)
}
-function next_page(){
- var end = start+sizeofpage-1;
- if(end+sizeofpage<itemsToShow.length){
- end+=sizeofpage;
- }
- else{
- end=itemsToShow.length-1;
+function next_page()
+{
+ var end = start + sizeofpage - 1;
+ if (end + sizeofpage < itemsToShow.length) {
+ end += sizeofpage;
+ } else {
+ end = itemsToShow.length - 1;
}
- if(start+sizeofpage<itemsToShow.length){
- start+=sizeofpage;
+ if (start + sizeofpage < itemsToShow.length) {
+ start += sizeofpage;
}
- updateView(start,end)
+ updateView(start, end)
}
///////////////////////////////////////////////
-function view_pagging(start,end){
+function view_pagging(start, end)
+{
var page = document.getElementById("pagging");
- page.innerHTML= (start+1)+' to '+(end+1) + ' of '+ (itemsToShow.length) +' dives';
+ page.innerHTML = (start + 1) + ' to ' + (end + 1) + ' of ' + (itemsToShow.length) + ' dives';
}
-function expandAll(){
- for(var i=start;i<start+sizeofpage;i++){
- if(i>=itemsToShow.length) break;
+function expandAll()
+{
+ for (var i = start; i < start + sizeofpage; i++) {
+ if (i >= itemsToShow.length)
+ break;
unexpand(document.getElementById(itemsToShow[i]));
items[itemsToShow[i]].expanded = false;
}
}
-function collapseAll(){
- for(var i=start;i<start+sizeofpage;i++){
- if(i>=itemsToShow.length) break;
+function collapseAll()
+{
+ for (var i = start; i < start + sizeofpage; i++) {
+ if (i >= itemsToShow.length)
+ break;
expand(document.getElementById(itemsToShow[i]));
items[itemsToShow[i]].expanded = true;
}
}
-function setNumberOfDives(e){
+function setNumberOfDives(e)
+{
var value = e.options[e.selectedIndex].value;
- sizeofpage=parseInt(value,10);
- var end = start + sizeofpage -1;
- view_in_range(start,end);
+ sizeofpage = parseInt(value, 10);
+ var end = start + sizeofpage - 1;
+ view_in_range(start, end);
}
-function toggleExpantion(ul){
- if(!items[ul.id].expanded)
- {
+function toggleExpantion(ul)
+{
+ if (!items[ul.id].expanded) {
expand(ul);
items[ul.id].expanded = true;
- }
- else
- {
+ } else {
unexpand(ul);
items[ul.id].expanded = false;
}
}
-function expand(ul){
+function expand(ul)
+{
ul.innerHTML = getlimited(items[ul.id]);
- ul.style.padding='2px 10px 2px 10px';
+ ul.style.padding = '2px 10px 2px 10px';
}
-function unexpand(ul){
+
+function unexpand(ul)
+{
ul.innerHTML = getExpanded(items[ul.id]);
- ul.style.padding='3px 10px 3px 10px';
+ ul.style.padding = '3px 10px 3px 10px';
}
///////////////////////////////////////
@@ -169,54 +183,58 @@ function unexpand(ul){
//
//////////////////////////////////////
-function getlimited (dive) {
- return '<div style="height:20px"><div class="item">'+(settings.subsurfaceNumbers==='0'?dive.number:dive.subsurface_number)+'</div>'+
- '<div class="item">'+dive.date+'</div>'+
- '<div class="item">'+dive.time+'</div>'+
- '<div class="item_large">'+dive.location+'</div>'+
- '<div class="item">'+dive.temperature.air+'</div>'+
- '<div class="item">'+dive.temperature.water+'</div></div>';
+function getlimited(dive)
+{
+ return '<div style="height:20px"><div class="item">' + (settings.subsurfaceNumbers === '0' ? dive.number : dive.subsurface_number) + '</div>' +
+ '<div class="item">' + dive.date + '</div>' +
+ '<div class="item">' + dive.time + '</div>' +
+ '<div class="item_large">' + dive.location + '</div>' +
+ '<div class="item">' + dive.temperature.air + '</div>' +
+ '<div class="item">' + dive.temperature.water + '</div></div>';
};
-function getExpanded (dive) {
- var res = '<table><tr><td class="words">Date: </td><td>'+dive.date+
- '</td><td class="words">     Time: </td><td>'+dive.time +
- '</td><td class="words">     Location: </td><td>'+'<a onclick=\"Search_list_Modules(\''+dive.location+'\')\">'+
- dive.location +'</a>'+
- '</td></tr></table><table><tr><td class="words">Rating:</td><td>'+putRating(dive.rating)+
- '</td><td class="words">   Visibilty:</td><td>'+putRating(dive.visibility)+
- '</td></tr></table>'+
- '<table><tr><td class="words">Air temp: </td><td>'+dive.temperature.air+
- '</td><td class="words">    Water temp: </td><td>'+dive.temperature.water +
- '</td></tr></table><table><tr><td class="words">DiveMaster: </td><td>'+dive.divemaster +
- '</td></tr><tr><td class="words"><p>Buddy: </p></td><td>'+dive.buddy +
- '</td></tr><tr><td class="words">Suit: </td><td>'+dive.suit +
- '</td></tr><tr><td class="words">Tags: </td><td>'+putTags(dive.tags)+
- '</td></tr></table><div style="margin:10px;"><p class="words">Notes: </p>' + dive.notes +'</div>';
- if(settings.listOnly==='0'){
- res += '<center><a onclick="showDiveDetails('+dive.number+')">show more details</a></center>';
+function getExpanded(dive)
+{
+ var res = '<table><tr><td class="words">Date: </td><td>' + dive.date +
+ '</td><td class="words">     Time: </td><td>' + dive.time +
+ '</td><td class="words">     Location: </td><td>' + '<a onclick=\"Search_list_Modules(\'' + dive.location + '\')\">' +
+ dive.location + '</a>' +
+ '</td></tr></table><table><tr><td class="words">Rating:</td><td>' + putRating(dive.rating) +
+ '</td><td class="words">   Visibilty:</td><td>' + putRating(dive.visibility) +
+ '</td></tr></table>' +
+ '<table><tr><td class="words">Air temp: </td><td>' + dive.temperature.air +
+ '</td><td class="words">    Water temp: </td><td>' + dive.temperature.water +
+ '</td></tr></table><table><tr><td class="words">DiveMaster: </td><td>' + dive.divemaster +
+ '</td></tr><tr><td class="words"><p>Buddy: </p></td><td>' + dive.buddy +
+ '</td></tr><tr><td class="words">Suit: </td><td>' + dive.suit +
+ '</td></tr><tr><td class="words">Tags: </td><td>' + putTags(dive.tags) +
+ '</td></tr></table><div style="margin:10px;"><p class="words">Notes: </p>' + dive.notes + '</div>';
+ if (settings.listOnly === '0') {
+ res += '<center><a onclick="showDiveDetails(' + dive.number + ')">show more details</a></center>';
}
return res;
};
-function putTags(tags){
- var result="";
- for(var i in tags){
- result+='<a onclick=\"Search_list_Modules(\''+tags[i]+'\')\">'+tags[i]+'</a>';
- if(i<tags.length-1)
- result+=', ';
+function putTags(tags)
+{
+ var result = "";
+ for (var i in tags) {
+ result += '<a onclick=\"Search_list_Modules(\'' + tags[i] + '\')\">' + tags[i] + '</a>';
+ if (i < tags.length - 1)
+ result += ', ';
}
return result;
}
-function putRating(rating){
+function putRating(rating)
+{
var result;
- result='<div>';
- for(var i=0;i<rating;i++)
- result+=' ★ ';
- for(var i=rating;i<5;i++)
- result+=' ☆ ';
- result+='</div>';
+ result = '<div>';
+ for (var i = 0; i < rating; i++)
+ result += ' ★ ';
+ for (var i = rating; i < 5; i++)
+ result += ' ☆ ';
+ result += '</div>';
return result;
}
@@ -237,123 +255,140 @@ var air = true;
var water = true;
var locat = true;
-function list_sort(sortOn){
- switch(sortOn){
- case '1' ://number
- if(number){
- sort_it(sortOn,cmpNumAsc);
+function list_sort(sortOn)
+{
+ switch (sortOn) {
+ case '1': //number
+ if (number) {
+ sort_it(sortOn, cmpNumAsc);
number = 1 - number;
- }
- else{
- sort_it(sortOn,cmpNumDes);
+ } else {
+ sort_it(sortOn, cmpNumDes);
number = 1 - number;
- }
+ }
break;
- case '2' ://date
- if(date){
- sort_it(sortOn,cmpDateAsc);
+ case '2': //date
+ if (date) {
+ sort_it(sortOn, cmpDateAsc);
date = 1 - date;
- }
- else{
- sort_it(sortOn,cmpDateDes);
+ } else {
+ sort_it(sortOn, cmpDateDes);
date = 1 - date;
- }
+ }
break;
- case '3'://time
- if(time){
- sort_it(sortOn,cmpTimeDes);
+ case '3': //time
+ if (time) {
+ sort_it(sortOn, cmpTimeDes);
time = 1 - time;
- }
- else{
- sort_it(sortOn,cmpTimeAsc);
+ } else {
+ sort_it(sortOn, cmpTimeAsc);
time = 1 - time;
- }
+ }
break;
- case '4'://Air temp
- if(air){
- sort_it(sortOn,cmpAtempDes);
+ case '4': //Air temp
+ if (air) {
+ sort_it(sortOn, cmpAtempDes);
air = 1 - air;
- }
- else{
- sort_it(sortOn,cmpAtempAsc);
+ } else {
+ sort_it(sortOn, cmpAtempAsc);
air = 1 - air;
- }
+ }
break;
- case '5'://Water temp
- if(water){
- sort_it(sortOn,cmpWtempDes);
+ case '5': //Water temp
+ if (water) {
+ sort_it(sortOn, cmpWtempDes);
water = 1 - water;
- }
- else{
- sort_it(sortOn,cmpWtempAsc);
+ } else {
+ sort_it(sortOn, cmpWtempAsc);
water = 1 - water;
- }
+ }
break;
- case '6'://Water temp
- if(locat){
- sort_it(sortOn,cmpLocationDes);
+ case '6': //Water temp
+ if (locat) {
+ sort_it(sortOn, cmpLocationDes);
locat = 1 - locat;
- }
- else{
- sort_it(sortOn,cmpLocationAsc);
+ } else {
+ sort_it(sortOn, cmpLocationAsc);
locat = 1 - locat;
- }
+ }
break;
}
}
-function cmpLocationAsc(j,iSmaller){
- return items[j].location < items[iSmaller].location ;
+function cmpLocationAsc(j, iSmaller)
+{
+ return items[j].location < items[iSmaller].location;
}
-function cmpLocationDes(j,iSmaller){
- return items[j].location > items[iSmaller].location ;
+function cmpLocationDes(j, iSmaller)
+{
+ return items[j].location > items[iSmaller].location;
}
-function cmpNumAsc(j,iSmaller){
- return items[j].subsurface_number < items[iSmaller].subsurface_number ;
+function cmpNumAsc(j, iSmaller)
+{
+ return items[j].subsurface_number < items[iSmaller].subsurface_number;
}
-function cmpNumDes(j,iSmaller){
- return items[j].subsurface_number > items[iSmaller].subsurface_number ;
+
+function cmpNumDes(j, iSmaller)
+{
+ return items[j].subsurface_number > items[iSmaller].subsurface_number;
}
-function cmpTimeAsc(j,iSmaller){
- return items[j].time < items[iSmaller].time ;
+
+function cmpTimeAsc(j, iSmaller)
+{
+ return items[j].time < items[iSmaller].time;
}
-function cmpTimeDes(j,iSmaller){
- return items[j].time > items[iSmaller].time ;
+
+function cmpTimeDes(j, iSmaller)
+{
+ return items[j].time > items[iSmaller].time;
}
-function cmpDateAsc(j,iSmaller){
- return items[j].date < items[iSmaller].date ;
+
+function cmpDateAsc(j, iSmaller)
+{
+ return items[j].date < items[iSmaller].date;
}
-function cmpDateDes(j,iSmaller){
- return items[j].date > items[iSmaller].date ;
+
+function cmpDateDes(j, iSmaller)
+{
+ return items[j].date > items[iSmaller].date;
}
-function cmpAtempAsc(j,iSmaller){
- return parseInt(items[j].temperature.air,10) < parseInt(items[iSmaller].temperature.air,10) ;
+
+function cmpAtempAsc(j, iSmaller)
+{
+ return parseInt(items[j].temperature.air, 10) < parseInt(items[iSmaller].temperature.air, 10);
}
-function cmpAtempDes(j,iSmaller){
- return parseInt(items[j].temperature.air,10) > parseInt(items[iSmaller].temperature.air,10) ;
+
+function cmpAtempDes(j, iSmaller)
+{
+ return parseInt(items[j].temperature.air, 10) > parseInt(items[iSmaller].temperature.air, 10);
}
-function cmpWtempAsc(j,iSmaller){
- return parseInt(items[j].temperature.water,10) < parseInt(items[iSmaller].temperature.water,10) ;
+
+function cmpWtempAsc(j, iSmaller)
+{
+ return parseInt(items[j].temperature.water, 10) < parseInt(items[iSmaller].temperature.water, 10);
}
-function cmpWtempDes(j,iSmaller){
- return parseInt(items[j].temperature.water,10) > parseInt(items[iSmaller].temperature.water,10) ;
+
+function cmpWtempDes(j, iSmaller)
+{
+ return parseInt(items[j].temperature.water, 10) > parseInt(items[iSmaller].temperature.water, 10);
}
-function sort_it(sortOn,function_){
+function sort_it(sortOn, function_)
+{
var res = new Array();
var visited = new Array(itemsToShow.length);
- for(var j=0;j<itemsToShow.length;j++){
- visited[j]=false;
- }
- for(var i=0;i< itemsToShow.length ;i++){
- for(var j=0;j<itemsToShow.length;j++)
- if(visited[j] === false)
- var iSmaller=j;
- for(var j=0;j<itemsToShow.length;j++){
- if(function_(itemsToShow[j],itemsToShow[iSmaller])){
- if(visited[j] === false){
+ for (var j = 0; j < itemsToShow.length; j++) {
+ visited[j] = false;
+ }
+ for (var i = 0; i < itemsToShow.length; i++) {
+ for (var j = 0; j < itemsToShow.length; j++)
+ if (visited[j] === false)
+ var iSmaller = j;
+ for (var j = 0; j < itemsToShow.length; j++) {
+ if (function_(itemsToShow[j], itemsToShow[iSmaller])) {
+ if (visited[j] === false) {
iSmaller = j;
}
}
@@ -362,7 +397,7 @@ function sort_it(sortOn,function_){
res.push(itemsToShow[iSmaller]);
}
itemsToShow = res;
- start=0;
+ start = 0;
viewInPage();
}
@@ -371,149 +406,167 @@ function sort_it(sortOn,function_){
// Searching
//
//////////////////////////////////////
-function Set(){
+function Set()
+{
this.keys = new Array();
}
-Set.prototype.contains = function(key){
+Set.prototype.contains = function(key)
+{
return (this.keys.indexOf(key) >= 0) ? true : false;
}
-Set.prototype.push = function(key) {
- if(!this.contains(key)){
+Set.prototype.push = function(key)
+{
+ if (!this.contains(key)) {
this.keys.push(key);
}
};
-Set.prototype.isEmpty = function() {
- return this.keys.length<=0? true:false;
+Set.prototype.isEmpty = function()
+{
+ return this.keys.length <= 0 ? true : false;
};
-Set.prototype.forEach = function(do_){
- this.keys.forEach(do_);
+Set.prototype.forEach = function(do_) {
+ this.keys.forEach (do_);
};
-Set.prototype.Union = function(another_set){
+Set.prototype.Union = function(another_set)
+{
if (another_set === null) {
return;
}
- for(var i=0; i<another_set.keys.length ;i++){
+ for (var i = 0; i < another_set.keys.length; i++) {
this.push(another_set.keys[i]);
};
};
////////////////////////////////////////
-function Node(value){
+function Node(value)
+{
this.children = new Array();
- this.value=value;
- this.key= new Set();
+ this.value = value;
+ this.key = new Set();
}
///////////////////////////////////////
-function Search_list_Modules(searchfor){
- document.getElementById("search_input").value=searchfor;
+function Search_list_Modules(searchfor)
+{
+ document.getElementById("search_input").value = searchfor;
SearchModules(searchfor);
}
-function SearchModules(searchfor){
- var resultKeys = new Set();//set
+function SearchModules(searchfor)
+{
+ var resultKeys = new Set(); //set
- if(searchfor.length<=0){
- //exit searching mode
- document.getElementById("search_input").style.borderColor="initial";
- start=0;
- itemsToShow=olditemstoshow;
- viewInPage();
+ if (searchfor.length <= 0) {
+ //exit searching mode
+ document.getElementById("search_input").style.borderColor = "initial";
+ start = 0;
+ itemsToShow = olditemstoshow;
+ viewInPage();
return;
}
- searchingModules.forEach(function(x){
+ searchingModules.forEach (function(x) {
resultKeys.Union(x.search(searchfor));
});
- if(searchingModules["location"].enabled===true)
- resultKeys.Union(searchingModules["location"].search(searchfor));
+ if (searchingModules["location"].enabled === true)
+ resultKeys.Union(searchingModules["location"].search(searchfor));
- if(searchingModules["divemaster"].enabled===true)
- resultKeys.Union(searchingModules["divemaster"].search(searchfor));
+ if (searchingModules["divemaster"].enabled === true)
+ resultKeys.Union(searchingModules["divemaster"].search(searchfor));
- if(searchingModules["buddy"].enabled===true)
- resultKeys.Union(searchingModules["buddy"].search(searchfor));
+ if (searchingModules["buddy"].enabled === true)
+ resultKeys.Union(searchingModules["buddy"].search(searchfor));
- if(searchingModules["notes"].enabled===true)
- resultKeys.Union(searchingModules["notes"].search(searchfor));
+ if (searchingModules["notes"].enabled === true)
+ resultKeys.Union(searchingModules["notes"].search(searchfor));
- if(searchingModules["tags"].enabled===true)
- resultKeys.Union(searchingModules["tags"].search(searchfor));
+ if (searchingModules["tags"].enabled === true)
+ resultKeys.Union(searchingModules["tags"].search(searchfor));
- if(resultKeys.isEmpty()){
- //didn't find keys
- document.getElementById("search_input").style.borderColor="red";
- itemsToShow=[];
- viewInPage();
+ if (resultKeys.isEmpty()) {
+ //didn't find keys
+ document.getElementById("search_input").style.borderColor = "red";
+ itemsToShow = [];
+ viewInPage();
return;
}
- //found keys
- document.getElementById("search_input").style.borderColor="initial";
- itemsToShow = resultKeys.keys;
- start=0;
- viewInPage();
+ //found keys
+ document.getElementById("search_input").style.borderColor = "initial";
+ itemsToShow = resultKeys.keys;
+ start = 0;
+ viewInPage();
}
///////////////////////////////////////
-function SearchModule(enabled){
+function SearchModule(enabled)
+{
this.head = new Node();
- this.enabled=enabled;
+ this.enabled = enabled;
}
-SearchModule.prototype.Enter_search_string = function(str,diveno){
- if(str==""||!str) return;
+SearchModule.prototype.Enter_search_string = function(str, diveno)
+{
+ if (str == "" || !str)
+ return;
var res = str.toLowerCase().split(" ");
- for(var i=0;i<res.length;i++){
- insertIn(res[i],diveno,this.head);
+ for (var i = 0; i < res.length; i++) {
+ insertIn(res[i], diveno, this.head);
numberofwords++;
- }
+ }
}
-SearchModule.prototype.Enter_search_tag = function(tags,diveno){
- if(!tags) return;
- for(var i=0;i<tags.length;i++){
- insertIn(tags[i],diveno,this.head);
+SearchModule.prototype.Enter_search_tag = function(tags, diveno)
+{
+ if (!tags)
+ return;
+ for (var i = 0; i < tags.length; i++) {
+ insertIn(tags[i], diveno, this.head);
numberofwords++;
}
}
-SearchModule.prototype.search = function(x){
- return searchin(x.toLowerCase(),this.head);
+SearchModule.prototype.search = function(x)
+{
+ return searchin(x.toLowerCase(), this.head);
}
////////////////////////////////////////
-function insertIn(value,key,node){
+function insertIn(value, key, node)
+{
node.key.push(key);
- if(value.length<=0) return;
+ if (value.length <= 0)
+ return;
var this_char = value[0];
- value = value.substring(1,value.length);
+ value = value.substring(1, value.length);
var i;
- for(i =0;i<node.children.length;i++){
- if(node.children[i].value==this_char){
- return insertIn(value,key,node.children[i]);
+ for (i = 0; i < node.children.length; i++) {
+ if (node.children[i].value == this_char) {
+ return insertIn(value, key, node.children[i]);
}
}
node.children[i] = new Node(this_char);
- insertIn(value,key,node.children[i]);
+ insertIn(value, key, node.children[i]);
}
-function searchin(value,node){
- if(value.length<=0 || node.children.length <= 0) return node.key;
+function searchin(value, node)
+{
+ if (value.length <= 0 || node.children.length <= 0)
+ return node.key;
var this_char = value[0];
- value = value.substring(1,value.length);
+ value = value.substring(1, value.length);
- for(var i =0;i<node.children.length;i++){
- if(node.children[i].value[0]==this_char){
- return searchin(value,node.children[i]);
+ for (var i = 0; i < node.children.length; i++) {
+ if (node.children[i].value[0] == this_char) {
+ return searchin(value, node.children[i]);
}
}
return null;
@@ -523,59 +576,65 @@ function searchin(value,node){
var tripsShown;
-function toggleTrips(){
+function toggleTrips()
+{
var trip_button = document.getElementById('trip_button');
- if(tripsShown){
- tripsShown=false;
- trip_button.style.backgroundColor="#dfdfdf";
+ if (tripsShown) {
+ tripsShown = false;
+ trip_button.style.backgroundColor = "#dfdfdf";
viewInPage();
- }else{
+ } else {
showtrips();
- trip_button.style.backgroundColor="#5f7f8f";
- tripsShown=true;
+ trip_button.style.backgroundColor = "#5f7f8f";
+ tripsShown = true;
}
}
-function showtrips(){
+function showtrips()
+{
var divelist = document.getElementById('diveslist');
- divelist.innerHTML="";
- for(var i=0;i<trips.length;i++){
- divelist.innerHTML+='<ul id="trip_'+i+'" class="trips" onclick="toggle_trip_expansion('+i+')">'+
- trips[i].name+' ( '+trips[i].dives.length+' dives)'+'</ul>'+'<div id="trip_dive_list_'+i+'"></div>';
+ divelist.innerHTML = "";
+ for (var i = 0; i < trips.length; i++) {
+ divelist.innerHTML += '<ul id="trip_' + i + '" class="trips" onclick="toggle_trip_expansion(' + i + ')">' +
+ trips[i].name + ' ( ' + trips[i].dives.length + ' dives)' + '</ul>' + '<div id="trip_dive_list_' + i + '"></div>';
};
- for(var i=0;i<trips.length;i++){
+ for (var i = 0; i < trips.length; i++) {
unexpand_trip(i);
}
}
-function toggle_trip_expansion(trip){
- if(trips[trip].expanded ===true){
+function toggle_trip_expansion(trip)
+{
+ if (trips[trip].expanded === true) {
unexpand_trip(trip);
- }else{
+ } else {
expand_trip(trip);
}
}
-function expand_trip(trip){
+function expand_trip(trip)
+{
trips[trip].expanded = true;
- var d = document.getElementById("trip_dive_list_"+trip);
- for(var j in trips[trip].dives){
- d.innerHTML+='<ul id="'+trips[trip].dives[j].number+'" onclick="toggleExpantion(this)" onmouseover="highlight(this)"'+
- ' onmouseout="unhighlight(this)">'+getlimited(trips[trip].dives[j])+'</ul>';
- }
+ var d = document.getElementById("trip_dive_list_" + trip);
+ for (var j in trips[trip].dives) {
+ d.innerHTML += '<ul id="' + trips[trip].dives[j].number + '" onclick="toggleExpantion(this)" onmouseover="highlight(this)"' +
+ ' onmouseout="unhighlight(this)">' + getlimited(trips[trip].dives[j]) + '</ul>';
+ }
}
-function unexpand_trip(trip){
+function unexpand_trip(trip)
+{
trips[trip].expanded = false;
- var d = document.getElementById("trip_dive_list_"+trip);
- d.innerHTML='';
+ var d = document.getElementById("trip_dive_list_" + trip);
+ d.innerHTML ='';
}
-function getItems(){
+function getItems()
+{
var count = 0;
- for(var i in trips){
- for(var j in trips[i].dives){
- items[count++]=trips[i].dives[j];
+ for (var i in trips) {
+ for (var j in trips[i].dives) {
+ items[count++] = trips[i].dives[j];
}
}
}
@@ -585,28 +644,37 @@ function getItems(){
/*
Canvas Colors Constants
*/
-var CAMARONE1 = rgb(0,0.4,0);
-var LIMENADE1 = rgb(0.4,0.8,0);
-var RIOGRANDE1 = rgb (0.8,0.8,0);
-var PIRATEGOLD1= rgb(0.8,0.5,0);
-var RED1 = rgb(1,0,0);
+var CAMARONE1 = rgb(0, 0.4, 0);
+var LIMENADE1 = rgb(0.4, 0.8, 0);
+var RIOGRANDE1 = rgb(0.8, 0.8, 0);
+var PIRATEGOLD1 = rgb(0.8, 0.5, 0);
+var RED1 = rgb(1, 0, 0);
/*
Some Global variables that hold the current shown dive data.
*/
-var dive_id;//current shown ID
-var points;//reference to the samples array of the shown dive.
-var MAX_HEIGHT;//Maximum depth, then its the maximum height for canvas
-var MAX_WIDTH;//dive duration, then its the maximum width for canvas
+var dive_id; //current shown ID
+var points; //reference to the samples array of the shown dive.
+var MAX_HEIGHT; //Maximum depth, then its the maximum height for canvas
+var MAX_WIDTH; //dive duration, then its the maximum width for canvas
/**
*Return RGB css color string.
*/
-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("");
+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("");
}
/**
@@ -614,10 +682,11 @@ function rgb(r, g, b){
*new scale = (old scale * height of canvas) / max height in dive
*to ensure that the dive profile is filling the whole area available
*/
-function scaleHeight(vari){
+function scaleHeight(vari)
+{
var height = document.getElementById("profileCanvas").height;
max = MAX_HEIGHT;
- return (vari*height)/max;
+ return (vari * height) / max;
}
/**
@@ -625,22 +694,24 @@ function scaleHeight(vari){
*new scale = (old scale * width of canvas) / max width in dive
*to ensure that the dive profile is filling the whole area available
*/
-function scaleWidth(vari){
+function scaleWidth(vari)
+{
var width = document.getElementById("profileCanvas").width;
max = MAX_WIDTH;
- return (vari*width)/max;
+ return (vari * width) / max;
}
/**
*Show Axis information(Numbers on scale)
*put a Number every 300 second scaled to canvas width.
*/
-function canvas_showAxisInfo(){
- var c=document.getElementById("profileCanvas");
- var ctx=c.getContext("2d");
- ctx.font="27px Georgia";/*This is better be a variable scale*/
- for (var i=0;i<MAX_WIDTH/scaleWidth(5);i++)
- ctx.fillText(""+i*5+"",scaleWidth(i*5*60),scaleHeight(MAX_HEIGHT-150));
+function canvas_showAxisInfo()
+{
+ var c = document.getElementById("profileCanvas");
+ var ctx = c.getContext("2d");
+ ctx.font = "27px Georgia"; /*This is better be a variable scale*/
+ for (var i = 0; i < MAX_WIDTH / scaleWidth(5); i++)
+ ctx.fillText("" + i * 5 + "", scaleWidth(i * 5 * 60), scaleHeight(MAX_HEIGHT - 150));
}
/**
@@ -648,13 +719,14 @@ function canvas_showAxisInfo(){
*with spacing = 5 * 60 = 300
*draw line every 5 minutes
*/
-function canvas_showGrid() {
+function canvas_showGrid()
+{
var cnv = document.getElementById("profileCanvas");
var cnvWidth = cnv.width;
var cnvHeight = cnv.height;
- var lineOptions= {
- separation: scaleWidth(300),
- color: '#AAAAAA'
+ var lineOptions = {
+ separation : scaleWidth(300),
+ color : '#AAAAAA'
};
var ctx = cnv.getContext('2d');
@@ -694,19 +766,21 @@ function canvas_showGrid() {
*and choose its color.
*This is the function that should be used internally.
*/
-function canvas_drawline(ctx,begin,end){
- drawline(ctx,begin,end,getcolor(begin,end));
+function canvas_drawline(ctx, begin, end)
+{
+ drawline(ctx, begin, end, getcolor(begin, end));
}
/**
*Draw a line in the canvas with the given
*starting point, ending point, and color.
*/
-function drawline(ctx,begin,end,col){
+function drawline(ctx, begin, end, col)
+{
ctx.strokeStyle = col;
ctx.beginPath();
- ctx.moveTo(scaleWidth(begin[0]),scaleHeight(begin[1]));
- ctx.lineTo(scaleWidth(end[0]),scaleHeight(end[1]));
+ ctx.moveTo(scaleWidth(begin[0]), scaleHeight(begin[1]));
+ ctx.lineTo(scaleWidth(end[0]), scaleHeight(end[1]));
ctx.stroke();
}
@@ -714,74 +788,83 @@ function drawline(ctx,begin,end,col){
*Choose Color for different speeds.
*this need to be fixed to go with subsurface conversion.
*/
-function getcolor(begin,end){
- var slope = (end[1]-begin[1])/(end[0]-begin[0]);
- if (Math.abs(slope) > 300 ) return RED1;
- if (Math.abs(slope) > 180 ) return PIRATEGOLD1;
- if (Math.abs(slope) > 110 ) return RIOGRANDE1;
- if (Math.abs(slope) > 70 ) return LIMENADE1;
+function getcolor(begin, end)
+{
+ var slope = (end[1] - begin[1]) / (end[0] - begin[0]);
+ if (Math.abs(slope) > 300)
+ return RED1;
+ if (Math.abs(slope) > 180)
+ return PIRATEGOLD1;
+ if (Math.abs(slope) > 110)
+ return RIOGRANDE1;
+ if (Math.abs(slope) > 70)
+ return LIMENADE1;
return CAMARONE1;
}
/**
*Return the HTML string for a dive cylinder entry in the table.
*/
-function get_cylinder_HTML(cylinder){
- return '<tr><td class="Cyl">'+cylinder.Type+'</td><td class="Cyl">'+cylinder.Size+'</td><td class="Cyl">'+cylinder.WPressure+'</td>'+
- '<td class="Cyl">'+cylinder.SPressure+'</td><td class="Cyl">'+cylinder.EPressure+'</td><td class="Cyl">'+cylinder.O2+'</td></tr>';
+function get_cylinder_HTML(cylinder)
+{
+ return '<tr><td class="Cyl">' + cylinder.Type + '</td><td class="Cyl">' + cylinder.Size + '</td><td class="Cyl">' + cylinder.WPressure + '</td>' +
+ '<td class="Cyl">' + cylinder.SPressure + '</td><td class="Cyl">' + cylinder.EPressure + '</td><td class="Cyl">' + cylinder.O2 + '</td></tr>';
}
/**
*Return HTML table of cylinders of a dive.
*/
-function get_cylinders_HTML(dive){
- var result="";
- result +='<h2>Dive equipments</h2><table><tr><td class="Cyl">Type</td><td class="Cyl">Size</td><td class="Cyl">Work Pressure</td><td class="Cyl">Start Pressure</td><td class="Cyl">End Pressure</td><td class="Cyl">O2</td></tr>';
- for (var i in dive.Cylinders){
- result+=get_cylinder_HTML(dive.Cylinders[i]);
- }
- result+='</table>';
+function get_cylinders_HTML(dive)
+{
+ var result = "";
+ result += '<h2>Dive equipments</h2><table><tr><td class="Cyl">Type</td><td class="Cyl">Size</td><td class="Cyl">Work Pressure</td><td class="Cyl">Start Pressure</td><td class="Cyl">End Pressure</td><td class="Cyl">O2</td></tr>';
+ for (var i in dive.Cylinders) {
+ result += get_cylinder_HTML(dive.Cylinders[i]);
+ }
+ result += '</table>';
return result;
}
/**
*Return HTML main data of a dive
*/
-function get_dive_HTML(dive) {
- return '<h2>Dive Information</h2><table><tr><td class="words">Date: </td><td>'+dive.date+
- '</td><td class="words">     Time: </td><td>'+dive.time +
- '</td><td class="words">     Location: </td><td>'+'<a onclick=\"Search_list_Modules(\''+dive.location+'\')\">'+
- dive.location +'</a>'+
- '</td></tr></table><table><tr><td class="words">Rating:</td><td>'+putRating(dive.rating)+
- '</td><td class="words">   Visibilty:</td><td>'+putRating(dive.visibility)+
- '</td></tr></table>'+
- '<table><tr><td class="words">Air temp: </td><td>'+dive.temperature.air+
- '</td><td class="words">    Water temp: </td><td>'+dive.temperature.water +
- '</td></tr></table><table><tr><td class="words">DiveMaster: </td><td>'+dive.divemaster +
- '</td></tr><tr><td class="words"><p>Buddy: </p></td><td>'+dive.buddy +
- '</td></tr><tr><td class="words">Suit: </td><td>'+dive.suit +
- '</td></tr><tr><td class="words">Tags: </td><td>'+putTags(dive.tags)+
- '</td></tr></table><div style="margin:10px;"><p class="words">Notes: </p>' + dive.notes +'</div>';
+function get_dive_HTML(dive)
+{
+ return '<h2>Dive Information</h2><table><tr><td class="words">Date: </td><td>' + dive.date +
+ '</td><td class="words">     Time: </td><td>' + dive.time +
+ '</td><td class="words">     Location: </td><td>' + '<a onclick=\"Search_list_Modules(\'' + dive.location + '\')\">' +
+ dive.location + '</a>' +
+ '</td></tr></table><table><tr><td class="words">Rating:</td><td>' + putRating(dive.rating) +
+ '</td><td class="words">   Visibilty:</td><td>' + putRating(dive.visibility) +
+ '</td></tr></table>' +
+ '<table><tr><td class="words">Air temp: </td><td>' + dive.temperature.air +
+ '</td><td class="words">    Water temp: </td><td>' + dive.temperature.water +
+ '</td></tr></table><table><tr><td class="words">DiveMaster: </td><td>' + dive.divemaster +
+ '</td></tr><tr><td class="words"><p>Buddy: </p></td><td>' + dive.buddy +
+ '</td></tr><tr><td class="words">Suit: </td><td>' + dive.suit +
+ '</td></tr><tr><td class="words">Tags: </td><td>' + putTags(dive.tags) +
+ '</td></tr></table><div style="margin:10px;"><p class="words">Notes: </p>' + dive.notes + '</div>';
};
/**
*Main canvas draw function
*this calls the axis and grid initialization functions.
*/
-function canvas_draw(){
- var c=document.getElementById("profileCanvas");
+function canvas_draw()
+{
+ var c = document.getElementById("profileCanvas");
c.width = window.innerWidth;
c.height = window.innerHeight;
canvas_showGrid();
canvas_showAxisInfo();
- var ctx=c.getContext("2d");
- ctx.lineWidth=4 //variable width
- //draw starting line, draw all samples then draw the final line.
- canvas_drawline(ctx,[0,0],points[0]);
- for(var i=1;i<points.length;i++){
- canvas_drawline(ctx,points[i-1],points[i]);
+ var ctx = c.getContext("2d");
+ ctx.lineWidth = 4 //variable width
+ //draw starting line, draw all samples then draw the final line.
+ canvas_drawline(ctx, [0,0], points[0]);
+ for (var i = 1; i < points.length; i++) {
+ canvas_drawline(ctx, points[i - 1], points[i]);
}
- canvas_drawline(ctx,points[points.length-1],[MAX_WIDTH,0]);
+ canvas_drawline(ctx, points[points.length - 1], [MAX_WIDTH,0]);
}
/**
@@ -791,40 +874,44 @@ function canvas_draw(){
*Hide the list and show the canvas view.
*this is called to view the dive details.
*/
-function showDiveDetails(dive){
+function showDiveDetails(dive)
+{
//set global variables
dive_id = dive;
points = items[dive_id].samples;
- MAX_HEIGHT = items[dive_id].maxdepth*1.1;
+ MAX_HEIGHT = items[dive_id].maxdepth * 1.1;
MAX_WIDTH = items[dive_id].duration;
//draw the canvas and initialize the view
canvas_draw();
- document.getElementById("diveinfo").innerHTML=get_dive_HTML(items[dive_id]);
- document.getElementById("dive_equipments").innerHTML=get_cylinders_HTML(items[dive_id]);
+ document.getElementById("diveinfo").innerHTML = get_dive_HTML(items[dive_id]);
+ document.getElementById("dive_equipments").innerHTML = get_cylinders_HTML(items[dive_id]);
//hide the list of dives and show the canvas.
- document.getElementById("diveListPanel").style.display='none';
- document.getElementById("divePanel").style.display='block';
+ document.getElementById("diveListPanel").style.display = 'none';
+ document.getElementById("divePanel").style.display = 'block';
}
/**
*Show the list view and hide the detailed list view.
*this function have to clear any data saved by showDiveDetails
*/
-function unshowDiveDetails(dive){
- document.getElementById("diveListPanel").style.display='block';
- document.getElementById("divePanel").style.display='none';
+function unshowDiveDetails(dive)
+{
+ document.getElementById("diveListPanel").style.display = 'block';
+ document.getElementById("divePanel").style.display = 'none';
}
-function nextDetailedDive(){
- if(dive_id<items.length){
+function nextDetailedDive()
+{
+ if (dive_id < items.length) {
showDiveDetails(++dive_id);
}
}
-function prevDetailedDive(){
- if(dive_id>0){
+function prevDetailedDive()
+{
+ if (dive_id > 0) {
showDiveDetails(--dive_id);
}
}
--
1.9.1
More information about the subsurface
mailing list