Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-11 15:14:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

bump(react) 0.14.7 => 15.0.1

Browse source
This commit is contained in:
Ben Gotow 2016-04-12 16:58:45 -07:00
parent cf926b0346
commit 5a9d6c9eba
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package.json
View file

@ -55,10 +55,10 @@
"proxyquire": "1.3.1", "proxyquire": "1.3.1",
"q": "^1.0.1", "q": "^1.0.1",
"raven": "0.7.2", "raven": "0.7.2",
"react": "^0.14.7", "react": "^15.0.1",
"react-addons-css-transition-group": "^0.14.7", "react-addons-css-transition-group": "^15.0.1",
"react-addons-test-utils": "^0.14.7", "react-addons-test-utils": "^15.0.1",
"react-dom": "^0.14.7", "react-dom": "^15.0.1",
"reflux": "0.1.13", "reflux": "0.1.13",
"request": "^2.53", "request": "^2.53",
"request-progress": "^0.3", "request-progress": "^0.3",

2
spec/components/editable-list-spec.jsx
View file

@ -170,7 +170,7 @@ describe('EditableList', ()=> {
const item = findDOMNode(makeItem('item 1', 0)); const item = findDOMNode(makeItem('item 1', 0));
expect(item.className.indexOf('selected')).toEqual(-1); expect(item.className.indexOf('selected')).toEqual(-1);
expect(item.className.indexOf('editable-item')).not.toEqual(-1); expect(item.className.indexOf('editable-item')).not.toEqual(-1);
expect(item.childNodes[0].textContent).toEqual('item 1'); expect(item.innerText).toEqual('item 1');
}); });
it('renders correctly when item is component', ()=> { it('renders correctly when item is component', ()=> {

10
src/components/editable-list.jsx
View file

@ -1,4 +1,5 @@
import _ from 'underscore'; import _ from 'underscore';
import uuid from 'node-uuid';
import classNames from 'classnames'; import classNames from 'classnames';
import ScrollRegion from './scroll-region'; import ScrollRegion from './scroll-region';
import KeyCommandsRegion from './key-commands-region'; import KeyCommandsRegion from './key-commands-region';
@ -115,6 +116,7 @@ class EditableList extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.listId = uuid.v4();
this.state = { this.state = {
dropInsertionIndex: -1, dropInsertionIndex: -1,
editingIndex: -1, editingIndex: -1,
@ -280,8 +282,6 @@ class EditableList extends Component {
} }
const row = event.target.closest('[data-item-idx]') || event.target; const row = event.target.closest('[data-item-idx]') || event.target;
const wrapperId = ReactDOM.findDOMNode(this.refs.itemsWrapper).dataset.reactid;
if (!row.dataset.itemIdx) { if (!row.dataset.itemIdx) {
return; return;
} }
@ -293,14 +293,14 @@ class EditableList extends Component {
} }
event.dataTransfer.setData('editablelist-index', row.dataset.itemIdx); event.dataTransfer.setData('editablelist-index', row.dataset.itemIdx);
event.dataTransfer.setData('editablelist-reactid', wrapperId); event.dataTransfer.setData('editablelist-listid', this.listId);
event.dataTransfer.effectAllowed = "move"; event.dataTransfer.effectAllowed = "move";
}; };
_onDragOver = (event)=> { _onDragOver = (event)=> {
const wrapperNode = ReactDOM.findDOMNode(this.refs.itemsWrapper); const wrapperNode = ReactDOM.findDOMNode(this.refs.itemsWrapper);
const originWrapperId = event.dataTransfer.getData('editablelist-reactid') const originListId = event.dataTransfer.getData('editablelist-listid')
const originSameList = (originWrapperId === wrapperNode.dataset.reactid); const originSameList = (originListId === this.listId);
let dropInsertionIndex = 0; let dropInsertionIndex = 0;
if ((event.currentTarget === wrapperNode) && originSameList) { if ((event.currentTarget === wrapperNode) && originSameList) {

3
src/components/menu.cjsx
View file

@ -24,7 +24,6 @@ class MenuItem extends React.Component
### ###
@propTypes: @propTypes:
divider: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.bool]) divider: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.bool])
key: React.PropTypes.string
selected: React.PropTypes.bool selected: React.PropTypes.bool
checked: React.PropTypes.bool checked: React.PropTypes.bool
@ -39,7 +38,7 @@ class MenuItem extends React.Component
"item": true "item": true
"selected": @props.selected "selected": @props.selected
"checked": @props.checked "checked": @props.checked
<div className={className} key={@props.key} onMouseDown={@props.onMouseDown}> <div className={className} onMouseDown={@props.onMouseDown}>
{@props.content} {@props.content}
</div> </div>