From d93991ee260228fae566ef0a8f57931abbd15802 Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Thu, 18 Aug 2016 16:53:27 +0900
Subject: [PATCH] function generate bug fix

---
 dist/entry.js             | 11 ++++++++---
 dist/entry.min.js         | 16 ++++++++--------
 src/variable_container.js |  4 ++--
 src/workspace/thread.js   |  7 ++++++-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/dist/entry.js b/dist/entry.js
index 93907525f9..249cd46472 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -13891,8 +13891,8 @@ Entry.VariableContainer.prototype.setVariables = function(b) {
 };
 Entry.VariableContainer.prototype.setFunctions = function(b) {
   b && b.forEach(function(a) {
-    Entry.generateFunctionSchema(a.id);
-  });
+    this.functions_[a.id] = !0;
+  }.bind(this));
   for (var a in b) {
     var c = new Entry.Func(b[a]);
     c.generateBlock();
@@ -18881,7 +18881,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 = e.type;
+        (Entry.block[f] || Entry.variableContainer.functions_[f.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..7446df886e 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -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){b&&b.forEach(function(a){this.functions_[a.id]=!0}.bind(this));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=e.type;(Entry.block[f]||Entry.variableContainer.functions_[f.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/variable_container.js b/src/variable_container.js
index 9876fbb65a..62e729de2d 100644
--- a/src/variable_container.js
+++ b/src/variable_container.js
@@ -591,8 +591,8 @@ Entry.VariableContainer.prototype.setVariables = function(variables) {
 Entry.VariableContainer.prototype.setFunctions = function(functions) {
     if (functions) {
         functions.forEach(function(f) {
-            Entry.generateFunctionSchema(f.id);
-        });
+            this.functions_[f.id] = true;
+        }.bind(this));
     }
 
     for (var i in functions) {
diff --git a/src/workspace/thread.js b/src/workspace/thread.js
index eaab7b0f01..84f246ea8e 100644
--- a/src/workspace/thread.js
+++ b/src/workspace/thread.js
@@ -35,7 +35,12 @@ 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 blockType = block.type;
+                if (Entry.block[blockType] ||
+                    Entry.variableContainer.functions_[blockType.split('_')[1]])
+                    this._data.push(new Entry.Block(block, this));
+            }
         }
 
         var codeView = this._code.view;