Merge pull request #448 from entrylabs/hotfix/function-schema-init

hotfix function schema
entrylabs · Aug 18, 2016 · 94342fd · 94342fd
2 parents f4a547d + 1716d43
commit 94342fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/dist/entry.js b/dist/entry.js
@@ -13885,6 +13885,9 @@ Entry.VariableContainer.prototype.setVariables = function(b) {
   this.updateList();
 };
 Entry.VariableContainer.prototype.setFunctions = function(b) {
+  b && b.forEach(function(a) {
+    Entry.block["func_" + a.id] = !0;
+  });
   for (var a in b) {
     var c = new Entry.Func(b[a]);
     c.generateBlock();

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/src/variable_container.js b/src/variable_container.js
@@ -589,6 +589,12 @@ Entry.VariableContainer.prototype.setVariables = function(variables) {
  * @param {!Array.<function model>} variables
  */
 Entry.VariableContainer.prototype.setFunctions = function(functions) {
+    if (functions) {
+        functions.forEach(function(f) {
+            Entry.block['func_' + f.id] = true;
+        });
+    }
+
     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
@@ -35,8 +35,7 @@ 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 Entry.block[block.type] && this._data.push(new Entry.Block(block, this));
         }
 
         var codeView = this._code.view;