From 948ec94230e2e4301c18d15161b9c14ef2c50b46 Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Thu, 18 Aug 2016 18:18:37 +0900
Subject: [PATCH 1/3] function refs

---
 dist/entry.js             | 18 ++++++++++++++----
 dist/entry.min.js         | 38 +++++++++++++++++++-------------------
 src/entry.js              | 18 ++++++++++++++++++
 src/variable_container.js |  6 ------
 src/workspace/thread.js   |  8 +++++++-
 5 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/dist/entry.js b/dist/entry.js
index 93907525f9..303de251d7 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -1,5 +1,6 @@
 var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:2, TEXT_ALIGNS:["center", "left", "right"], clipboard:null, loadProject:function(b) {
   b || (b = Entry.getStartProject(Entry.mediaFilePath));
+  this.setFuncRefs(b.functions);
   "workspace" == this.type && Entry.stateManager.startIgnore();
   Entry.projectId = b._id;
   Entry.variableContainer.setVariables(b.variables);
@@ -16,6 +17,7 @@ var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:
   Entry.engine.projectTimer || Entry.variableContainer.generateTimer();
   0 === Object.keys(Entry.container.inputValue).length && Entry.variableContainer.generateAnswer();
   Entry.start();
+  this.removeFuncRefs();
   return b;
 }, exportProject:function(b) {
   b || (b = {});
@@ -123,6 +125,12 @@ var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:
     a.template = Lang.template.function_general;
     Entry.block[b] = a;
   }
+}, setFuncRefs:function(b) {
+  this.functions = b ? b.map(function(a) {
+    return a.id;
+  }) : [];
+}, removeFuncRefs:function() {
+  delete this.functions;
 }};
 window.Entry = Entry;
 Entry.Albert = {PORT_MAP:{leftWheel:0, rightWheel:0, buzzer:0, leftEye:0, rightEye:0, note:0, bodyLed:0, frontLed:0, padWidth:0, padHeight:0}, setZero:function() {
@@ -13890,9 +13898,6 @@ Entry.VariableContainer.prototype.setVariables = function(b) {
   this.updateList();
 };
 Entry.VariableContainer.prototype.setFunctions = function(b) {
-  b && b.forEach(function(a) {
-    Entry.generateFunctionSchema(a.id);
-  });
   for (var a in b) {
     var c = new Entry.Func(b[a]);
     c.generateBlock();
@@ -18881,7 +18886,12 @@ Entry.Thread = function(b, a, c) {
     }
     for (var d = 0;d < a.length;d++) {
       var e = a[d];
-      e instanceof Entry.Block || e.isDummy ? (e.setThread(this), this._data.push(e)) : Entry.block[e.type] && this._data.push(new Entry.Block(e, this));
+      if (e instanceof Entry.Block || e.isDummy) {
+        e.setThread(this), this._data.push(e);
+      } else {
+        var f = Entry.functions, g = e.type;
+        (Entry.block[g] || f && -1 < f.indexOf(g.split("_")[1])) && this._data.push(new Entry.Block(e, this));
+      }
     }
     (d = this._code.view) && this.createView(d.board, b);
   };
diff --git a/dist/entry.min.js b/dist/entry.min.js
index 47f09a61ba..cb14d88159 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -1,14 +1,14 @@
-Entry={block:{},TEXT_ALIGN_CENTER:0,TEXT_ALIGN_LEFT:1,TEXT_ALIGN_RIGHT:2,TEXT_ALIGNS:["center","left","right"],clipboard:null,loadProject:function(b){b||(b=Entry.getStartProject(Entry.mediaFilePath));"workspace"==this.type&&Entry.stateManager.startIgnore();Entry.projectId=b._id;Entry.variableContainer.setVariables(b.variables);Entry.variableContainer.setMessages(b.messages);Entry.scene.addScenes(b.scenes);Entry.stage.initObjectContainers();Entry.variableContainer.setFunctions(b.functions);Entry.container.setObjects(b.objects);
-Entry.FPS=b.speed?b.speed:60;createjs.Ticker.setFPS(Entry.FPS);"workspace"==this.type&&setTimeout(function(){Entry.stateManager.endIgnore()},300);Entry.engine.projectTimer||Entry.variableContainer.generateTimer();0===Object.keys(Entry.container.inputValue).length&&Entry.variableContainer.generateAnswer();Entry.start();return b},exportProject:function(b){b||(b={});Entry.engine.isState("stop")||Entry.engine.toggleStop();Entry.Func&&Entry.Func.workspace&&Entry.Func.workspace.visible&&Entry.Func.cancelEdit();
-b.objects=Entry.container.toJSON();b.scenes=Entry.scene.toJSON();b.variables=Entry.variableContainer.getVariableJSON();b.messages=Entry.variableContainer.getMessageJSON();b.functions=Entry.variableContainer.getFunctionJSON();b.scenes=Entry.scene.toJSON();b.speed=Entry.FPS;return b},setBlockByText:function(b,a){for(var c=[],d=jQuery.parseXML(a).getElementsByTagName("category"),e=0;e<d.length;e++){for(var f=d[e],g={category:f.getAttribute("id"),blocks:[]},f=f.childNodes,h=0;h<f.length;h++){var k=f[h];
-!k.tagName||"BLOCK"!=k.tagName.toUpperCase()&&"BTN"!=k.tagName.toUpperCase()||g.blocks.push(k.getAttribute("type"))}c.push(g)}Entry.playground.setBlockMenu(c)},setBlock:function(b,a){Entry.playground.setMenuBlock(b,a)},enableArduino:function(){},initSound:function(b){b.path=b.fileurl?b.fileurl:Entry.defaultPath+"/uploads/"+b.filename.substring(0,2)+"/"+b.filename.substring(2,4)+"/"+b.filename+b.ext;Entry.soundQueue.loadFile({id:b.id,src:b.path,type:createjs.LoadQueue.SOUND})},beforeUnload:function(b){Entry.hw.closeConnection();
-Entry.variableContainer.updateCloudVariables();if("workspace"==Entry.type&&(localStorage&&Entry.interfaceState&&localStorage.setItem("workspace-interface",JSON.stringify(Entry.interfaceState)),!Entry.stateManager.isSaved()))return Lang.Workspace.project_changed},loadInterfaceState:function(){if("workspace"==Entry.type)if(localStorage&&localStorage.getItem("workspace-interface")){var b=localStorage.getItem("workspace-interface");this.resizeElement(JSON.parse(b))}else this.resizeElement({menuWidth:280,
-canvasWidth:480})},resizeElement:function(b){if("workspace"==Entry.type){var a=this.interfaceState;!b.canvasWidth&&a.canvasWidth&&(b.canvasWidth=a.canvasWidth);!b.menuWidth&&this.interfaceState.menuWidth&&(b.menuWidth=a.menuWidth);Entry.engine.speedPanelOn&&Entry.engine.toggleSpeedPanel();(a=b.canvasWidth)?325>a?a=325:720<a&&(a=720):a=400;b.canvasWidth=a;var c=9*a/16;Entry.engine.view_.style.width=a+"px";Entry.engine.view_.style.height=c+"px";Entry.engine.view_.style.top="40px";Entry.stage.canvas.canvas.style.width=
-a+"px";400<=a?Entry.engine.view_.removeClass("collapsed"):Entry.engine.view_.addClass("collapsed");Entry.playground.view_.style.left=a+.5+"px";Entry.propertyPanel.resize(a);var d=Entry.engine.view_.getElementsByClassName("entryAddButtonWorkspace_w")[0];d&&(Entry.objectAddable?(d.style.top=c+24+"px",d.style.width=.7*a+"px"):d.style.display="none");if(d=Entry.engine.view_.getElementsByClassName("entryRunButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=
-.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a-4+"px");if(d=Entry.engine.view_.getElementsByClassName("entryStopButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a+"px");(a=b.menuWidth)?244>a?a=244:400<a&&(a=400):a=264;b.menuWidth=a;$(".blockMenuContainer").css({width:a-64+"px"});$(".blockMenuContainer>svg").css({width:a-64+"px"});Entry.playground.mainWorkspace.blockMenu.setWidth();
-$(".entryWorkspaceBoard").css({left:a+"px"});Entry.playground.resizeHandle_.style.left=a+"px";Entry.playground.variableViewWrapper_.style.width=a+"px";this.interfaceState=b}Entry.windowResized.notify()},getUpTime:function(){return(new Date).getTime()-this.startTime},addActivity:function(b){Entry.stateManager&&Entry.stateManager.addActivity(b)},startActivityLogging:function(){Entry.reporter&&Entry.reporter.start(Entry.projectId,window.user?window.user._id:null,Entry.startTime)},getActivityLog:function(){var b=
-{};Entry.stateManager&&(b.activityLog=Entry.stateManager.activityLog_);return b},DRAG_MODE_NONE:0,DRAG_MODE_MOUSEDOWN:1,DRAG_MODE_DRAG:2,cancelObjectEdit:function(b){var a=Entry.playground.object;if(a){var c=b.target;b=0!==$(a.view_).find(c).length;c=c.tagName.toUpperCase();!a.isEditing||"INPUT"===c&&b||a.editObjectValues(!1)}},generateFunctionSchema:function(b){b="func_"+b;if(!Entry.block[b]){var a=function(){};a.prototype=Entry.block.function_general;a=new a;a.changeEvent=new Entry.Event;a.template=
-Lang.template.function_general;Entry.block[b]=a}}};window.Entry=Entry;Entry.Albert={PORT_MAP:{leftWheel:0,rightWheel:0,buzzer:0,leftEye:0,rightEye:0,note:0,bodyLed:0,frontLed:0,padWidth:0,padHeight:0},setZero:function(){var b=Entry.Albert.PORT_MAP,a=Entry.hw.sendQueue,c;for(c in b)a[c]=b[c];Entry.hw.update();b=Entry.Albert;b.tempo=60;b.removeAllTimeouts()},monitorTemplate:{imgPath:"hw/albert.png",width:387,height:503,listPorts:{oid:{name:"OID",type:"input",pos:{x:0,y:0}},buzzer:{name:Lang.Hw.buzzer,type:"output",pos:{x:0,y:0}},note:{name:Lang.Hw.note,type:"output",
+Entry={block:{},TEXT_ALIGN_CENTER:0,TEXT_ALIGN_LEFT:1,TEXT_ALIGN_RIGHT:2,TEXT_ALIGNS:["center","left","right"],clipboard:null,loadProject:function(b){b||(b=Entry.getStartProject(Entry.mediaFilePath));this.setFuncRefs(b.functions);"workspace"==this.type&&Entry.stateManager.startIgnore();Entry.projectId=b._id;Entry.variableContainer.setVariables(b.variables);Entry.variableContainer.setMessages(b.messages);Entry.scene.addScenes(b.scenes);Entry.stage.initObjectContainers();Entry.variableContainer.setFunctions(b.functions);
+Entry.container.setObjects(b.objects);Entry.FPS=b.speed?b.speed:60;createjs.Ticker.setFPS(Entry.FPS);"workspace"==this.type&&setTimeout(function(){Entry.stateManager.endIgnore()},300);Entry.engine.projectTimer||Entry.variableContainer.generateTimer();0===Object.keys(Entry.container.inputValue).length&&Entry.variableContainer.generateAnswer();Entry.start();this.removeFuncRefs();return b},exportProject:function(b){b||(b={});Entry.engine.isState("stop")||Entry.engine.toggleStop();Entry.Func&&Entry.Func.workspace&&
+Entry.Func.workspace.visible&&Entry.Func.cancelEdit();b.objects=Entry.container.toJSON();b.scenes=Entry.scene.toJSON();b.variables=Entry.variableContainer.getVariableJSON();b.messages=Entry.variableContainer.getMessageJSON();b.functions=Entry.variableContainer.getFunctionJSON();b.scenes=Entry.scene.toJSON();b.speed=Entry.FPS;return b},setBlockByText:function(b,a){for(var c=[],d=jQuery.parseXML(a).getElementsByTagName("category"),e=0;e<d.length;e++){for(var f=d[e],g={category:f.getAttribute("id"),
+blocks:[]},f=f.childNodes,h=0;h<f.length;h++){var k=f[h];!k.tagName||"BLOCK"!=k.tagName.toUpperCase()&&"BTN"!=k.tagName.toUpperCase()||g.blocks.push(k.getAttribute("type"))}c.push(g)}Entry.playground.setBlockMenu(c)},setBlock:function(b,a){Entry.playground.setMenuBlock(b,a)},enableArduino:function(){},initSound:function(b){b.path=b.fileurl?b.fileurl:Entry.defaultPath+"/uploads/"+b.filename.substring(0,2)+"/"+b.filename.substring(2,4)+"/"+b.filename+b.ext;Entry.soundQueue.loadFile({id:b.id,src:b.path,
+type:createjs.LoadQueue.SOUND})},beforeUnload:function(b){Entry.hw.closeConnection();Entry.variableContainer.updateCloudVariables();if("workspace"==Entry.type&&(localStorage&&Entry.interfaceState&&localStorage.setItem("workspace-interface",JSON.stringify(Entry.interfaceState)),!Entry.stateManager.isSaved()))return Lang.Workspace.project_changed},loadInterfaceState:function(){if("workspace"==Entry.type)if(localStorage&&localStorage.getItem("workspace-interface")){var b=localStorage.getItem("workspace-interface");
+this.resizeElement(JSON.parse(b))}else this.resizeElement({menuWidth:280,canvasWidth:480})},resizeElement:function(b){if("workspace"==Entry.type){var a=this.interfaceState;!b.canvasWidth&&a.canvasWidth&&(b.canvasWidth=a.canvasWidth);!b.menuWidth&&this.interfaceState.menuWidth&&(b.menuWidth=a.menuWidth);Entry.engine.speedPanelOn&&Entry.engine.toggleSpeedPanel();(a=b.canvasWidth)?325>a?a=325:720<a&&(a=720):a=400;b.canvasWidth=a;var c=9*a/16;Entry.engine.view_.style.width=a+"px";Entry.engine.view_.style.height=
+c+"px";Entry.engine.view_.style.top="40px";Entry.stage.canvas.canvas.style.width=a+"px";400<=a?Entry.engine.view_.removeClass("collapsed"):Entry.engine.view_.addClass("collapsed");Entry.playground.view_.style.left=a+.5+"px";Entry.propertyPanel.resize(a);var d=Entry.engine.view_.getElementsByClassName("entryAddButtonWorkspace_w")[0];d&&(Entry.objectAddable?(d.style.top=c+24+"px",d.style.width=.7*a+"px"):d.style.display="none");if(d=Entry.engine.view_.getElementsByClassName("entryRunButtonWorkspace_w")[0])Entry.objectAddable?
+(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a-4+"px");if(d=Entry.engine.view_.getElementsByClassName("entryStopButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a+"px");(a=b.menuWidth)?244>a?a=244:400<a&&(a=400):a=264;b.menuWidth=a;$(".blockMenuContainer").css({width:a-64+"px"});$(".blockMenuContainer>svg").css({width:a-
+64+"px"});Entry.playground.mainWorkspace.blockMenu.setWidth();$(".entryWorkspaceBoard").css({left:a+"px"});Entry.playground.resizeHandle_.style.left=a+"px";Entry.playground.variableViewWrapper_.style.width=a+"px";this.interfaceState=b}Entry.windowResized.notify()},getUpTime:function(){return(new Date).getTime()-this.startTime},addActivity:function(b){Entry.stateManager&&Entry.stateManager.addActivity(b)},startActivityLogging:function(){Entry.reporter&&Entry.reporter.start(Entry.projectId,window.user?
+window.user._id:null,Entry.startTime)},getActivityLog:function(){var b={};Entry.stateManager&&(b.activityLog=Entry.stateManager.activityLog_);return b},DRAG_MODE_NONE:0,DRAG_MODE_MOUSEDOWN:1,DRAG_MODE_DRAG:2,cancelObjectEdit:function(b){var a=Entry.playground.object;if(a){var c=b.target;b=0!==$(a.view_).find(c).length;c=c.tagName.toUpperCase();!a.isEditing||"INPUT"===c&&b||a.editObjectValues(!1)}},generateFunctionSchema:function(b){b="func_"+b;if(!Entry.block[b]){var a=function(){};a.prototype=Entry.block.function_general;
+a=new a;a.changeEvent=new Entry.Event;a.template=Lang.template.function_general;Entry.block[b]=a}},setFuncRefs:function(b){this.functions=b?b.map(function(a){return a.id}):[]},removeFuncRefs:function(){delete this.functions}};window.Entry=Entry;Entry.Albert={PORT_MAP:{leftWheel:0,rightWheel:0,buzzer:0,leftEye:0,rightEye:0,note:0,bodyLed:0,frontLed:0,padWidth:0,padHeight:0},setZero:function(){var b=Entry.Albert.PORT_MAP,a=Entry.hw.sendQueue,c;for(c in b)a[c]=b[c];Entry.hw.update();b=Entry.Albert;b.tempo=60;b.removeAllTimeouts()},monitorTemplate:{imgPath:"hw/albert.png",width:387,height:503,listPorts:{oid:{name:"OID",type:"input",pos:{x:0,y:0}},buzzer:{name:Lang.Hw.buzzer,type:"output",pos:{x:0,y:0}},note:{name:Lang.Hw.note,type:"output",
 pos:{x:0,y:0}}},ports:{leftProximity:{name:Lang.Blocks.ALBERT_sensor_leftProximity,type:"input",pos:{x:178,y:401}},rightProximity:{name:Lang.Blocks.ALBERT_sensor_rightProximity,type:"input",pos:{x:66,y:359}},battery:{name:Lang.Blocks.ALBERT_sensor_battery,type:"input",pos:{x:88,y:368}},light:{name:Lang.Blocks.ALBERT_sensor_light,type:"input",pos:{x:127,y:391}},leftWheel:{name:Lang.Hw.leftWheel,type:"output",pos:{x:299,y:406}},rightWheel:{name:Lang.Hw.rightWheel,type:"output",pos:{x:22,y:325}},leftEye:{name:Lang.Hw.leftEye,
 type:"output",pos:{x:260,y:26}},rightEye:{name:Lang.Hw.rightEye,type:"output",pos:{x:164,y:13}},bodyLed:{name:Lang.Hw.body+" "+Lang.Hw.led,type:"output",pos:{x:367,y:308}},frontLed:{name:Lang.Hw.front+" "+Lang.Hw.led,pos:{x:117,y:410}}},mode:"both"},tempo:60,timeouts:[],removeTimeout:function(b){clearTimeout(b);var a=this.timeouts;b=a.indexOf(b);0<=b&&a.splice(b,1)},removeAllTimeouts:function(){var b=this.timeouts,a;for(a in b)clearTimeout(b[a]);this.timeouts=[]},name:"albert"};
 Blockly.Blocks.albert_hand_found={init:function(){this.setColour("#00979D");this.appendDummyInput().appendField(Lang.Blocks.ALBERT_hand_found);this.setOutput(!0,"Boolean");this.setInputsInline(!0)}};Entry.block.albert_hand_found=function(b,a){var c=Entry.hw.portData;return 40<c.leftProximity||40<c.rightProximity};
@@ -1279,7 +1279,7 @@ for(c in this.lists_)d=this.lists_[c],d.object_||(a.push(d),e=d.listElement,this
 this.lists_[c],a.push(d),e=d.listElement,this.listView_.appendChild(e),d.callerListElement&&this.listView_.appendChild(d.callerListElement);if("all"==b||"func"==b)for(c in"func"==b&&this.listView_.appendChild(this.functionAddButton_),this.functions_)b=this.functions_[c],a.push(b),e=b.listElement,this.listView_.appendChild(e),b.callerListElement&&this.listView_.appendChild(b.callerListElement);this.listView_.appendChild(this.variableSettingView);this.listView_.appendChild(this.listSettingView)}};
 Entry.VariableContainer.prototype.setMessages=function(b){for(var a in b){var c=b[a];c.id||(c.id=Entry.generateHash());this.createMessageView(c);this.messages_.push(c)}Entry.playground.reloadPlayground();this.updateList()};
 Entry.VariableContainer.prototype.setVariables=function(b){for(var a in b){var c=new Entry.Variable(b[a]),d=c.getType();"variable"==d||"slide"==d?(c.generateView(this.variables_.length),this.createVariableView(c),this.variables_.push(c)):"list"==d?(c.generateView(this.lists_.length),this.createListView(c),this.lists_.push(c)):"timer"==d?this.generateTimer(c):"answer"==d&&this.generateAnswer(c)}Entry.isEmpty(Entry.engine.projectTimer)&&Entry.variableContainer.generateTimer();Entry.isEmpty(Entry.container.inputValue)&&
-Entry.variableContainer.generateAnswer();Entry.playground.reloadPlayground();this.updateList()};Entry.VariableContainer.prototype.setFunctions=function(b){b&&b.forEach(function(a){Entry.generateFunctionSchema(a.id)});for(var a in b){var c=new Entry.Func(b[a]);c.generateBlock();this.createFunctionView(c);this.functions_[c.id]=c}this.updateList()};Entry.VariableContainer.prototype.getFunction=function(b){return this.functions_[b]};
+Entry.variableContainer.generateAnswer();Entry.playground.reloadPlayground();this.updateList()};Entry.VariableContainer.prototype.setFunctions=function(b){for(var a in b){var c=new Entry.Func(b[a]);c.generateBlock();this.createFunctionView(c);this.functions_[c.id]=c}this.updateList()};Entry.VariableContainer.prototype.getFunction=function(b){return this.functions_[b]};
 Entry.VariableContainer.prototype.getVariable=function(b,a){var c=Entry.findObjsByKey(this.variables_,"id_",b)[0];a&&a.isClone&&c.object_&&(c=Entry.findObjsByKey(a.variables,"id_",b)[0]);return c};Entry.VariableContainer.prototype.getList=function(b,a){var c=Entry.findObjsByKey(this.lists_,"id_",b)[0];a&&a.isClone&&c.object_&&(c=Entry.findObjsByKey(a.lists,"id_",b)[0]);return c};Entry.VariableContainer.prototype.createFunction=function(){if(!Entry.Func.isEdit){var b=new Entry.Func;Entry.Func.edit(b)}};
 Entry.VariableContainer.prototype.addFunction=function(b){};Entry.VariableContainer.prototype.removeFunction=function(b){var a=b.id;b=this.functions_;b[a].destroy();delete b[a];a="func_"+a;Entry.container.removeFuncBlocks(a);for(var c in b)b[c].content.removeBlocksByType(a);this.updateList()};Entry.VariableContainer.prototype.checkListPosition=function(b,a){var c=b.x_+b.width_,d=-b.y_,e=-b.y_+-b.height_;return a.x>b.x_&&a.x<c&&a.y<d&&a.y>e?!0:!1};
 Entry.VariableContainer.prototype.getListById=function(b){var a=this.lists_,c=[];if(0<a.length){for(var d=0;d<a.length;d++)this.checkListPosition(a[d],b)&&c.push(a[d]);return c}return!1};Entry.VariableContainer.prototype.editFunction=function(b,a){};Entry.VariableContainer.prototype.saveFunction=function(b){this.functions_[b.id]||(this.functions_[b.id]=b,this.createFunctionView(b));b.listElement.nameField.innerHTML=b.description;this.updateList()};
@@ -2127,13 +2127,13 @@ Entry.skeleton.basic_double_loop={path:function(b){var a=b.contentWidth,c=b.cont
 c).replace(/%wh2/gi,d).replace(/%w/gi,a).replace(/%bw/gi,a-8).replace(/%h1/gi,c/2).replace(/%h2/gi,d/2).replace(/%sh1/gi,b+1).replace(/%sh2/gi,e+1)},magnets:function(b){var a=Math.max(b.contentHeight%1E6+2,30),c=Math.max(Math.floor(b.contentHeight/1E6)+2,30),d=b._statements[0]?b._statements[0].height:20,e=b._statements[1]?b._statements[1].height:20,d=Math.max(d,20),e=Math.max(e,20);return{previous:{x:0,y:0},next:{x:0,y:d+e+a+c+19+b.offsetY}}},box:function(b){var a=b.contentWidth,c=Math.max(Math.floor(b.contentHeight/
 1E6)+2,30),d=Math.max(b.contentHeight%1E6+2,30),e=b._statements[0]?b._statements[0].height%1E6:20;b=b._statements[1]?b._statements[1].height:20;e=Math.max(e,20);b=Math.max(b,20);return{offsetX:-8,offsetY:0,width:a+30,height:c+d+e+b+17,marginBottom:0}},statementPos:function(b){var a=Math.max(30,b.contentHeight%1E6+2)+1;return[{x:16,y:a},{x:16,y:a+Math.max(b._statements[0]?b._statements[0].height%1E6:20,20)+Math.max(Math.floor(b.contentHeight/1E6)+2,30)+1}]},contentPos:function(b){return{x:14,y:Math.max(b.contentHeight%
 1E6,28)/2+1}}};Entry.Thread=function(b,a,c){this._data=new Entry.Collection;this._code=a;this.changeEvent=new Entry.Event(this);this.changeEvent.attach(this,this.handleChange);this._event=null;this.parent=c?c:a;this.load(b)};
-(function(b){b.load=function(a,b){void 0===a&&(a=[]);if(!(a instanceof Array))return console.error("thread must be array");for(var d=0;d<a.length;d++){var e=a[d];e instanceof Entry.Block||e.isDummy?(e.setThread(this),this._data.push(e)):Entry.block[e.type]&&this._data.push(new Entry.Block(e,this))}(d=this._code.view)&&this.createView(d.board,b)};b.registerEvent=function(a,b){this._event=b;this._code.registerEvent(a,b)};b.unregisterEvent=function(a,b){this._code.unregisterEvent(a,b)};b.createView=
-function(a,b){this.view||(this.view=new Entry.ThreadView(this,a));this._data.map(function(d){d.createView(a,b)})};b.separate=function(a,b){if(this._data.has(a.id)){var d=this._data.splice(this._data.indexOf(a),b);this._code.createThread(d);this.changeEvent.notify()}};b.cut=function(a){a=this._data.indexOf(a);a=this._data.splice(a);this.changeEvent.notify();return a};b.insertByBlock=function(a,b){for(var d=a?this._data.indexOf(a):-1,e=0;e<b.length;e++)b[e].setThread(this);this._data.splice.apply(this._data,
-[d+1,0].concat(b));this.changeEvent.notify()};b.insertToTop=function(a){a.setThread(this);this._data.unshift.apply(this._data,[a]);this.changeEvent.notify()};b.clone=function(a,b){a=a||this._code;for(var d=new Entry.Thread([],a),e=this._data,f=[],g=0,h=e.length;g<h;g++)f.push(e[g].clone(d));d.load(f,b);return d};b.toJSON=function(a,b){for(var d=[],e=void 0===b?0:b;e<this._data.length;e++)this._data[e]instanceof Entry.Block&&d.push(this._data[e].toJSON(a));return d};b.destroy=function(a){this._code.destroyThread(this,
-!1);this.view&&this.view.destroy(a);for(var b=this._data,d=b.length-1;0<=d;d--)b[d].destroy(a)};b.getBlock=function(a){return this._data[a]};b.getBlocks=function(){return this._data.map(function(a){return a})};b.countBlock=function(){for(var a=0,b=0;b<this._data.length;b++){var d=this._data[b];if(d.type&&(a++,d=d.statements))for(var e=0;e<d.length;e++)a+=d[e].countBlock()}return a};b.handleChange=function(){0===this._data.length&&this.destroy()};b.getCode=function(){return this._code};b.setCode=function(a){this._code=
-a};b.spliceBlock=function(a){this._data.remove(a);this.changeEvent.notify()};b.getFirstBlock=function(){return this._data[0]};b.getPrevBlock=function(a){a=this._data.indexOf(a);return this._data.at(a-1)};b.getNextBlock=function(a){a=this._data.indexOf(a);return this._data.at(a+1)};b.getLastBlock=function(){return this._data.at(this._data.length-1)};b.getRootBlock=function(){return this._data.at(0)};b.hasBlockType=function(a){function b(d){if(a==d.type)return!0;for(var f=d.params,g=0;g<f.length;g++){var h=
-f[g];if(h&&h.constructor==Entry.Block&&b(h))return!0}if(d=d.statements)for(f=0;f<d.length;f++)if(d[f].hasBlockType(a))return!0;return!1}for(var d=0;d<this._data.length;d++)if(b(this._data[d]))return!0;return!1};b.getCount=function(a){var b=this._data.length;a&&(b-=this._data.indexOf(a));return b};b.indexOf=function(a){return this._data.indexOf(a)};b.pointer=function(a,b){var d=this.indexOf(b);a.unshift(d);this.parent instanceof Entry.Block&&a.unshift(this.parent.indexOfStatements(this));return this._code===
-this.parent?(a.unshift(this._code.indexOf(this)),d=this._data[0],a.unshift(d.y),a.unshift(d.x),a):this.parent.pointer(a)};b.getBlockList=function(a,b){for(var d=[],e=0;e<this._data.length;e++)d=d.concat(this._data[e].getBlockList(a,b));return d};b.stringify=function(){return JSON.stringify(this.toJSON())}})(Entry.Thread.prototype);Entry.Block=function(b,a){var c=this;Entry.Model(this,!1);this._schema=null;this.setThread(a);this.load(b);var d=this.getCode();d.registerBlock(this);var e=this.events.dataAdd;e&&d.object&&e.forEach(function(a){Entry.Utils.isFunction(a)&&a(c)})};Entry.Block.MAGNET_RANGE=10;Entry.Block.MAGNET_OFFSET=.4;Entry.Block.DELETABLE_TRUE=1;Entry.Block.DELETABLE_FALSE=2;Entry.Block.DELETABLE_FALSE_LIGHTEN=3;
+(function(b){b.load=function(a,b){void 0===a&&(a=[]);if(!(a instanceof Array))return console.error("thread must be array");for(var d=0;d<a.length;d++){var e=a[d];if(e instanceof Entry.Block||e.isDummy)e.setThread(this),this._data.push(e);else{var f=Entry.functions,g=e.type;(Entry.block[g]||f&&-1<f.indexOf(g.split("_")[1]))&&this._data.push(new Entry.Block(e,this))}}(d=this._code.view)&&this.createView(d.board,b)};b.registerEvent=function(a,b){this._event=b;this._code.registerEvent(a,b)};b.unregisterEvent=
+function(a,b){this._code.unregisterEvent(a,b)};b.createView=function(a,b){this.view||(this.view=new Entry.ThreadView(this,a));this._data.map(function(d){d.createView(a,b)})};b.separate=function(a,b){if(this._data.has(a.id)){var d=this._data.splice(this._data.indexOf(a),b);this._code.createThread(d);this.changeEvent.notify()}};b.cut=function(a){a=this._data.indexOf(a);a=this._data.splice(a);this.changeEvent.notify();return a};b.insertByBlock=function(a,b){for(var d=a?this._data.indexOf(a):-1,e=0;e<
+b.length;e++)b[e].setThread(this);this._data.splice.apply(this._data,[d+1,0].concat(b));this.changeEvent.notify()};b.insertToTop=function(a){a.setThread(this);this._data.unshift.apply(this._data,[a]);this.changeEvent.notify()};b.clone=function(a,b){a=a||this._code;for(var d=new Entry.Thread([],a),e=this._data,f=[],g=0,h=e.length;g<h;g++)f.push(e[g].clone(d));d.load(f,b);return d};b.toJSON=function(a,b){for(var d=[],e=void 0===b?0:b;e<this._data.length;e++)this._data[e]instanceof Entry.Block&&d.push(this._data[e].toJSON(a));
+return d};b.destroy=function(a){this._code.destroyThread(this,!1);this.view&&this.view.destroy(a);for(var b=this._data,d=b.length-1;0<=d;d--)b[d].destroy(a)};b.getBlock=function(a){return this._data[a]};b.getBlocks=function(){return this._data.map(function(a){return a})};b.countBlock=function(){for(var a=0,b=0;b<this._data.length;b++){var d=this._data[b];if(d.type&&(a++,d=d.statements))for(var e=0;e<d.length;e++)a+=d[e].countBlock()}return a};b.handleChange=function(){0===this._data.length&&this.destroy()};
+b.getCode=function(){return this._code};b.setCode=function(a){this._code=a};b.spliceBlock=function(a){this._data.remove(a);this.changeEvent.notify()};b.getFirstBlock=function(){return this._data[0]};b.getPrevBlock=function(a){a=this._data.indexOf(a);return this._data.at(a-1)};b.getNextBlock=function(a){a=this._data.indexOf(a);return this._data.at(a+1)};b.getLastBlock=function(){return this._data.at(this._data.length-1)};b.getRootBlock=function(){return this._data.at(0)};b.hasBlockType=function(a){function b(d){if(a==
+d.type)return!0;for(var f=d.params,g=0;g<f.length;g++){var h=f[g];if(h&&h.constructor==Entry.Block&&b(h))return!0}if(d=d.statements)for(f=0;f<d.length;f++)if(d[f].hasBlockType(a))return!0;return!1}for(var d=0;d<this._data.length;d++)if(b(this._data[d]))return!0;return!1};b.getCount=function(a){var b=this._data.length;a&&(b-=this._data.indexOf(a));return b};b.indexOf=function(a){return this._data.indexOf(a)};b.pointer=function(a,b){var d=this.indexOf(b);a.unshift(d);this.parent instanceof Entry.Block&&
+a.unshift(this.parent.indexOfStatements(this));return this._code===this.parent?(a.unshift(this._code.indexOf(this)),d=this._data[0],a.unshift(d.y),a.unshift(d.x),a):this.parent.pointer(a)};b.getBlockList=function(a,b){for(var d=[],e=0;e<this._data.length;e++)d=d.concat(this._data[e].getBlockList(a,b));return d};b.stringify=function(){return JSON.stringify(this.toJSON())}})(Entry.Thread.prototype);Entry.Block=function(b,a){var c=this;Entry.Model(this,!1);this._schema=null;this.setThread(a);this.load(b);var d=this.getCode();d.registerBlock(this);var e=this.events.dataAdd;e&&d.object&&e.forEach(function(a){Entry.Utils.isFunction(a)&&a(c)})};Entry.Block.MAGNET_RANGE=10;Entry.Block.MAGNET_OFFSET=.4;Entry.Block.DELETABLE_TRUE=1;Entry.Block.DELETABLE_FALSE=2;Entry.Block.DELETABLE_FALSE_LIGHTEN=3;
 (function(b){b.schema={id:null,x:0,y:0,type:null,params:[],statements:[],view:null,thread:null,movable:null,deletable:Entry.Block.DELETABLE_TRUE,readOnly:null,copyable:!0,events:{}};b.load=function(a){a.id||(a.id=Entry.Utils.generateId());this.set(a);this.loadSchema()};b.changeSchema=function(a){this.set({params:[]});this.loadSchema()};b.getSchema=function(){this._schema||this.loadSchema();return this._schema};b.loadSchema=function(){if(this._schema=Entry.block[this.type]){!this._schemaChangeEvent&&
 this._schema.changeEvent&&(this._schemaChangeEvent=this._schema.changeEvent.attach(this,this.changeSchema));var a=this._schema.events;if(a)for(var b in a){this.events[b]||(this.events[b]=[]);for(var d=a[b],e=0;e<d.length;e++){var f=d[e];f&&0>this.events[b].indexOf(f)&&this.events[b].push(f)}}this._schema.event&&this.thread.registerEvent(this,this._schema.event);a=this.params;b=this._schema.params;for(e=0;b&&e<b.length;e++)d=void 0===a[e]||null===a[e]?b[e].value:a[e],f=a[e]||e<a.length,!d||"Output"!==
 b[e].type&&"Block"!==b[e].type||(d=new Entry.Block(d,this.thread)),f?a.splice(e,1,d):a.push(d);if(a=this._schema.statements)for(e=0;e<a.length;e++)this.statements.splice(e,1,new Entry.Thread(this.statements[e],this.getCode(),this))}};b.changeType=function(a){this._schemaChangeEvent&&this._schemaChangeEvent.destroy();this.set({type:a});this.loadSchema();this.view&&this.view.changeType(a)};b.setThread=function(a){this.set({thread:a})};b.getThread=function(){return this.thread};b.insertAfter=function(a){this.thread.insertByBlock(this,
diff --git a/src/entry.js b/src/entry.js
index 323e32d35c..39d32bdb04 100644
--- a/src/entry.js
+++ b/src/entry.js
@@ -25,6 +25,8 @@ Entry.loadProject = function(project) {
         project = Entry.getStartProject(Entry.mediaFilePath);
     }
 
+    this.setFuncRefs(project.functions);
+
     if (this.type == 'workspace')
         Entry.stateManager.startIgnore();
     Entry.projectId = project._id;
@@ -49,6 +51,9 @@ Entry.loadProject = function(project) {
     if (Object.keys(Entry.container.inputValue).length === 0)
         Entry.variableContainer.generateAnswer();
     Entry.start();
+
+    this.removeFuncRefs();
+
     return project;
 };
 
@@ -353,4 +358,17 @@ Entry.generateFunctionSchema = function(functionId) {
     Entry.block[functionId] = blockSchema;
 };
 
+Entry.setFuncRefs = function(functions) {
+    if (!functions) this.functions = [];
+    else {
+        this.functions = functions.map(function(f) {
+            return f.id;
+        });
+    }
+};
+
+Entry.removeFuncRefs = function() {
+    delete this.functions;
+};
+
 window.Entry = Entry;
diff --git a/src/variable_container.js b/src/variable_container.js
index 9876fbb65a..59a5b2cb7f 100644
--- a/src/variable_container.js
+++ b/src/variable_container.js
@@ -589,12 +589,6 @@ Entry.VariableContainer.prototype.setVariables = function(variables) {
  * @param {!Array.<function model>} variables
  */
 Entry.VariableContainer.prototype.setFunctions = function(functions) {
-    if (functions) {
-        functions.forEach(function(f) {
-            Entry.generateFunctionSchema(f.id);
-        });
-    }
-
     for (var i in functions) {
         var func = new Entry.Func(functions[i]);
         func.generateBlock();
diff --git a/src/workspace/thread.js b/src/workspace/thread.js
index eaab7b0f01..2699a8a76b 100644
--- a/src/workspace/thread.js
+++ b/src/workspace/thread.js
@@ -35,7 +35,13 @@ Entry.Thread = function(thread, code, parent) {
             if (block instanceof Entry.Block || block.isDummy) {
                 block.setThread(this);
                 this._data.push(block);
-            } else Entry.block[block.type] && this._data.push(new Entry.Block(block, this));
+            } else {
+                var functions = Entry.functions;
+                var blockType = block.type;
+                if (Entry.block[blockType] || (
+                    functions && functions.indexOf(blockType.split('_')[1]) > -1))
+                    this._data.push(new Entry.Block(block, this));
+            }
         }
 
         var codeView = this._code.view;

From cef6996a7e175073f974fde926fd7cd3648e27a8 Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Fri, 19 Aug 2016 09:33:05 +0900
Subject: [PATCH 2/3] restore to origin

---
 dist/entry.js             | 28 +++++-----------------------
 src/entry.js              | 17 -----------------
 src/variable_container.js |  6 +++---
 src/workspace/thread.js   |  9 ++-------
 4 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/dist/entry.js b/dist/entry.js
index 303de251d7..4e01bad7c8 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -1,6 +1,5 @@
 var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:2, TEXT_ALIGNS:["center", "left", "right"], clipboard:null, loadProject:function(b) {
   b || (b = Entry.getStartProject(Entry.mediaFilePath));
-  this.setFuncRefs(b.functions);
   "workspace" == this.type && Entry.stateManager.startIgnore();
   Entry.projectId = b._id;
   Entry.variableContainer.setVariables(b.variables);
@@ -17,7 +16,6 @@ var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:
   Entry.engine.projectTimer || Entry.variableContainer.generateTimer();
   0 === Object.keys(Entry.container.inputValue).length && Entry.variableContainer.generateAnswer();
   Entry.start();
-  this.removeFuncRefs();
   return b;
 }, exportProject:function(b) {
   b || (b = {});
@@ -125,12 +123,6 @@ var Entry = {block:{}, TEXT_ALIGN_CENTER:0, TEXT_ALIGN_LEFT:1, TEXT_ALIGN_RIGHT:
     a.template = Lang.template.function_general;
     Entry.block[b] = a;
   }
-}, setFuncRefs:function(b) {
-  this.functions = b ? b.map(function(a) {
-    return a.id;
-  }) : [];
-}, removeFuncRefs:function() {
-  delete this.functions;
 }};
 window.Entry = Entry;
 Entry.Albert = {PORT_MAP:{leftWheel:0, rightWheel:0, buzzer:0, leftEye:0, rightEye:0, note:0, bodyLed:0, frontLed:0, padWidth:0, padHeight:0}, setZero:function() {
@@ -13928,15 +13920,10 @@ Entry.VariableContainer.prototype.createFunction = function() {
 Entry.VariableContainer.prototype.addFunction = function(b) {
 };
 Entry.VariableContainer.prototype.removeFunction = function(b) {
-  var a = b.id;
-  b = this.functions_;
-  b[a].destroy();
-  delete b[a];
-  a = "func_" + a;
-  Entry.container.removeFuncBlocks(a);
-  for (var c in b) {
-    b[c].content.removeBlocksByType(a);
-  }
+  b = b.id;
+  var a = this.functions_;
+  a[b].destroy();
+  delete a[b];
   this.updateList();
 };
 Entry.VariableContainer.prototype.checkListPosition = function(b, a) {
@@ -18886,12 +18873,7 @@ Entry.Thread = function(b, a, c) {
     }
     for (var d = 0;d < a.length;d++) {
       var e = a[d];
-      if (e instanceof Entry.Block || e.isDummy) {
-        e.setThread(this), this._data.push(e);
-      } else {
-        var f = Entry.functions, g = e.type;
-        (Entry.block[g] || f && -1 < f.indexOf(g.split("_")[1])) && this._data.push(new Entry.Block(e, this));
-      }
+      e instanceof Entry.Block || e.isDummy ? (e.setThread(this), this._data.push(e)) : this._data.push(new Entry.Block(e, this));
     }
     (d = this._code.view) && this.createView(d.board, b);
   };
diff --git a/src/entry.js b/src/entry.js
index 39d32bdb04..d49ffe86b3 100644
--- a/src/entry.js
+++ b/src/entry.js
@@ -25,8 +25,6 @@ Entry.loadProject = function(project) {
         project = Entry.getStartProject(Entry.mediaFilePath);
     }
 
-    this.setFuncRefs(project.functions);
-
     if (this.type == 'workspace')
         Entry.stateManager.startIgnore();
     Entry.projectId = project._id;
@@ -52,8 +50,6 @@ Entry.loadProject = function(project) {
         Entry.variableContainer.generateAnswer();
     Entry.start();
 
-    this.removeFuncRefs();
-
     return project;
 };
 
@@ -358,17 +354,4 @@ Entry.generateFunctionSchema = function(functionId) {
     Entry.block[functionId] = blockSchema;
 };
 
-Entry.setFuncRefs = function(functions) {
-    if (!functions) this.functions = [];
-    else {
-        this.functions = functions.map(function(f) {
-            return f.id;
-        });
-    }
-};
-
-Entry.removeFuncRefs = function() {
-    delete this.functions;
-};
-
 window.Entry = Entry;
diff --git a/src/variable_container.js b/src/variable_container.js
index 59a5b2cb7f..c728445c64 100644
--- a/src/variable_container.js
+++ b/src/variable_container.js
@@ -663,9 +663,9 @@ Entry.VariableContainer.prototype.removeFunction = function(func) {
     delete functions[functionId];
     var functionType = 'func_' + functionId;
 
-    Entry.container.removeFuncBlocks(functionType);
-    for (var id in functions)
-        functions[id].content.removeBlocksByType(functionType);
+    //Entry.container.removeFuncBlocks(functionType);
+    //for (var id in functions)
+        //functions[id].content.removeBlocksByType(functionType);
     this.updateList();
 };
 
diff --git a/src/workspace/thread.js b/src/workspace/thread.js
index 2699a8a76b..c5272c3e2a 100644
--- a/src/workspace/thread.js
+++ b/src/workspace/thread.js
@@ -35,13 +35,8 @@ Entry.Thread = function(thread, code, parent) {
             if (block instanceof Entry.Block || block.isDummy) {
                 block.setThread(this);
                 this._data.push(block);
-            } else {
-                var functions = Entry.functions;
-                var blockType = block.type;
-                if (Entry.block[blockType] || (
-                    functions && functions.indexOf(blockType.split('_')[1]) > -1))
-                    this._data.push(new Entry.Block(block, this));
-            }
+            } else
+                this._data.push(new Entry.Block(block, this));
         }
 
         var codeView = this._code.view;

From 738b6f40c3614fa00405ed1852f8f012664ae18f Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Fri, 19 Aug 2016 11:08:04 +0900
Subject: [PATCH 3/3] remove when schema is undefined

---
 dist/entry.js               | 98 ++++++++++++++++++++-----------------
 dist/entry.min.js           | 52 ++++++++++----------
 src/variable_container.js   |  6 +--
 src/workspace/block.js      |  2 +-
 src/workspace/block_view.js | 10 ++--
 src/workspace/executors.js  |  4 +-
 src/workspace/thread.js     |  2 +-
 7 files changed, 94 insertions(+), 80 deletions(-)

diff --git a/dist/entry.js b/dist/entry.js
index 4e01bad7c8..840c52161d 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -13920,10 +13920,15 @@ Entry.VariableContainer.prototype.createFunction = function() {
 Entry.VariableContainer.prototype.addFunction = function(b) {
 };
 Entry.VariableContainer.prototype.removeFunction = function(b) {
-  b = b.id;
-  var a = this.functions_;
-  a[b].destroy();
-  delete a[b];
+  var a = b.id;
+  b = this.functions_;
+  b[a].destroy();
+  delete b[a];
+  a = "func_" + a;
+  Entry.container.removeFuncBlocks(a);
+  for (var c in b) {
+    b[c].content.removeBlocksByType(a);
+  }
   this.updateList();
 };
 Entry.VariableContainer.prototype.checkListPosition = function(b, a) {
@@ -15855,6 +15860,7 @@ Entry.BlockMenuScroller.RADIUS = 7;
   };
 })(Entry.BlockMenuScroller.prototype);
 Entry.BlockView = function(b, a, c) {
+  var d = this;
   Entry.Model(this, !1);
   this.block = b;
   this._lazyUpdatePos = _.debounce(b._updatePos.bind(b), 200);
@@ -15863,39 +15869,42 @@ Entry.BlockView = function(b, a, c) {
   this.set(b);
   this.svgGroup = a.svgBlockGroup.elem("g");
   this._schema = Entry.block[b.type];
-  this._schema.changeEvent && (this._schemaChangeEvent = this._schema.changeEvent.attach(this, this._updateSchema));
-  var d = this._skeleton = Entry.skeleton[this._schema.skeleton];
-  this._contents = [];
-  this._statements = [];
-  this.magnet = {};
-  this._paramMap = {};
-  d.magnets && d.magnets(this).next && (this.svgGroup.nextMagnet = this.block, this._nextGroup = this.svgGroup.elem("g"), this._observers.push(this.observe(this, "_updateMagnet", ["contentHeight"])));
-  this.isInBlockMenu = this.getBoard() instanceof Entry.BlockMenu;
-  var e = this;
-  this.mouseHandler = function() {
-    var a = e.block.events;
-    a && a.mousedown && a.mousedown.forEach(function(a) {
-      a(e);
+  if (void 0 === this._schema) {
+    this.block.destroy(!1, !1);
+  } else {
+    this._schema.changeEvent && (this._schemaChangeEvent = this._schema.changeEvent.attach(this, this._updateSchema));
+    var e = this._skeleton = Entry.skeleton[this._schema.skeleton];
+    this._contents = [];
+    this._statements = [];
+    this.magnet = {};
+    this._paramMap = {};
+    e.magnets && e.magnets(this).next && (this.svgGroup.nextMagnet = this.block, this._nextGroup = this.svgGroup.elem("g"), this._observers.push(this.observe(this, "_updateMagnet", ["contentHeight"])));
+    this.isInBlockMenu = this.getBoard() instanceof Entry.BlockMenu;
+    this.mouseHandler = function() {
+      var a = d.block.events;
+      a && a.mousedown && a.mousedown.forEach(function(a) {
+        a(d);
+      });
+      d.onMouseDown.apply(d, arguments);
+    };
+    this._startRender(b, c);
+    this._observers.push(this.block.observe(this, "_setMovable", ["movable"]));
+    this._observers.push(this.block.observe(this, "_setReadOnly", ["movable"]));
+    this._observers.push(this.block.observe(this, "_setCopyable", ["copyable"]));
+    this._observers.push(this.block.observe(this, "_updateColor", ["deletable"], !1));
+    this._observers.push(this.observe(this, "_updateBG", ["magneting"], !1));
+    this._observers.push(this.observe(this, "_updateOpacity", ["visible"], !1));
+    this._observers.push(this.observe(this, "_updateDisplay", ["display"], !1));
+    this._observers.push(this.observe(this, "_updateShadow", ["shadow"]));
+    this._observers.push(this.observe(this, "_updateMagnet", ["offsetY"]));
+    this._observers.push(a.code.observe(this, "_setBoard", ["board"], !1));
+    this.dragMode = Entry.DRAG_MODE_NONE;
+    Entry.Utils.disableContextmenu(this.svgGroup.node);
+    a = b.events.viewAdd;
+    "workspace" == Entry.type && a && !this.isInBlockMenu && a.forEach(function(a) {
+      Entry.Utils.isFunction(a) && a(b);
     });
-    e.onMouseDown.apply(e, arguments);
-  };
-  this._startRender(b, c);
-  this._observers.push(this.block.observe(this, "_setMovable", ["movable"]));
-  this._observers.push(this.block.observe(this, "_setReadOnly", ["movable"]));
-  this._observers.push(this.block.observe(this, "_setCopyable", ["copyable"]));
-  this._observers.push(this.block.observe(this, "_updateColor", ["deletable"], !1));
-  this._observers.push(this.observe(this, "_updateBG", ["magneting"], !1));
-  this._observers.push(this.observe(this, "_updateOpacity", ["visible"], !1));
-  this._observers.push(this.observe(this, "_updateDisplay", ["display"], !1));
-  this._observers.push(this.observe(this, "_updateShadow", ["shadow"]));
-  this._observers.push(this.observe(this, "_updateMagnet", ["offsetY"]));
-  this._observers.push(a.code.observe(this, "_setBoard", ["board"], !1));
-  this.dragMode = Entry.DRAG_MODE_NONE;
-  Entry.Utils.disableContextmenu(this.svgGroup.node);
-  a = b.events.viewAdd;
-  "workspace" == Entry.type && a && !this.isInBlockMenu && a.forEach(function(a) {
-    Entry.Utils.isFunction(a) && a(b);
-  });
+  }
 };
 Entry.BlockView.PARAM_SPACE = 5;
 Entry.BlockView.DRAG_RADIUS = 5;
@@ -16724,14 +16733,15 @@ Entry.Executor = function(b, a) {
       for (;;) {
         var a = null;
         try {
-          a = this.scope.block.getSchema().func.call(this.scope, this.entity, this.scope);
-        } catch (b) {
-          if ("AsyncError" === b.name) {
+          var b = this.scope.block.getSchema();
+          b && (a = b.func.call(this.scope, this.entity, this.scope));
+        } catch (e) {
+          if ("AsyncError" === e.name) {
             a = Entry.STATIC.BREAK;
           } else {
-            var c = !1;
-            "\ub7f0\ud0c0\uc784 \uc5d0\ub7ec" != b.message && (c = !0);
-            Entry.Utils.stopProjectWithToast(this.scope, "\ub7f0\ud0c0\uc784 \uc5d0\ub7ec", c);
+            var d = !1;
+            "\ub7f0\ud0c0\uc784 \uc5d0\ub7ec" != e.message && (d = !0);
+            Entry.Utils.stopProjectWithToast(this.scope, "\ub7f0\ud0c0\uc784 \uc5d0\ub7ec", d);
           }
         }
         if (this.isEnd()) {
@@ -18886,7 +18896,7 @@ Entry.Thread = function(b, a, c) {
   };
   b.createView = function(a, b) {
     this.view || (this.view = new Entry.ThreadView(this, a));
-    this._data.map(function(d) {
+    this._data.getAll().forEach(function(d) {
       d.createView(a, b);
     });
   };
@@ -19161,7 +19171,7 @@ Entry.Block.DELETABLE_FALSE_LIGHTEN = 3;
     f = this.getNextBlock();
     this.getCode().unregisterBlock(this);
     e = this.getThread();
-    this._schema.event && e.unregisterEvent(this, this._schema.event);
+    this._schema && this._schema.event && e.unregisterEvent(this, this._schema.event);
     f && (b ? f.destroy(a, b) : g ? f.view && f.view.bindPrev(g) : (g = this.getThread().view.getParent(), g.constructor === Entry.FieldStatement ? (f.view && f.view.bindPrev(g), g.insertTopBlock(f)) : g.constructor === Entry.FieldStatement ? f.replace(g._valueBlock) : f.view._toGlobalCoordinate()));
     !this.doNotSplice && e.spliceBlock ? e.spliceBlock(this) : delete this.doNotSplice;
     this.view && this.view.destroy(a);
diff --git a/dist/entry.min.js b/dist/entry.min.js
index cb14d88159..74f8e21f7d 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -1,14 +1,14 @@
-Entry={block:{},TEXT_ALIGN_CENTER:0,TEXT_ALIGN_LEFT:1,TEXT_ALIGN_RIGHT:2,TEXT_ALIGNS:["center","left","right"],clipboard:null,loadProject:function(b){b||(b=Entry.getStartProject(Entry.mediaFilePath));this.setFuncRefs(b.functions);"workspace"==this.type&&Entry.stateManager.startIgnore();Entry.projectId=b._id;Entry.variableContainer.setVariables(b.variables);Entry.variableContainer.setMessages(b.messages);Entry.scene.addScenes(b.scenes);Entry.stage.initObjectContainers();Entry.variableContainer.setFunctions(b.functions);
-Entry.container.setObjects(b.objects);Entry.FPS=b.speed?b.speed:60;createjs.Ticker.setFPS(Entry.FPS);"workspace"==this.type&&setTimeout(function(){Entry.stateManager.endIgnore()},300);Entry.engine.projectTimer||Entry.variableContainer.generateTimer();0===Object.keys(Entry.container.inputValue).length&&Entry.variableContainer.generateAnswer();Entry.start();this.removeFuncRefs();return b},exportProject:function(b){b||(b={});Entry.engine.isState("stop")||Entry.engine.toggleStop();Entry.Func&&Entry.Func.workspace&&
-Entry.Func.workspace.visible&&Entry.Func.cancelEdit();b.objects=Entry.container.toJSON();b.scenes=Entry.scene.toJSON();b.variables=Entry.variableContainer.getVariableJSON();b.messages=Entry.variableContainer.getMessageJSON();b.functions=Entry.variableContainer.getFunctionJSON();b.scenes=Entry.scene.toJSON();b.speed=Entry.FPS;return b},setBlockByText:function(b,a){for(var c=[],d=jQuery.parseXML(a).getElementsByTagName("category"),e=0;e<d.length;e++){for(var f=d[e],g={category:f.getAttribute("id"),
-blocks:[]},f=f.childNodes,h=0;h<f.length;h++){var k=f[h];!k.tagName||"BLOCK"!=k.tagName.toUpperCase()&&"BTN"!=k.tagName.toUpperCase()||g.blocks.push(k.getAttribute("type"))}c.push(g)}Entry.playground.setBlockMenu(c)},setBlock:function(b,a){Entry.playground.setMenuBlock(b,a)},enableArduino:function(){},initSound:function(b){b.path=b.fileurl?b.fileurl:Entry.defaultPath+"/uploads/"+b.filename.substring(0,2)+"/"+b.filename.substring(2,4)+"/"+b.filename+b.ext;Entry.soundQueue.loadFile({id:b.id,src:b.path,
-type:createjs.LoadQueue.SOUND})},beforeUnload:function(b){Entry.hw.closeConnection();Entry.variableContainer.updateCloudVariables();if("workspace"==Entry.type&&(localStorage&&Entry.interfaceState&&localStorage.setItem("workspace-interface",JSON.stringify(Entry.interfaceState)),!Entry.stateManager.isSaved()))return Lang.Workspace.project_changed},loadInterfaceState:function(){if("workspace"==Entry.type)if(localStorage&&localStorage.getItem("workspace-interface")){var b=localStorage.getItem("workspace-interface");
-this.resizeElement(JSON.parse(b))}else this.resizeElement({menuWidth:280,canvasWidth:480})},resizeElement:function(b){if("workspace"==Entry.type){var a=this.interfaceState;!b.canvasWidth&&a.canvasWidth&&(b.canvasWidth=a.canvasWidth);!b.menuWidth&&this.interfaceState.menuWidth&&(b.menuWidth=a.menuWidth);Entry.engine.speedPanelOn&&Entry.engine.toggleSpeedPanel();(a=b.canvasWidth)?325>a?a=325:720<a&&(a=720):a=400;b.canvasWidth=a;var c=9*a/16;Entry.engine.view_.style.width=a+"px";Entry.engine.view_.style.height=
-c+"px";Entry.engine.view_.style.top="40px";Entry.stage.canvas.canvas.style.width=a+"px";400<=a?Entry.engine.view_.removeClass("collapsed"):Entry.engine.view_.addClass("collapsed");Entry.playground.view_.style.left=a+.5+"px";Entry.propertyPanel.resize(a);var d=Entry.engine.view_.getElementsByClassName("entryAddButtonWorkspace_w")[0];d&&(Entry.objectAddable?(d.style.top=c+24+"px",d.style.width=.7*a+"px"):d.style.display="none");if(d=Entry.engine.view_.getElementsByClassName("entryRunButtonWorkspace_w")[0])Entry.objectAddable?
-(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a-4+"px");if(d=Entry.engine.view_.getElementsByClassName("entryStopButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a+"px");(a=b.menuWidth)?244>a?a=244:400<a&&(a=400):a=264;b.menuWidth=a;$(".blockMenuContainer").css({width:a-64+"px"});$(".blockMenuContainer>svg").css({width:a-
-64+"px"});Entry.playground.mainWorkspace.blockMenu.setWidth();$(".entryWorkspaceBoard").css({left:a+"px"});Entry.playground.resizeHandle_.style.left=a+"px";Entry.playground.variableViewWrapper_.style.width=a+"px";this.interfaceState=b}Entry.windowResized.notify()},getUpTime:function(){return(new Date).getTime()-this.startTime},addActivity:function(b){Entry.stateManager&&Entry.stateManager.addActivity(b)},startActivityLogging:function(){Entry.reporter&&Entry.reporter.start(Entry.projectId,window.user?
-window.user._id:null,Entry.startTime)},getActivityLog:function(){var b={};Entry.stateManager&&(b.activityLog=Entry.stateManager.activityLog_);return b},DRAG_MODE_NONE:0,DRAG_MODE_MOUSEDOWN:1,DRAG_MODE_DRAG:2,cancelObjectEdit:function(b){var a=Entry.playground.object;if(a){var c=b.target;b=0!==$(a.view_).find(c).length;c=c.tagName.toUpperCase();!a.isEditing||"INPUT"===c&&b||a.editObjectValues(!1)}},generateFunctionSchema:function(b){b="func_"+b;if(!Entry.block[b]){var a=function(){};a.prototype=Entry.block.function_general;
-a=new a;a.changeEvent=new Entry.Event;a.template=Lang.template.function_general;Entry.block[b]=a}},setFuncRefs:function(b){this.functions=b?b.map(function(a){return a.id}):[]},removeFuncRefs:function(){delete this.functions}};window.Entry=Entry;Entry.Albert={PORT_MAP:{leftWheel:0,rightWheel:0,buzzer:0,leftEye:0,rightEye:0,note:0,bodyLed:0,frontLed:0,padWidth:0,padHeight:0},setZero:function(){var b=Entry.Albert.PORT_MAP,a=Entry.hw.sendQueue,c;for(c in b)a[c]=b[c];Entry.hw.update();b=Entry.Albert;b.tempo=60;b.removeAllTimeouts()},monitorTemplate:{imgPath:"hw/albert.png",width:387,height:503,listPorts:{oid:{name:"OID",type:"input",pos:{x:0,y:0}},buzzer:{name:Lang.Hw.buzzer,type:"output",pos:{x:0,y:0}},note:{name:Lang.Hw.note,type:"output",
+Entry={block:{},TEXT_ALIGN_CENTER:0,TEXT_ALIGN_LEFT:1,TEXT_ALIGN_RIGHT:2,TEXT_ALIGNS:["center","left","right"],clipboard:null,loadProject:function(b){b||(b=Entry.getStartProject(Entry.mediaFilePath));"workspace"==this.type&&Entry.stateManager.startIgnore();Entry.projectId=b._id;Entry.variableContainer.setVariables(b.variables);Entry.variableContainer.setMessages(b.messages);Entry.scene.addScenes(b.scenes);Entry.stage.initObjectContainers();Entry.variableContainer.setFunctions(b.functions);Entry.container.setObjects(b.objects);
+Entry.FPS=b.speed?b.speed:60;createjs.Ticker.setFPS(Entry.FPS);"workspace"==this.type&&setTimeout(function(){Entry.stateManager.endIgnore()},300);Entry.engine.projectTimer||Entry.variableContainer.generateTimer();0===Object.keys(Entry.container.inputValue).length&&Entry.variableContainer.generateAnswer();Entry.start();return b},exportProject:function(b){b||(b={});Entry.engine.isState("stop")||Entry.engine.toggleStop();Entry.Func&&Entry.Func.workspace&&Entry.Func.workspace.visible&&Entry.Func.cancelEdit();
+b.objects=Entry.container.toJSON();b.scenes=Entry.scene.toJSON();b.variables=Entry.variableContainer.getVariableJSON();b.messages=Entry.variableContainer.getMessageJSON();b.functions=Entry.variableContainer.getFunctionJSON();b.scenes=Entry.scene.toJSON();b.speed=Entry.FPS;return b},setBlockByText:function(b,a){for(var c=[],d=jQuery.parseXML(a).getElementsByTagName("category"),e=0;e<d.length;e++){for(var f=d[e],g={category:f.getAttribute("id"),blocks:[]},f=f.childNodes,h=0;h<f.length;h++){var k=f[h];
+!k.tagName||"BLOCK"!=k.tagName.toUpperCase()&&"BTN"!=k.tagName.toUpperCase()||g.blocks.push(k.getAttribute("type"))}c.push(g)}Entry.playground.setBlockMenu(c)},setBlock:function(b,a){Entry.playground.setMenuBlock(b,a)},enableArduino:function(){},initSound:function(b){b.path=b.fileurl?b.fileurl:Entry.defaultPath+"/uploads/"+b.filename.substring(0,2)+"/"+b.filename.substring(2,4)+"/"+b.filename+b.ext;Entry.soundQueue.loadFile({id:b.id,src:b.path,type:createjs.LoadQueue.SOUND})},beforeUnload:function(b){Entry.hw.closeConnection();
+Entry.variableContainer.updateCloudVariables();if("workspace"==Entry.type&&(localStorage&&Entry.interfaceState&&localStorage.setItem("workspace-interface",JSON.stringify(Entry.interfaceState)),!Entry.stateManager.isSaved()))return Lang.Workspace.project_changed},loadInterfaceState:function(){if("workspace"==Entry.type)if(localStorage&&localStorage.getItem("workspace-interface")){var b=localStorage.getItem("workspace-interface");this.resizeElement(JSON.parse(b))}else this.resizeElement({menuWidth:280,
+canvasWidth:480})},resizeElement:function(b){if("workspace"==Entry.type){var a=this.interfaceState;!b.canvasWidth&&a.canvasWidth&&(b.canvasWidth=a.canvasWidth);!b.menuWidth&&this.interfaceState.menuWidth&&(b.menuWidth=a.menuWidth);Entry.engine.speedPanelOn&&Entry.engine.toggleSpeedPanel();(a=b.canvasWidth)?325>a?a=325:720<a&&(a=720):a=400;b.canvasWidth=a;var c=9*a/16;Entry.engine.view_.style.width=a+"px";Entry.engine.view_.style.height=c+"px";Entry.engine.view_.style.top="40px";Entry.stage.canvas.canvas.style.width=
+a+"px";400<=a?Entry.engine.view_.removeClass("collapsed"):Entry.engine.view_.addClass("collapsed");Entry.playground.view_.style.left=a+.5+"px";Entry.propertyPanel.resize(a);var d=Entry.engine.view_.getElementsByClassName("entryAddButtonWorkspace_w")[0];d&&(Entry.objectAddable?(d.style.top=c+24+"px",d.style.width=.7*a+"px"):d.style.display="none");if(d=Entry.engine.view_.getElementsByClassName("entryRunButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=
+.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a-4+"px");if(d=Entry.engine.view_.getElementsByClassName("entryStopButtonWorkspace_w")[0])Entry.objectAddable?(d.style.top=c+24+"px",d.style.left=.7*a+"px",d.style.width=.3*a+"px"):(d.style.left="2px",d.style.top=c+24+"px",d.style.width=a+"px");(a=b.menuWidth)?244>a?a=244:400<a&&(a=400):a=264;b.menuWidth=a;$(".blockMenuContainer").css({width:a-64+"px"});$(".blockMenuContainer>svg").css({width:a-64+"px"});Entry.playground.mainWorkspace.blockMenu.setWidth();
+$(".entryWorkspaceBoard").css({left:a+"px"});Entry.playground.resizeHandle_.style.left=a+"px";Entry.playground.variableViewWrapper_.style.width=a+"px";this.interfaceState=b}Entry.windowResized.notify()},getUpTime:function(){return(new Date).getTime()-this.startTime},addActivity:function(b){Entry.stateManager&&Entry.stateManager.addActivity(b)},startActivityLogging:function(){Entry.reporter&&Entry.reporter.start(Entry.projectId,window.user?window.user._id:null,Entry.startTime)},getActivityLog:function(){var b=
+{};Entry.stateManager&&(b.activityLog=Entry.stateManager.activityLog_);return b},DRAG_MODE_NONE:0,DRAG_MODE_MOUSEDOWN:1,DRAG_MODE_DRAG:2,cancelObjectEdit:function(b){var a=Entry.playground.object;if(a){var c=b.target;b=0!==$(a.view_).find(c).length;c=c.tagName.toUpperCase();!a.isEditing||"INPUT"===c&&b||a.editObjectValues(!1)}},generateFunctionSchema:function(b){b="func_"+b;if(!Entry.block[b]){var a=function(){};a.prototype=Entry.block.function_general;a=new a;a.changeEvent=new Entry.Event;a.template=
+Lang.template.function_general;Entry.block[b]=a}}};window.Entry=Entry;Entry.Albert={PORT_MAP:{leftWheel:0,rightWheel:0,buzzer:0,leftEye:0,rightEye:0,note:0,bodyLed:0,frontLed:0,padWidth:0,padHeight:0},setZero:function(){var b=Entry.Albert.PORT_MAP,a=Entry.hw.sendQueue,c;for(c in b)a[c]=b[c];Entry.hw.update();b=Entry.Albert;b.tempo=60;b.removeAllTimeouts()},monitorTemplate:{imgPath:"hw/albert.png",width:387,height:503,listPorts:{oid:{name:"OID",type:"input",pos:{x:0,y:0}},buzzer:{name:Lang.Hw.buzzer,type:"output",pos:{x:0,y:0}},note:{name:Lang.Hw.note,type:"output",
 pos:{x:0,y:0}}},ports:{leftProximity:{name:Lang.Blocks.ALBERT_sensor_leftProximity,type:"input",pos:{x:178,y:401}},rightProximity:{name:Lang.Blocks.ALBERT_sensor_rightProximity,type:"input",pos:{x:66,y:359}},battery:{name:Lang.Blocks.ALBERT_sensor_battery,type:"input",pos:{x:88,y:368}},light:{name:Lang.Blocks.ALBERT_sensor_light,type:"input",pos:{x:127,y:391}},leftWheel:{name:Lang.Hw.leftWheel,type:"output",pos:{x:299,y:406}},rightWheel:{name:Lang.Hw.rightWheel,type:"output",pos:{x:22,y:325}},leftEye:{name:Lang.Hw.leftEye,
 type:"output",pos:{x:260,y:26}},rightEye:{name:Lang.Hw.rightEye,type:"output",pos:{x:164,y:13}},bodyLed:{name:Lang.Hw.body+" "+Lang.Hw.led,type:"output",pos:{x:367,y:308}},frontLed:{name:Lang.Hw.front+" "+Lang.Hw.led,pos:{x:117,y:410}}},mode:"both"},tempo:60,timeouts:[],removeTimeout:function(b){clearTimeout(b);var a=this.timeouts;b=a.indexOf(b);0<=b&&a.splice(b,1)},removeAllTimeouts:function(){var b=this.timeouts,a;for(a in b)clearTimeout(b[a]);this.timeouts=[]},name:"albert"};
 Blockly.Blocks.albert_hand_found={init:function(){this.setColour("#00979D");this.appendDummyInput().appendField(Lang.Blocks.ALBERT_hand_found);this.setOutput(!0,"Boolean");this.setInputsInline(!0)}};Entry.block.albert_hand_found=function(b,a){var c=Entry.hw.portData;return 40<c.leftProximity||40<c.rightProximity};
@@ -1940,10 +1940,10 @@ b}})(Entry.BlockMenu.prototype);Entry.BlockMenuScroller=function(b){var a=this;t
 (a=this._adjustValue(a)-this.vY,0!==a&&(this.board.code.moveBy(0,-a*this.vRatio),this.updateScrollBar(a)))};b._adjustValue=function(a){var b=this.board.svgDom.height(),b=b-b/this.vRatio;a=this.vY+a;a=Math.max(0,a);return a=Math.min(b,a)};b.setVisible=function(a){a!=this.isVisible()&&(this._visible=a,this.svgGroup.attr({display:!0===a?"block":"none"}))};b.setOpacity=function(a){this._opacity!=a&&(this.vScrollbar.attr({opacity:a}),this._opacity=a)};b.isVisible=function(){return this._visible};b._updateRatio=
 function(){var a=this.board,b=a.svgBlockGroup.getBoundingClientRect(),d=a.blockMenuContainer.height(),a=a.offset();this.vRatio=b=(b.height+(b.top-a.top)+10)/d;1>=b?this.setVisible(!1):this.setVisible(!0)};b._reset=function(){this.vY=0;this.vScrollbar.attr({y:this.vY});this.resizeScrollBar()};b.onMouseDown=function(a){function b(a){a.stopPropagation&&a.stopPropagation();a.preventDefault&&a.preventDefault();a=a.originalEvent&&a.originalEvent.touches?a.originalEvent.touches[0]:a;var c=e.dragInstance;
 e.scroll(a.pageY-c.offsetY);c.set({offsetY:a.pageY})}function d(a){$(document).unbind(".scroll");delete e.dragInstance}var e=this;a.stopPropagation&&a.stopPropagation();a.preventDefault&&a.preventDefault();if(0===a.button||a.originalEvent&&a.originalEvent.touches){Entry.documentMousedown&&Entry.documentMousedown.notify(a);var f;f=a.originalEvent&&a.originalEvent.touches?a.originalEvent.touches[0]:a;var g=$(document);g.bind("mousemove.scroll",b);g.bind("mouseup.scroll",d);g.bind("touchmove.scroll",
-b);g.bind("touchend.scroll",d);e.dragInstance=new Entry.DragInstance({startY:f.pageY,offsetY:f.pageY})}a.stopPropagation()};b._addControl=function(){$(this.vScrollbar).bind("mousedown touchstart",this.mouseHandler)}})(Entry.BlockMenuScroller.prototype);Entry.BlockView=function(b,a,c){Entry.Model(this,!1);this.block=b;this._lazyUpdatePos=_.debounce(b._updatePos.bind(b),200);this._board=a;this._observers=[];this.set(b);this.svgGroup=a.svgBlockGroup.elem("g");this._schema=Entry.block[b.type];this._schema.changeEvent&&(this._schemaChangeEvent=this._schema.changeEvent.attach(this,this._updateSchema));var d=this._skeleton=Entry.skeleton[this._schema.skeleton];this._contents=[];this._statements=[];this.magnet={};this._paramMap={};d.magnets&&d.magnets(this).next&&
-(this.svgGroup.nextMagnet=this.block,this._nextGroup=this.svgGroup.elem("g"),this._observers.push(this.observe(this,"_updateMagnet",["contentHeight"])));this.isInBlockMenu=this.getBoard()instanceof Entry.BlockMenu;var e=this;this.mouseHandler=function(){var a=e.block.events;a&&a.mousedown&&a.mousedown.forEach(function(a){a(e)});e.onMouseDown.apply(e,arguments)};this._startRender(b,c);this._observers.push(this.block.observe(this,"_setMovable",["movable"]));this._observers.push(this.block.observe(this,
-"_setReadOnly",["movable"]));this._observers.push(this.block.observe(this,"_setCopyable",["copyable"]));this._observers.push(this.block.observe(this,"_updateColor",["deletable"],!1));this._observers.push(this.observe(this,"_updateBG",["magneting"],!1));this._observers.push(this.observe(this,"_updateOpacity",["visible"],!1));this._observers.push(this.observe(this,"_updateDisplay",["display"],!1));this._observers.push(this.observe(this,"_updateShadow",["shadow"]));this._observers.push(this.observe(this,
-"_updateMagnet",["offsetY"]));this._observers.push(a.code.observe(this,"_setBoard",["board"],!1));this.dragMode=Entry.DRAG_MODE_NONE;Entry.Utils.disableContextmenu(this.svgGroup.node);a=b.events.viewAdd;"workspace"==Entry.type&&a&&!this.isInBlockMenu&&a.forEach(function(a){Entry.Utils.isFunction(a)&&a(b)})};Entry.BlockView.PARAM_SPACE=5;Entry.BlockView.DRAG_RADIUS=5;Entry.BlockView.pngMap={};
+b);g.bind("touchend.scroll",d);e.dragInstance=new Entry.DragInstance({startY:f.pageY,offsetY:f.pageY})}a.stopPropagation()};b._addControl=function(){$(this.vScrollbar).bind("mousedown touchstart",this.mouseHandler)}})(Entry.BlockMenuScroller.prototype);Entry.BlockView=function(b,a,c){var d=this;Entry.Model(this,!1);this.block=b;this._lazyUpdatePos=_.debounce(b._updatePos.bind(b),200);this._board=a;this._observers=[];this.set(b);this.svgGroup=a.svgBlockGroup.elem("g");this._schema=Entry.block[b.type];if(void 0===this._schema)this.block.destroy(!1,!1);else{this._schema.changeEvent&&(this._schemaChangeEvent=this._schema.changeEvent.attach(this,this._updateSchema));var e=this._skeleton=Entry.skeleton[this._schema.skeleton];this._contents=[];this._statements=
+[];this.magnet={};this._paramMap={};e.magnets&&e.magnets(this).next&&(this.svgGroup.nextMagnet=this.block,this._nextGroup=this.svgGroup.elem("g"),this._observers.push(this.observe(this,"_updateMagnet",["contentHeight"])));this.isInBlockMenu=this.getBoard()instanceof Entry.BlockMenu;this.mouseHandler=function(){var a=d.block.events;a&&a.mousedown&&a.mousedown.forEach(function(a){a(d)});d.onMouseDown.apply(d,arguments)};this._startRender(b,c);this._observers.push(this.block.observe(this,"_setMovable",
+["movable"]));this._observers.push(this.block.observe(this,"_setReadOnly",["movable"]));this._observers.push(this.block.observe(this,"_setCopyable",["copyable"]));this._observers.push(this.block.observe(this,"_updateColor",["deletable"],!1));this._observers.push(this.observe(this,"_updateBG",["magneting"],!1));this._observers.push(this.observe(this,"_updateOpacity",["visible"],!1));this._observers.push(this.observe(this,"_updateDisplay",["display"],!1));this._observers.push(this.observe(this,"_updateShadow",
+["shadow"]));this._observers.push(this.observe(this,"_updateMagnet",["offsetY"]));this._observers.push(a.code.observe(this,"_setBoard",["board"],!1));this.dragMode=Entry.DRAG_MODE_NONE;Entry.Utils.disableContextmenu(this.svgGroup.node);a=b.events.viewAdd;"workspace"==Entry.type&&a&&!this.isInBlockMenu&&a.forEach(function(a){Entry.Utils.isFunction(a)&&a(b)})}};Entry.BlockView.PARAM_SPACE=5;Entry.BlockView.DRAG_RADIUS=5;Entry.BlockView.pngMap={};
 (function(b){b.schema={id:0,type:Entry.STATIC.BLOCK_RENDER_MODEL,x:0,y:0,offsetX:0,offsetY:0,width:0,height:0,contentWidth:0,contentHeight:0,magneting:!1,visible:!0,animating:!1,shadow:!0,display:!0};b._startRender=function(a,b){var d=this,e=this._skeleton;this.svgGroup.attr({class:"block"});var f=e.classes;f&&0!==f.length&&f.forEach(function(a){d.svgGroup.addClass(a)});f=e.path(this);this.pathGroup=this.svgGroup.elem("g");this._updateMagnet();this._path=this.pathGroup.elem("path");this.getBoard().patternRect&&
 ($(this._path).mouseenter(function(a){d._mouseEnable&&d._changeFill(!0)}),$(this._path).mouseleave(function(a){d._mouseEnable&&d._changeFill(!1)}));var g=this._schema.color;this.block.deletable===Entry.Block.DELETABLE_FALSE_LIGHTEN&&(g=Entry.Utils.colorLighten(g));this._fillColor=g;f={d:f,fill:g,class:"blockPath"};if(this.magnet.next||this._skeleton.nextShadow)g=this.getBoard().suffix,this.pathGroup.attr({filter:"url(#entryBlockShadowFilter_"+g+")"});else if(this.magnet.string||this.magnet.boolean)f.stroke=
 e.outerLine;e.outerLine&&(f["stroke-width"]="0.6");this._path.attr(f);this._moveTo(this.x,this.y,!1);this._startContentRender(b);!0!==this._board.disableMouseEvent&&this._addControl();this.bindPrev()};b._startContentRender=function(a){a=void 0===a?Entry.Workspace.MODE_BOARD:a;this.contentSvgGroup&&this.contentSvgGroup.remove();var b=this._schema;b.statements&&b.statements.length&&this.statementSvgGroup&&this.statementSvgGroup.remove();this._contents=[];this.contentSvgGroup=this.svgGroup.elem("g");
@@ -1991,9 +1991,9 @@ b.getBlockList=function(a,b){for(var d=this.getThreads(),e=[],f=0;f<d.length;f++
 (function(b){b.schema={board:null,scrollX:0,scrollY:0};b._setBoard=function(){this.set({board:this.code.board})};b.reDraw=function(){this.code.map(function(a){a.view.reDraw()})}})(Entry.CodeView.prototype);Entry.ConnectionRipple={};
 (function(b){b.createDom=function(a){this.svgDom||(this._ripple=a.getBoard().svgGroup.elem("circle",{cx:0,cy:0,r:0,stroke:"#888","stroke-width":10}))};b.setView=function(a){this._ripple||this.createDom(a);var b=this._ripple,d=a.getBoard().svgGroup;b.remove();a=a.getAbsoluteCoordinate();b.attr({cx:a.x,cy:a.y});d.appendChild(b);b._startTime=new Date;return this};b.dispose=function(){var a=this,b=this._ripple,d=(new Date-b._startTime)/150;1<d?b.remove():(b.attr({r:25*d,opacity:1-d}),window.setTimeout(function(){a.dispose()},
 10))}})(Entry.ConnectionRipple);Entry.Executor=function(b,a){this.scope=new Entry.Scope(b,this);this.entity=a;this._callStack=[];this.register={}};
-(function(b){b.execute=function(){if(!this.isEnd())for(;;){var a=null;try{a=this.scope.block.getSchema().func.call(this.scope,this.entity,this.scope)}catch(b){if("AsyncError"===b.name)a=Entry.STATIC.BREAK;else{var c=!1;"\ub7f0\ud0c0\uc784 \uc5d0\ub7ec"!=b.message&&(c=!0);Entry.Utils.stopProjectWithToast(this.scope,"\ub7f0\ud0c0\uc784 \uc5d0\ub7ec",c)}}if(this.isEnd())break;if(void 0===a||null===a||a===Entry.STATIC.PASS){if(this.scope=new Entry.Scope(this.scope.block.getNextBlock(),this),null===this.scope.block)if(this._callStack.length){if(a=
-this.scope,this.scope=this._callStack.pop(),this.scope.isLooped!==a.isLooped)break}else break}else if(a!==Entry.STATIC.CONTINUE&&(a===Entry.STATIC.BREAK||this.scope===a))break}};b.stepInto=function(a){a instanceof Entry.Thread||console.error("Must step in to thread");a=a.getFirstBlock();if(!a)return Entry.STATIC.BREAK;this._callStack.push(this.scope);this.scope=new Entry.Scope(a,this);return Entry.STATIC.CONTINUE};b.break=function(){this._callStack.length&&(this.scope=this._callStack.pop());return Entry.STATIC.PASS};
-b.breakLoop=function(){this._callStack.length&&(this.scope=this._callStack.pop());for(;this._callStack.length&&"repeat"!==Entry.block[this.scope.block.type].class;)this.scope=this._callStack.pop();return Entry.STATIC.PASS};b.end=function(){this.scope.block=null};b.isEnd=function(){return null===this.scope.block}})(Entry.Executor.prototype);Entry.Scope=function(b,a){this.type=(this.block=b)?b.type:null;this.executor=a;this.entity=a.entity};
+(function(b){b.execute=function(){if(!this.isEnd())for(;;){var a=null;try{var b=this.scope.block.getSchema();b&&(a=b.func.call(this.scope,this.entity,this.scope))}catch(e){if("AsyncError"===e.name)a=Entry.STATIC.BREAK;else{var d=!1;"\ub7f0\ud0c0\uc784 \uc5d0\ub7ec"!=e.message&&(d=!0);Entry.Utils.stopProjectWithToast(this.scope,"\ub7f0\ud0c0\uc784 \uc5d0\ub7ec",d)}}if(this.isEnd())break;if(void 0===a||null===a||a===Entry.STATIC.PASS){if(this.scope=new Entry.Scope(this.scope.block.getNextBlock(),this),
+null===this.scope.block)if(this._callStack.length){if(a=this.scope,this.scope=this._callStack.pop(),this.scope.isLooped!==a.isLooped)break}else break}else if(a!==Entry.STATIC.CONTINUE&&(a===Entry.STATIC.BREAK||this.scope===a))break}};b.stepInto=function(a){a instanceof Entry.Thread||console.error("Must step in to thread");a=a.getFirstBlock();if(!a)return Entry.STATIC.BREAK;this._callStack.push(this.scope);this.scope=new Entry.Scope(a,this);return Entry.STATIC.CONTINUE};b.break=function(){this._callStack.length&&
+(this.scope=this._callStack.pop());return Entry.STATIC.PASS};b.breakLoop=function(){this._callStack.length&&(this.scope=this._callStack.pop());for(;this._callStack.length&&"repeat"!==Entry.block[this.scope.block.type].class;)this.scope=this._callStack.pop();return Entry.STATIC.PASS};b.end=function(){this.scope.block=null};b.isEnd=function(){return null===this.scope.block}})(Entry.Executor.prototype);Entry.Scope=function(b,a){this.type=(this.block=b)?b.type:null;this.executor=a;this.entity=a.entity};
 (function(b){b.callReturn=function(){};b.getParam=function(a){a=this.block.params[a];var b=new Entry.Scope(a,this.executor);return Entry.block[a.type].func.call(b,this.entity,b)};b.getParams=function(){var a=this;return this.block.params.map(function(b){if(b instanceof Entry.Block){var d=new Entry.Scope(b,a.executor);return Entry.block[b.type].func.call(d,a.entity,d)}return b})};b.getValue=function(a,b){var d=this.block.params[this._getParamIndex(a,b)],e=new Entry.Scope(d,this.executor);return Entry.block[d.type].func.call(e,
 this.entity,e)};b.getStringValue=function(a,b){return String(this.getValue(a,b))};b.getNumberValue=function(a,b){return Number(this.getValue(a))};b.getBooleanValue=function(a,b){return Number(this.getValue(a,b))?!0:!1};b.getField=function(a,b){return this.block.params[this._getParamIndex(a)]};b.getStringField=function(a,b){return String(this.getField(a))};b.getNumberField=function(a){return Number(this.getField(a))};b.getStatement=function(a,b){return this.executor.stepInto(this.block.statements[this._getStatementIndex(a,
 b)])};b._getParamIndex=function(a){this._schema||(this._schema=Entry.block[this.type]);return this._schema.paramsKeyMap[a]};b._getStatementIndex=function(a){this._schema||(this._schema=Entry.block[this.type]);return this._schema.statementsKeyMap[a]};b.die=function(){this.block=null;return Entry.STATIC.BREAK}})(Entry.Scope.prototype);Entry.Field=function(){};
@@ -2127,19 +2127,19 @@ Entry.skeleton.basic_double_loop={path:function(b){var a=b.contentWidth,c=b.cont
 c).replace(/%wh2/gi,d).replace(/%w/gi,a).replace(/%bw/gi,a-8).replace(/%h1/gi,c/2).replace(/%h2/gi,d/2).replace(/%sh1/gi,b+1).replace(/%sh2/gi,e+1)},magnets:function(b){var a=Math.max(b.contentHeight%1E6+2,30),c=Math.max(Math.floor(b.contentHeight/1E6)+2,30),d=b._statements[0]?b._statements[0].height:20,e=b._statements[1]?b._statements[1].height:20,d=Math.max(d,20),e=Math.max(e,20);return{previous:{x:0,y:0},next:{x:0,y:d+e+a+c+19+b.offsetY}}},box:function(b){var a=b.contentWidth,c=Math.max(Math.floor(b.contentHeight/
 1E6)+2,30),d=Math.max(b.contentHeight%1E6+2,30),e=b._statements[0]?b._statements[0].height%1E6:20;b=b._statements[1]?b._statements[1].height:20;e=Math.max(e,20);b=Math.max(b,20);return{offsetX:-8,offsetY:0,width:a+30,height:c+d+e+b+17,marginBottom:0}},statementPos:function(b){var a=Math.max(30,b.contentHeight%1E6+2)+1;return[{x:16,y:a},{x:16,y:a+Math.max(b._statements[0]?b._statements[0].height%1E6:20,20)+Math.max(Math.floor(b.contentHeight/1E6)+2,30)+1}]},contentPos:function(b){return{x:14,y:Math.max(b.contentHeight%
 1E6,28)/2+1}}};Entry.Thread=function(b,a,c){this._data=new Entry.Collection;this._code=a;this.changeEvent=new Entry.Event(this);this.changeEvent.attach(this,this.handleChange);this._event=null;this.parent=c?c:a;this.load(b)};
-(function(b){b.load=function(a,b){void 0===a&&(a=[]);if(!(a instanceof Array))return console.error("thread must be array");for(var d=0;d<a.length;d++){var e=a[d];if(e instanceof Entry.Block||e.isDummy)e.setThread(this),this._data.push(e);else{var f=Entry.functions,g=e.type;(Entry.block[g]||f&&-1<f.indexOf(g.split("_")[1]))&&this._data.push(new Entry.Block(e,this))}}(d=this._code.view)&&this.createView(d.board,b)};b.registerEvent=function(a,b){this._event=b;this._code.registerEvent(a,b)};b.unregisterEvent=
-function(a,b){this._code.unregisterEvent(a,b)};b.createView=function(a,b){this.view||(this.view=new Entry.ThreadView(this,a));this._data.map(function(d){d.createView(a,b)})};b.separate=function(a,b){if(this._data.has(a.id)){var d=this._data.splice(this._data.indexOf(a),b);this._code.createThread(d);this.changeEvent.notify()}};b.cut=function(a){a=this._data.indexOf(a);a=this._data.splice(a);this.changeEvent.notify();return a};b.insertByBlock=function(a,b){for(var d=a?this._data.indexOf(a):-1,e=0;e<
-b.length;e++)b[e].setThread(this);this._data.splice.apply(this._data,[d+1,0].concat(b));this.changeEvent.notify()};b.insertToTop=function(a){a.setThread(this);this._data.unshift.apply(this._data,[a]);this.changeEvent.notify()};b.clone=function(a,b){a=a||this._code;for(var d=new Entry.Thread([],a),e=this._data,f=[],g=0,h=e.length;g<h;g++)f.push(e[g].clone(d));d.load(f,b);return d};b.toJSON=function(a,b){for(var d=[],e=void 0===b?0:b;e<this._data.length;e++)this._data[e]instanceof Entry.Block&&d.push(this._data[e].toJSON(a));
-return d};b.destroy=function(a){this._code.destroyThread(this,!1);this.view&&this.view.destroy(a);for(var b=this._data,d=b.length-1;0<=d;d--)b[d].destroy(a)};b.getBlock=function(a){return this._data[a]};b.getBlocks=function(){return this._data.map(function(a){return a})};b.countBlock=function(){for(var a=0,b=0;b<this._data.length;b++){var d=this._data[b];if(d.type&&(a++,d=d.statements))for(var e=0;e<d.length;e++)a+=d[e].countBlock()}return a};b.handleChange=function(){0===this._data.length&&this.destroy()};
-b.getCode=function(){return this._code};b.setCode=function(a){this._code=a};b.spliceBlock=function(a){this._data.remove(a);this.changeEvent.notify()};b.getFirstBlock=function(){return this._data[0]};b.getPrevBlock=function(a){a=this._data.indexOf(a);return this._data.at(a-1)};b.getNextBlock=function(a){a=this._data.indexOf(a);return this._data.at(a+1)};b.getLastBlock=function(){return this._data.at(this._data.length-1)};b.getRootBlock=function(){return this._data.at(0)};b.hasBlockType=function(a){function b(d){if(a==
-d.type)return!0;for(var f=d.params,g=0;g<f.length;g++){var h=f[g];if(h&&h.constructor==Entry.Block&&b(h))return!0}if(d=d.statements)for(f=0;f<d.length;f++)if(d[f].hasBlockType(a))return!0;return!1}for(var d=0;d<this._data.length;d++)if(b(this._data[d]))return!0;return!1};b.getCount=function(a){var b=this._data.length;a&&(b-=this._data.indexOf(a));return b};b.indexOf=function(a){return this._data.indexOf(a)};b.pointer=function(a,b){var d=this.indexOf(b);a.unshift(d);this.parent instanceof Entry.Block&&
-a.unshift(this.parent.indexOfStatements(this));return this._code===this.parent?(a.unshift(this._code.indexOf(this)),d=this._data[0],a.unshift(d.y),a.unshift(d.x),a):this.parent.pointer(a)};b.getBlockList=function(a,b){for(var d=[],e=0;e<this._data.length;e++)d=d.concat(this._data[e].getBlockList(a,b));return d};b.stringify=function(){return JSON.stringify(this.toJSON())}})(Entry.Thread.prototype);Entry.Block=function(b,a){var c=this;Entry.Model(this,!1);this._schema=null;this.setThread(a);this.load(b);var d=this.getCode();d.registerBlock(this);var e=this.events.dataAdd;e&&d.object&&e.forEach(function(a){Entry.Utils.isFunction(a)&&a(c)})};Entry.Block.MAGNET_RANGE=10;Entry.Block.MAGNET_OFFSET=.4;Entry.Block.DELETABLE_TRUE=1;Entry.Block.DELETABLE_FALSE=2;Entry.Block.DELETABLE_FALSE_LIGHTEN=3;
+(function(b){b.load=function(a,b){void 0===a&&(a=[]);if(!(a instanceof Array))return console.error("thread must be array");for(var d=0;d<a.length;d++){var e=a[d];e instanceof Entry.Block||e.isDummy?(e.setThread(this),this._data.push(e)):this._data.push(new Entry.Block(e,this))}(d=this._code.view)&&this.createView(d.board,b)};b.registerEvent=function(a,b){this._event=b;this._code.registerEvent(a,b)};b.unregisterEvent=function(a,b){this._code.unregisterEvent(a,b)};b.createView=function(a,b){this.view||
+(this.view=new Entry.ThreadView(this,a));this._data.getAll().forEach(function(d){d.createView(a,b)})};b.separate=function(a,b){if(this._data.has(a.id)){var d=this._data.splice(this._data.indexOf(a),b);this._code.createThread(d);this.changeEvent.notify()}};b.cut=function(a){a=this._data.indexOf(a);a=this._data.splice(a);this.changeEvent.notify();return a};b.insertByBlock=function(a,b){for(var d=a?this._data.indexOf(a):-1,e=0;e<b.length;e++)b[e].setThread(this);this._data.splice.apply(this._data,[d+
+1,0].concat(b));this.changeEvent.notify()};b.insertToTop=function(a){a.setThread(this);this._data.unshift.apply(this._data,[a]);this.changeEvent.notify()};b.clone=function(a,b){a=a||this._code;for(var d=new Entry.Thread([],a),e=this._data,f=[],g=0,h=e.length;g<h;g++)f.push(e[g].clone(d));d.load(f,b);return d};b.toJSON=function(a,b){for(var d=[],e=void 0===b?0:b;e<this._data.length;e++)this._data[e]instanceof Entry.Block&&d.push(this._data[e].toJSON(a));return d};b.destroy=function(a){this._code.destroyThread(this,
+!1);this.view&&this.view.destroy(a);for(var b=this._data,d=b.length-1;0<=d;d--)b[d].destroy(a)};b.getBlock=function(a){return this._data[a]};b.getBlocks=function(){return this._data.map(function(a){return a})};b.countBlock=function(){for(var a=0,b=0;b<this._data.length;b++){var d=this._data[b];if(d.type&&(a++,d=d.statements))for(var e=0;e<d.length;e++)a+=d[e].countBlock()}return a};b.handleChange=function(){0===this._data.length&&this.destroy()};b.getCode=function(){return this._code};b.setCode=function(a){this._code=
+a};b.spliceBlock=function(a){this._data.remove(a);this.changeEvent.notify()};b.getFirstBlock=function(){return this._data[0]};b.getPrevBlock=function(a){a=this._data.indexOf(a);return this._data.at(a-1)};b.getNextBlock=function(a){a=this._data.indexOf(a);return this._data.at(a+1)};b.getLastBlock=function(){return this._data.at(this._data.length-1)};b.getRootBlock=function(){return this._data.at(0)};b.hasBlockType=function(a){function b(d){if(a==d.type)return!0;for(var f=d.params,g=0;g<f.length;g++){var h=
+f[g];if(h&&h.constructor==Entry.Block&&b(h))return!0}if(d=d.statements)for(f=0;f<d.length;f++)if(d[f].hasBlockType(a))return!0;return!1}for(var d=0;d<this._data.length;d++)if(b(this._data[d]))return!0;return!1};b.getCount=function(a){var b=this._data.length;a&&(b-=this._data.indexOf(a));return b};b.indexOf=function(a){return this._data.indexOf(a)};b.pointer=function(a,b){var d=this.indexOf(b);a.unshift(d);this.parent instanceof Entry.Block&&a.unshift(this.parent.indexOfStatements(this));return this._code===
+this.parent?(a.unshift(this._code.indexOf(this)),d=this._data[0],a.unshift(d.y),a.unshift(d.x),a):this.parent.pointer(a)};b.getBlockList=function(a,b){for(var d=[],e=0;e<this._data.length;e++)d=d.concat(this._data[e].getBlockList(a,b));return d};b.stringify=function(){return JSON.stringify(this.toJSON())}})(Entry.Thread.prototype);Entry.Block=function(b,a){var c=this;Entry.Model(this,!1);this._schema=null;this.setThread(a);this.load(b);var d=this.getCode();d.registerBlock(this);var e=this.events.dataAdd;e&&d.object&&e.forEach(function(a){Entry.Utils.isFunction(a)&&a(c)})};Entry.Block.MAGNET_RANGE=10;Entry.Block.MAGNET_OFFSET=.4;Entry.Block.DELETABLE_TRUE=1;Entry.Block.DELETABLE_FALSE=2;Entry.Block.DELETABLE_FALSE_LIGHTEN=3;
 (function(b){b.schema={id:null,x:0,y:0,type:null,params:[],statements:[],view:null,thread:null,movable:null,deletable:Entry.Block.DELETABLE_TRUE,readOnly:null,copyable:!0,events:{}};b.load=function(a){a.id||(a.id=Entry.Utils.generateId());this.set(a);this.loadSchema()};b.changeSchema=function(a){this.set({params:[]});this.loadSchema()};b.getSchema=function(){this._schema||this.loadSchema();return this._schema};b.loadSchema=function(){if(this._schema=Entry.block[this.type]){!this._schemaChangeEvent&&
 this._schema.changeEvent&&(this._schemaChangeEvent=this._schema.changeEvent.attach(this,this.changeSchema));var a=this._schema.events;if(a)for(var b in a){this.events[b]||(this.events[b]=[]);for(var d=a[b],e=0;e<d.length;e++){var f=d[e];f&&0>this.events[b].indexOf(f)&&this.events[b].push(f)}}this._schema.event&&this.thread.registerEvent(this,this._schema.event);a=this.params;b=this._schema.params;for(e=0;b&&e<b.length;e++)d=void 0===a[e]||null===a[e]?b[e].value:a[e],f=a[e]||e<a.length,!d||"Output"!==
 b[e].type&&"Block"!==b[e].type||(d=new Entry.Block(d,this.thread)),f?a.splice(e,1,d):a.push(d);if(a=this._schema.statements)for(e=0;e<a.length;e++)this.statements.splice(e,1,new Entry.Thread(this.statements[e],this.getCode(),this))}};b.changeType=function(a){this._schemaChangeEvent&&this._schemaChangeEvent.destroy();this.set({type:a});this.loadSchema();this.view&&this.view.changeType(a)};b.setThread=function(a){this.set({thread:a})};b.getThread=function(){return this.thread};b.insertAfter=function(a){this.thread.insertByBlock(this,
 a)};b._updatePos=function(){this.view&&this.set({x:this.view.x,y:this.view.y})};b.moveTo=function(a,b){this.view&&this.view._moveTo(a,b);this._updatePos();this.getCode().changeEvent.notify()};b.createView=function(a,b){this.view||(this.set({view:new Entry.BlockView(this,a,b)}),this._updatePos())};b.clone=function(a){return new Entry.Block(this.toJSON(!0),a)};b.toJSON=function(a){var b=this._toJSON();delete b.view;delete b.thread;delete b.events;a&&delete b.id;b.params=b.params.map(function(b){b instanceof
 Entry.Block&&(b=b.toJSON(a));return b});b.statements=b.statements.map(function(b){return b.toJSON(a)});b.x=this.x;b.y=this.y;b.movable=this.movable;b.deletable=this.deletable;b.readOnly=this.readOnly;return b};b.destroy=function(a,b){var d=this,e=this.params;if(e)for(var f=0;f<e.length;f++){var g=e[f];g instanceof Entry.Block&&(g.doNotSplice=!0,g.destroy(a))}if(e=this.statements)for(f=0;f<e.length;f++)e[f].destroy(a);g=this.getPrevBlock();f=this.getNextBlock();this.getCode().unregisterBlock(this);
-e=this.getThread();this._schema.event&&e.unregisterEvent(this,this._schema.event);f&&(b?f.destroy(a,b):g?f.view&&f.view.bindPrev(g):(g=this.getThread().view.getParent(),g.constructor===Entry.FieldStatement?(f.view&&f.view.bindPrev(g),g.insertTopBlock(f)):g.constructor===Entry.FieldStatement?f.replace(g._valueBlock):f.view._toGlobalCoordinate()));!this.doNotSplice&&e.spliceBlock?e.spliceBlock(this):delete this.doNotSplice;this.view&&this.view.destroy(a);this._schemaChangeEvent&&this._schemaChangeEvent.destroy();
+e=this.getThread();this._schema&&this._schema.event&&e.unregisterEvent(this,this._schema.event);f&&(b?f.destroy(a,b):g?f.view&&f.view.bindPrev(g):(g=this.getThread().view.getParent(),g.constructor===Entry.FieldStatement?(f.view&&f.view.bindPrev(g),g.insertTopBlock(f)):g.constructor===Entry.FieldStatement?f.replace(g._valueBlock):f.view._toGlobalCoordinate()));!this.doNotSplice&&e.spliceBlock?e.spliceBlock(this):delete this.doNotSplice;this.view&&this.view.destroy(a);this._schemaChangeEvent&&this._schemaChangeEvent.destroy();
 (f=this.events.dataDestroy)&&this.getCode().object&&f.forEach(function(a){Entry.Utils.isFunction(a)&&a(d)})};b.getView=function(){return this.view};b.setMovable=function(a){this.movable!=a&&this.set({movable:a})};b.setCopyable=function(a){this.copyable!=a&&this.set({copyable:a})};b.isMovable=function(){return this.movable};b.isCopyable=function(){return this.copyable};b.setDeletable=function(a){this.deletable!=a&&this.set({deletable:a})};b.isDeletable=function(){return this.deletable===Entry.Block.DELETABLE_TRUE};
 b.isReadOnly=function(){return this.readOnly};b.getCode=function(){return this.thread.getCode()};b.doAdd=function(){this.getCode().changeEvent.notify()};b.doMove=function(){this._updatePos();this.getCode().changeEvent.notify()};b.doSeparate=function(){this.separate()};b.doInsert=function(a){"basic"===this.getBlockType()?this.insert(a):this.replace(a)};b.doDestroy=function(a){this.destroy(a);this.getCode().changeEvent.notify();return this};b.doDestroyBelow=function(a){console.log("destroyBelow",this.id,
 this.x,this.y);this.destroy(a,!0);this.getCode().changeEvent.notify();return this};b.copy=function(){var a=this.getThread(),b=[];if(a instanceof Entry.Thread)for(var d=a.getBlocks().indexOf(this),a=a.toJSON(!0,d),d=0;d<a.length;d++)b.push(a[d]);else b.push(this.toJSON(!0));a=this.view.getAbsoluteCoordinate();d=b[0];d.x=a.x+15;d.y=a.y+15;d.id=Entry.Utils.generateId();return b};b.copyToClipboard=function(){Entry.clipboard=this.copy()};b.separate=function(a){this.thread.separate(this,a);this._updatePos();
diff --git a/src/variable_container.js b/src/variable_container.js
index c728445c64..59a5b2cb7f 100644
--- a/src/variable_container.js
+++ b/src/variable_container.js
@@ -663,9 +663,9 @@ Entry.VariableContainer.prototype.removeFunction = function(func) {
     delete functions[functionId];
     var functionType = 'func_' + functionId;
 
-    //Entry.container.removeFuncBlocks(functionType);
-    //for (var id in functions)
-        //functions[id].content.removeBlocksByType(functionType);
+    Entry.container.removeFuncBlocks(functionType);
+    for (var id in functions)
+        functions[id].content.removeBlocksByType(functionType);
     this.updateList();
 };
 
diff --git a/src/workspace/block.js b/src/workspace/block.js
index 284b9e0af8..52891bb3bd 100644
--- a/src/workspace/block.js
+++ b/src/workspace/block.js
@@ -235,7 +235,7 @@ Entry.Block.DELETABLE_FALSE_LIGHTEN = 3;
 
         this.getCode().unregisterBlock(this);
         var thread = this.getThread();
-        if (this._schema.event)
+        if (this._schema && this._schema.event)
             thread.unregisterEvent(this, this._schema.event);
         if (nextBlock) {
             if (next) nextBlock.destroy(animate, next);
diff --git a/src/workspace/block_view.js b/src/workspace/block_view.js
index 1af01b1003..d7ddab4f14 100644
--- a/src/workspace/block_view.js
+++ b/src/workspace/block_view.js
@@ -9,6 +9,7 @@ goog.provide("Entry.BlockView");
  *
  */
 Entry.BlockView = function(block, board, mode) {
+    var that = this;
     Entry.Model(this, false);
     this.block = block;
     this._lazyUpdatePos = _.debounce(block._updatePos.bind(block), 200);
@@ -18,6 +19,11 @@ Entry.BlockView = function(block, board, mode) {
     this.svgGroup = board.svgBlockGroup.elem("g");
 
     this._schema = Entry.block[block.type];
+    if (this._schema === undefined) {
+        this.block.destroy(false, false);
+        return;
+    }
+
     if (this._schema.changeEvent)
         this._schemaChangeEvent = this._schema.changeEvent.attach(
             this, this._updateSchema);
@@ -35,10 +41,6 @@ Entry.BlockView = function(block, board, mode) {
 
     this.isInBlockMenu = this.getBoard() instanceof Entry.BlockMenu;
 
-    //if (skeleton.morph)
-        //this._observers.push(this.block.observe(this, "_renderPath", skeleton.morph, false));
-
-    var that = this;
     this.mouseHandler = function() {
         var events = that.block.events;
         if (events && events.mousedown)
diff --git a/src/workspace/executors.js b/src/workspace/executors.js
index 7099a481a6..46da3069a6 100644
--- a/src/workspace/executors.js
+++ b/src/workspace/executors.js
@@ -19,7 +19,9 @@ Entry.Executor = function(block, entity) {
         while (true) {
             var returnVal = null;
             try {
-                returnVal = this.scope.block.getSchema().func.call(this.scope, this.entity, this.scope);
+                var schema = this.scope.block.getSchema();
+                if (schema)
+                    returnVal = schema.func.call(this.scope, this.entity, this.scope);
             } catch(e) {
                 if(e.name === 'AsyncError') {
                     returnVal = Entry.STATIC.BREAK;
diff --git a/src/workspace/thread.js b/src/workspace/thread.js
index c5272c3e2a..4a7853e0db 100644
--- a/src/workspace/thread.js
+++ b/src/workspace/thread.js
@@ -56,7 +56,7 @@ Entry.Thread = function(thread, code, parent) {
         if (!this.view)
             this.view = new Entry.ThreadView(this, board);
         var prevBlock = null;
-        this._data.map(function(b) {
+        this._data.getAll().forEach(function(b) {
             b.createView(board, mode);
         });
     };