Skip to content

Commit

Permalink
Merge 8a47664 into 621ece6
Browse files Browse the repository at this point in the history
  • Loading branch information
Jodie Doubleday committed Jun 5, 2015
2 parents 621ece6 + 8a47664 commit b2779e8
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
**/dev/*.js
*.less
**/*.less
8 changes: 6 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
"jsx": true
},
"rules": {
"quotes": [2, 'single'],
"strict": [2, 'never']
"quotes": [2, "single"],
"strict": [2, "never"],
"brace-style": [2, "1tbs"],
"indent": [2, 2],
"linebreak-style": [2, "unix"],
"semi": [2, "always"]
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"postinstall": "./scripts/postinstall.sh",
"coveralls": "./node_modules/mocha/bin/mocha --require blanket --require tests/bootstrap.js --reporter mocha-lcov-reporter --compilers .:tests/compiler.js src/**/__tests__/*-test.js src/components/**/__tests__/*-test.js | ./node_modules/coveralls/bin/coveralls.js",
"test": "./node_modules/mocha/bin/mocha --require tests/bootstrap.js --compilers .:tests/compiler.js src/**/__tests__/*-test.js src/components/**/__tests__/*-test.js",
"lint": "./node_modules/eslint/bin/eslint.js src/ && echo '🍻 All good!'"
"lint": "node_modules/.bin/eslint src --ext .jsx --ext .js --quiet && echo '🍻 All good!'"
},
"config": {
"blanket": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var React = require('react');
var classNames = require('classnames');
var getComponentClasses = require('../../../../utils/getComponentClasses');

Expand Down
1 change: 0 additions & 1 deletion src/components/button/code/templates/buttonTemplate.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var React = require('react');
var classNames = require('classnames');
var getComponentClasses = require('../../../../utils/getComponentClasses');

Expand Down
3 changes: 1 addition & 2 deletions src/components/flag/code/templates/flagTemplate.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var React = require('react');
var classNames = require('classnames');
var getComponentClasses = require('../../../../utils/getComponentClasses');

Expand All @@ -12,4 +11,4 @@ module.exports = function(props) {
{props.children}
</span>
);
};
};
2 changes: 0 additions & 2 deletions src/components/image/code/templates/imageTemplate.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
var React = require('react');

module.exports = function(props) {
return (
<img alt={props.alt} src={props.src} className="component-image" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/image/code/views/imageView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ module.exports = React.createClass({
render: function() {
return require('../templates/imageTemplate.jsx')(this.props);
}
});
});
12 changes: 5 additions & 7 deletions src/components/rating/code/templates/ratingTemplate.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
var React = require('react');

module.exports = function(props) {

var $rating = [];
var $blankRating = [];

for(var i = 0; i < props.rating; i++) {
$rating.push( (!!props.children) ? props.children : <span className="rating-icon" /> );
$rating.push( props.children ? <span className="rating-icon" /> : props.children);
}

if(props.outOf && props.blankIcon){
for(var j = 0; j < ( props.outOf-props.rating ); j++) {
for(var j = 0; j < ( props.outOf - props.rating ); j++) {
$blankRating.push( props.blankIcon );
}
}
Expand All @@ -21,4 +19,4 @@ module.exports = function(props) {
{$blankRating}
</div>
);
};
};
4 changes: 2 additions & 2 deletions src/components/rating/code/views/ratingView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = React.createClass({
outOf: React.PropTypes.number,
blankIcon: React.PropTypes.node
},

render: function() {
return require('../templates/ratingTemplate.jsx')(this.props);
}
});
});
4 changes: 1 addition & 3 deletions src/components/reviews/code/templates/reviewsTemplate.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
var React = require('react');

module.exports = function(props) {
return (
<div itemProp="aggregateRating" itemScope itemType="http://schema.org/AggregateRating" className="ui-component-reviews">
Expand All @@ -8,4 +6,4 @@ module.exports = function(props) {
<div><span itemProp="reviewCount">({ props.reviewCount }</span> <a title="Customer reviews">Reviews</a>)</div>
</div>
);
};
};
2 changes: 1 addition & 1 deletion src/components/reviews/code/views/reviewsView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ module.exports = React.createClass({
render: function() {
return require('../templates/reviewsTemplate.jsx')(this.props);
}
});
});
1 change: 0 additions & 1 deletion src/components/tile/code/templates/tileTemplate.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var React = require('react');
var ImageComponent = require('../../../image');

module.exports = function(props) {
Expand Down
4 changes: 2 additions & 2 deletions src/components/tile/code/views/tileView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ module.exports = React.createClass({
image: React.PropTypes.object.isRequired,
title: React.PropTypes.string.isRequired
},

defaultProps: function() {
return {};
},

render: function() {
return require('../templates/tileTemplate.jsx')(this.props);
}
});
});

0 comments on commit b2779e8

Please sign in to comment.