From 220ae9f2d29a3d727cc676a27ba9c2bc3af8c733 Mon Sep 17 00:00:00 2001 From: ozhozh Date: Sun, 27 Sep 2009 12:20:17 +0000 Subject: [PATCH] Fix sort order on admin index when some filtering is set. Fixes issue 99. git-svn-id: http://yourls.googlecode.com/svn/trunk@204 12232710-3e20-11de-b438-597f59cd7555 --- js/insert.js | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/js/insert.js b/js/insert.js index f6966a9..e11525c 100644 --- a/js/insert.js +++ b/js/insert.js @@ -4,12 +4,23 @@ $(document).ready(function(){ reset_url(); $('#new_url_form').attr('action', 'javascript:add();'); if ($("#tblUrl").tablesorter && $("#tblUrl tr.nourl_found").length != 1) { + var order = {'id':0, 'url':1, 'timestamp':2, 'ip':3, 'clicks':4}; + var order_by = {'asc':0, 'desc':1}; + var s_by = order[query_string('s_by')]; + var s_order = order_by[query_string('s_order')]; + if( !s_by) { + s_by = 2; + s_order = 1; + } + $("#tblUrl").tablesorter({ - sortList:[[2,1]], // Sort on column #3 (numbering starts at 0) + sortList:[[ s_by, s_order ]], // Sort on column #3 (numbering starts at 0) headers: { 5: {sorter: false} }, // no sorter on column #6 widgets: ['zebra'] // prettify }); } + + }); // Create new link and add to table @@ -169,4 +180,16 @@ function increment() { $('.increment').each(function(){ $(this).html( parseInt($(this).html()) + 1); }); +} + +// Get +function query_string( key ) { + default_=""; + key = key.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]"); + var regex = new RegExp("[\\?&]"+key+"=([^&#]*)"); + var qs = regex.exec(window.location.href); + if(qs == null) + return default_; + else + return qs[1]; } \ No newline at end of file -- 2.45.0