From 8bcc07326d26ad4f2e9b826d2b05a67e97acd3e5 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 19 Apr 2013 10:22:37 -0700
Subject: [PATCH] avoid global names

---
 war/src/main/webapp/scripts/sortable.js | 587 ++++++++++++------------
 1 file changed, 302 insertions(+), 285 deletions(-)

diff --git a/war/src/main/webapp/scripts/sortable.js b/war/src/main/webapp/scripts/sortable.js
index a640d9be0c..d810d23ffd 100644
--- a/war/src/main/webapp/scripts/sortable.js
+++ b/war/src/main/webapp/scripts/sortable.js
@@ -42,323 +42,340 @@ The script guesses the table data, and try to use the right sorting algorithm.
 But you can override this behavior by having 'data="..."' attribute on each row,
 in which case the sort will be done on that field.
 */
-function ts_makeSortable(table) {
-    var firstRow;
-    if (table.rows && table.rows.length > 0) {
-        firstRow = table.rows[0];
-    }
-    if (!firstRow) return;
 
-    // We have a first row: assume it's the header, and make its contents clickable links
-    for (var i=0;i<firstRow.cells.length;i++) {
-        var cell = firstRow.cells[i];
-        var txt = ts_getInnerText(cell);
+var Sortable = (function() {
+    function ts_makeSortable(table) {
+        var firstRow;
+        if (table.rows && table.rows.length > 0) {
+            firstRow = table.rows[0];
+        }
+        if (!firstRow) return;
 
-        var initialSortDir = arrowTable[cell.getAttribute("initialSortDir")];
-        if(initialSortDir==null)    initialSortDir=arrowTable.none;
-        cell.innerHTML = '<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;">'+txt+
-                         '<span class="sortarrow">'+initialSortDir.text+'</span></a>';
+        // We have a first row: assume it's the header, and make its contents clickable links
+        for (var i=0;i<firstRow.cells.length;i++) {
+            var cell = firstRow.cells[i];
+            var txt = ts_getInnerText(cell);
+
+            var initialSortDir = arrowTable[cell.getAttribute("initialSortDir")];
+            if(initialSortDir==null)    initialSortDir=arrowTable.none;
+            cell.innerHTML = '<a href="#" class="sortheader">'+txt+
+                             '<span class="sortarrow">'+initialSortDir.text+'</span></a>';
+            cell.firstChild.onclick = function () {
+                ts_resortTable(this);
+                return false;
+            }
 
-        if(initialSortDir!=arrowTable.none)
-            cell.firstChild.lastChild.sortdir = initialSortDir;
+            if(initialSortDir!=arrowTable.none)
+                cell.firstChild.lastChild.sortdir = initialSortDir;
+        }
+        ts_loadDirection(table);
+        ts_refresh(table);
     }
-    ts_loadDirection(table);
-    ts_refresh(table);
-}
-
-function ts_getInnerText(el) {
-	if (typeof el == "string") return el;
-	if (typeof el == "undefined") { return el };
-	if (el.innerText) return el.innerText;	//Not needed but it is faster
-	var str = "";
-
-	var cs = el.childNodes;
-	var l = cs.length;
-	for (var i = 0; i < l; i++) {
-		switch (cs[i].nodeType) {
-			case 1: //ELEMENT_NODE
-				str += ts_getInnerText(cs[i]);
-				break;
-			case 3:	//TEXT_NODE
-				str += cs[i].nodeValue;
-				break;
-		}
-	}
-	return str;
-}
-
-// extract data for sorting from a cell
-function extractData(x) {
-  if(x==null) return '';
-  var data = x.getAttribute("data");
-  if(data!=null)
-    return data;
-  return ts_getInnerText(x);
-}
 
-var arrowTable = {
-    up: {
-        id: "up",
-        text: "&nbsp;&nbsp;&uarr;"
-    },
-    down: {
-        id: "down",
-        text: "&nbsp;&nbsp;&darr;"
-    },
-    none: {
-        id: "none",
-        text: "&nbsp;&nbsp;&nbsp;"
-    },
-    lnkRef: null
-}
-
-arrowTable.up.next = arrowTable.down;
-arrowTable.down.next = arrowTable.up;
-
-function ts_resortTable(lnk) {
-    // get the span
-    var span = lnk.lastChild;
-    var spantext = ts_getInnerText(span);
-    var th = lnk.parentNode;
-    var column = th.cellIndex;
-    var table = getParent(th,'TABLE');
-
-    // Work out a type for the column
-    if (table.rows.length <= 1) return;
-    var itm = extractData(table.rows[1].cells[column]).trim();
-    var sortfn = ts_sort_caseinsensitive;
-    if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
-    if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
-    if (itm.match(/^[�$]/)) sortfn = ts_sort_currency;
-    if (itm.match(/^-?[\d\.]+$/)) sortfn = ts_sort_numeric;
-    var firstRow = new Array();
-    var newRows = new Array();
-    for (i=0;i<table.rows[0].length;i++) { firstRow[i] = table.rows[0][i]; }
-    for (j=1;j<table.rows.length;j++) { newRows[j-1] = table.rows[j]; }
-
-    var dir = span.sortdir;
-    if (arrowTable.lnkRef != lnk) {
-        if (dir == null) dir = arrowTable.up;
-    } else {
-        dir = dir.next; // new sort direction
-    }
-    var sortfn2 = sortfn;
-    if(dir === arrowTable.up) {
-        // ascending
-        sortfn2 = function(a,b){return -sortfn(a,b)};
-    }
-    newRows.sort(function(a,b) {
-        return sortfn2(
-            extractData(a.cells[column]),
-            extractData(b.cells[column]));
-    });
-
-    arrowTable.lnkRef = lnk; // make column sort down only if column selected is same as last
-    span.sortdir = dir;
-
-    // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
-    // don't do sortbottom rows
-    for (var i=0;i<newRows.length;i++) {
-        if (! Element.hasClassName(newRows[i], 'sortbottom'))
-            table.tBodies[0].appendChild(newRows[i]);
-    }
-    // do sortbottom rows only
-    for (var i=0;i<newRows.length;i++) {
-        if (Element.hasClassName(newRows[i], 'sortbottom'))
-            table.tBodies[0].appendChild(newRows[i]);
+    function ts_getInnerText(el) {
+    	if (typeof el == "string") return el;
+    	if (typeof el == "undefined") { return el };
+    	if (el.innerText) return el.innerText;	//Not needed but it is faster
+    	var str = "";
+
+    	var cs = el.childNodes;
+    	var l = cs.length;
+    	for (var i = 0; i < l; i++) {
+    		switch (cs[i].nodeType) {
+    			case 1: //ELEMENT_NODE
+    				str += ts_getInnerText(cs[i]);
+    				break;
+    			case 3:	//TEXT_NODE
+    				str += cs[i].nodeValue;
+    				break;
+    		}
+    	}
+    	return str;
     }
 
-    // Delete any other arrows there may be showing
-    var allspans = table.rows[0].getElementsByTagName("span");
-    for (var ci=0;ci<allspans.length;ci++) {
-        if (allspans[ci].className == 'sortarrow') {
-            allspans[ci].innerHTML = arrowTable.none.text;
-        }
+    // extract data for sorting from a cell
+    function extractData(x) {
+      if(x==null) return '';
+      var data = x.getAttribute("data");
+      if(data!=null)
+        return data;
+      return ts_getInnerText(x);
     }
 
-    span.innerHTML = dir.text;
-    ts_saveDirection(table, column, dir);
-}
+    var arrowTable = {
+        up: {
+            id: "up",
+            text: "&nbsp;&nbsp;&uarr;"
+        },
+        down: {
+            id: "down",
+            text: "&nbsp;&nbsp;&darr;"
+        },
+        none: {
+            id: "none",
+            text: "&nbsp;&nbsp;&nbsp;"
+        },
+        lnkRef: null
+    };
 
-/**
- * Call when data has changed.
- * @since 1.484
- */
-function ts_refresh(table){
-    var column;
-    var dir;
-    var key = ts_getStorageKey(table);
-    var val = ts_Storage.hasKey(key) ? ts_Storage.getItem(key) : null;
-    if (val != null) {
-        var vals = val.split(":");
-        if(vals.length != 2) {
-            return;
+    arrowTable.up.next = arrowTable.down;
+    arrowTable.down.next = arrowTable.up;
+
+    function ts_resortTable(lnk) {
+        // get the span
+        var span = lnk.lastChild;
+        var spantext = ts_getInnerText(span);
+        var th = lnk.parentNode;
+        var column = th.cellIndex;
+        var table = getParent(th,'TABLE');
+
+        // Work out a type for the column
+        if (table.rows.length <= 1) return;
+        var itm = extractData(table.rows[1].cells[column]).trim();
+        var sortfn = ts_sort_caseinsensitive;
+        if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
+        if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
+        if (itm.match(/^[�$]/)) sortfn = ts_sort_currency;
+        if (itm.match(/^-?[\d\.]+$/)) sortfn = ts_sort_numeric;
+        var firstRow = new Array();
+        var newRows = new Array();
+        for (i=0;i<table.rows[0].length;i++) { firstRow[i] = table.rows[0][i]; }
+        for (j=1;j<table.rows.length;j++) { newRows[j-1] = table.rows[j]; }
+
+        var dir = span.sortdir;
+        if (arrowTable.lnkRef != lnk) {
+            if (dir == null) dir = arrowTable.up;
+        } else {
+            dir = dir.next; // new sort direction
         }
-        column = parseInt(vals[0]);
-        dir = vals[1];
-    } else {
-        var firstRow;
-        if (table.rows && table.rows.length > 0) {
-            firstRow = table.rows[0];
+        var sortfn2 = sortfn;
+        if(dir === arrowTable.up) {
+            // ascending
+            sortfn2 = function(a,b){return -sortfn(a,b)};
         }
-        if (!firstRow) {
-            return;
+        newRows.sort(function(a,b) {
+            return sortfn2(
+                extractData(a.cells[column]),
+                extractData(b.cells[column]));
+        });
+
+        arrowTable.lnkRef = lnk; // make column sort down only if column selected is same as last
+        span.sortdir = dir;
+
+        // We appendChild rows that already exist to the tbody, so it moves them rather than creating new ones
+        // don't do sortbottom rows
+        for (var i=0;i<newRows.length;i++) {
+            if (! Element.hasClassName(newRows[i], 'sortbottom'))
+                table.tBodies[0].appendChild(newRows[i]);
         }
-        for (var i=0;i<firstRow.cells.length;i++) {
-            var cell = firstRow.cells[i];
-            var initialSortDir = cell.getAttribute("initialSortDir");
-            if (initialSortDir != null) {
-                column = i;
-                dir = initialSortDir;
-            }
+        // do sortbottom rows only
+        for (var i=0;i<newRows.length;i++) {
+            if (Element.hasClassName(newRows[i], 'sortbottom'))
+                table.tBodies[0].appendChild(newRows[i]);
         }
-        if (dir == null) {
-            return;
+
+        // Delete any other arrows there may be showing
+        var allspans = table.rows[0].getElementsByTagName("span");
+        for (var ci=0;ci<allspans.length;ci++) {
+            if (allspans[ci].className == 'sortarrow') {
+                allspans[ci].innerHTML = arrowTable.none.text;
+            }
         }
+
+        span.innerHTML = dir.text;
+        ts_saveDirection(table, column, dir);
     }
-    // Work out a type for the column
-    if (table.rows.length <= 1) return;
-    var itm = extractData(table.rows[1].cells[column]).trim();
-    var sortfn = ts_sort_caseinsensitive;
-    if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
-    if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
-    if (itm.match(/^[�$]/)) sortfn = ts_sort_currency;
-    if (itm.match(/^-?[\d\.]+$/)) sortfn = ts_sort_numeric;
-    var firstRow = new Array();
-    var newRows = new Array();
-    for (i=0;i<table.rows[0].length;i++) { firstRow[i] = table.rows[0][i]; }
-    for (j=1;j<table.rows.length;j++) { newRows[j-1] = table.rows[j]; }
-
-    var sortfn2 = sortfn;
-    if(dir === 'up') {
-        // ascending
-        sortfn2 = function(a,b){return -sortfn(a,b)};
-    }
-    newRows.sort(function(a,b) {
-        return sortfn2(
-            extractData(a.cells[column]),
-            extractData(b.cells[column]));
-    });
-    for (var i=0;i<newRows.length;i++) {
-        if (! Element.hasClassName(newRows[i], 'sortbottom'))
-            table.tBodies[0].appendChild(newRows[i]);
-    }
-    for (var i=0;i<newRows.length;i++) {
-        if (Element.hasClassName(newRows[i], 'sortbottom'))
-            table.tBodies[0].appendChild(newRows[i]);
-    }
-}
 
-function getParent(el, pTagName) {
-	if (el == null) return null;
-	else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase())	// Gecko bug, supposed to be uppercase
-		return el;
-	else
-		return getParent(el.parentNode, pTagName);
-}
+    /**
+     * Call when data has changed.
+     * @since 1.484
+     */
+    function ts_refresh(table){
+        var column;
+        var dir;
+        var key = ts_getStorageKey(table);
+        var val = ts_Storage.hasKey(key) ? ts_Storage.getItem(key) : null;
+        if (val != null) {
+            var vals = val.split(":");
+            if(vals.length != 2) {
+                return;
+            }
+            column = parseInt(vals[0]);
+            dir = vals[1];
+        } else {
+            var firstRow;
+            if (table.rows && table.rows.length > 0) {
+                firstRow = table.rows[0];
+            }
+            if (!firstRow) {
+                return;
+            }
+            for (var i=0;i<firstRow.cells.length;i++) {
+                var cell = firstRow.cells[i];
+                var initialSortDir = cell.getAttribute("initialSortDir");
+                if (initialSortDir != null) {
+                    column = i;
+                    dir = initialSortDir;
+                }
+            }
+            if (dir == null) {
+                return;
+            }
+        }
+        // Work out a type for the column
+        if (table.rows.length <= 1) return;
+        var itm = extractData(table.rows[1].cells[column]).trim();
+        var sortfn = ts_sort_caseinsensitive;
+        if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d\d\d$/)) sortfn = ts_sort_date;
+        if (itm.match(/^\d\d[\/-]\d\d[\/-]\d\d$/)) sortfn = ts_sort_date;
+        if (itm.match(/^[�$]/)) sortfn = ts_sort_currency;
+        if (itm.match(/^-?[\d\.]+$/)) sortfn = ts_sort_numeric;
+        var firstRow = new Array();
+        var newRows = new Array();
+        for (i=0;i<table.rows[0].length;i++) { firstRow[i] = table.rows[0][i]; }
+        for (j=1;j<table.rows.length;j++) { newRows[j-1] = table.rows[j]; }
+
+        var sortfn2 = sortfn;
+        if(dir === 'up') {
+            // ascending
+            sortfn2 = function(a,b){return -sortfn(a,b)};
+        }
+        newRows.sort(function(a,b) {
+            return sortfn2(
+                extractData(a.cells[column]),
+                extractData(b.cells[column]));
+        });
+        for (var i=0;i<newRows.length;i++) {
+            if (! Element.hasClassName(newRows[i], 'sortbottom'))
+                table.tBodies[0].appendChild(newRows[i]);
+        }
+        for (var i=0;i<newRows.length;i++) {
+            if (Element.hasClassName(newRows[i], 'sortbottom'))
+                table.tBodies[0].appendChild(newRows[i]);
+        }
+    }
 
-function ts_sort_date(a,b) {
-  function toDt(x) {
-    // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
-    if (x.length == 10) {
-        return x.substr(6,4)+x.substr(3,2)+x.substr(0,2);
-    } else {
-        yr = x.substr(6,2);
-        if (parseInt(yr) < 50) { yr = '20'+yr; } else { yr = '19'+yr; }
-        return yr+x.substr(3,2)+x.substr(0,2);
+    function getParent(el, pTagName) {
+    	if (el == null) return null;
+    	else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase())	// Gecko bug, supposed to be uppercase
+    		return el;
+    	else
+    		return getParent(el.parentNode, pTagName);
     }
-  }
 
-  var dt1 = toDt(a);
-  var dt2 = toDt(b);
+    function ts_sort_date(a,b) {
+      function toDt(x) {
+        // y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
+        if (x.length == 10) {
+            return x.substr(6,4)+x.substr(3,2)+x.substr(0,2);
+        } else {
+            yr = x.substr(6,2);
+            if (parseInt(yr) < 50) { yr = '20'+yr; } else { yr = '19'+yr; }
+            return yr+x.substr(3,2)+x.substr(0,2);
+        }
+      }
 
-  if (dt1==dt2) return 0;
-  if (dt1<dt2) return -1;
-  return 1;
-}
+      var dt1 = toDt(a);
+      var dt2 = toDt(b);
 
-function ts_sort_currency(a,b) {
-    a = a.replace(/[^0-9.]/g,'');
-    b = b.replace(/[^0-9.]/g,'');
-    return parseFloat(a) - parseFloat(b);
-}
+      if (dt1==dt2) return 0;
+      if (dt1<dt2) return -1;
+      return 1;
+    }
 
-function ts_sort_numeric(a,b) {
-    a = parseFloat(a);
-    if (isNaN(a)) a = 0;
-    b = parseFloat(b);
-    if (isNaN(b)) b = 0;
-    return a-b;
-}
+    function ts_sort_currency(a,b) {
+        a = a.replace(/[^0-9.]/g,'');
+        b = b.replace(/[^0-9.]/g,'');
+        return parseFloat(a) - parseFloat(b);
+    }
 
-function ts_sort_caseinsensitive(a,b) {
-    a = a.toLowerCase();
-    b = b.toLowerCase();
-    if (a==b) return 0;
-    if (a<b) return -1;
-    return 1;
-}
+    function ts_sort_numeric(a,b) {
+        a = parseFloat(a);
+        if (isNaN(a)) a = 0;
+        b = parseFloat(b);
+        if (isNaN(b)) b = 0;
+        return a-b;
+    }
 
-function ts_sort_default(a,b) {
-    if (a==b) return 0;
-    if (a<b) return -1;
-    return 1;
-}
+    function ts_sort_caseinsensitive(a,b) {
+        a = a.toLowerCase();
+        b = b.toLowerCase();
+        if (a==b) return 0;
+        if (a<b) return -1;
+        return 1;
+    }
+
+    function ts_sort_default(a,b) {
+        if (a==b) return 0;
+        if (a<b) return -1;
+        return 1;
+    }
 
-function ts_getIndexOfSortableTable(table){
-    var allTables = document.getElementsByTagName("TABLE");
-    var sortableTables = [];
-    for (var i=0; i<allTables.length; i++) {
-        if($(allTables[i]).hasClassName("sortable")){
-            sortableTables.push(allTables[i]);
+    function ts_getIndexOfSortableTable(table){
+        var allTables = document.getElementsByTagName("TABLE");
+        var sortableTables = [];
+        for (var i=0; i<allTables.length; i++) {
+            if($(allTables[i]).hasClassName("sortable")){
+                sortableTables.push(allTables[i]);
+            }
         }
+        return sortableTables.indexOf(table);
     }
-    return sortableTables.indexOf(table);
-}
-function ts_getStorageKey(table){
-    var uri = document.location;
-    var tableIndex = ts_getIndexOfSortableTable(table);
-    return "ts_direction::" + uri + "::" + tableIndex;
-}
-function ts_saveDirection(table, columnIndex, direction){
-    var key = ts_getStorageKey(table);
-    ts_Storage.setItem(key, columnIndex + ":" + direction.id);
-}
-function ts_loadDirection(table){
-    var key = ts_getStorageKey(table);
-    if(ts_Storage.hasKey(key)){
-        var val = ts_Storage.getItem(key);
-        if(val){
-            var vals = val.split(":");
-            if(vals.length == 2) {
-                var colIndex = parseInt(vals[0]);
-                var direction = arrowTable[vals[1]];
-                var col = table.rows[0].cells[colIndex];
-                var anchor = col.firstChild;
-                var arrow = anchor.lastChild;
-                arrow.sortdir = direction;
-                ts_resortTable(anchor);
+    function ts_getStorageKey(table){
+        var uri = document.location;
+        var tableIndex = ts_getIndexOfSortableTable(table);
+        return "ts_direction::" + uri + "::" + tableIndex;
+    }
+    function ts_saveDirection(table, columnIndex, direction){
+        var key = ts_getStorageKey(table);
+        ts_Storage.setItem(key, columnIndex + ":" + direction.id);
+    }
+    function ts_loadDirection(table){
+        var key = ts_getStorageKey(table);
+        if(ts_Storage.hasKey(key)){
+            var val = ts_Storage.getItem(key);
+            if(val){
+                var vals = val.split(":");
+                if(vals.length == 2) {
+                    var colIndex = parseInt(vals[0]);
+                    var direction = arrowTable[vals[1]];
+                    var col = table.rows[0].cells[colIndex];
+                    var anchor = col.firstChild;
+                    var arrow = anchor.lastChild;
+                    arrow.sortdir = direction;
+                    ts_resortTable(anchor);
+                }
             }
         }
     }
-}
 
-var ts_Storage;
-try {
-    ts_Storage = YAHOO.util.StorageManager.get(
-        YAHOO.util.StorageEngineHTML5.ENGINE_NAME,
-        YAHOO.util.StorageManager.LOCATION_SESSION,
-        {
-            order: [
-                YAHOO.util.StorageEngineGears
-            ]
+    var ts_Storage;
+    try {
+        ts_Storage = YAHOO.util.StorageManager.get(
+            YAHOO.util.StorageEngineHTML5.ENGINE_NAME,
+            YAHOO.util.StorageManager.LOCATION_SESSION,
+            {
+                order: [
+                    YAHOO.util.StorageEngineGears
+                ]
+            }
+        );
+    } catch(e) {
+        // no storage available
+        ts_Storage = {
+            setItem : function() {},
+            getItem : function() { return null; },
+            hasKey : function() { return false; }
+        };
+    }
+
+    return {
+        Sortable : function(table) {
+            ts_makeSortable(table);
         }
-    );
-} catch(e) {
-    // no storage available
-    ts_Storage = {
-        setItem : function() {},
-        getItem : function() { return null; },
-        hasKey : function() { return false; }
     };
+})();
+
+function ts_makeSortable(table) { // backward compatibility
+    return new Sortable.Sortable(table);
 }
-- 
GitLab