From fd1ad988ab9be8394b8670b673bd682aa4be2872 Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Fri, 19 Aug 2016 11:31:17 +0900
Subject: [PATCH] conflict

---
 dist/entry.js     |  7 -------
 dist/entry.min.js | 12 ++++++------
 src/entry.js      | 16 ----------------
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/dist/entry.js b/dist/entry.js
index 402e7b06ca..2eaae1abf3 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);
@@ -124,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() {
diff --git a/dist/entry.min.js b/dist/entry.min.js
index 89b8dcb520..b3a703ab8b 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();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,
+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}},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",
+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};
diff --git a/src/entry.js b/src/entry.js
index 18c6077fd8..323e32d35c 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;
@@ -355,18 +353,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;