Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cleaned up js code

  • Loading branch information...
commit 437033d914ab40804fc85f117265adb4714afb88 1 parent 864cd60
@blaflamme blaflamme authored
View
14 demo/static/main.js
@@ -1,15 +1,15 @@
require.config({
- paths: {
- "jquery": "jquery-1.7.2.min",
- "toolbar": "/_debug_toolbar/static/js/toolbar"
- }
+ paths: {
+ "jquery": "jquery-1.7.2.min",
+ "toolbar": "/_debug_toolbar/static/js/toolbar"
+ }
});
require(["jquery", "toolbar"], function($, toolbar) {
- $(function() {
- console.log('TEST REQUIREJS');
- });
+ $(function() {
+ console.log('TEST REQUIREJS');
+ });
});
define("main", function(){});
View
366 pyramid_debugtoolbar/static/js/debugger.js
@@ -9,205 +9,203 @@ require([
"jquery",
"toolbar"], function($, tablesorter, toolbar) {
- $(function() {
-
- var sourceView = null;
-
+ $(function() {
+ var sourceView = null;
+
+ /**
+ * if we are in console mode, show the console.
+ */
+ if (window.CONSOLE_MODE && windoe.EVALEX) {
+ openShell(null, $('div.console div.inner').empty(), 0);
+ }
+
+ $('div.traceback div.frame').each(function() {
+ var
+ target = $('pre', this)
+ .click(function() {
+ sourceButton.click();
+ }),
+ consoleNode = null, source = null,
+ frameID = this.id.substring(6);
+
/**
- * if we are in console mode, show the console.
+ * Add an interactive console to the frames
*/
- if (window.CONSOLE_MODE && windoe.EVALEX) {
- openShell(null, $('div.console div.inner').empty(), 0);
- }
-
- $('div.traceback div.frame').each(function() {
- var
- target = $('pre', this)
- .click(function() {
- sourceButton.click();
- }),
- consoleNode = null, source = null,
- frameID = this.id.substring(6);
-
- /**
- * Add an interactive console to the frames
- */
- if (EVALEX)
- $('<img class="console-icon" src="'
- + window.DEBUG_TOOLBAR_STATIC_PATH + '/img/console.png">')
- .attr('title', 'Open an interactive python shell in this frame')
- .click(function() {
- consoleNode = openShell(consoleNode, target, frameID);
- return false;
- })
- .prependTo(target);
-
- /**
- * Show sourcecode
- */
- var sourceButton = $('<img src="' + window.DEBUG_TOOLBAR_STATIC_PATH + '/img/source.png">')
- .attr('title', 'Display the sourcecode for this frame')
+ if (EVALEX)
+ $('<img class="console-icon" src="'
+ + window.DEBUG_TOOLBAR_STATIC_PATH + '/img/console.png">')
+ .attr('title', 'Open an interactive python shell in this frame')
.click(function() {
- if (!sourceView)
- $('h2', sourceView =
- $('<div class="box"><h2>View Source</h2><div class="sourceview">' +
- '<table></table></div>')
- .insertBefore('div.explanation'))
- .css('cursor', 'pointer')
- .click(function() {
- sourceView.slideUp('fast');
- });
- $.get(window.DEBUG_TOOLBAR_ROOT_PATH + '/source',
- {frm: frameID, token: window.DEBUGGER_TOKEN}, function(data) {
- $('table', sourceView)
- .replaceWith(data);
- if (!sourceView.is(':visible'))
- sourceView.slideDown('fast', function() {
- focusSourceBlock();
- });
- else
- focusSourceBlock();
- });
+ consoleNode = openShell(consoleNode, target, frameID);
return false;
})
.prependTo(target);
- });
-
+
/**
- * toggle traceback types on click.
+ * Show sourcecode
*/
- $('h2.traceback').click(function() {
- $(this).next().slideToggle('fast');
- $('div.plain').slideToggle('fast');
- }).css('cursor', 'pointer');
- $('div.plain').hide();
-
- /**
- * Add extra info (this is here so that only users with JavaScript
- * enabled see it.)
- */
- $('span.nojavascript')
- .removeClass('nojavascript')
- .html('<p>To switch between the interactive traceback and the plaintext ' +
- 'one, you can click on the "Traceback" headline. From the text ' +
- 'traceback you can also create a paste of it. ' + (!window.EVALEX ? '' :
- 'For code execution mouse-over the frame you want to debug and ' +
- 'click on the console icon on the right side.' +
- '<p>You can execute arbitrary Python code in the stack frames and ' +
- 'there are some extra helpers available for introspection:' +
- '<ul><li><code>dump()</code> shows all variables in the frame' +
- '<li><code>dump(obj)</code> dumps all that\'s known about the object</ul>'));
-
- /**
- * Add the pastebin feature
- */
- $('div.plain form')
- .submit(function() {
- var label = $('input[type="submit"]', this);
- var old_val = label.val();
- label.val('submitting...');
- $.ajax({
- dataType: 'json',
- url: window.DEBUG_TOOLBAR_ROOT_PATH + '/paste',
- data: {tb: window.TRACEBACK, token: window.DEBUGGER_TOKEN},
- success: function(data) {
- $('div.plain span.pastemessage')
- .removeClass('pastemessage')
- .text('Paste created: ')
- .append($('<a>#' + data.id + '</a>').attr('href', data.url));
- },
- error: function() {
- alert('Error: Could not submit paste. No network connection?');
- label.val(old_val);
- }
+ var sourceButton = $('<img src="' + window.DEBUG_TOOLBAR_STATIC_PATH + '/img/source.png">')
+ .attr('title', 'Display the sourcecode for this frame')
+ .click(function() {
+ if (!sourceView)
+ $('h2', sourceView =
+ $('<div class="box"><h2>View Source</h2><div class="sourceview">' +
+ '<table></table></div>')
+ .insertBefore('div.explanation'))
+ .css('cursor', 'pointer')
+ .click(function() {
+ sourceView.slideUp('fast');
+ });
+ $.get(window.DEBUG_TOOLBAR_ROOT_PATH + '/source',
+ {frm: frameID, token: window.DEBUGGER_TOKEN}, function(data) {
+ $('table', sourceView)
+ .replaceWith(data);
+ if (!sourceView.is(':visible'))
+ sourceView.slideDown('fast', function() {
+ focusSourceBlock();
+ });
+ else
+ focusSourceBlock();
});
return false;
+ })
+ .prependTo(target);
+ });
+
+ /**
+ * toggle traceback types on click.
+ */
+ $('h2.traceback').click(function() {
+ $(this).next().slideToggle('fast');
+ $('div.plain').slideToggle('fast');
+ }).css('cursor', 'pointer');
+ $('div.plain').hide();
+
+ /**
+ * Add extra info (this is here so that only users with JavaScript
+ * enabled see it.)
+ */
+ $('span.nojavascript')
+ .removeClass('nojavascript')
+ .html('<p>To switch between the interactive traceback and the plaintext ' +
+ 'one, you can click on the "Traceback" headline. From the text ' +
+ 'traceback you can also create a paste of it. ' + (!window.EVALEX ? '' :
+ 'For code execution mouse-over the frame you want to debug and ' +
+ 'click on the console icon on the right side.' +
+ '<p>You can execute arbitrary Python code in the stack frames and ' +
+ 'there are some extra helpers available for introspection:' +
+ '<ul><li><code>dump()</code> shows all variables in the frame' +
+ '<li><code>dump(obj)</code> dumps all that\'s known about the object</ul>'));
+
+ /**
+ * Add the pastebin feature
+ */
+ $('div.plain form')
+ .submit(function() {
+ var label = $('input[type="submit"]', this);
+ var old_val = label.val();
+ label.val('submitting...');
+ $.ajax({
+ dataType: 'json',
+ url: window.DEBUG_TOOLBAR_ROOT_PATH + '/paste',
+ data: {tb: window.TRACEBACK, token: window.DEBUGGER_TOKEN},
+ success: function(data) {
+ $('div.plain span.pastemessage')
+ .removeClass('pastemessage')
+ .text('Paste created: ')
+ .append($('<a>#' + data.id + '</a>').attr('href', data.url));
+ },
+ error: function() {
+ alert('Error: Could not submit paste. No network connection?');
+ label.val(old_val);
+ }
});
-
- // if we have javascript we submit by ajax anyways, so no need for the
- // not scaling textarea.
- var plainTraceback = $('div.plain textarea');
- plainTraceback.replaceWith($('<pre>').text(plainTraceback.text()));
-
- /**
- * Helper function for shell initialization
- */
- function openShell(consoleNode, target, frameID) {
- if (consoleNode)
- return consoleNode.slideToggle('fast');
- consoleNode = $('<pre class="console">')
- .appendTo(target.parent())
- .hide()
- var historyPos = 0, history = [''];
- var output = $('<div class="output">[console ready]</div>')
- .appendTo(consoleNode);
- var form = $('<form>&gt;&gt;&gt; </form>')
- .submit(function() {
- var cmd = command.val();
- $.get(window.DEBUG_TOOLBAR_ROOT_PATH + '/execute', {
- cmd: cmd, frm: frameID, token:window.DEBUGGER_TOKEN}, function(data) {
- var tmp = $('<div>').html(data);
- $('span.extended', tmp).each(function() {
- var hidden = $(this).wrap('<span>').hide();
- hidden
- .parent()
- .append($('<a href="#" class="toggle">&nbsp;&nbsp;</a>')
- .click(function() {
- hidden.toggle();
- $(this).toggleClass('open')
- return false;
- }));
- });
- output.append(tmp);
- command.focus();
- consoleNode.scrollTop(command.position().top);
- var old = history.pop();
- history.push(cmd);
- if (typeof old != 'undefined')
- history.push(old);
- historyPos = history.length - 1;
- });
- command.val('');
- return false;
- }).
- appendTo(consoleNode);
-
- var command = $('<input type="text">')
- .appendTo(form)
- .keydown(function(e) {
- if (e.charCode == 100 && e.ctrlKey) {
- output.text('--- screen cleared ---');
- return false;
- }
- else if (e.charCode == 0 && (e.keyCode == 38 || e.keyCode == 40)) {
- if (e.keyCode == 38 && historyPos > 0)
- historyPos--;
- else if (e.keyCode == 40 && historyPos < history.length)
- historyPos++;
- command.val(history[historyPos]);
- return false;
- }
+ return false;
+ });
+
+ // if we have javascript we submit by ajax anyways, so no need for the
+ // not scaling textarea.
+ var plainTraceback = $('div.plain textarea');
+ plainTraceback.replaceWith($('<pre>').text(plainTraceback.text()));
+
+ /**
+ * Helper function for shell initialization
+ */
+ function openShell(consoleNode, target, frameID) {
+ if (consoleNode)
+ return consoleNode.slideToggle('fast');
+ consoleNode = $('<pre class="console">')
+ .appendTo(target.parent())
+ .hide()
+ var historyPos = 0, history = [''];
+ var output = $('<div class="output">[console ready]</div>')
+ .appendTo(consoleNode);
+ var form = $('<form>&gt;&gt;&gt; </form>')
+ .submit(function() {
+ var cmd = command.val();
+ $.get(window.DEBUG_TOOLBAR_ROOT_PATH + '/execute', {
+ cmd: cmd, frm: frameID, token:window.DEBUGGER_TOKEN}, function(data) {
+ var tmp = $('<div>').html(data);
+ $('span.extended', tmp).each(function() {
+ var hidden = $(this).wrap('<span>').hide();
+ hidden
+ .parent()
+ .append($('<a href="#" class="toggle">&nbsp;&nbsp;</a>')
+ .click(function() {
+ hidden.toggle();
+ $(this).toggleClass('open')
+ return false;
+ }));
});
-
- return consoleNode.slideDown('fast', function() {
+ output.append(tmp);
command.focus();
+ consoleNode.scrollTop(command.position().top);
+ var old = history.pop();
+ history.push(cmd);
+ if (typeof old != 'undefined')
+ history.push(old);
+ historyPos = history.length - 1;
});
- }
-
- /**
- * Focus the current block in the source view.
- */
- function focusSourceBlock() {
- var tmp, line = $('table.source tr.current');
- for (var i = 0; i < 7; i++) {
- tmp = line.prev();
- if (!(tmp && tmp.is('.in-frame')))
- break
- line = tmp;
+ command.val('');
+ return false;
+ }).
+ appendTo(consoleNode);
+
+ var command = $('<input type="text">')
+ .appendTo(form)
+ .keydown(function(e) {
+ if (e.charCode == 100 && e.ctrlKey) {
+ output.text('--- screen cleared ---');
+ return false;
+ }
+ else if (e.charCode == 0 && (e.keyCode == 38 || e.keyCode == 40)) {
+ if (e.keyCode == 38 && historyPos > 0)
+ historyPos--;
+ else if (e.keyCode == 40 && historyPos < history.length)
+ historyPos++;
+ command.val(history[historyPos]);
+ return false;
}
- var container = $('div.sourceview');
- container.scrollTop(line.offset().top);
- }
+ });
+ return consoleNode.slideDown('fast', function() {
+ command.focus();
});
+ }
+
+ /**
+ * Focus the current block in the source view.
+ */
+ function focusSourceBlock() {
+ var tmp, line = $('table.source tr.current');
+ for (var i = 0; i < 7; i++) {
+ tmp = line.prev();
+ if (!(tmp && tmp.is('.in-frame')))
+ break
+ line = tmp;
+ }
+ var container = $('div.sourceview');
+ container.scrollTop(line.offset().top);
+ }
+ });
});
View
405 pyramid_debugtoolbar/static/js/toolbar.js
@@ -5,7 +5,7 @@ require.config({
});
define("tablesorter", function() {
- (function($){$.extend({tablesorter:new
+ (function($){$.extend({tablesorter:new
function(){var parsers=[],widgets=[];this.defaults={cssHeader:"header",cssAsc:"headerSortUp",cssDesc:"headerSortDown",cssChildRow:"expand-child",sortInitialOrder:"asc",sortMultiSortKey:"shiftKey",sortForce:null,sortAppend:null,sortLocaleCompare:true,textExtraction:"simple",parsers:{},widgets:[],widgetZebra:{css:["even","odd"]},headers:{},widthFixed:false,cancelSelection:true,sortList:[],headerList:[],dateFormat:"us",decimal:'/\.|\,/g',onRenderHeader:null,selectorHeaders:'thead th',debug:false};function benchmark(s,d){log(s+","+(new Date().getTime()-d.getTime())+"ms");}this.benchmark=benchmark;function log(s){if(typeof console!="undefined"&&typeof console.debug!="undefined"){console.log(s);}else{alert(s);}}function buildParserCache(table,$headers){if(table.config.debug){var parsersDebug="";}if(table.tBodies.length==0)return;var rows=table.tBodies[0].rows;if(rows[0]){var list=[],cells=rows[0].cells,l=cells.length;for(var i=0;i<l;i++){var p=false;if($.metadata&&($($headers[i]).metadata()&&$($headers[i]).metadata().sorter)){p=getParserById($($headers[i]).metadata().sorter);}else if((table.config.headers[i]&&table.config.headers[i].sorter)){p=getParserById(table.config.headers[i].sorter);}if(!p){p=detectParserForColumn(table,rows,-1,i);}if(table.config.debug){parsersDebug+="column:"+i+" parser:"+p.id+"\n";}list.push(p);}}if(table.config.debug){log(parsersDebug);}return list;};function detectParserForColumn(table,rows,rowIndex,cellIndex){var l=parsers.length,node=false,nodeValue=false,keepLooking=true;while(nodeValue==''&&keepLooking){rowIndex++;if(rows[rowIndex]){node=getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex);nodeValue=trimAndGetNodeText(table.config,node);if(table.config.debug){log('Checking if value was empty on row:'+rowIndex);}}else{keepLooking=false;}}for(var i=1;i<l;i++){if(parsers[i].is(nodeValue,table,node)){return parsers[i];}}return parsers[0];}function getNodeFromRowAndCellIndex(rows,rowIndex,cellIndex){return rows[rowIndex].cells[cellIndex];}function trimAndGetNodeText(config,node){return $.trim(getElementText(config,node));}function getParserById(name){var l=parsers.length;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==name.toLowerCase()){return parsers[i];}}return false;}function buildCache(table){if(table.config.debug){var cacheTime=new Date();}var totalRows=(table.tBodies[0]&&table.tBodies[0].rows.length)||0,totalCells=(table.tBodies[0].rows[0]&&table.tBodies[0].rows[0].cells.length)||0,parsers=table.config.parsers,cache={row:[],normalized:[]};for(var i=0;i<totalRows;++i){var c=$(table.tBodies[0].rows[i]),cols=[];if(c.hasClass(table.config.cssChildRow)){cache.row[cache.row.length-1]=cache.row[cache.row.length-1].add(c);continue;}cache.row.push(c);for(var j=0;j<totalCells;++j){cols.push(parsers[j].format(getElementText(table.config,c[0].cells[j]),table,c[0].cells[j]));}cols.push(cache.normalized.length);cache.normalized.push(cols);cols=null;};if(table.config.debug){benchmark("Building cache for "+totalRows+" rows:",cacheTime);}return cache;};function getElementText(config,node){var text="";if(!node)return"";if(!config.supportsTextContent)config.supportsTextContent=node.textContent||false;if(config.textExtraction=="simple"){if(config.supportsTextContent){text=node.textContent;}else{if(node.childNodes[0]&&node.childNodes[0].hasChildNodes()){text=node.childNodes[0].innerHTML;}else{text=node.innerHTML;}}}else{if(typeof(config.textExtraction)=="function"){text=config.textExtraction(node);}else{text=$(node).text();}}return text;}function appendToTable(table,cache){if(table.config.debug){var appendTime=new Date()}var c=cache,r=c.row,n=c.normalized,totalRows=n.length,checkCell=(n[0].length-1),tableBody=$(table.tBodies[0]),rows=[];for(var i=0;i<totalRows;i++){var pos=n[i][checkCell];rows.push(r[pos]);if(!table.config.appender){var l=r[pos].length;for(var j=0;j<l;j++){tableBody[0].appendChild(r[pos][j]);}}}if(table.config.appender){table.config.appender(table,rows);}rows=null;if(table.config.debug){benchmark("Rebuilt table:",appendTime);}applyWidget(table);setTimeout(function(){$(table).trigger("sortEnd");},0);};function buildHeaders(table){if(table.config.debug){var time=new Date();}var meta=($.metadata)?true:false;var header_index=computeTableHeaderCellIndexes(table);$tableHeaders=$(table.config.selectorHeaders,table).each(function(index){this.column=header_index[this.parentNode.rowIndex+"-"+this.cellIndex];this.order=formatSortingOrder(table.config.sortInitialOrder);this.count=this.order;if(checkHeaderMetadata(this)||checkHeaderOptions(table,index))this.sortDisabled=true;if(checkHeaderOptionsSortingLocked(table,index))this.order=this.lockedOrder=checkHeaderOptionsSortingLocked(table,index);if(!this.sortDisabled){var $th=$(this).addClass(table.config.cssHeader);if(table.config.onRenderHeader)table.config.onRenderHeader.apply($th);}table.config.headerList[index]=this;});if(table.config.debug){benchmark("Built headers:",time);log($tableHeaders);}return $tableHeaders;};function computeTableHeaderCellIndexes(t){var matrix=[];var lookup={};var thead=t.getElementsByTagName('THEAD')[0];var trs=thead.getElementsByTagName('TR');for(var i=0;i<trs.length;i++){var cells=trs[i].cells;for(var j=0;j<cells.length;j++){var c=cells[j];var rowIndex=c.parentNode.rowIndex;var cellId=rowIndex+"-"+c.cellIndex;var rowSpan=c.rowSpan||1;var colSpan=c.colSpan||1
var firstAvailCol;if(typeof(matrix[rowIndex])=="undefined"){matrix[rowIndex]=[];}for(var k=0;k<matrix[rowIndex].length+1;k++){if(typeof(matrix[rowIndex][k])=="undefined"){firstAvailCol=k;break;}}lookup[cellId]=firstAvailCol;for(var k=rowIndex;k<rowIndex+rowSpan;k++){if(typeof(matrix[k])=="undefined"){matrix[k]=[];}var matrixrow=matrix[k];for(var l=firstAvailCol;l<firstAvailCol+colSpan;l++){matrixrow[l]="x";}}}}return lookup;}function checkCellColSpan(table,rows,row){var arr=[],r=table.tHead.rows,c=r[row].cells;for(var i=0;i<c.length;i++){var cell=c[i];if(cell.colSpan>1){arr=arr.concat(checkCellColSpan(table,headerArr,row++));}else{if(table.tHead.length==1||(cell.rowSpan>1||!r[row+1])){arr.push(cell);}}}return arr;};function checkHeaderMetadata(cell){if(($.metadata)&&($(cell).metadata().sorter===false)){return true;};return false;}function checkHeaderOptions(table,i){if((table.config.headers[i])&&(table.config.headers[i].sorter===false)){return true;};return false;}function checkHeaderOptionsSortingLocked(table,i){if((table.config.headers[i])&&(table.config.headers[i].lockedOrder))return table.config.headers[i].lockedOrder;return false;}function applyWidget(table){var c=table.config.widgets;var l=c.length;for(var i=0;i<l;i++){getWidgetById(c[i]).format(table);}}function getWidgetById(name){var l=widgets.length;for(var i=0;i<l;i++){if(widgets[i].id.toLowerCase()==name.toLowerCase()){return widgets[i];}}};function formatSortingOrder(v){if(typeof(v)!="Number"){return(v.toLowerCase()=="desc")?1:0;}else{return(v==1)?1:0;}}function isValueInArray(v,a){var l=a.length;for(var i=0;i<l;i++){if(a[i][0]==v){return true;}}return false;}function setHeadersCss(table,$headers,list,css){$headers.removeClass(css[0]).removeClass(css[1]);var h=[];$headers.each(function(offset){if(!this.sortDisabled){h[this.column]=$(this);}});var l=list.length;for(var i=0;i<l;i++){h[list[i][0]].addClass(css[list[i][1]]);}}function fixColumnWidth(table,$headers){var c=table.config;if(c.widthFixed){var colgroup=$('<colgroup>');$("tr:first td",table.tBodies[0]).each(function(){colgroup.append($('<col>').css('width',$(this).width()));});$(table).prepend(colgroup);};}function updateHeaderSortCount(table,sortList){var c=table.config,l=sortList.length;for(var i=0;i<l;i++){var s=sortList[i],o=c.headerList[s[0]];o.count=s[1];o.count++;}}function multisort(table,sortList,cache){if(table.config.debug){var sortTime=new Date();}var dynamicExp="var sortWrapper = function(a,b) {",l=sortList.length;for(var i=0;i<l;i++){var c=sortList[i][0];var order=sortList[i][1];var s=(table.config.parsers[c].type=="text")?((order==0)?makeSortFunction("text","asc",c):makeSortFunction("text","desc",c)):((order==0)?makeSortFunction("numeric","asc",c):makeSortFunction("numeric","desc",c));var e="e"+i;dynamicExp+="var "+e+" = "+s;dynamicExp+="if("+e+") { return "+e+"; } ";dynamicExp+="else { ";}var orgOrderCol=cache.normalized[0].length-1;dynamicExp+="return a["+orgOrderCol+"]-b["+orgOrderCol+"];";for(var i=0;i<l;i++){dynamicExp+="}; ";}dynamicExp+="return 0; ";dynamicExp+="}; ";if(table.config.debug){benchmark("Evaling expression:"+dynamicExp,new Date());}eval(dynamicExp);cache.normalized.sort(sortWrapper);if(table.config.debug){benchmark("Sorting on "+sortList.toString()+" and dir "+order+" time:",sortTime);}return cache;};function makeSortFunction(type,direction,index){var a="a["+index+"]",b="b["+index+"]";if(type=='text'&&direction=='asc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+a+" < "+b+") ? -1 : 1 )));";}else if(type=='text'&&direction=='desc'){return"("+a+" == "+b+" ? 0 : ("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : ("+b+" < "+a+") ? -1 : 1 )));";}else if(type=='numeric'&&direction=='asc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+a+" - "+b+"));";}else if(type=='numeric'&&direction=='desc'){return"("+a+" === null && "+b+" === null) ? 0 :("+a+" === null ? Number.POSITIVE_INFINITY : ("+b+" === null ? Number.NEGATIVE_INFINITY : "+b+" - "+a+"));";}};function makeSortText(i){return"((a["+i+"] < b["+i+"]) ? -1 : ((a["+i+"] > b["+i+"]) ? 1 : 0));";};function makeSortTextDesc(i){return"((b["+i+"] < a["+i+"]) ? -1 : ((b["+i+"] > a["+i+"]) ? 1 : 0));";};function makeSortNumeric(i){return"a["+i+"]-b["+i+"];";};function makeSortNumericDesc(i){return"b["+i+"]-a["+i+"];";};function sortText(a,b){if(table.config.sortLocaleCompare)return a.localeCompare(b);return((a<b)?-1:((a>b)?1:0));};function sortTextDesc(a,b){if(table.config.sortLocaleCompare)return b.localeCompare(a);return((b<a)?-1:((b>a)?1:0));};function sortNumeric(a,b){return a-b;};function sortNumericDesc(a,b){return b-a;};function getCachedSortType(parsers,i){return parsers[i].type;};this.construct=function(settings){return this.each(function(){if(!this.tHead||!this.tBodies)return;var $this,$document,$headers,cache,config,shiftDown=0,sortOrder;this.config={};config=$.extend(this.config,$.tablesorter.defaults,settings);$this=$(this);$.data(this,"tablesorter",config);$headers=buildHeaders(this);this.config.parsers=buildParserCache(this,$headers);cache=buildCache(this);var sortCSS=[config.cssDesc,config.cssAsc];fixColumnWidth(this);$headers.click(function(e){var totalRows=($this[0].tBodies[0]&&$this[0].tBodies[0].rows.length)||0;if(!this.sortDisabled&&totalRows>0){$this.trigger("sortStart");var $cell=$(this);var i=this.column;this.order=this.count++%2;if(this.lockedOrder)this.order=this.lockedOrder;if(!e[config.sortMultiSortKey]){config.sortList=[];if(config.sortForce!=null){var a=config.sortForce;for(var j=0;j<a.length;j++){if(a[j][0]!=i){config.sortList.push(a[j]);}}}config.sortList.push([i,this.order]);}else{if(isValueInArray(i,config.sortList)){for(var j=0;j<config.sortList.length;j++){var s=config.sortList[j],o=config.headerList[s[0]];if(s[0]==i){o.count=s[1];o.count++;s[1]=o.count%2;}}}else{config.sortList.push([i,this.order]);}};setTimeout(function(){setHeadersCss($this[0],$headers,config.sortList,sortCSS);appendToTable($this[0],multisort($this[0],config.sortList,cache));},1);return false;}}).mousedown(function(){if(config.cancelSelection){this.onselectstart=function(){return false};return false;}});$this.bind("update",function(){var me=this;setTimeout(function(){me.config.parsers=buildParserCache(me,$headers);cache=buildCache(me);},1);}).bind("updateCell",function(e,cell){var config=this.config;var pos=[(cell.parentNode.rowIndex-1),cell.cellIndex];cache.normalized[pos[0]][pos[1]]=config.parsers[pos[1]].format(getElementText(config,cell),cell);}).bind("sorton",function(e,list){$(this).trigger("sortStart");config.sortList=list;var sortList=config.sortList;updateHeaderSortCount(this,sortList);setHeadersCss(this,$headers,sortList,sortCSS);appendToTable(this,multisort(this,sortList,cache));}).bind("appendCache",function(){appendToTable(this,cache);}).bind("applyWidgetId",function(e,id){getWidgetById(id).format(this);}).bind("applyWidgets",function(){applyWidget(this);});if($.metadata&&($(this).metadata()&&$(this).metadata().sortlist)){config.sortList=$(this).metadata().sortlist;}if(config.sortList.length>0){$this.trigger("sorton",[config.sortList]);}applyWidget(this);});};this.addParser=function(parser){var l=parsers.length,a=true;for(var i=0;i<l;i++){if(parsers[i].id.toLowerCase()==parser.id.toLowerCase()){a=false;}}if(a){parsers.push(parser);};};this.addWidget=function(widget){widgets.push(widget);};this.formatFloat=function(s){var i=parseFloat(s);return(isNaN(i))?0:i;};this.formatInt=function(s){var i=parseInt(s);return(isNaN(i))?0:i;};this.isDigit=function(s,config){return/^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g,'')));};this.clearTableBody=function(table){if($.browser.msie){function empty(){while(this.firstChild)this.removeChild(this.firstChild);}empty.apply(table.tBodies[0]);}else{table.tBodies[0].innerHTML="";}};}});$.fn.extend({tablesorter:$.tablesorter.construct});var ts=$.tablesorter;ts.addParser({id:"text",is:function(s){return true;},format:function(s){return $.trim(s.toLocaleLowerCase());},type:"text"});ts.addParser({id:"digit",is:function(s,table){var c=table.config;return $.tablesorter.isDigit(s,c);},format:function(s){return $.tablesorter.formatFloat(s);},type:"numeric"});ts.addParser({id:"currency",is:function(s){return/^[£$€?.]/.test(s);},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g),""));},type:"numeric"});ts.addParser({id:"ipAddress",is:function(s){return/^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);},format:function(s){var a=s.split("."),r="",l=a.length;for(var i=0;i<l;i++){var item=a[i];if(item.length==2){r+="0"+item;}else{r+=item;}}return $.tablesorter.formatFloat(r);},type:"numeric"});ts.addParser({id:"url",is:function(s){return/^(https?|ftp|file):\/\/$/.test(s);},format:function(s){return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//),''));},type:"text"});ts.addParser({id:"isoDate",is:function(s){return/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);},format:function(s){return $.tablesorter.formatFloat((s!="")?new Date(s.replace(new RegExp(/-/g),"/")).getTime():"0");},type:"numeric"});ts.addParser({id:"percent",is:function(s){return/\%$/.test($.trim(s));},format:function(s){return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g),""));},type:"numeric"});ts.addParser({id:"usLongDate",is:function(s){return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));},format:function(s){return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"shortDate",is:function(s){return/\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);},format:function(s,table){var c=table.config;s=s.replace(/\-/g,"/");if(c.dateFormat=="us"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$1/$2");}else if(c.dateFormat=="uk"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/,"$3/$2/$1");}else if(c.dateFormat=="dd/mm/yy"||c.dateFormat=="dd-mm-yy"){s=s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/,"$1/$2/$3");}return $.tablesorter.formatFloat(new Date(s).getTime());},type:"numeric"});ts.addParser({id:"time",is:function(s){return/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);},format:function(s){return $.tablesorter.formatFloat(new Date("2000/01/01 "+s).getTime());},type:"numeric"});ts.addParser({id:"metadata",is:function(s){return false;},format:function(s,table,cell){var c=table.config,p=(!c.parserMetadataName)?'sortValue':c.parserMetadataName;return $(cell).metadata()[p];},type:"numeric"});ts.addWidget({id:"zebra",format:function(table){if(table.config.debug){var time=new Date();}var $tr,row=-1,odd;$("tr:visible",table.tBodies[0]).each(function(i){$tr=$(this);if(!$tr.hasClass(table.config.cssChildRow))row++;odd=(row%2==0);$tr.removeClass(table.config.widgetZebra.css[odd?0:1]).addClass(table.config.widgetZebra.css[odd?1:0])});if(table.config.debug){$.tablesorter.benchmark("Applying Zebra widget",time);}}});})(jQuery);
});
@@ -14,206 +14,203 @@ require([
"jquery",
"tablesorter"], function($, tablesorter) {
- $(function() {
- // cookie
- $.cookie = function(name, value, options) { if (typeof value != 'undefined') { options = options || {}; if (value === null) { value = ''; options.expires = -1; } var expires = ''; if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { var date; if (typeof options.expires == 'number') { date = new Date(); date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); } else { date = options.expires; } expires = '; expires=' + date.toUTCString(); } var path = options.path ? '; path=' + (options.path) : ''; var domain = options.domain ? '; domain=' + (options.domain) : ''; var secure = options.secure ? '; secure' : ''; document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); } else { var cookieValue = null; if (document.cookie && document.cookie != '') { var cookies = document.cookie.split(';'); for (var i = 0; i < cookies.length; i++) { var cookie = $.trim(cookies[i]); if (cookie.substring(0, name.length + 1) == (name + '=')) { cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); break; } } } return cookieValue; } };
- //
- $('head').append('<link rel="stylesheet" href="'+DEBUG_TOOLBAR_STATIC_PATH+'css/toolbar.css?'+ Math.random() +'" type="text/css" />');
- var COOKIE_NAME = 'pdtb';
- var COOKIE_NAME_ACTIVE = COOKIE_NAME +'_active';
- var pdtb = {
- events: {
- ready: []
- },
- isReady: false,
- init: function() {
- $('#pDebug').show();
- var current = null;
- $('#pDebugPanelList li a').click(function() {
- if (!this.className) {
- return false;
- }
- current = $('#pDebug #' + this.className + '-content');
- if (current.is(':visible')) {
- $(document).trigger('close.pDebug');
- $(this).parent().removeClass('active');
- } else {
- $('.panelContent').hide(); // Hide any that are already open
- current.show();
- $('#pDebugToolbar li').removeClass('active');
- $(this).parent().addClass('active');
- }
- return false;
- });
- $('#pDebugPanelList li .switch').click(function() {
- var $panel = $(this).parent();
- var $this = $(this);
- var dom_id = $panel.attr('id');
-
- // Turn cookie content into an array of active panels
- var active_str = $.cookie(COOKIE_NAME_ACTIVE);
- var active = (active_str) ? active_str.split(';') : [];
- active = $.grep(active, function(n,i) { return n != dom_id; });
-
- if ($this.hasClass('active')) {
- $this.removeClass('active');
- $this.addClass('inactive');
- }
- else {
- active.push(dom_id);
- $this.removeClass('inactive');
- $this.addClass('active');
- }
-
- if (active.length > 0) {
- $.cookie(COOKIE_NAME_ACTIVE, active.join(';'), {
- path: '/', expires: 10
- });
- }
- else {
- $.cookie(COOKIE_NAME_ACTIVE, null, {
- path: '/', expires: -1
- });
- }
- });
- $('#pDebug a.pDebugClose').click(function() {
- $(document).trigger('close.pDebug');
- $('#pDebugToolbar li').removeClass('active');
- return false;
- });
- $('#pDebug a.remoteCall').click(function() {
- $('#pDebugWindow').load(this.href, {}, function() {
- $('#pDebugWindow a.pDebugBack').click(function() {
- $(this).parent().parent().hide();
- return false;
- });
- });
- $('#pDebugWindow').show();
- return false;
- });
- $('#pDebugTemplatePanel a.pTemplateShowContext').click(function() {
- pdtb.toggle_arrow($(this).children('.toggleArrow'))
- pdtb.toggle_content($(this).parent().next());
- return false;
- });
- $('#pDebugSQLPanel a.pSQLShowStacktrace').click(function() {
- pdtb.toggle_content($('.pSQLHideStacktraceDiv', $(this).parents('tr')));
- return false;
- });
- $('#pHideToolBarButton').click(function() {
- pdtb.hide_toolbar(true);
- return false;
- });
- $('#pShowToolBarButton').click(function() {
- pdtb.show_toolbar();
- return false;
- });
- $("#pShowToolBarButton").hover(function() {
- $(this).data('pTimeout', setTimeout(function() {
- pdtb.show_toolbar(false, true);
- return false;
- }, 1000));
- }, function () {
- clearTimeout($(this).data('pTimeout'));
- });
- $(document).bind('close.pDebug', function() {
- // If a sub-panel is open, close that
- if ($('#pDebugWindow').is(':visible')) {
- $('#pDebugWindow').hide();
- return;
- }
- // If a panel is open, close that
- if ($('.panelContent').is(':visible')) {
- $('.panelContent').hide();
- return;
- }
- // Otherwise, just minimize the toolbar
- if ($('#pDebugToolbar').is(':visible')) {
- pdtb.hide_toolbar(true);
- return;
- }
- });
- if ($.cookie(COOKIE_NAME)) {
- pdtb.hide_toolbar(false);
- } else {
- pdtb.show_toolbar(false);
- }
- $('#pDebug .pDebugHoverable').hover(function(){
- $(this).addClass('pDebugHover');
- }, function(){
- $(this).removeClass('pDebugHover');
- });
- pdtb.isReady = true;
- $.each(pdtb.events.ready, function(_, callback){
- callback(pdtb);
- });
- },
- toggle_content: function(elem) {
- if (elem.is(':visible')) {
- elem.hide();
- } else {
- elem.show();
- }
- },
- close: function() {
- $(document).trigger('close.pDebug');
- return false;
- },
- hide_toolbar: function(setCookie) {
- // close any sub panels
- $('#pDebugWindow').hide();
- // close all panels
- $('.panelContent').hide();
- $('#pDebugToolbar li').removeClass('active');
- // finally close toolbar
- $('#pDebugToolbar').hide('fast');
- $('#pDebugToolbarHandle').show();
- // Unbind keydown
- $(document).unbind('keydown.pDebug');
- if (setCookie) {
- $.cookie(COOKIE_NAME, 'hide', {
- path: '/',
- expires: 10
- });
- }
- },
- show_toolbar: function(animate, auto_hide) {
- auto_hide = auto_hide || false
- // Set up keybindings
- $(document).bind('keydown.pDebug', function(e) {
- if (e.keyCode == 27) {
- pdtb.close();
- }
- });
- $('#pDebugToolbarHandle').hide();
- if (animate) {
- $('#pDebugToolbar').show('fast');
- } else {
- $('#pDebugToolbar').show();
- }
- if (auto_hide == false) {
- $.cookie(COOKIE_NAME, null, {
- path: '/',
- expires: -1
- });
- }
- },
- toggle_arrow: function(elem) {
- var uarr = String.fromCharCode(0x25b6);
- var darr = String.fromCharCode(0x25bc);
- elem.html(elem.html() == uarr ? darr : uarr);
- },
- ready: function(callback){
- if (pdtb.isReady) {
- callback(pdtb);
- } else {
- pdtb.events.ready.push(callback);
- }
- }
- };
- $(document).ready(function() {
- pdtb.init();
- $(".pDebugSortable").tablesorter();
- });
- });
-});
+ $(function() {
+ // cookie
+ $.cookie = function(name, value, options) { if (typeof value != 'undefined') { options = options || {}; if (value === null) { value = ''; options.expires = -1; } var expires = ''; if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) { var date; if (typeof options.expires == 'number') { date = new Date(); date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); } else { date = options.expires; } expires = '; expires=' + date.toUTCString(); } var path = options.path ? '; path=' + (options.path) : ''; var domain = options.domain ? '; domain=' + (options.domain) : ''; var secure = options.secure ? '; secure' : ''; document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join(''); } else { var cookieValue = null; if (document.cookie && document.cookie != '') { var cookies = document.cookie.split(';'); for (var i = 0; i < cookies.length; i++) { var cookie = $.trim(cookies[i]); if (cookie.substring(0, name.length + 1) == (name + '=')) { cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); break; } } } return cookieValue; } };
+ //
+ $('head').append('<link rel="stylesheet" href="'+DEBUG_TOOLBAR_STATIC_PATH+'css/toolbar.css?'+ Math.random() +'" type="text/css" />');
+ var COOKIE_NAME = 'pdtb';
+ var COOKIE_NAME_ACTIVE = COOKIE_NAME +'_active';
+ var pdtb = {
+ events: {
+ ready: []
+ },
+ isReady: false,
+ init: function() {
+ $('#pDebug').show();
+ var current = null;
+ $('#pDebugPanelList li a').click(function() {
+ if (!this.className) {
+ return false;
+ }
+ current = $('#pDebug #' + this.className + '-content');
+ if (current.is(':visible')) {
+ $(document).trigger('close.pDebug');
+ $(this).parent().removeClass('active');
+ } else {
+ $('.panelContent').hide(); // Hide any that are already open
+ current.show();
+ $('#pDebugToolbar li').removeClass('active');
+ $(this).parent().addClass('active');
+ }
+ return false;
+ });
+ $('#pDebugPanelList li .switch').click(function() {
+ var $panel = $(this).parent();
+ var $this = $(this);
+ var dom_id = $panel.attr('id');
+ // Turn cookie content into an array of active panels
+ var active_str = $.cookie(COOKIE_NAME_ACTIVE);
+ var active = (active_str) ? active_str.split(';') : [];
+ active = $.grep(active, function(n,i) { return n != dom_id; });
+ if ($this.hasClass('active')) {
+ $this.removeClass('active');
+ $this.addClass('inactive');
+ }
+ else {
+ active.push(dom_id);
+ $this.removeClass('inactive');
+ $this.addClass('active');
+ }
+ if (active.length > 0) {
+ $.cookie(COOKIE_NAME_ACTIVE, active.join(';'), {
+ path: '/', expires: 10
+ });
+ }
+ else {
+ $.cookie(COOKIE_NAME_ACTIVE, null, {
+ path: '/', expires: -1
+ });
+ }
+ });
+ $('#pDebug a.pDebugClose').click(function() {
+ $(document).trigger('close.pDebug');
+ $('#pDebugToolbar li').removeClass('active');
+ return false;
+ });
+ $('#pDebug a.remoteCall').click(function() {
+ $('#pDebugWindow').load(this.href, {}, function() {
+ $('#pDebugWindow a.pDebugBack').click(function() {
+ $(this).parent().parent().hide();
+ return false;
+ });
+ });
+ $('#pDebugWindow').show();
+ return false;
+ });
+ $('#pDebugTemplatePanel a.pTemplateShowContext').click(function() {
+ pdtb.toggle_arrow($(this).children('.toggleArrow'))
+ pdtb.toggle_content($(this).parent().next());
+ return false;
+ });
+ $('#pDebugSQLPanel a.pSQLShowStacktrace').click(function() {
+ pdtb.toggle_content($('.pSQLHideStacktraceDiv', $(this).parents('tr')));
+ return false;
+ });
+ $('#pHideToolBarButton').click(function() {
+ pdtb.hide_toolbar(true);
+ return false;
+ });
+ $('#pShowToolBarButton').click(function() {
+ pdtb.show_toolbar();
+ return false;
+ });
+ $("#pShowToolBarButton").hover(function() {
+ $(this).data('pTimeout', setTimeout(function() {
+ pdtb.show_toolbar(false, true);
+ return false;
+ }, 1000));
+ }, function () {
+ clearTimeout($(this).data('pTimeout'));
+ });
+ $(document).bind('close.pDebug', function() {
+ // If a sub-panel is open, close that
+ if ($('#pDebugWindow').is(':visible')) {
+ $('#pDebugWindow').hide();
+ return;
+ }
+ // If a panel is open, close that
+ if ($('.panelContent').is(':visible')) {
+ $('.panelContent').hide();
+ return;
+ }
+ // Otherwise, just minimize the toolbar
+ if ($('#pDebugToolbar').is(':visible')) {
+ pdtb.hide_toolbar(true);
+ return;
+ }
+ });
+ if ($.cookie(COOKIE_NAME)) {
+ pdtb.hide_toolbar(false);
+ } else {
+ pdtb.show_toolbar(false);
+ }
+ $('#pDebug .pDebugHoverable').hover(function(){
+ $(this).addClass('pDebugHover');
+ }, function(){
+ $(this).removeClass('pDebugHover');
+ });
+ pdtb.isReady = true;
+ $.each(pdtb.events.ready, function(_, callback){
+ callback(pdtb);
+ });
+ },
+ toggle_content: function(elem) {
+ if (elem.is(':visible')) {
+ elem.hide();
+ } else {
+ elem.show();
+ }
+ },
+ close: function() {
+ $(document).trigger('close.pDebug');
+ return false;
+ },
+ hide_toolbar: function(setCookie) {
+ // close any sub panels
+ $('#pDebugWindow').hide();
+ // close all panels
+ $('.panelContent').hide();
+ $('#pDebugToolbar li').removeClass('active');
+ // finally close toolbar
+ $('#pDebugToolbar').hide('fast');
+ $('#pDebugToolbarHandle').show();
+ // Unbind keydown
+ $(document).unbind('keydown.pDebug');
+ if (setCookie) {
+ $.cookie(COOKIE_NAME, 'hide', {
+ path: '/',
+ expires: 10
+ });
+ }
+ },
+ show_toolbar: function(animate, auto_hide) {
+ auto_hide = auto_hide || false
+ // Set up keybindings
+ $(document).bind('keydown.pDebug', function(e) {
+ if (e.keyCode == 27) {
+ pdtb.close();
+ }
+ });
+ $('#pDebugToolbarHandle').hide();
+ if (animate) {
+ $('#pDebugToolbar').show('fast');
+ } else {
+ $('#pDebugToolbar').show();
+ }
+ if (auto_hide == false) {
+ $.cookie(COOKIE_NAME, null, {
+ path: '/',
+ expires: -1
+ });
+ }
+ },
+ toggle_arrow: function(elem) {
+ var uarr = String.fromCharCode(0x25b6);
+ var darr = String.fromCharCode(0x25bc);
+ elem.html(elem.html() == uarr ? darr : uarr);
+ },
+ ready: function(callback){
+ if (pdtb.isReady) {
+ callback(pdtb);
+ } else {
+ pdtb.events.ready.push(callback);
+ }
+ }
+ };
+ $(document).ready(function() {
+ pdtb.init();
+ $(".pDebugSortable").tablesorter();
+ });
+ });
+});
Please sign in to comment.
Something went wrong with that request. Please try again.