Skip to content

Commit

Permalink
Refactor hierarchical menus: support pointer 'aim' for extra user aff…
Browse files Browse the repository at this point in the history
…ordance.
  • Loading branch information
nedbaldessin committed Nov 28, 2018
1 parent 7fd0790 commit ff8bf3d
Show file tree
Hide file tree
Showing 7 changed files with 206 additions and 166 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": ["transform-decorators-legacy"]
}
99 changes: 35 additions & 64 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,19 @@
"webpack-bundle-analyzer": "^3.0.3"
},
"dependencies": {
"babel-plugin-transform-decorators-legacy": "^1.3.5",
"breakpoint-sass": "^2.7.1",
"bricks.js": "^1.8.0",
"deepmerge": "^2.1.1",
"normalize.css": "^8.0.0",
"prop-types": "^15.6.2",
"qs": "^6.5.2",
"react": "^16.6.0",
"react-aim": "^0.2.3",
"react-breakpoints": "^3.0.0",
"react-compound-slider": "^0.16.2",
"react-copy-to-clipboard": "^5.0.1",
"react-dom": "^16.6.0",
"react-hover-observer": "^2.1.1",
"react-infinite-scroller": "^1.2.0",
"react-loading-image": "^0.5.0",
"react-nl2br": "^0.4.0",
Expand Down
8 changes: 3 additions & 5 deletions resources/assets/js/Collection/Collection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ class Collection extends Component {
);
}

handleFilterChange(filterObj) {
this.setState({ filterObj: filterObj, currentPage: 1 });
}

handleLoading() {
this.setState({ isLoading: true });
}
Expand Down Expand Up @@ -314,7 +310,9 @@ class Collection extends Component {
hits: this.searches[searchUrl].data.hits,
hasMore: this.searches[searchUrl].data.hasMore,
currentPage: 1,
isLoading: false
isLoading: false,
filterObj: filterObj,
totalHits: this.searches[searchUrl].data.totalHits
}),
() => {
this.historyPushState();
Expand Down
Loading

0 comments on commit ff8bf3d

Please sign in to comment.