rebuild

Author: jquense

dist/react-widgets-simple-number.js

@@ -444,11 +444,7 @@ var Calendar = _react2['default'].createClass(babelHelpers.createDecoratedObject
     var view = this.state.view;
     var dt = this.state.currentDate;
 
-<<<<<<< HEAD
-    if (view === 'month') return localizers.date.format(dt, format(props, 'header'), culture);else if (view === 'year') return localizers.date.format(dt, format(props, 'year'), culture);else if (view === 'decade') return localizers.date.format(_utilDates2['default'].startOf(dt, 'decade'), format(props, 'decade'), culture);else if (view === 'century') return localizers.date.format(_utilDates2['default'].startOf(dt, 'century'), format(props, 'century'), culture);
-=======
     if (view === 'month') return _utilLocalizers.date.format(dt, format(props, 'header'), culture);else if (view === 'year') return _utilLocalizers.date.format(dt, format(props, 'year'), culture);else if (view === 'decade') return _utilLocalizers.date.format(_utilDates2['default'].startOf(dt, 'decade'), format(props, 'decade'), culture);else if (view === 'century') return _utilLocalizers.date.format(_utilDates2['default'].startOf(dt, 'century'), format(props, 'century'), culture);
->>>>>>> origin/master
   }
 }, {
   key: 'inRangeValue',
@@ -482,13 +478,5 @@ function msgs(msgs) {
   }, msgs);
 }
 
-<<<<<<< HEAD
-var UncontrolledCalendar = _uncontrollable2['default'](Calendar, { value: 'onChange' });
-
-UncontrolledCalendar.BaseCalendar = Calendar;
-
-exports['default'] = UncontrolledCalendar;
-=======
 exports['default'] = _uncontrollable2['default'](Calendar, { value: 'onChange' });
->>>>>>> origin/master
 module.exports = exports['default'];

dist/react-widgets.js

@@ -28,10 +28,6 @@ var _utilPropTypes2 = babelHelpers.interopRequireDefault(_utilPropTypes);
 
 var _utilWidgetHelpers = require('./util/widgetHelpers');
 
-<<<<<<< HEAD
-var localizers = _utilConfiguration2['default'].locale;
-=======
->>>>>>> origin/master
 var format = function format(props) {
   return _utilLocalizers.date.getFormat('decade', props.decadeFormat);
 };

lib/Calendar.js

@@ -90,10 +90,7 @@ var propTypes = {
 
   onSelect: _react2['default'].PropTypes.func,
 
-<<<<<<< HEAD
-=======
   autoFocus: _react2['default'].PropTypes.bool,
->>>>>>> origin/master
   disabled: _utilPropTypes2['default'].disabled,
   readOnly: _utilPropTypes2['default'].readOnly,
 
@@ -218,10 +215,7 @@ var ComboBox = _react2['default'].createClass(babelHelpers.createDecoratedObject
     var busy = _props2.busy;
     var dropUp = _props2.dropUp;
     var name = _props2.name;
-<<<<<<< HEAD
-=======
     var autoFocus = _props2.autoFocus;
->>>>>>> origin/master
     var placeholder = _props2.placeholder;
     var value = _props2.value;
     var open = _props2.open;
@@ -424,11 +418,6 @@ var ComboBox = _react2['default'].createClass(babelHelpers.createDecoratedObject
       }
     }
 
-<<<<<<< HEAD
-    _utilWidgetHelpers.notify(this.props.onKeyDown, [e]);
-
-=======
->>>>>>> origin/master
     function select(item, fromList) {
       if (!item) return self.change(_utilCompat2['default'].findDOMNode(self.refs.input).value, false);
 
@@ -497,11 +486,8 @@ var ComboBox = _react2['default'].createClass(babelHelpers.createDecoratedObject
     return data;
   }
 }]));
-<<<<<<< HEAD
-=======
 
 exports['default'] = _uncontrollable2['default'](ComboBox, { open: 'onToggle', value: 'onChange' });
->>>>>>> origin/master
 
 function msgs(msgs) {
   return babelHelpers._extends({
@@ -518,13 +504,4 @@ function getFilter(suggest, word, textField) {
     return suggest(item, word);
   };
 }
-<<<<<<< HEAD
-
-var UncontrolledComboBox = _uncontrollable2['default'](ComboBox, { open: 'onToggle', value: 'onChange' });
-
-UncontrolledComboBox.BaseComboBox = ComboBox;
-
-exports['default'] = UncontrolledComboBox;
-=======
->>>>>>> origin/master
 module.exports = exports['default'];

lib/Century.js

@@ -118,10 +118,7 @@ var propTypes = babelHelpers._extends({}, Calendar.propTypes, {
   initialView: _react2['default'].PropTypes.oneOf(viewEnum),
   finalView: _react2['default'].PropTypes.oneOf(viewEnum),
 
-<<<<<<< HEAD
-=======
   autoFocus: _react2['default'].PropTypes.bool,
->>>>>>> origin/master
   disabled: _utilPropTypes2['default'].disabled,
   readOnly: _utilPropTypes2['default'].readOnly,
 
@@ -264,10 +261,7 @@ var DateTimePicker = _react2['default'].createClass(babelHelpers.createDecorated
         tabIndex: tabIndex || 0,
         role: 'combobox',
         'aria-labelledby': ariaLabelledby,
-<<<<<<< HEAD
-=======
         'aria-describedby': ariaDescribedby,
->>>>>>> origin/master
         'aria-expanded': !!open,
         'aria-busy': !!busy,
         'aria-owns': owns.trim(),
@@ -416,11 +410,6 @@ var DateTimePicker = _react2['default'].createClass(babelHelpers.createDecorated
       if (open === popups.CALENDAR) this.refs.calPopup._keyDown(e);
       if (open === popups.TIME) this.refs.timePopup._keyDown(e);
     }
-<<<<<<< HEAD
-
-    _utilWidgetHelpers.notify(this.props.onKeyDown, [e]);
-=======
->>>>>>> origin/master
   }
 }, {
   key: '_focus',
@@ -440,11 +429,7 @@ var DateTimePicker = _react2['default'].createClass(babelHelpers.createDecorated
 }, {
   key: 'focus',
   value: function focus() {
-<<<<<<< HEAD
-    if (_reactLibGetActiveElement2['default']() !== _utilCompat2['default'].findDOMNode(this.refs.valueInput)) this.refs.valueInput.focus();
-=======
     if (_domHelpersActiveElement2['default']() !== _utilCompat2['default'].findDOMNode(this.refs.valueInput)) this.refs.valueInput.focus();
->>>>>>> origin/master
   }
 }, {
   key: '_selectDate',
@@ -495,11 +480,7 @@ var DateTimePicker = _react2['default'].createClass(babelHelpers.createDecorated
 
     if (parse) formats = formats.concat(this.props.parse);
 
-<<<<<<< HEAD
-    _reactLibInvariant2['default'](formats.length, 'React Widgets: there are no specified `parse` formats provided and the `format` prop is a function. ' + 'the DateTimePicker is unable to parse `%s` into a dateTime, ' + 'please provide either a parse function or Globalize.js compatible string for `format`', string);
-=======
     _invariant2['default'](formats.length, 'React Widgets: there are no specified `parse` formats provided and the `format` prop is a function. ' + 'the DateTimePicker is unable to parse `%s` into a dateTime, ' + 'please provide either a parse function or Globalize.js compatible string for `format`', string);
->>>>>>> origin/master
 
     return formatsParser(formats, this.props.culture, string);
   }
@@ -527,15 +508,7 @@ var DateTimePicker = _react2['default'].createClass(babelHelpers.createDecorated
   }
 }]));
 
-<<<<<<< HEAD
-var UncontrolledDateTimePicker = _uncontrollable2['default'](DateTimePicker, { open: 'onToggle', value: 'onChange' });
-
-UncontrolledDateTimePicker.BaseDateTimePicker = DateTimePicker;
-
-exports['default'] = UncontrolledDateTimePicker;
-=======
 exports['default'] = _uncontrollable2['default'](DateTimePicker, { open: 'onToggle', value: 'onChange' });
->>>>>>> origin/master
 
 function getFormat(props) {
   var cal = props[popups.CALENDAR] != null ? props.calendar : true,

lib/Combobox.js

@@ -27,15 +27,6 @@ var _utilPropTypes = require('./util/propTypes');
 var _utilPropTypes2 = babelHelpers.interopRequireDefault(_utilPropTypes);
 
 var _utilWidgetHelpers = require('./util/widgetHelpers');
-<<<<<<< HEAD
-
-var localizers = _utilConfiguration2['default'].locale;
-
-var format = function format(props) {
-  return props.yearFormat || localizers.date.formats.year;
-};
-=======
->>>>>>> origin/master
 
 var propTypes = {
   optionID: _react2['default'].PropTypes.func,

lib/DateTimePicker.js

@@ -2,24 +2,15 @@
 
 var babelHelpers = require('./util/babelHelpers.js');
 
-<<<<<<< HEAD
-=======
 exports.__esModule = true;
 
->>>>>>> origin/master
 var _react = require('react');
 
 var _react2 = babelHelpers.interopRequireDefault(_react);
 
-<<<<<<< HEAD
-var _reactLibGetActiveElement = require('react/lib/getActiveElement');
-
-var _reactLibGetActiveElement2 = babelHelpers.interopRequireDefault(_reactLibGetActiveElement);
-=======
 var _domHelpersActiveElement = require('dom-helpers/activeElement');
 
 var _domHelpersActiveElement2 = babelHelpers.interopRequireDefault(_domHelpersActiveElement);
->>>>>>> origin/master
 
 var _domHelpersQueryContains = require('dom-helpers/query/contains');
 
@@ -214,13 +205,8 @@ var DropdownList = _react2['default'].createClass(babelHelpers.createDecoratedOb
     List = List || groupBy && _ListGroupable2['default'] || _List2['default'];
 
     var elementProps = omit(this.props, Object.keys(propTypes));
-<<<<<<< HEAD
-    var listProps = pick(this.props, Object.keys(_utilCompat2['default'].type(List).propTypes));
-    var popupProps = pick(this.props, Object.keys(_utilCompat2['default'].type(_Popup2['default']).propTypes));
-=======
     var listProps = pick(this.props, Object.keys(List.propTypes));
     var popupProps = pick(this.props, Object.keys(_Popup2['default'].propTypes));
->>>>>>> origin/master
 
     var _state = this.state;
     var focusedItem = _state.focusedItem;
@@ -416,11 +402,6 @@ var DropdownList = _react2['default'].createClass(babelHelpers.createDecoratedOb
       isOpen ? _this4.setState({ focusedItem: item }) : change(item);
     });
 
-<<<<<<< HEAD
-    _utilWidgetHelpers.notify(this.props.onKeyDown, [e]);
-
-=======
->>>>>>> origin/master
     function change(item, fromList) {
       if (!item) return;
       fromList ? self._onSelect(item) : self.change(item);
@@ -440,11 +421,7 @@ var DropdownList = _react2['default'].createClass(babelHelpers.createDecoratedOb
   value: function focus(target) {
     var inst = target || (this.props.filter && this.props.open ? this.refs.filter : this.refs.input);
 
-<<<<<<< HEAD
-    if (_reactLibGetActiveElement2['default']() !== _utilCompat2['default'].findDOMNode(inst)) _utilCompat2['default'].findDOMNode(inst).focus();
-=======
     if (_domHelpersActiveElement2['default']() !== _utilCompat2['default'].findDOMNode(inst)) _utilCompat2['default'].findDOMNode(inst).focus();
->>>>>>> origin/master
   }
 }, {
   key: '_data',
@@ -495,11 +472,5 @@ function msgs(msgs) {
   }, msgs);
 }
 
-<<<<<<< HEAD
-module.exports = _uncontrollable2['default'](DropdownList, { open: 'onToggle', value: 'onChange', searchTerm: 'onSearch' });
-
-module.exports.BaseDropdownList = DropdownList;
-=======
 exports['default'] = _uncontrollable2['default'](DropdownList, { open: 'onToggle', value: 'onChange', searchTerm: 'onSearch' });
-module.exports = exports['default'];
->>>>>>> origin/master
+module.exports = exports['default'];

lib/Decade.js

@@ -122,7 +122,7 @@ exports['default'] = _react2['default'].createClass({
           key: 'item_' + idx,
           id: currentId,
           dataItem: item,
-          focused: focused === item, z: true,
+          focused: focused === item,
           selected: selected === item,
           onClick: onSelect.bind(null, item)
         },

lib/DropdownList.js

@@ -36,10 +36,6 @@ var _utilDataHelpers = require('./util/dataHelpers');
 
 var _utilWidgetHelpers = require('./util/widgetHelpers');
 
-var _utilDataHelpers = require('./util/dataHelpers');
-
-var _utilWidgetHelpers = require('./util/widgetHelpers');
-
 var optionId = function optionId(id, idx) {
   return id + '__option__' + idx;
 };
@@ -227,11 +223,7 @@ exports['default'] = _react2['default'].createClass({
     // so long as you also sorted by group
     keys = keys || [];
 
-<<<<<<< HEAD
-    _reactLibWarning2['default'](typeof groupBy !== 'string' || !data.length || _util_2['default'].has(data[0], groupBy), '[React Widgets] You are seem to be trying to group this list by a ' + ('property `' + groupBy + '` that doesn\'t exist in the dataset items, this may be a typo'));
-=======
     _warning2['default'](typeof groupBy !== 'string' || !data.length || _util_2['default'].has(data[0], groupBy), '[React Widgets] You are seem to be trying to group this list by a ' + ('property `' + groupBy + '` that doesn\'t exist in the dataset items, this may be a typo'));
->>>>>>> origin/master
 
     return data.reduce(function (grps, item) {
       var group = iter(item);