From: Mike Taylor Date: Wed, 26 Mar 2014 11:43:10 +0000 (+0000) Subject: Reorder functions. X-Git-Tag: 1.0.0~1197 X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=26f6bf0de4de592cf4147d86b3c1080d6ece9cee;p=mkws-moved-to-github.git Reorder functions. --- diff --git a/src/mkws-team.js b/src/mkws-team.js index c529c1e..98d586e 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -166,22 +166,6 @@ function team($, teamName) { } - function newSearch(query, sortOrder, targets) - { - log("newSearch: " + query); - - if (mkws_config.use_service_proxy && !mkws.authenticated) { - alert("searching before authentication"); - return; - } - - m_filters = [] - triggerSearch(query, sortOrder, targets); - switchView('records'); // In case it's configured to start off as hidden - m_submitted = true; - } - - // limit by target functions that.limitTarget = function (id, name) { @@ -244,6 +228,32 @@ function team($, teamName) { } + that.showPage = function (pageNum) + { + m_currentPage = pageNum; + m_paz.showPage(m_currentPage - 1); + } + + + that.pagerNext = function () { + if (m_totalRecordCount - m_perpage*m_currentPage > 0) { + m_paz.showNext(); + m_currentPage++; + } + } + + + that.pagerPrev = function () { + if (m_paz.showPrev() != false) + m_currentPage--; + } + + + that.reShow = function() { + m_paz.show(0, m_perpage, m_sortOrder); + } + + function resetPage() { m_currentPage = 1; @@ -252,6 +262,22 @@ function team($, teamName) { that.resetPage = resetPage; + function newSearch(query, sortOrder, targets) + { + log("newSearch: " + query); + + if (mkws_config.use_service_proxy && !mkws.authenticated) { + alert("searching before authentication"); + return; + } + + m_filters = [] + triggerSearch(query, sortOrder, targets); + switchView('records'); // In case it's configured to start off as hidden + m_submitted = true; + } + + function triggerSearch (query, sortOrder, targets) { resetPage(); @@ -302,32 +328,6 @@ function team($, teamName) { } - that.reShow = function() { - m_paz.show(0, m_perpage, m_sortOrder); - } - - - that.showPage = function (pageNum) - { - m_currentPage = pageNum; - m_paz.showPage(m_currentPage - 1); - } - - - that.pagerNext = function () { - if (m_totalRecordCount - m_perpage*m_currentPage > 0) { - m_paz.showNext(); - m_currentPage++; - } - } - - - that.pagerPrev = function () { - if (m_paz.showPrev() != false) - m_currentPage--; - } - - // switching view between targets and records function switchView(view) { var targets = findnode('.mkwsTargets');