From 3028c145798c254955fd3fd241838153f416c4bd Mon Sep 17 00:00:00 2001
From: yotamberk <yotamberk@gmail.com>
Date: Sat, 15 Apr 2017 23:47:49 +0300
Subject: [PATCH] Fix #2679 (#2973)

* Fix redraw order

* Fix error when option is not defined

* Allow template labels

* Add .travis.yml file

* Add experiment travis code

* Fix react example

* Make selectiveExtend accept null/undefined parameters
---
 lib/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.js b/lib/util.js
index cfbfbaf5..24e2641a 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -188,7 +188,7 @@ exports.selectiveExtend = function (props, a, b) {
 
     for (var p = 0; p < props.length; p++) {
       var prop = props[p];
-      if (other.hasOwnProperty(prop)) {
+      if (other && other.hasOwnProperty(prop)) {
         a[prop] = other[prop];
       }
     }