CLOUDSTACK-2976: At zone level setting same parameter page is getting displayed repeatedly when you scroll down
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2fb18db7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2fb18db7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2fb18db7 Branch: refs/heads/vmsync Commit: 2fb18db7b1484fbc7cedf616b2970fe596586db8 Parents: 2f345c5 Author: Isaac Chiang <isaacchi...@gmail.com> Authored: Sun Jun 16 23:04:33 2013 +0800 Committer: Isaac Chiang <isaacchi...@gmail.com> Committed: Sun Jun 16 23:04:33 2013 +0800 ---------------------------------------------------------------------- ui/scripts/ui/widgets/listView.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2fb18db7/ui/scripts/ui/widgets/listView.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index ba4d288..8dbc2f6 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -1327,6 +1327,12 @@ }); $table.dataTable(null, { noSelect: uiCustom }); + if(args.data && + args.data.length < pageSize && + options.setEndTable) { + options.setEndTable(); + } + setTimeout(function() { $table.dataTable('refresh'); }); @@ -1467,6 +1473,12 @@ var page = 1; var actions = listViewData.actions; var reorder = listViewData.reorder; + var tableHeight = $table.height(); + var endTable = false; + var setEndTable = function() { + endTable = true; + } + var $switcher; if (args.sections) { @@ -1572,7 +1584,8 @@ { context: args.context, reorder: reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable } ); @@ -1625,7 +1638,8 @@ { context: $listView.data('view-args').context, reorder: listViewData.reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable } ); }; @@ -1675,7 +1689,8 @@ { context: $listView.data('view-args').context, reorder: listViewData.reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable } ); }; @@ -1728,8 +1743,6 @@ return false; }); - var tableHeight = $table.height(); - var endTable = false; // Infinite scrolling event $listView.bind('scroll', function(event) { @@ -1767,7 +1780,8 @@ filterBy: filterBy }, actions, { reorder: listViewData.reorder, - detailView: listViewData.detailView + detailView: listViewData.detailView, + setEndTable: setEndTable }); $table.height() == tableHeight ? endTable = true : tableHeight = $table.height(); }