fix: update with empty string throws exception

indr · Jan 25, 2019 · 04f1664 · 04f1664
1 parent c3c7714
commit 04f1664
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Adapter.js b/src/Adapter.js
@@ -42,6 +42,7 @@ const Adapter = class {
   }
 
   data (data) {
+    if (!data || typeof data !== 'object') return
     this._updateInstances(data)
   }
 

diff --git a/test/Adapter.spec.js b/test/Adapter.spec.js
@@ -104,6 +104,12 @@ describe('Adapter', () => {
     expect(movieClip.visible).to.equal(true)
   })
 
+  it('data without argument or null must not throw exception', () => {
+    const adapter = new Adapter(webcg, movieClip, createjs)
+    adapter.data()
+    adapter.data(null)
+  })
+
   it('data with string data should update createjs Text instances', () => {
     movieClip.f0 = new createjs.Text('f0')
     movieClip.f0.parent = movieClip
@@ -123,7 +129,7 @@ describe('Adapter', () => {
     expect(movieClip.instance.f1.text).to.equal(1)
   })
 
-  it('data should update createjs MovieClip instances', () => {
+  it('data with object data should update createjs MovieClip instances', () => {
     movieClip.f0 = new createjs.Text('f0')
     movieClip.f0.parent = movieClip
     movieClip.instance = new createjs.MovieClip()
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ const Adapter = class { @@
       }
       data (data) {
+        if (!data || typeof data !== 'object') return
         this._updateInstances(data)
       }
@@ Expand Down @@