OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Some null checks in animation code

pull/21833/head
David Baker 2016-01-08 16:43:25 +00:00
parent 223f6f7914
commit b37ea52a1f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Velociraptor.js
View File

@ -36,7 +36,7 @@ module.exports = React.createClass({
var old = oldChildren[c.key]; var old = oldChildren[c.key];
var oldNode = ReactDom.findDOMNode(self.nodes[old.key]); var oldNode = ReactDom.findDOMNode(self.nodes[old.key]);
if (oldNode.style.left != c.props.style.left) { if (oldNode && oldNode.style.left != c.props.style.left) {
Velocity(oldNode, { left: c.props.style.left }, self.props.transition).then(function() { Velocity(oldNode, { left: c.props.style.left }, self.props.transition).then(function() {
// special case visibility because it's nonsensical to animate an invisible element // special case visibility because it's nonsensical to animate an invisible element
// so we always hidden->visible pre-transition and visible->hidden after // so we always hidden->visible pre-transition and visible->hidden after
@ -73,6 +73,7 @@ module.exports = React.createClass({
collectNode: function(k, node) { collectNode: function(k, node) {
if ( if (
node &&
this.nodes[k] === undefined && this.nodes[k] === undefined &&
node.props.startStyle && node.props.startStyle &&
Object.keys(node.props.startStyle).length Object.keys(node.props.startStyle).length