fixed bad merge and linting errors

Author: jsdf

.jscsrc

@@ -5,6 +5,8 @@
  "requireCapitalizedComments": null,
  "requireEarlyReturn": null,
  "disallowSemicolons": true,
+ "disallowMultipleSpaces": true,
+ "disallowPaddingNewlinesInBlocks": true,
  "requireCurlyBraces": null,
  "requireSpaceBeforeKeywords": [
  "else",

lib/ControlledRefreshableListView.js

@@ -29,10 +29,16 @@ var ControlledRefreshableListView = React.createClass({
  propTypes: {
  onRefresh: PropTypes.func.isRequired,
  isRefreshing: PropTypes.bool.isRequired,
- refreshPrompt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+ waitingForRelease: PropTypes.bool,
+ onHold: PropTypes.func,
+ onPull: PropTypes.func,
+ pullingPrompt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+ pullingIndicator: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+ holdingPrompt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+ holdingIndicator: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
  refreshDescription: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
- pullingIndicatorComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
- holdingIndicatorComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+ refreshingPrompt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
+ refreshingIndicator: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
  refreshingIndicatorComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
  minPulldownDistance: PropTypes.number,
  ignoreInertialScroll: PropTypes.bool,
@@ -66,7 +72,6 @@ var ControlledRefreshableListView = React.createClass({
  },
  componentWillReceiveProps(nextProps) {
  if (!this.props.isRefreshing && nextProps.isRefreshing && this.isTouching) {
-
  this.waitingForRelease = true
  this.setState({waitingForRelease: true})
  }
@@ -169,26 +174,21 @@ var ControlledRefreshableListView = React.createClass({
  pullingPrompt,
  holdingPrompt,
  refreshingPrompt,
+ refreshDescription,
  pullingIndicator,
  holdingIndicator,
  refreshingIndicator,
  } = this.props
  var refreshingIndicatorProps = {
  isRefreshing,
-<<<<<<< HEAD
- description: refreshDescription,
- prompt: refreshPrompt,
- pulldownDistance: -(this.lastScrollY || 0),
-=======
  pullingIndicator,
  holdingIndicator,
  refreshingIndicator,
  pullingPrompt: pullingPrompt || 'Pull to refresh',
  holdingPrompt: holdingPrompt || 'Release to refresh',
- refreshingPrompt: refreshingPrompt,
+ refreshingPrompt: refreshingPrompt || refreshDescription,
  isTouching: this.isTouching,
  isWaitingForRelease: this.isWaitingForRelease(),
->>>>>>> atom2ueki-master
  }
  return createElementFrom(this.props.refreshingIndicatorComponent, refreshingIndicatorProps)
  },
@@ -221,10 +221,10 @@ var stylesheet = StyleSheet.create({
  fillParent: {
  backgroundColor: 'transparent',
  position: 'absolute',
- top:  0,
- left:  0,
- right:  0,
- bottom:  0,
+ top: 0,
+ left: 0,
+ right: 0,
+ bottom: 0,
  },
  // offsetParent: {
  // position: 'relative',

lib/RefreshingIndicator.js

@@ -20,6 +20,7 @@ var RefreshingIndicator = React.createClass({
  holdingPrompt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
  refreshingPrompt: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
  isTouching: PropTypes.bool.isRequired,
+ isRefreshing: PropTypes.bool.isRequired,
  isWaitingForRelease: PropTypes.bool.isRequired,
  },
  getDefaultProps() {

lib/__tests__/RefreshingIndicator-test.js

@@ -13,7 +13,6 @@ describe('RefreshingIndicator', function() {
  })
 
  it('renders an activity indicator', function() {
-
  let renderer = this.shallowRender(
  <RefreshingIndicator
  description={description}