added sortable sub calls table to profiler output. Niftiness.
This commit is contained in:
Matthew Wilson
parent
eb13ca2df3
commit
41f3318e3c
5 changed files with 626 additions and 8 deletions
|
|
@ -103,7 +103,7 @@ sub page {
|
|||
}
|
||||
}
|
||||
$output = tryAssetMethod($session,$asset,$method);
|
||||
$output = tryAssetMethod($session,$asset,"view") unless ($method eq "view" || $output);
|
||||
$output = tryAssetMethod($session,$asset,"view") unless ($output || ($method eq "view"));
|
||||
}
|
||||
}
|
||||
if ($output eq "") {
|
||||
|
|
|
|||
|
|
@ -244,7 +244,9 @@ per sub, descending.
|
|||
=cut
|
||||
|
||||
sub results {
|
||||
my @parents;
|
||||
my @parents = ();
|
||||
my $exclTimes = {};
|
||||
my $inclTimes = {};
|
||||
my $output = qq|
|
||||
<script>
|
||||
function showhide(id){
|
||||
|
|
@ -267,7 +269,7 @@ obj.style.display = "none";
|
|||
$call->{duration} = $call->{end} - $call->{start};
|
||||
$call->{excl} = $call->{duration};
|
||||
if (defined $parents[0]) {
|
||||
$subTimes[$parents[-1]]->{excl} = $subTimes[$parents[-1]]->{excl} - $call->{duration};
|
||||
$subTimes[$parents[-1]]->{excl} -= $call->{duration};
|
||||
}
|
||||
if($subTimes[$entry + 1] && ($subTimes[$entry + 1]->{depth} > $call->{depth})) {
|
||||
# Do stuff to the next line if it's at a deeper depth.
|
||||
|
|
@ -286,16 +288,20 @@ obj.style.display = "none";
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for(my $entry=0;$entry <= $#subTimes;$entry++) {
|
||||
my $call = $subTimes[$entry];
|
||||
$output .= "\n".' ';
|
||||
$output .= ' | ' for(2..$call->{depth});
|
||||
$output .= "\n".' ';
|
||||
$output .= ' | ' for(2..($call->{depth}));
|
||||
$exclTimes->{$call->{routine}} = [] unless exists $exclTimes->{$call->{routine}};
|
||||
push(@{$exclTimes->{$call->{routine}}},$call->{excl});
|
||||
$inclTimes->{$call->{routine}} = [] unless exists $inclTimes->{$call->{routine}};
|
||||
push(@{$inclTimes->{$call->{routine}}},$call->{duration});
|
||||
if($subTimes[$entry + 1] && ($subTimes[$entry + 1]->{depth} > $call->{depth})) {
|
||||
# Do stuff to the next line if it's at a deeper depth.
|
||||
$output .= qq|<a href="#" onclick="showhide('profile$call->{entry}'); return(false);"> + </a>|;
|
||||
} else {
|
||||
$output .= ' | ';
|
||||
$output .= '— ';
|
||||
}
|
||||
$output .= "<b>" if($total < ($call->{duration} * 40));
|
||||
$output .= $call->{routine} . " ( ".sprintf("%.4f",$call->{duration})."s )";
|
||||
|
|
@ -311,13 +317,163 @@ obj.style.display = "none";
|
|||
}
|
||||
if($nextDepth < $call->{depth}) {
|
||||
$nextDepth++;
|
||||
for(1 .. ($call->{depth} - $nextDepth + 1)) {
|
||||
for(0 .. ($call->{depth} - $nextDepth)) {
|
||||
$output .= "\n</div>\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
$output .= "<br>\n<br>\n";
|
||||
$output .= '<h2>Subroutine Calls Aggregate Data</h2>';
|
||||
$output .= '"Exclusive" measures the time spent in the subroutine call, excluding the time spent in its called subroutines. Inclusive measures...'."<br>\n<br>\n";
|
||||
$output .= qq|
|
||||
<style>
|
||||
.sort-table {
|
||||
font: Icon;
|
||||
border: 1px Solid ThreeDShadow;
|
||||
background: Window;
|
||||
color: WindowText;
|
||||
}
|
||||
.evenST {
|
||||
background: #eee;
|
||||
}
|
||||
|
||||
.oddST {
|
||||
|
||||
}
|
||||
.sort-table thead {
|
||||
background: ButtonFace;
|
||||
}
|
||||
|
||||
.sort-table td {
|
||||
padding: 2px 5px;
|
||||
}
|
||||
|
||||
.sort-table thead td {
|
||||
border: 1px solid;
|
||||
border-color: ButtonHighlight ButtonShadow
|
||||
ButtonShadow ButtonHighlight;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.sort-table thead td:active {
|
||||
border-color: ButtonShadow ButtonHighlight
|
||||
ButtonHighlight ButtonShadow;
|
||||
padding: 3px 4px 1px 6px;
|
||||
}
|
||||
|
||||
.sort-table thead td[_sortType=None]:active {
|
||||
border-color: ButtonHighlight ButtonShadow
|
||||
ButtonShadow ButtonHighlight;
|
||||
padding: 2px 5px;
|
||||
}
|
||||
|
||||
.sort-arrow {
|
||||
width: 11px;
|
||||
height: 11px;
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
margin: 0 2px;
|
||||
}
|
||||
|
||||
.sort-arrow.descending {
|
||||
background-image: url("/extras/wobject/Profiler/downsimple.png");
|
||||
|
||||
}
|
||||
|
||||
.sort-arrow.ascending {
|
||||
background-image: url("/extras/wobject/Profiler/upsimple.png");
|
||||
}
|
||||
|
||||
</style>
|
||||
<script type="text/javascript" src="/extras/wobject/Profiler/sortabletable.js"></script>
|
||||
<table class="sort-table" id="subStatsTable" cellspacing="0">
|
||||
<thead>
|
||||
<tr>
|
||||
<td>Inclusive %</td>
|
||||
<td>Inclusive Total</td>
|
||||
<td>Inclusive Mean</td>
|
||||
<td>Calls Total</td>
|
||||
<td>Exclusive %</td>
|
||||
<td>Exclusive Total</td>
|
||||
<td>Exclusive Mean</td>
|
||||
<td>Sub Name</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>|;
|
||||
my $rawtotal = ($subTimes[-1]->{'end'} - $subTimes[0]->{'start'});
|
||||
foreach my $rout (keys %{$inclTimes}) {
|
||||
my $totExcl = sum($exclTimes->{$rout});
|
||||
my $totIncl = sum($inclTimes->{$rout});
|
||||
next if ((($totExcl+0) > 1000000) || (($totExcl+0) < -1000000)); # skip problem subs.
|
||||
$output .= sprintf("<tr><td>%.2f%%</td><td>%.5f</td><td>%.5f</td><td>%u</td><td>%.2f%%</td><td>%.5f</td><td>%.5f</td><td>%s</td></tr>",
|
||||
(100 * $totIncl / $rawtotal ), # Inclusive %
|
||||
$totIncl, # Inclusive Total
|
||||
($totIncl / (scalar(@{$inclTimes->{$rout}}))), # Inclusive Mean
|
||||
(scalar(@{$inclTimes->{$rout}})), # Calls Total
|
||||
(100 * $totExcl / $rawtotal), # Exclusive %
|
||||
$totExcl, # Exclusive Total
|
||||
($totExcl / (scalar(@{$exclTimes->{$rout}}))), # Exclusive Mean
|
||||
$rout # Sub Name
|
||||
);
|
||||
}
|
||||
$output .= q@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
|
||||
function addSTClassName(el, sClassName) {
|
||||
var s = el.className;
|
||||
var p = s.split(" ");
|
||||
var l = p.length;
|
||||
for (var i = 0; i < l; i++) {
|
||||
if (p[i] == sClassName)
|
||||
return;
|
||||
}
|
||||
p[p.length] = sClassName;
|
||||
el.className = p.join(" ").replace( /(^\s+)|(\s+$)/g, "" );
|
||||
}
|
||||
|
||||
function removeSTClassName(el, sClassName) {
|
||||
var s = el.className;
|
||||
var p = s.split(" ");
|
||||
var np = [];
|
||||
var l = p.length;
|
||||
var j = 0;
|
||||
for (var i = 0; i < l; i++) {
|
||||
if (p[i] != sClassName) {
|
||||
np[j++] = p[i]; }
|
||||
}
|
||||
el.className = np.join(" ").replace( /(^\s+)|(\s+$)/g, "" );
|
||||
}
|
||||
|
||||
function perceST(str) {
|
||||
return Number(str.replace(
|
||||
/%/,""));
|
||||
}
|
||||
|
||||
SortableTable.prototype.addSortType( "Percent", perceST );
|
||||
var stST = new SortableTable( document.getElementById("subStatsTable"),
|
||||
["Percent", "Number", "Number", "Number", "Percent", "Number", "Number", "String"] );
|
||||
|
||||
// restore the class names
|
||||
stST.onsort = function () {
|
||||
var rows = stST.tBody.rows;
|
||||
var l = rows.length;
|
||||
for (var i = 0; i < l; i++) {
|
||||
removeSTClassName(rows[i], i % 2 ? "oddST" : "evenST");
|
||||
addSTClassName(rows[i], i % 2 ? "evenST" : "oddST");
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
stST.sort( 6 , 1 ); // sort by exclusive mean, descending.
|
||||
|
||||
//]]>
|
||||
</script>@;
|
||||
|
||||
$output .= "<br>\n<br>\n<br>\n<br>\n";
|
||||
undef(@subTimes);
|
||||
return $output;
|
||||
|
|
@ -344,5 +500,12 @@ sub is_constant {
|
|||
return $is_const;
|
||||
}
|
||||
|
||||
sub sum {
|
||||
my ($sum, $elem);
|
||||
$sum = 0;
|
||||
my $arrRef = shift;
|
||||
foreach $elem (@{$arrRef}) { $sum += $elem; }
|
||||
return($sum);
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
BIN
www/extras/wobject/Profiler/downsimple.png
Normal file
BIN
www/extras/wobject/Profiler/downsimple.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 201 B |
455
www/extras/wobject/Profiler/sortabletable.js
Normal file
455
www/extras/wobject/Profiler/sortabletable.js
Normal file
|
|
@ -0,0 +1,455 @@
|
|||
|
||||
/*----------------------------------------------------------------------------\
|
||||
| Sortable Table 1.12 |
|
||||
|-----------------------------------------------------------------------------|
|
||||
| Created by Erik Arvidsson |
|
||||
| (http://webfx.eae.net/contact.html#erik) |
|
||||
| For WebFX (http://webfx.eae.net/) |
|
||||
|-----------------------------------------------------------------------------|
|
||||
| A DOM 1 based script that allows an ordinary HTML table to be sortable. |
|
||||
|-----------------------------------------------------------------------------|
|
||||
| Copyright (c) 1998 - 2004 Erik Arvidsson |
|
||||
|-----------------------------------------------------------------------------|
|
||||
| This software is provided "as is", without warranty of any kind, express or |
|
||||
| implied, including but not limited to the warranties of merchantability, |
|
||||
| fitness for a particular purpose and noninfringement. In no event shall the |
|
||||
| authors or copyright holders be liable for any claim, damages or other |
|
||||
| liability, whether in an action of contract, tort or otherwise, arising |
|
||||
| from, out of or in connection with the software or the use or other |
|
||||
| dealings in the software. |
|
||||
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
||||
| This software is available under the three different licenses mentioned |
|
||||
| below. To use this software you must chose, and qualify, for one of those. |
|
||||
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
||||
| The WebFX Non-Commercial License http://webfx.eae.net/license.html |
|
||||
| Permits anyone the right to use the software in a non-commercial context |
|
||||
| free of charge. |
|
||||
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
||||
| The WebFX Commercial license http://webfx.eae.net/commercial.html |
|
||||
| Permits the license holder the right to use the software in a commercial |
|
||||
| context. Such license must be specifically obtained, however it's valid for |
|
||||
| any number of implementations of the licensed software. |
|
||||
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
||||
| GPL - The GNU General Public License http://www.gnu.org/licenses/gpl.txt |
|
||||
| Permits anyone the right to use and modify the software without limitations |
|
||||
| as long as proper credits are given and the original and modified source |
|
||||
| code are included. Requires that the final product, software derivate from |
|
||||
| the original source or any software utilizing a GPL component, such as |
|
||||
| this, is also licensed under the GPL license. |
|
||||
|-----------------------------------------------------------------------------|
|
||||
| 2003-01-10 | First version |
|
||||
| 2003-01-19 | Minor changes to the date parsing |
|
||||
| 2003-01-28 | JScript 5.0 fixes (no support for 'in' operator) |
|
||||
| 2003-02-01 | Sloppy typo like error fixed in getInnerText |
|
||||
| 2003-07-04 | Added workaround for IE cellIndex bug. |
|
||||
| 2003-11-09 | The bDescending argument to sort was not correctly working |
|
||||
| | Using onclick DOM0 event if no support for addEventListener |
|
||||
| | or attachEvent |
|
||||
| 2004-01-13 | Adding addSortType and removeSortType which makes it a lot |
|
||||
| | easier to add new, custom sort types. |
|
||||
| 2004-01-27 | Switch to use descending = false as the default sort order. |
|
||||
| | Change defaultDescending to suit your needs. |
|
||||
| 2004-03-14 | Improved sort type None look and feel a bit |
|
||||
| 2004-08-26 | Made the handling of tBody and tHead more flexible. Now you |
|
||||
| | can use another tHead or no tHead, and you can chose some |
|
||||
| | other tBody. |
|
||||
|-----------------------------------------------------------------------------|
|
||||
| Created 2003-01-10 | All changes are in the log above. | Updated 2004-08-26 |
|
||||
\----------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
function SortableTable(oTable, oSortTypes) {
|
||||
|
||||
this.sortTypes = oSortTypes || [];
|
||||
|
||||
this.sortColumn = null;
|
||||
this.descending = null;
|
||||
|
||||
var oThis = this;
|
||||
this._headerOnclick = function (e) {
|
||||
oThis.headerOnclick(e);
|
||||
};
|
||||
|
||||
if (oTable) {
|
||||
this.setTable( oTable );
|
||||
this.document = oTable.ownerDocument || oTable.document;
|
||||
}
|
||||
else {
|
||||
this.document = document;
|
||||
}
|
||||
|
||||
|
||||
// only IE needs this
|
||||
var win = this.document.defaultView || this.document.parentWindow;
|
||||
this._onunload = function () {
|
||||
oThis.destroy();
|
||||
};
|
||||
if (win && typeof win.attachEvent != "undefined") {
|
||||
win.attachEvent("onunload", this._onunload);
|
||||
}
|
||||
}
|
||||
|
||||
SortableTable.gecko = navigator.product == "Gecko";
|
||||
SortableTable.msie = /msie/i.test(navigator.userAgent);
|
||||
// Mozilla is faster when doing the DOM manipulations on
|
||||
// an orphaned element. MSIE is not
|
||||
SortableTable.removeBeforeSort = SortableTable.gecko;
|
||||
|
||||
SortableTable.prototype.onsort = function () {};
|
||||
|
||||
// default sort order. true -> descending, false -> ascending
|
||||
SortableTable.prototype.defaultDescending = false;
|
||||
|
||||
// shared between all instances. This is intentional to allow external files
|
||||
// to modify the prototype
|
||||
SortableTable.prototype._sortTypeInfo = {};
|
||||
|
||||
SortableTable.prototype.setTable = function (oTable) {
|
||||
if ( this.tHead )
|
||||
this.uninitHeader();
|
||||
this.element = oTable;
|
||||
this.setTHead( oTable.tHead );
|
||||
this.setTBody( oTable.tBodies[0] );
|
||||
};
|
||||
|
||||
SortableTable.prototype.setTHead = function (oTHead) {
|
||||
if (this.tHead && this.tHead != oTHead )
|
||||
this.uninitHeader();
|
||||
this.tHead = oTHead;
|
||||
this.initHeader( this.sortTypes );
|
||||
};
|
||||
|
||||
SortableTable.prototype.setTBody = function (oTBody) {
|
||||
this.tBody = oTBody;
|
||||
};
|
||||
|
||||
SortableTable.prototype.setSortTypes = function ( oSortTypes ) {
|
||||
if ( this.tHead )
|
||||
this.uninitHeader();
|
||||
this.sortTypes = oSortTypes || [];
|
||||
if ( this.tHead )
|
||||
this.initHeader( this.sortTypes );
|
||||
};
|
||||
|
||||
// adds arrow containers and events
|
||||
// also binds sort type to the header cells so that reordering columns does
|
||||
// not break the sort types
|
||||
SortableTable.prototype.initHeader = function (oSortTypes) {
|
||||
if (!this.tHead) return;
|
||||
var cells = this.tHead.rows[0].cells;
|
||||
var doc = this.tHead.ownerDocument || this.tHead.document;
|
||||
this.sortTypes = oSortTypes || [];
|
||||
var l = cells.length;
|
||||
var img, c;
|
||||
for (var i = 0; i < l; i++) {
|
||||
c = cells[i];
|
||||
if (this.sortTypes[i] != null && this.sortTypes[i] != "None") {
|
||||
img = doc.createElement("IMG");
|
||||
img.src = "/extras/wobject/Profiler/blank.png";
|
||||
c.appendChild(img);
|
||||
if (this.sortTypes[i] != null)
|
||||
c._sortType = this.sortTypes[i];
|
||||
if (typeof c.addEventListener != "undefined")
|
||||
c.addEventListener("click", this._headerOnclick, false);
|
||||
else if (typeof c.attachEvent != "undefined")
|
||||
c.attachEvent("onclick", this._headerOnclick);
|
||||
else
|
||||
c.onclick = this._headerOnclick;
|
||||
}
|
||||
else
|
||||
{
|
||||
c.setAttribute( "_sortType", oSortTypes[i] );
|
||||
c._sortType = "None";
|
||||
}
|
||||
}
|
||||
this.updateHeaderArrows();
|
||||
};
|
||||
|
||||
// remove arrows and events
|
||||
SortableTable.prototype.uninitHeader = function () {
|
||||
if (!this.tHead) return;
|
||||
var cells = this.tHead.rows[0].cells;
|
||||
var l = cells.length;
|
||||
var c;
|
||||
for (var i = 0; i < l; i++) {
|
||||
c = cells[i];
|
||||
if (c._sortType != null && c._sortType != "None") {
|
||||
c.removeChild(c.lastChild);
|
||||
if (typeof c.removeEventListener != "undefined")
|
||||
c.removeEventListener("click", this._headerOnclick, false);
|
||||
else if (typeof c.detachEvent != "undefined")
|
||||
c.detachEvent("onclick", this._headerOnclick);
|
||||
c._sortType = null;
|
||||
c.removeAttribute( "_sortType" );
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
SortableTable.prototype.updateHeaderArrows = function () {
|
||||
if (!this.tHead) return;
|
||||
var cells = this.tHead.rows[0].cells;
|
||||
var l = cells.length;
|
||||
var img;
|
||||
for (var i = 0; i < l; i++) {
|
||||
if (cells[i]._sortType != null && cells[i]._sortType != "None") {
|
||||
img = cells[i].lastChild;
|
||||
if (i == this.sortColumn)
|
||||
img.className = "sort-arrow " + (this.descending ? "descending" : "ascending");
|
||||
else
|
||||
img.className = "sort-arrow";
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
SortableTable.prototype.headerOnclick = function (e) {
|
||||
// find TD element
|
||||
var el = e.target || e.srcElement;
|
||||
while (el.tagName != "TD")
|
||||
el = el.parentNode;
|
||||
|
||||
this.sort(SortableTable.msie ? SortableTable.getCellIndex(el) : el.cellIndex);
|
||||
};
|
||||
|
||||
// IE returns wrong cellIndex when columns are hidden
|
||||
SortableTable.getCellIndex = function (oTd) {
|
||||
var cells = oTd.parentNode.childNodes
|
||||
var l = cells.length;
|
||||
var i;
|
||||
for (i = 0; cells[i] != oTd && i < l; i++)
|
||||
;
|
||||
return i;
|
||||
};
|
||||
|
||||
SortableTable.prototype.getSortType = function (nColumn) {
|
||||
return this.sortTypes[nColumn] || "String";
|
||||
};
|
||||
|
||||
// only nColumn is required
|
||||
// if bDescending is left out the old value is taken into account
|
||||
// if sSortType is left out the sort type is found from the sortTypes array
|
||||
|
||||
SortableTable.prototype.sort = function (nColumn, bDescending, sSortType) {
|
||||
if (!this.tBody) return;
|
||||
if (sSortType == null)
|
||||
sSortType = this.getSortType(nColumn);
|
||||
|
||||
// exit if None
|
||||
if (sSortType == "None")
|
||||
return;
|
||||
|
||||
if (bDescending == null) {
|
||||
if (this.sortColumn != nColumn)
|
||||
this.descending = this.defaultDescending;
|
||||
else
|
||||
this.descending = !this.descending;
|
||||
}
|
||||
else
|
||||
this.descending = bDescending;
|
||||
|
||||
this.sortColumn = nColumn;
|
||||
|
||||
if (typeof this.onbeforesort == "function")
|
||||
this.onbeforesort();
|
||||
|
||||
var f = this.getSortFunction(sSortType, nColumn);
|
||||
var a = this.getCache(sSortType, nColumn);
|
||||
var tBody = this.tBody;
|
||||
|
||||
a.sort(f);
|
||||
|
||||
if (this.descending)
|
||||
a.reverse();
|
||||
|
||||
if (SortableTable.removeBeforeSort) {
|
||||
// remove from doc
|
||||
var nextSibling = tBody.nextSibling;
|
||||
var p = tBody.parentNode;
|
||||
p.removeChild(tBody);
|
||||
}
|
||||
|
||||
// insert in the new order
|
||||
var l = a.length;
|
||||
for (var i = 0; i < l; i++)
|
||||
tBody.appendChild(a[i].element);
|
||||
|
||||
if (SortableTable.removeBeforeSort) {
|
||||
// insert into doc
|
||||
p.insertBefore(tBody, nextSibling);
|
||||
}
|
||||
|
||||
this.updateHeaderArrows();
|
||||
|
||||
this.destroyCache(a);
|
||||
|
||||
if (typeof this.onsort == "function")
|
||||
this.onsort();
|
||||
};
|
||||
|
||||
SortableTable.prototype.asyncSort = function (nColumn, bDescending, sSortType) {
|
||||
var oThis = this;
|
||||
this._asyncsort = function () {
|
||||
oThis.sort(nColumn, bDescending, sSortType);
|
||||
};
|
||||
window.setTimeout(this._asyncsort, 1);
|
||||
};
|
||||
|
||||
SortableTable.prototype.getCache = function (sType, nColumn) {
|
||||
if (!this.tBody) return [];
|
||||
var rows = this.tBody.rows;
|
||||
var l = rows.length;
|
||||
var a = new Array(l);
|
||||
var r;
|
||||
for (var i = 0; i < l; i++) {
|
||||
r = rows[i];
|
||||
a[i] = {
|
||||
value: this.getRowValue(r, sType, nColumn),
|
||||
element: r
|
||||
};
|
||||
};
|
||||
return a;
|
||||
};
|
||||
|
||||
SortableTable.prototype.destroyCache = function (oArray) {
|
||||
var l = oArray.length;
|
||||
for (var i = 0; i < l; i++) {
|
||||
oArray[i].value = null;
|
||||
oArray[i].element = null;
|
||||
oArray[i] = null;
|
||||
}
|
||||
};
|
||||
|
||||
SortableTable.prototype.getRowValue = function (oRow, sType, nColumn) {
|
||||
// if we have defined a custom getRowValue use that
|
||||
if (this._sortTypeInfo[sType] && this._sortTypeInfo[sType].getRowValue)
|
||||
return this._sortTypeInfo[sType].getRowValue(oRow, nColumn);
|
||||
|
||||
var s;
|
||||
var c = oRow.cells[nColumn];
|
||||
if (typeof c.innerText != "undefined")
|
||||
s = c.innerText;
|
||||
else
|
||||
s = SortableTable.getInnerText(c);
|
||||
return this.getValueFromString(s, sType);
|
||||
};
|
||||
|
||||
SortableTable.getInnerText = function (oNode) {
|
||||
var s = "";
|
||||
var cs = oNode.childNodes;
|
||||
var l = cs.length;
|
||||
for (var i = 0; i < l; i++) {
|
||||
switch (cs[i].nodeType) {
|
||||
case 1: //ELEMENT_NODE
|
||||
s += SortableTable.getInnerText(cs[i]);
|
||||
break;
|
||||
case 3: //TEXT_NODE
|
||||
s += cs[i].nodeValue;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return s;
|
||||
};
|
||||
|
||||
SortableTable.prototype.getValueFromString = function (sText, sType) {
|
||||
if (this._sortTypeInfo[sType])
|
||||
return this._sortTypeInfo[sType].getValueFromString( sText );
|
||||
return sText;
|
||||
/*
|
||||
switch (sType) {
|
||||
case "Number":
|
||||
return Number(sText);
|
||||
case "CaseInsensitiveString":
|
||||
return sText.toUpperCase();
|
||||
case "Date":
|
||||
var parts = sText.split("-");
|
||||
var d = new Date(0);
|
||||
d.setFullYear(parts[0]);
|
||||
d.setDate(parts[2]);
|
||||
d.setMonth(parts[1] - 1);
|
||||
return d.valueOf();
|
||||
}
|
||||
return sText;
|
||||
*/
|
||||
};
|
||||
|
||||
SortableTable.prototype.getSortFunction = function (sType, nColumn) {
|
||||
if (this._sortTypeInfo[sType])
|
||||
return this._sortTypeInfo[sType].compare;
|
||||
return SortableTable.basicCompare;
|
||||
};
|
||||
|
||||
SortableTable.prototype.destroy = function () {
|
||||
this.uninitHeader();
|
||||
var win = this.document.parentWindow;
|
||||
if (win && typeof win.detachEvent != "undefined") { // only IE needs this
|
||||
win.detachEvent("onunload", this._onunload);
|
||||
}
|
||||
this._onunload = null;
|
||||
this.element = null;
|
||||
this.tHead = null;
|
||||
this.tBody = null;
|
||||
this.document = null;
|
||||
this._headerOnclick = null;
|
||||
this.sortTypes = null;
|
||||
this._asyncsort = null;
|
||||
this.onsort = null;
|
||||
};
|
||||
|
||||
// Adds a sort type to all instance of SortableTable
|
||||
// sType : String - the identifier of the sort type
|
||||
// fGetValueFromString : function ( s : string ) : T - A function that takes a
|
||||
// string and casts it to a desired format. If left out the string is just
|
||||
// returned
|
||||
// fCompareFunction : function ( n1 : T, n2 : T ) : Number - A normal JS sort
|
||||
// compare function. Takes two values and compares them. If left out less than,
|
||||
// <, compare is used
|
||||
// fGetRowValue : function( oRow : HTMLTRElement, nColumn : int ) : T - A function
|
||||
// that takes the row and the column index and returns the value used to compare.
|
||||
// If left out then the innerText is first taken for the cell and then the
|
||||
// fGetValueFromString is used to convert that string the desired value and type
|
||||
|
||||
SortableTable.prototype.addSortType = function (sType, fGetValueFromString, fCompareFunction, fGetRowValue) {
|
||||
this._sortTypeInfo[sType] = {
|
||||
type: sType,
|
||||
getValueFromString: fGetValueFromString || SortableTable.idFunction,
|
||||
compare: fCompareFunction || SortableTable.basicCompare,
|
||||
getRowValue: fGetRowValue
|
||||
};
|
||||
};
|
||||
|
||||
// this removes the sort type from all instances of SortableTable
|
||||
SortableTable.prototype.removeSortType = function (sType) {
|
||||
delete this._sortTypeInfo[sType];
|
||||
};
|
||||
|
||||
SortableTable.basicCompare = function compare(n1, n2) {
|
||||
if (n1.value < n2.value)
|
||||
return -1;
|
||||
if (n2.value < n1.value)
|
||||
return 1;
|
||||
return 0;
|
||||
};
|
||||
|
||||
SortableTable.idFunction = function (x) {
|
||||
return x;
|
||||
};
|
||||
|
||||
SortableTable.toUpperCase = function (s) {
|
||||
return s.toUpperCase();
|
||||
};
|
||||
|
||||
SortableTable.toDate = function (s) {
|
||||
var parts = s.split("-");
|
||||
var d = new Date(0);
|
||||
d.setFullYear(parts[0]);
|
||||
d.setDate(parts[2]);
|
||||
d.setMonth(parts[1] - 1);
|
||||
return d.valueOf();
|
||||
};
|
||||
|
||||
|
||||
// add sort types
|
||||
SortableTable.prototype.addSortType("Number", Number);
|
||||
SortableTable.prototype.addSortType("CaseInsensitiveString", SortableTable.toUpperCase);
|
||||
SortableTable.prototype.addSortType("Date", SortableTable.toDate);
|
||||
SortableTable.prototype.addSortType("String");
|
||||
// None is a special case
|
||||
BIN
www/extras/wobject/Profiler/upsimple.png
Normal file
BIN
www/extras/wobject/Profiler/upsimple.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 201 B |
Loading…
Add table
Add a link
Reference in a new issue