Skip to content

Commit

Permalink
Merge pull request #208 from AnweshCR7/Final-Issue-178
Browse files Browse the repository at this point in the history
Fixed Filter not showing issue
  • Loading branch information
jamalge authored Aug 29, 2018
2 parents 4f975f2 + 46a50fc commit bc247d3
Show file tree
Hide file tree
Showing 4 changed files with 581 additions and 439 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: required
dist: trusty
language: node_js
node_js:
- stable
- 9
branches:
except:
- gh-pages
Expand Down
2 changes: 1 addition & 1 deletion aha-table.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</template>

<!-- filter entry -->
<template is="dom-if" if="{{_isFilterableColumn(column, filterable)}}">
<template is="dom-if" if="{{_isFilterableColumn(column, filterable, column.hide)}}">
<input role="textbox" aria-label="Enter text to filter column" placeholder="{{localize('Filter')}}" class="text-input text-input--filter" type="text" on-input="_filter" />
</template>
</span>
Expand Down
7 changes: 4 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"iron-a11y-keys-behavior": "^2.0.0",
"px-icon-set": "^2.0.0",
"px-validation": "^1.0.0",
"px-dropdown": "^4.0.0",
"px-dropdown": "4.3.4",
"app-localize-behavior": "^2.0.0"
},
"devDependencies": {
Expand All @@ -44,7 +44,8 @@
},
"resolutions": {
"webcomponentsjs": "^0.7.24",
"promise-polyfill": "^1.0.0"
"promise-polyfill": "^1.0.0",
"px-overlay": "^1.1.1"
},
"license": "Apache-2.0"
}
}
Loading

4 comments on commit bc247d3

@AnweshCR7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@evanjd Thanks for your help Evan. I'll be careful for the upcoming PRs. Also, I would like to know if I need to push the changes you made, to pass the CI test?

@evanjd
Copy link
Contributor

@evanjd evanjd commented on bc247d3 Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnweshCR7 I pushed them to your branch already, that's how CI passed in the first place.

Also, no problem. 👍

@AnweshCR7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@evanjd Yeah.. I need to make a new PR, for another fix. Which is why I was asking if I would be required to make those changes Locally before pushing it.

@evanjd
Copy link
Contributor

@evanjd evanjd commented on bc247d3 Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AnweshCR7 Ah. In that case, create a new branch from master and pull from upstream to get the latest changes.

https://help.github.com/articles/configuring-a-remote-for-a-fork/
then
https://help.github.com/articles/syncing-a-fork/

Please sign in to comment.