Skip to content

Commit

Permalink
Merge branch 'list_height_v2' into 'master'
Browse files Browse the repository at this point in the history
List height v3

See merge request mistio/mist-list!13
  • Loading branch information
d-mo committed Nov 15, 2017
2 parents 3a1b419 + 06eecb8 commit 227bf80
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mist-list",
"version": "1.1.10",
"version": "1.1.11",
"authors": [
"Dimitris Moraitis <[email protected]>",
"Christina Papakonstantinou <[email protected]>"
Expand Down
5 changes: 3 additions & 2 deletions mist-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -647,10 +647,10 @@ <h2 hidden$=[[editingFilter]] style="margin-left: 22px; width: 100%" on-tap="_st
this.debounce('windowResize', function() {
var top = this.getBoundingClientRect().top;
var newHeight;
if (this.querySelector('[slot="header"]'))
if (this.querySelector('h2[slot="header"]'))
newHeight = Math.min(window.innerHeight - top - 96, this.$.grid.$.items.clientHeight + 60);
else
newHeight = Math.min(window.innerHeight - top - 74, this.$.grid.$.items.clientHeight + 60);
newHeight = Math.min(window.innerHeight - top - 40, this.$.grid.$.items.clientHeight + 60);
//if (this.columnMenu)
// newHeight += 64;
this.style.height = newHeight + "px";
Expand All @@ -660,6 +660,7 @@ <h2 hidden$=[[editingFilter]] style="margin-left: 22px; width: 100%" on-tap="_st
_filterItems: function(items, length, filter) {
console.log('filterItems', filter);
this.set('filteredItems', this.items.filter(this.applyFilter.bind(this)));
this.fire('mist-list-filtered-items-length-changed', {length:this.filteredItems.length});
this.$.grid.set('items', this.filteredItems);

if (this.selectedItems.length) {
Expand Down

0 comments on commit 227bf80

Please sign in to comment.