Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-30 06:18:02 +02:00
Code Issues Projects Releases Wiki Activity

updates for paginator and pagination in logs.

Browse Source
This commit is contained in:
kunw 2016-08-06 15:11:20 +08:00
parent f44e6f5991
commit d4035e0ec3
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/resources/js/components/log/list-log.directive.html
View File

@ -47,8 +47,8 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<paginator class="pull-right" total-count="//vm.totalCount//" page-size="1" page="vm.page" display-count="3" retrieve="vm.search({op: vm.op, username: vm.username})"></paginator>
</div> </div>
<paginator class="pull-right" total-count="//vm.totalCount//" page-size="//vm.pageSize//" page="vm.page" display-count="3"></paginator>
</div> </div>
</div> </div>
</div> </div>

2
static/resources/js/components/log/list-log.directive.js
View File

@ -53,7 +53,7 @@
}; };
vm.page = 1; vm.page = 1;
vm.pageSize = 1; vm.pageSize = 2;
$scope.$watch('vm.totalCount', function(current) { $scope.$watch('vm.totalCount', function(current) {
if(current) { if(current) {

33
static/resources/js/components/paginator/paginator.directive.js
View File

@ -22,8 +22,7 @@
'totalCount': '@', 'totalCount': '@',
'pageSize': '@', 'pageSize': '@',
'page': '=', 'page': '=',
'displayCount': '@', 'displayCount': '@'
'retrieve': '&'
}, },
'link': link, 'link': link,
'controller': PaginatorController, 'controller': PaginatorController,
@ -57,6 +56,7 @@
++this.time; ++this.time;
++ctrl.page; ++ctrl.page;
} }
scope.$apply();
} }
TimeCounter.prototype.canIncrement = function() { TimeCounter.prototype.canIncrement = function() {
@ -71,6 +71,7 @@
--this.time; --this.time;
--ctrl.page; --ctrl.page;
} }
scope.$apply();
} }
TimeCounter.prototype.canDecrement = function() { TimeCounter.prototype.canDecrement = function() {
@ -94,10 +95,7 @@
} }
element.find('ul li:first a').on('click', previous); element.find('ul li:first a').on('click', previous);
ctrl.showPrevious = false;
element.find('ul li:last a').on('click', next); element.find('ul li:last a').on('click', next);
ctrl.showNext = (buttonCount > displayCount);
var drawButtons = function(time) { var drawButtons = function(time) {
element.find('li[tag="pagination-button"]').remove(); element.find('li[tag="pagination-button"]').remove();
@ -114,12 +112,12 @@
} }
drawButtons(tc.getTime()); drawButtons(tc.getTime());
togglePrevious(false);
toggleNext((buttonCount > displayCount)); togglePrevious(tc.canDecrement());
toggleNext(tc.canIncrement());
togglePageButton(); togglePageButton();
function togglePrevious(status) { function togglePrevious(status) {
if(status){ if(status){
element.find('ul li:first').removeClass('disabled'); element.find('ul li:first').removeClass('disabled');
@ -139,19 +137,9 @@
function buttonClickHandler(e) { function buttonClickHandler(e) {
ctrl.page = $(e.target).attr('page'); ctrl.page = $(e.target).attr('page');
togglePageButton(); togglePageButton();
ctrl.retrieve(); togglePrevious(tc.canDecrement());
toggleNext(tc.canIncrement());
if(tc.canIncrement()) { scope.$apply();
toggleNext(true);
}else {
toggleNext(false);
}
if(tc.canDecrement()) {
togglePrevious(true);
}else{
togglePrevious(false);
}
} }
function togglePageButton() { function togglePageButton() {
@ -165,6 +153,7 @@
drawButtons(tc.getTime()); drawButtons(tc.getTime());
element.find('li[tag="pagination-button"] a[page="' + ctrl.page + '"]').trigger('click'); element.find('li[tag="pagination-button"] a[page="' + ctrl.page + '"]').trigger('click');
} }
scope.$apply();
} }
function next() { function next() {
@ -172,8 +161,8 @@
tc.increment(); tc.increment();
drawButtons(tc.getTime()); drawButtons(tc.getTime());
element.find('li[tag="pagination-button"] a[page="' + ctrl.page + '"]').trigger('click'); element.find('li[tag="pagination-button"] a[page="' + ctrl.page + '"]').trigger('click');
} }
scope.$apply();
} }
} }
}); });