Resolving conflict with live version of slice.php (+a few minor

[plewww.git] / plekit / table / columns.js

diff --git a/plekit/table/columns.js b/plekit/table/columns.js
index bb225fc..b4dc7f1 100644 (file)
--- a/plekit/table/columns.js
+++ b/plekit/table/columns.js
@@ -806,6 +806,7 @@ function addColumnAjax(column, header) {
 
        if (to_load)
        {
+               document.getElementById('loading'+column).innerHTML = "<img width=10 src=/plekit/icons/ajax-loader.gif>";
                var url = "/plekit/php/updateColumn.php?slice_id="+slice_id+"&tagName="+t;
                load_data(column, header, url);
        }
@@ -818,7 +819,6 @@ function addColumn(column, fetch) {
        var selectedperiod="";
        var header=column;
 
-       document.getElementById('loading'+column).innerHTML = "<img width=10 src=/plekit/icons/ajax-loader.gif>";
 
        if (inTypeC(column)!=-1)
        {
@@ -834,11 +834,8 @@ function addColumn(column, fetch) {
 
        if (fetch)
                addColumnAjax(column, header);
-       else
-               document.getElementById('loading'+column).innerHTML = "";
 
        addColumnToConfiguration(header);
-       
 }
 
 
@@ -851,7 +848,6 @@ function deleteColumnCells(header) {
 }
 
 
-
 function deleteColumn(column) {
 
        var selectedperiod="";
@@ -865,17 +861,8 @@ function deleteColumn(column) {
        deleteColumnCells(header);
 
        deleteColumnFromConfiguration(header);
-
-       //document.getElementById('check'+column).checked = false;
 }
 
-function scrollList() {
-debugfilter("here "+document.getElementById('scrolldiv').focused);
-if (event.keyCode == 40)
-       debugfilter("down");
-else if (event.keyCode == 38)
-       debugfilter("up");
-}
 
 /* 
  
@@ -883,6 +870,13 @@ EXTRA
 
 //to be used for scrolling the column list with down/up arrows 
 
+function scrollList() {
+debugfilter("here "+document.getElementById('scrolldiv').focused);
+if (event.keyCode == 40)
+       debugfilter("down");
+else if (event.keyCode == 38)
+       debugfilter("up");
+}
 
 function resetColumns() {