openstack/horizon
Code Issues Proposed changes

Merge "Floating IP table should support sorting"

Browse Source
This commit is contained in:
Jenkins 2015-03-09 04:55:34 +00:00 committed by Gerrit Code Review
commit 699e423010
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
horizon/static/horizon/js/horizon.tables.js
View File

@ -307,6 +307,10 @@ $.tablesorter.addParser({
// innertext smashed together with no delimiters, so we need to find // innertext smashed together with no delimiters, so we need to find
// the original cell and grab its first element to do the work // the original cell and grab its first element to do the work
var a = $(cell).find('li').first().text().split('.'); var a = $(cell).find('li').first().text().split('.');
// if the cell doesn't contains the list, try to get the text directly
if (a === "") {
a = $(cell).text().split('.');
}
if (a.length !== 4) { if (a.length !== 4) {
return false; return false;
} }
@ -323,6 +327,10 @@ $.tablesorter.addParser({
format: function(s, table, cell) { format: function(s, table, cell) {
var result = 0; var result = 0;
var a = $(cell).find('li').first().text().split('.'); var a = $(cell).find('li').first().text().split('.');
// if the cell doesn't contains the list, try to get the text directly
if (a === "") {
a = $(cell).text().split('.');
}
var last_index = a.length - 1; var last_index = a.length - 1;
// inet_aton(3), Javascript-style. The unsigned-right-shift operation is // inet_aton(3), Javascript-style. The unsigned-right-shift operation is
// needed to keep the result from flipping over to negative when suitably // needed to keep the result from flipping over to negative when suitably