@girder/core 3.1.14 → 3.1.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/views/widgets/HierarchyWidget.js +5 -2
  3. package/views/widgets/ItemListWidget.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@girder/core",
3
- "version": "3.1.14",
3
+ "version": "3.1.15",
4
4
  "description": "Extensible data management platform",
5
5
  "homepage": "https://girder.readthedocs.org",
6
6
  "bugs": {
package/views/widgets/HierarchyWidget.js CHANGED
@@ -281,14 +281,17 @@ var HierarchyWidget = View.extend({
281
281
  this.itemCount = this.itemListView.collection.length;
282
282
  this._childCountCheck();
283
283
  if (this._paginated && this.hierarchyPaginated && this.itemListView.getNumPages() > 1) {
284
- this.render();
284
+ if (this.parentModel.resourceName !== 'collection') {
285
+ this.hierarchyPaginated.setElement(this.$('.g-hierarachy-paginated-bar')).render();
286
+ }
285
287
  this.$('.g-hierarchy-breadcrumb-bar').addClass('g-hierarchy-sticky');
286
288
  this.$('.g-hierarachy-paginated-bar').addClass('g-hierarchy-sticky');
287
289
  this.$('.g-hierarchy-breadcrumb-bar').css({ top: 0 });
288
290
  this.$('.g-hierarachy-paginated-bar').css({ bottom: 0 });
291
+ this.$('.g-hierarachy-paginated-bar').removeClass('hidden');
289
292
  } else {
290
293
  // We remove the bar if the current folder doesn't have more than one page, keep the sticky breadcrumb though
291
- this.$('.g-hierarachy-paginated-bar').remove();
294
+ this.$('.g-hierarachy-paginated-bar').addClass('hidden');
292
295
  }
293
296
  });
294
297
  // Only emitted when there is more than one page of data
package/views/widgets/ItemListWidget.js CHANGED
@@ -77,7 +77,7 @@ var ItemListWidget = View.extend({
77
77
 
78
78
  this.collection.fetch({ folderId: settings.folderId }).done(() => {
79
79
  this._totalPages = Math.ceil(this.collection.getTotalCount() / this.collection.pageLimit);
80
- if (this._paginated && this.collection.hasNextPage) {
80
+ if (this._paginated && this.collection.hasNextPage()) {
81
81
  // Tells the parent container that the item is paginated so it can render the page selector
82
82
  this.trigger('g:paginated');
83
83
  // We need to get the position in the list for the selected item