merge

src/module/editor.receiver.js

@@ -92,7 +92,7 @@ Minder.Receiver = kity.createClass('Receiver',{
                             return;
 
                     }
-                    var text = (this.container.textContent || this.container.innerText).replace(/\u200b/g,'');
+                    var text = this.container.textContent.replace(/\u200b/g,'');
 
                     if(this.textShape.getOpacity() == 0){
                         this.textShape.setOpacity(1);

src/module/layout.bottom.js

@@ -504,9 +504,11 @@ KityMinder.registerModule( "LayoutBottom", function () {
 					Layout.connect = null;
 					Layout.shicon = null;
 				} else {
-					_buffer[ 0 ].getRenderContainer().remove();
-					Layout.connect.remove();
-					if ( Layout.shicon ) Layout.shicon.remove();
+					try {
+						_buffer[ 0 ].getRenderContainer().remove();
+						Layout.connect.remove();
+						if ( Layout.shicon ) Layout.shicon.remove();
+					} catch ( error ) {}
 				}
 				_buffer = _buffer.concat( _buffer[ 0 ].getChildren() );
 				_buffer.shift();