Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
metagrover committed Jun 3, 2017
2 parents 4d075ca + 68f25bb commit 19409af
Show file tree
Hide file tree
Showing 17 changed files with 336 additions and 336 deletions.
2 changes: 1 addition & 1 deletion app/actuators/ResultCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class ResultCard extends Component {
this.appliedQuery = {};
}

componentDidMount() {
componentWillMount() {
this.streamProp = this.props.stream;
this.size = this.props.size;
this.initialize();
Expand Down
2 changes: 1 addition & 1 deletion app/actuators/ResultList.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class ResultList extends Component {
this.appliedQuery = {};
}

componentDidMount() {
componentWillMount() {
this.streamProp = this.props.stream;
this.size = this.props.size;
this.initialize();
Expand Down
6 changes: 3 additions & 3 deletions app/stories/ViewSwitcher.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ export default class ViewSwitcherDefault extends Component {
data={[
{
label: "Grid",
value: "rbc-resultcard-wrapper"
value: "rbc-resultcard"
},
{
label: "List",
value: "rbc-resultlist-wrapper"
value: "rbc-resultlist"
}
]}
defaultSelected="rbc-resultcard-wrapper"
defaultSelected="rbc-resultcard"
/>
<ResultCard
componentId="SearchResult"
Expand Down
94 changes: 47 additions & 47 deletions dist/airbnb_recipe.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/style.min.css

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions dist/ecommerce_recipe.bundle.js

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions dist/meetup_recipe.bundle.js

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions dist/news_recipe.bundle.js

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions dist/producthunt_recipe.bundle.js

Large diffs are not rendered by default.

68 changes: 34 additions & 34 deletions dist/simplebeds_recipe.bundle.js

Large diffs are not rendered by default.

94 changes: 47 additions & 47 deletions dist/yelp_recipe.bundle.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/actuators/ResultCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ var ResultCard = function (_Component) {
}

_createClass(ResultCard, [{
key: "componentDidMount",
value: function componentDidMount() {
key: "componentWillMount",
value: function componentWillMount() {
this.streamProp = this.props.stream;
this.size = this.props.size;
this.initialize();
Expand Down
4 changes: 2 additions & 2 deletions lib/actuators/ResultList.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ var ResultList = function (_Component) {
}

_createClass(ResultList, [{
key: "componentDidMount",
value: function componentDidMount() {
key: "componentWillMount",
value: function componentWillMount() {
this.streamProp = this.props.stream;
this.size = this.props.size;
this.initialize();
Expand Down
6 changes: 3 additions & 3 deletions lib/stories/ViewSwitcher.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ var ViewSwitcherDefault = function (_Component) {
_react2.default.createElement(_app.ViewSwitcher, {
data: [{
label: "Grid",
value: "rbc-resultcard-wrapper"
value: "rbc-resultcard"
}, {
label: "List",
value: "rbc-resultlist-wrapper"
value: "rbc-resultlist"
}],
defaultSelected: "rbc-resultcard-wrapper"
defaultSelected: "rbc-resultcard"
}),
_react2.default.createElement(_app.ResultCard, {
componentId: "SearchResult",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@appbaseio/reactivesearch",
"version": "0.5.11",
"version": "0.5.12",
"description": "A React UI components library for building search experiences",
"main": "lib/app.js",
"scripts": {
Expand Down Expand Up @@ -32,7 +32,7 @@
},
"homepage": "https://github.com/appbaseio/reactivesearch#readme",
"dependencies": {
"@appbaseio/reactivemaps": "1.0.0-alpha34",
"@appbaseio/reactivemaps": "1.0.0-alpha35",
"classnames": "^2.2.5",
"jquery": "^3.1.1",
"lodash": "^4.15.0",
Expand Down
74 changes: 37 additions & 37 deletions umd/ReactiveSearch.js

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# yarn lockfile v1


"@appbaseio/reactivebase@1.0.0-alpha42":
version "1.0.0-alpha42"
resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.0.0-alpha42.tgz#77a081f54168711955924e6788e8eb895326680a"
"@appbaseio/reactivebase@1.0.0-alpha44":
version "1.0.0-alpha44"
resolved "https://registry.yarnpkg.com/@appbaseio/reactivebase/-/reactivebase-1.0.0-alpha44.tgz#698faefbc61e67e0a3b42c8801d5cb1fa0d00c27"
dependencies:
appbase-js "^0.11.0"
babel-preset-stage-0 "^6.5.0"
Expand All @@ -31,11 +31,11 @@
grunt "~0.4.0"
serve-static "^1.10.2"

"@appbaseio/reactivemaps@1.0.0-alpha33":
version "1.0.0-alpha33"
resolved "https://registry.yarnpkg.com/@appbaseio/reactivemaps/-/reactivemaps-1.0.0-alpha33.tgz#3b5ddfde002b54494ca7b002f9ff7c786134eb2c"
"@appbaseio/reactivemaps@1.0.0-alpha35":
version "1.0.0-alpha35"
resolved "https://registry.yarnpkg.com/@appbaseio/reactivemaps/-/reactivemaps-1.0.0-alpha35.tgz#03ceddeaf1f3946b3aeea7ae4c0b01f17e3eb84e"
dependencies:
"@appbaseio/reactivebase" "1.0.0-alpha42"
"@appbaseio/reactivebase" "1.0.0-alpha44"
"@appbaseio/reactivemaps-manual" "1.0.0-alpha"
appbase-js "^0.11.0"
axios "^0.15.2"
Expand Down

0 comments on commit 19409af

Please sign in to comment.