Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
Naomi 2011-02-02 14:59:07 -05:00
commit bb7890a6f5
1 changed files with 6 additions and 6 deletions

View File

@ -2,7 +2,7 @@ var registered = false;
var datagridData; var datagridData;
function getDateText(obj){ function getDateText(obj){
var str = obj.aData[ obj.iDataColumn ]; var str = obj.aData[ obj.iDataColumn ].toString();
if (str.indexOf(" ") != -1){ if (str.indexOf(" ") != -1){
return changeTimePrecision(str.substring(0, str.indexOf(" "))); return changeTimePrecision(str.substring(0, str.indexOf(" ")));
} }
@ -10,7 +10,7 @@ function getDateText(obj){
} }
function getTimeText(obj){ function getTimeText(obj){
var str = obj.aData[ obj.iDataColumn ]; var str = obj.aData[ obj.iDataColumn ].toString();
if (str.indexOf(" ") != -1){ if (str.indexOf(" ") != -1){
return changeTimePrecision(str.substring(str.indexOf(" ")+1)); return changeTimePrecision(str.substring(str.indexOf(" ")+1));
} }
@ -18,7 +18,7 @@ function getTimeText(obj){
} }
function changeTimePrecisionInit(obj){ function changeTimePrecisionInit(obj){
var str = obj.aData[ obj.iDataColumn ]; var str = obj.aData[ obj.iDataColumn ].toString();
return changeTimePrecision(str); return changeTimePrecision(str);
} }
@ -62,12 +62,12 @@ function createDataGrid(){
"aaData": datagridData.rows, "aaData": datagridData.rows,
"aoColumns": datagridData.columnHeaders, "aoColumns": datagridData.columnHeaders,
"fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
if (aData[aData.length-2] != ""){ if (aData[aData.length-2] != "")
$(nRow).attr("style", "background-color:#166622"); $(nRow).attr("style", "background-color:#166622");
}
if (aData[0] == "c") if (aData[0] == "c")
$(nRow).attr("style", "background-color:#61B329"); $(nRow).attr("style", "background-color:#61B329");
else if (aData[0] == "b")
$(nRow).attr("style", "background-color:#EE3B3B");
return nRow; return nRow;
} }
} ); } );