From 923814774bf63b03a5fd82667a287910ddd889b0 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 6 Dec 2017 17:56:32 +0100
Subject: [PATCH] fix contextview

---
 src/app/editor/contextView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/editor/contextView.js b/src/app/editor/contextView.js
index 9622a5bc13..b4a3df4485 100644
--- a/src/app/editor/contextView.js
+++ b/src/app/editor/contextView.js
@@ -109,7 +109,7 @@ class ContextView {
         if (target) {
           this._current = target
         } else {
-          this._current = last
+          this._current = null
         }
       }
     }
@@ -123,7 +123,7 @@ class ContextView {
     if (!node) return yo`<div></div>`
     var self = this
     var references = this._api.contextualListener.referencesOf(node)
-    var type = node.attributes.type ? node.attributes.type : node.name
+    var type = (node.attributes && node.attributes.type) ? node.attributes.type : node.name
     references = `${references ? references.length : '0'} reference(s)`
 
     var ref = 0