Skip to content

Commit

Permalink
Latest build
Browse files Browse the repository at this point in the history
  • Loading branch information
javivelasco committed Jul 4, 2016
1 parent 3e29844 commit f43dac6
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 10 deletions.
12 changes: 9 additions & 3 deletions lib/autocomplete/Autocomplete.js
Expand Up @@ -393,9 +393,15 @@ var factory = function factory(Chip, Input) {
var _props = this.props;
var error = _props.error;
var label = _props.label;
var theme = _props.theme;

var other = _objectWithoutProperties(_props, ['error', 'label', 'theme']);
var source = _props.source;
var suggestionMatch = _props.suggestionMatch;
var //eslint-disable-line no-unused-vars
selectedPosition = _props.selectedPosition;
var showSuggestionsWhenValueIsSet = _props.showSuggestionsWhenValueIsSet;
var //eslint-disable-line no-unused-vars
theme = _props.theme;

var other = _objectWithoutProperties(_props, ['error', 'label', 'source', 'suggestionMatch', 'selectedPosition', 'showSuggestionsWhenValueIsSet', 'theme']);

var className = (0, _classnames5.default)(theme.autocomplete, _defineProperty({}, theme.focus, this.state.focus), this.props.className);

Expand Down
6 changes: 5 additions & 1 deletion lib/avatar/Avatar.js
Expand Up @@ -11,6 +11,10 @@ var _react = require('react');

var _react2 = _interopRequireDefault(_react);

var _classnames = require('classnames');

var _classnames2 = _interopRequireDefault(_classnames);

var _reactCssThemr = require('react-css-themr');

var _identifiers = require('../identifiers.js');
Expand All @@ -36,7 +40,7 @@ var factory = function factory(FontIcon) {

return _react2.default.createElement(
'div',
_extends({ 'data-react-toolbox': 'avatar', className: theme.avatar + ' ' + className }, other),
_extends({ 'data-react-toolbox': 'avatar', className: (0, _classnames2.default)(theme.avatar, className) }, other),
children,
typeof image === 'string' ? _react2.default.createElement('img', { className: theme.image, src: image, title: title }) : image,
typeof icon === 'string' ? _react2.default.createElement(FontIcon, { className: theme.letter, value: icon }) : icon,
Expand Down
5 changes: 4 additions & 1 deletion lib/dropdown/Dropdown.js
Expand Up @@ -190,8 +190,11 @@ var factory = function factory(Input) {
var template = _props.template;
var theme = _props.theme;
var source = _props.source;
var allowBlank = _props.allowBlank;
var auto = _props.auto;

var others = _objectWithoutProperties(_props, ['template', 'theme', 'source', 'allowBlank', 'auto']); //eslint-disable-line no-unused-vars

var others = _objectWithoutProperties(_props, ['template', 'theme', 'source']);

var selected = this.getSelectedItem();
var className = (0, _classnames4.default)(theme.dropdown, (_classnames2 = {}, _defineProperty(_classnames2, theme.up, this.state.up), _defineProperty(_classnames2, theme.active, this.state.active), _defineProperty(_classnames2, theme.disabled, this.props.disabled), _classnames2), this.props.className);
Expand Down
16 changes: 12 additions & 4 deletions lib/list/ListItem.js
Expand Up @@ -74,16 +74,24 @@ var factory = function factory(ripple, ListItemLayout, ListItemContent) {
if (!_react2.default.isValidElement(child)) {
return;
}
if (child.props.listItemIgnore) {
children.ignored.push(child);

var _child$props = child.props;
var listItemIgnore = _child$props.listItemIgnore;

var rest = _objectWithoutProperties(_child$props, ['listItemIgnore']);

var strippedChild = _extends({}, child, { props: rest });

if (listItemIgnore) {
children.ignored.push(strippedChild);
return;
}
if (child.type === ListItemContent) {
children.itemContent = child;
children.itemContent = strippedChild;
return;
}
var bucket = children.itemContent ? 'rightActions' : 'leftActions';
children[bucket].push(_extends({}, child, { key: i }));
children[bucket].push(_extends({}, strippedChild, { key: i }));
});

return children;
Expand Down
4 changes: 3 additions & 1 deletion lib/ripple/Ripple.js
Expand Up @@ -166,11 +166,13 @@ var rippleFactory = function rippleFactory() {
var _props2 = this.props;
var children = _props2.children;
var ripple = _props2.ripple;
var //eslint-disable-line no-unused-vars
onRippleEnded = _props2.onRippleEnded;
var className = _props2.rippleClassName;
var centered = _props2.rippleCentered;
var spread = _props2.rippleSpread;

var other = _objectWithoutProperties(_props2, ['children', 'ripple', 'rippleClassName', 'rippleCentered', 'rippleSpread']);
var other = _objectWithoutProperties(_props2, ['children', 'ripple', 'onRippleEnded', 'rippleClassName', 'rippleCentered', 'rippleSpread']);

var rippleClassName = (0, _classnames3.default)(this.props.theme.ripple, (_classnames = {}, _defineProperty(_classnames, this.props.theme.rippleActive, this.state.active), _defineProperty(_classnames, this.props.theme.rippleRestarting, this.state.restarting), _classnames), className);

Expand Down

0 comments on commit f43dac6

Please sign in to comment.