Fixed BLUR-408, always prevent default
Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1a27eebd Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1a27eebd Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1a27eebd Branch: refs/heads/master Commit: 1a27eebd825dad1296a00a1f0ad5b2e2343cea38 Parents: 26099b1 Author: Andrew Avenoso <[email protected]> Authored: Thu Mar 5 14:41:47 2015 -0500 Committer: Andrew Avenoso <[email protected]> Committed: Thu Mar 5 14:41:47 2015 -0500 ---------------------------------------------------------------------- .../src/main/webapp/js/blurconsole.model.js | 15 +++++------ .../src/main/webapp/js/blurconsole.queries.js | 1 + blur-console/src/main/webapp/public/index.html | 2 +- ...rconsole.192655f13c0102b988a33cd4ee77ad62.js | 28 -------------------- ...rconsole.1fba25fb7797cd657a20228a4f8fbbff.js | 28 ++++++++++++++++++++ ...rconsole.87e5fd52350b7072bfd01119e265b6ec.js | 28 ++++++++++++++++++++ .../src/main/webapp/public/js/blurconsole.js | 6 ++--- ...sole.js.a04bf6d81a7ec36b19922c0a0507a996.map | 1 + ...sole.js.d573e28d39f5ab7738c08ed6fd66a45d.map | 1 - .../main/webapp/public/js/blurconsole.js.map | 2 +- 10 files changed, 70 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1a27eebd/blur-console/src/main/webapp/js/blurconsole.model.js ---------------------------------------------------------------------- diff --git a/blur-console/src/main/webapp/js/blurconsole.model.js b/blur-console/src/main/webapp/js/blurconsole.model.js index c42511c..29a7a3c 100644 --- a/blur-console/src/main/webapp/js/blurconsole.model.js +++ b/blur-console/src/main/webapp/js/blurconsole.model.js @@ -366,16 +366,16 @@ blurconsole.model = (function() { //-------------- Public API ----------------------- function queriesForTable(table, sort, filter) { var queries = [], qSort, sortField, sortDir; - qSort = (sort || 'startTime~desc').split('~'); sortField = qSort[0]; sortDir = qSort.length > 1 ? qSort[1] : 'asc'; - - $.each(stateMap.queries.queries, function(i, query){ - if (query.table === table && _matchesFilter(query, filter)) { - queries.push(query); - } - }); + if(stateMap.queries.queries) { + $.each(stateMap.queries.queries, function(i, query){ + if (query.table === table && _matchesFilter(query, filter)) { + queries.push(query); + } + }); + } queries.sort(function(a, b){ if (sortDir === 'asc') { @@ -384,7 +384,6 @@ blurconsole.model = (function() { return b[sortField] > a[sortField]; } }); - return queries; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1a27eebd/blur-console/src/main/webapp/js/blurconsole.queries.js ---------------------------------------------------------------------- diff --git a/blur-console/src/main/webapp/js/blurconsole.queries.js b/blur-console/src/main/webapp/js/blurconsole.queries.js index 60daf4e..d4d5c3f 100644 --- a/blur-console/src/main/webapp/js/blurconsole.queries.js +++ b/blur-console/src/main/webapp/js/blurconsole.queries.js @@ -93,6 +93,7 @@ blurconsole.queries = (function() { //----------------------------- Event Handlers and DOM Methods ----------------------------- function _showQueriesForTable(evt) { + evt.preventDefault(); stateMap.currentTable = $(evt.currentTarget).attr('href'); $('.list-group-item', jqueryMap.$tableHolder).removeClass('active'); $('.list-group-item[href="' + stateMap.currentTable + '"]', jqueryMap.$tableHolder).addClass('active'); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1a27eebd/blur-console/src/main/webapp/public/index.html ---------------------------------------------------------------------- diff --git a/blur-console/src/main/webapp/public/index.html b/blur-console/src/main/webapp/public/index.html index 125b010..3c83690 100644 --- a/blur-console/src/main/webapp/public/index.html +++ b/blur-console/src/main/webapp/public/index.html @@ -64,7 +64,7 @@ under the License. </ul> </nav> <div id="blurconsole"></div> - <script src="js/blurconsole.192655f13c0102b988a33cd4ee77ad62.js"></script> + <script src="js/blurconsole.1fba25fb7797cd657a20228a4f8fbbff.js"></script> <script src="service/config.js"></script> <script type="text/javascript"> $(function () { blurconsole.initModule( $('#blurconsole') ); });
