imported pager fix (a6ee26e5) · Commits · github_fork / Clip

src/fnordmetric/webui/fnordmetric-metric-preview.html

+2 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		display: block;
		}


		.group.group_by fn-button[data-active='active'] {
		background: rgb(226, 232, 237);
		}
		@@ -180,7 +179,7 @@
		</div>
		<div class='group date'>
		<b>End Time</b>
		<fn-datepicker data-time-select data-selectable="past">
		<fn-datepicker data-size="small" data-time-select data-selectable="past">
		</fn-datepicker>
		</div>
		</fnordmetric-controls-section>
		@@ -211,7 +210,7 @@
		</div>
		<div class="result_pane" id="table">
		<fn-table data-per-page='25' data-page='0' style="width:100%;"></fn-table>
		<fn-pager class='table' data-first-item='1' data-per-page='25' data-current-page='0' data-for data-circling></fn-pager>
		<fn-pager class='table' data-first-item='1' data-per-page='25' data-for data-circling></fn-pager>
		</div>
		</fn-loader>
		</fn-loader>

src/libfnord/fnord-webcomponents/components/fn-pager.html

+10 −10

Original line number	Diff line number	Diff line
		@@ -90,11 +90,11 @@

		this.forElement = function(elem) {
		var page = elem.getAttribute('data-page');
		page = (page == null)? 1 : parseInt(page, 10);
		page = (page == null)? 0 : parseInt(page, 10);
		this.current_page = page;

		var end = elem.getNumberOfItems();
		end = (end == null)? 1 : parseInt(end, 10);
		end = (end == null)? 0 : parseInt(end, 10);
		this.end = end;

		var per_page = elem.getAttribute('data-per-page');
		@@ -109,11 +109,11 @@

		this.init = function() {
		var page = this.getAttribute('data-current-page');
		page = (page == null)? 1 : parseInt(page, 10);
		page = (page == null)? 0 : parseInt(page, 10);
		this.current_page = page;

		var end = this.getAttribute('data-last-item');
		end = (end == null)? 1 : parseInt(end, 10);
		end = (end == null)? 0 : parseInt(end, 10);
		this.end = end;

		var per_page = this.getAttribute('data-per-page');
		@@ -126,7 +126,7 @@
		var per_page = this.per_page;
		var end = this.end;

		var start = (current_page - 1) * per_page + 1;
		var start = (current_page) * per_page + 1;
		var current_end = start + per_page - 1;

		if (current_end > end) {
		@@ -142,27 +142,27 @@
		var forward_tooltip = this.shadowRoot.querySelector(".forward");
		var base = this;

		var pages = Math.ceil(this.end / this.per_page);
		var pages = Math.ceil((this.end - 1) / this.per_page);

		backward_tooltip.onclick = function() {
		var current_page = base.current_page;
		if (current_page > 0 \|\| base.hasAttribute('data-circling')) {
		var new_page = ((current_page + pages) % pages);
		var new_page = ((current_page + pages) % (pages + 1));
		cb(new_page, caller);
		base.current_page = new_page + 1;
		base.current_page = new_page;
		base.renderTitle();
		}
		};

		forward_tooltip.onclick = function() {
		var current_page = base.current_page;
		if (current_page < pages) {
		if (current_page < pages -1) {
		base.current_page = current_page + 1;
		base.renderTitle();
		cb(current_page, caller);
		} else {
		if (base.hasAttribute('data-circling')) {
		base.current_page = 1;
		base.current_page = 0;
		base.renderTitle();
		cb(0, caller);
		}

Admin message