From e6de381ec2c317ed94e3f7d0e4d2f876a71c7dd5 Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Tue, 12 Jul 2016 10:55:35 +0900
Subject: [PATCH] timer & button bug

project timer pause when project paused.
run button show & hide bug
---
 dist/entry.js     | 29 +++++++++++------------------
 dist/entry.min.js | 10 ++++++----
 src/engine.js     | 42 +++++++++++++++++++++++++++++++-----------
 3 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/dist/entry.js b/dist/entry.js
index 600137447f..d4391c85d9 100644
--- a/dist/entry.js
+++ b/dist/entry.js
@@ -7129,26 +7129,14 @@ Entry.Engine.prototype.run = function() {
   this.isState("run") ? this.toggleStop() : (this.isState("stop") || this.isState("pause")) && this.toggleRun();
 };
 Entry.Engine.prototype.toggleRun = function() {
-  Entry.addActivity("run");
-  "stop" == this.state && (Entry.container.mapEntity(function(b) {
+  "pause" === this.state ? this.togglePause() : (Entry.addActivity("run"), "stop" == this.state && (Entry.container.mapEntity(function(b) {
     b.takeSnapshot();
   }), Entry.variableContainer.mapVariable(function(b) {
     b.takeSnapshot();
   }), Entry.variableContainer.mapList(function(b) {
     b.takeSnapshot();
-  }), this.projectTimer.takeSnapshot(), Entry.container.inputValue.takeSnapshot(), Entry.container.takeSequenceSnapshot(), Entry.scene.takeStartSceneSnapshot(), this.state = "run", this.fireEvent("start"));
-  this.state = "run";
-  "mobile" == Entry.type && this.view_.addClass("entryEngineBlueWorkspace");
-  this.pauseButton.innerHTML = Lang.Workspace.pause;
-  this.runButton.addClass("run");
-  this.runButton.addClass("entryRemove");
-  this.stopButton.removeClass("entryRemove");
-  this.pauseButton && this.pauseButton.removeClass("entryRemove");
-  this.runButton2 && this.runButton2.addClass("entryRemove");
-  this.stopButton2 && this.stopButton2.removeClass("entryRemove");
-  this.isUpdating || (Entry.engine.update(), Entry.engine.isUpdating = !0);
-  Entry.stage.selectObject();
-  Entry.dispatchEvent("run");
+  }), this.projectTimer.takeSnapshot(), Entry.container.inputValue.takeSnapshot(), Entry.container.takeSequenceSnapshot(), Entry.scene.takeStartSceneSnapshot(), this.state = "run", this.fireEvent("start")), this.state = "run", "mobile" == Entry.type && this.view_.addClass("entryEngineBlueWorkspace"), this.pauseButton.innerHTML = Lang.Workspace.pause, this.runButton.addClass("run"), this.runButton.addClass("entryRemove"), this.stopButton.removeClass("entryRemove"), this.pauseButton && this.pauseButton.removeClass("entryRemove"), 
+  this.runButton2 && this.runButton2.addClass("entryRemove"), this.stopButton2 && this.stopButton2.removeClass("entryRemove"), this.isUpdating || (Entry.engine.update(), Entry.engine.isUpdating = !0), Entry.stage.selectObject(), Entry.dispatchEvent("run"));
 };
 Entry.Engine.prototype.toggleStop = function() {
   Entry.addActivity("stop");
@@ -7187,7 +7175,9 @@ Entry.Engine.prototype.toggleStop = function() {
   Entry.stage.hideInputField();
 };
 Entry.Engine.prototype.togglePause = function() {
-  "pause" == this.state ? (this.state = "run", this.pauseButton.innerHTML = Lang.Workspace.pause) : (this.state = "pause", this.pauseButton.innerHTML = Lang.Workspace.restart, this.runButton.removeClass("entryRemove"), this.stopButton.removeClass("entryRemove"));
+  var b = Entry.engine.projectTimer;
+  "pause" == this.state ? (b.pausedTime += (new Date).getTime() - b.pauseStart, b.isPaused ? b.pauseStart = (new Date).getTime() : delete b.pauseStart, this.state = "run", this.pauseButton.innerHTML = Lang.Workspace.pause, this.runButton.addClass("entryRemove"), this.runButton2 && this.runButton2.addClass("entryRemove")) : (this.state = "pause", b.isPaused && (b.pausedTime += (new Date).getTime() - b.pauseStart), b.pauseStart = (new Date).getTime(), this.pauseButton.innerHTML = Lang.Workspace.restart, 
+  this.runButton.removeClass("entryRemove"), this.stopButton.removeClass("entryRemove"), this.runButton2 && this.runButton2.removeClass("entryRemove"));
 };
 Entry.Engine.prototype.fireEvent = function(b) {
   "run" == this.state && Entry.container.mapEntityIncludeCloneOnScene(this.raiseEvent, b);
@@ -7265,8 +7255,11 @@ Entry.Engine.prototype.stopProjectTimer = function() {
   b && (this.updateProjectTimer(0), b.isPaused = !1, b.isInit = !1, b.pausedTime = 0, clearInterval(b.tick));
 };
 Entry.Engine.prototype.updateProjectTimer = function(b) {
-  var a = Entry.engine.projectTimer, c = (new Date).getTime();
-  a && ("undefined" == typeof b ? a.isPaused || a.setValue((c - a.start - a.pausedTime) / 1E3) : (a.setValue(b), a.pausedTime = 0, a.start = c));
+  var a = Entry.engine, c = a.projectTimer;
+  if (c) {
+    var d = (new Date).getTime();
+    "undefined" == typeof b ? c.isPaused || a.isState("pause") || c.setValue((d - c.start - c.pausedTime) / 1E3) : (c.setValue(b), c.pausedTime = 0, c.start = d);
+  }
 };
 Entry.EntityObject = function(b) {
   this.parent = b;
diff --git a/dist/entry.min.js b/dist/entry.min.js
index 11fdc33dc6..8cb2b6f103 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -748,11 +748,13 @@ Entry.Engine.prototype.toggleSpeedPanel=function(){if(this.speedPanelOn)this.spe
 Entry.Engine.prototype.setSpeedMeter=function(b){var a=this.speeds.indexOf(b);0>a||(a=Math.min(4,a),a=Math.max(0,a),this.speedPanelOn&&(this.speedHandle_.style.left=(Entry.interfaceState.canvasWidth-80)/10*(2*a+1)+80-9+"px"),Entry.FPS!=b&&(clearInterval(this.ticker),this.ticker=setInterval(this.update,Math.floor(1E3/b)),Entry.FPS=b))};Entry.Engine.prototype.start=function(b){createjs.Ticker.setFPS(Entry.FPS);this.ticker=setInterval(this.update,Math.floor(1E3/Entry.FPS))};
 Entry.Engine.prototype.stop=function(){clearInterval(this.ticker);this.ticker=null};Entry.Engine.prototype.update=function(){Entry.engine.isState("run")&&(Entry.engine.computeObjects(),Entry.hw.update())};Entry.Engine.prototype.computeObjects=function(){Entry.container.mapObjectOnScene(this.computeFunction)};Entry.Engine.prototype.computeFunction=function(b){b.script.tick()};
 Entry.Engine.computeThread=function(b,a){Entry.engine.isContinue=!0;for(var c=!1;a&&Entry.engine.isContinue&&!c;){Entry.engine.isContinue=!a.isRepeat;var d=a.run(),c=d&&d===a;a=d}return a};Entry.Engine.prototype.isState=function(b){return-1<this.state.indexOf(b)};Entry.Engine.prototype.run=function(){this.isState("run")?this.toggleStop():(this.isState("stop")||this.isState("pause"))&&this.toggleRun()};
-Entry.Engine.prototype.toggleRun=function(){Entry.addActivity("run");"stop"==this.state&&(Entry.container.mapEntity(function(b){b.takeSnapshot()}),Entry.variableContainer.mapVariable(function(b){b.takeSnapshot()}),Entry.variableContainer.mapList(function(b){b.takeSnapshot()}),this.projectTimer.takeSnapshot(),Entry.container.inputValue.takeSnapshot(),Entry.container.takeSequenceSnapshot(),Entry.scene.takeStartSceneSnapshot(),this.state="run",this.fireEvent("start"));this.state="run";"mobile"==Entry.type&&
-this.view_.addClass("entryEngineBlueWorkspace");this.pauseButton.innerHTML=Lang.Workspace.pause;this.runButton.addClass("run");this.runButton.addClass("entryRemove");this.stopButton.removeClass("entryRemove");this.pauseButton&&this.pauseButton.removeClass("entryRemove");this.runButton2&&this.runButton2.addClass("entryRemove");this.stopButton2&&this.stopButton2.removeClass("entryRemove");this.isUpdating||(Entry.engine.update(),Entry.engine.isUpdating=!0);Entry.stage.selectObject();Entry.dispatchEvent("run")};
+Entry.Engine.prototype.toggleRun=function(){"pause"===this.state?this.togglePause():(Entry.addActivity("run"),"stop"==this.state&&(Entry.container.mapEntity(function(b){b.takeSnapshot()}),Entry.variableContainer.mapVariable(function(b){b.takeSnapshot()}),Entry.variableContainer.mapList(function(b){b.takeSnapshot()}),this.projectTimer.takeSnapshot(),Entry.container.inputValue.takeSnapshot(),Entry.container.takeSequenceSnapshot(),Entry.scene.takeStartSceneSnapshot(),this.state="run",this.fireEvent("start")),
+this.state="run","mobile"==Entry.type&&this.view_.addClass("entryEngineBlueWorkspace"),this.pauseButton.innerHTML=Lang.Workspace.pause,this.runButton.addClass("run"),this.runButton.addClass("entryRemove"),this.stopButton.removeClass("entryRemove"),this.pauseButton&&this.pauseButton.removeClass("entryRemove"),this.runButton2&&this.runButton2.addClass("entryRemove"),this.stopButton2&&this.stopButton2.removeClass("entryRemove"),this.isUpdating||(Entry.engine.update(),Entry.engine.isUpdating=!0),Entry.stage.selectObject(),
+Entry.dispatchEvent("run"))};
 Entry.Engine.prototype.toggleStop=function(){Entry.addActivity("stop");var b=Entry.container,a=Entry.variableContainer;b.mapEntity(function(a){a.loadSnapshot();a.object.filters=[];a.resetFilter();a.dialog&&a.dialog.remove();a.brush&&a.removeBrush()});a.mapVariable(function(a){a.loadSnapshot()});a.mapList(function(a){a.loadSnapshot();a.updateView()});this.stopProjectTimer();b.clearRunningState();b.loadSequenceSnapshot();this.projectTimer.loadSnapshot();Entry.container.inputValue.loadSnapshot();Entry.scene.loadStartSceneSnapshot();
 Entry.Func.clearThreads();createjs.Sound.setVolume(1);createjs.Sound.stop();this.view_.removeClass("entryEngineBlueWorkspace");this.runButton.removeClass("entryRemove");this.stopButton.addClass("entryRemove");this.pauseButton&&this.pauseButton.addClass("entryRemove");this.runButton2&&this.runButton2.removeClass("entryRemove");this.stopButton2&&this.stopButton2.addClass("entryRemove");this.state="stop";Entry.dispatchEvent("stop");Entry.stage.hideInputField()};
-Entry.Engine.prototype.togglePause=function(){"pause"==this.state?(this.state="run",this.pauseButton.innerHTML=Lang.Workspace.pause):(this.state="pause",this.pauseButton.innerHTML=Lang.Workspace.restart,this.runButton.removeClass("entryRemove"),this.stopButton.removeClass("entryRemove"))};Entry.Engine.prototype.fireEvent=function(b){"run"==this.state&&Entry.container.mapEntityIncludeCloneOnScene(this.raiseEvent,b)};Entry.Engine.prototype.raiseEvent=function(b,a){b.parent.script.raiseEvent(a,b)};
+Entry.Engine.prototype.togglePause=function(){var b=Entry.engine.projectTimer;"pause"==this.state?(b.pausedTime+=(new Date).getTime()-b.pauseStart,b.isPaused?b.pauseStart=(new Date).getTime():delete b.pauseStart,this.state="run",this.pauseButton.innerHTML=Lang.Workspace.pause,this.runButton.addClass("entryRemove"),this.runButton2&&this.runButton2.addClass("entryRemove")):(this.state="pause",b.isPaused&&(b.pausedTime+=(new Date).getTime()-b.pauseStart),b.pauseStart=(new Date).getTime(),this.pauseButton.innerHTML=
+Lang.Workspace.restart,this.runButton.removeClass("entryRemove"),this.stopButton.removeClass("entryRemove"),this.runButton2&&this.runButton2.removeClass("entryRemove"))};Entry.Engine.prototype.fireEvent=function(b){"run"==this.state&&Entry.container.mapEntityIncludeCloneOnScene(this.raiseEvent,b)};Entry.Engine.prototype.raiseEvent=function(b,a){b.parent.script.raiseEvent(a,b)};
 Entry.Engine.prototype.fireEventOnEntity=function(b,a){"run"==this.state&&Entry.container.mapEntityIncludeCloneOnScene(this.raiseEventOnEntity,[a,b])};Entry.Engine.prototype.raiseEventOnEntity=function(b,a){b===a[0]&&b.parent.script.raiseEvent(a[1],b)};
 Entry.Engine.prototype.captureKeyEvent=function(b){var a=b.keyCode,c=Entry.type;b.ctrlKey&&"workspace"==c?83==a?(b.preventDefault(),Entry.dispatchEvent("saveWorkspace")):82==a?(b.preventDefault(),Entry.engine.run()):90==a&&(b.preventDefault(),console.log("engine"),Entry.dispatchEvent(b.shiftKey?"redo":"undo")):Entry.engine.isState("run")&&Entry.container.mapEntityIncludeCloneOnScene(Entry.engine.raiseKeyEvent,["keyPress",a]);Entry.engine.isState("stop")&&"workspace"===c&&37<=a&&40>=a&&Entry.stage.moveSprite(b)};
 Entry.Engine.prototype.raiseKeyEvent=function(b,a){return b.parent.script.raiseEvent(a[0],b,String(a[1]))};Entry.Engine.prototype.updateMouseView=function(){var b=Entry.stage.mouseCoordinate;this.mouseView.innerHTML="X : "+b.x+", Y : "+b.y;this.mouseView.removeClass("entryRemove")};Entry.Engine.prototype.hideMouseView=function(){this.mouseView.addClass("entryRemove")};
@@ -760,7 +762,7 @@ Entry.Engine.prototype.toggleFullscreen=function(){if(this.popup)this.popup.remo
 Entry.Engine.prototype.exitFullScreen=function(){document.webkitIsFullScreen||document.mozIsFullScreen||document.isFullScreen||(Entry.engine.footerView_.removeClass("entryRemove"),Entry.engine.headerView_.removeClass("entryRemove"))};Entry.Engine.prototype.showProjectTimer=function(){Entry.engine.projectTimer&&this.projectTimer.setVisible(!0)};
 Entry.Engine.prototype.hideProjectTimer=function(){var b=this.projectTimer;if(b&&b.isVisible()&&!this.isState("run")){for(var a=Entry.container.getAllObjects(),c=["get_project_timer_value","reset_project_timer","set_visible_project_timer","choose_project_timer_action"],d=0,e=a.length;d<e;d++)for(var f=a[d].script,g=0;g<c.length;g++)if(f.hasBlockType(c[g]))return;b.setVisible(!1)}};Entry.Engine.prototype.clearTimer=function(){clearInterval(this.ticker);clearInterval(this.projectTimer.tick)};
 Entry.Engine.prototype.startProjectTimer=function(){var b=this.projectTimer;b&&(b.start=(new Date).getTime(),b.isInit=!0,b.pausedTime=0,b.tick=setInterval(function(a){Entry.engine.updateProjectTimer()},1E3/60))};Entry.Engine.prototype.stopProjectTimer=function(){var b=this.projectTimer;b&&(this.updateProjectTimer(0),b.isPaused=!1,b.isInit=!1,b.pausedTime=0,clearInterval(b.tick))};
-Entry.Engine.prototype.updateProjectTimer=function(b){var a=Entry.engine.projectTimer,c=(new Date).getTime();a&&("undefined"==typeof b?a.isPaused||a.setValue((c-a.start-a.pausedTime)/1E3):(a.setValue(b),a.pausedTime=0,a.start=c))};Entry.EntityObject=function(b){this.parent=b;this.type=b.objectType;this.flip=!1;this.collision=Entry.Utils.COLLISION.NONE;this.id=Entry.generateHash();"sprite"==this.type?(this.object=new createjs.Bitmap,this.effect={},this.setInitialEffectValue()):"textBox"==this.type&&(this.object=new createjs.Container,this.textObject=new createjs.Text,this.textObject.font="20px Nanum Gothic",this.textObject.textBaseline="middle",this.textObject.textAlign="center",this.bgObject=new createjs.Shape,this.bgObject.graphics.setStrokeStyle(1).beginStroke("#f00").drawRect(0,
+Entry.Engine.prototype.updateProjectTimer=function(b){var a=Entry.engine,c=a.projectTimer;if(c){var d=(new Date).getTime();"undefined"==typeof b?c.isPaused||a.isState("pause")||c.setValue((d-c.start-c.pausedTime)/1E3):(c.setValue(b),c.pausedTime=0,c.start=d)}};Entry.EntityObject=function(b){this.parent=b;this.type=b.objectType;this.flip=!1;this.collision=Entry.Utils.COLLISION.NONE;this.id=Entry.generateHash();"sprite"==this.type?(this.object=new createjs.Bitmap,this.effect={},this.setInitialEffectValue()):"textBox"==this.type&&(this.object=new createjs.Container,this.textObject=new createjs.Text,this.textObject.font="20px Nanum Gothic",this.textObject.textBaseline="middle",this.textObject.textAlign="center",this.bgObject=new createjs.Shape,this.bgObject.graphics.setStrokeStyle(1).beginStroke("#f00").drawRect(0,
 0,100,100),this.object.addChild(this.bgObject),this.object.addChild(this.textObject),this.fontType="Nanum Gothic",this.fontSize=20,this.strike=this.underLine=this.fontItalic=this.fontBold=!1);this.object.entity=this;this.object.cursor="pointer";this.object.on("mousedown",function(a){var b=this.entity.parent.id;Entry.dispatchEvent("entityClick",this.entity);Entry.stage.isObjectClick=!0;"minimize"!=Entry.type&&Entry.engine.isState("stop")&&(this.offset={x:-this.parent.x+this.entity.getX()-(.75*a.stageX-
 240),y:-this.parent.y-this.entity.getY()-(.75*a.stageY-135)},this.cursor="move",this.entity.initCommand(),Entry.container.selectObject(b))});this.object.on("pressup",function(a){Entry.dispatchEvent("entityClickCanceled",this.entity);this.cursor="pointer";this.entity.checkCommand()});this.object.on("pressmove",function(a){"minimize"!=Entry.type&&Entry.engine.isState("stop")&&!this.entity.parent.getLock()&&(this.entity.doCommand(),this.entity.setX(.75*a.stageX-240+this.offset.x),this.entity.setY(-(.75*
 a.stageY-135)-this.offset.y),Entry.stage.updateObject())})};Entry.EntityObject.prototype.injectModel=function(b,a){if("sprite"==this.type)this.setImage(b);else if("textBox"==this.type){var c=this.parent;a.text=a.text||c.text||c.name;this.setFont(a.font);this.setBGColour(a.bgColor);this.setColour(a.colour);this.setUnderLine(a.underLine);this.setStrike(a.strike);this.setText(a.text)}a&&this.syncModel_(a)};
diff --git a/src/engine.js b/src/engine.js
index f152341c61..658a88d441 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -18,18 +18,19 @@ Entry.Engine = function() {
     if (Entry.keyPressed)
         Entry.keyPressed.attach(this, this.captureKeyEvent);
 
-    Entry.addEventListener('canvasClick', function(e){
+    Entry.addEventListener('canvasClick', function(e) {
         Entry.engine.fireEvent('mouse_clicked');
     });
-    Entry.addEventListener('canvasClickCanceled', function(e){
+    Entry.addEventListener('canvasClickCanceled', function(e) {
         Entry.engine.fireEvent('mouse_click_cancled');
     });
-    Entry.addEventListener('entityClick', function(entity){
+    Entry.addEventListener('entityClick', function(entity) {
         Entry.engine.fireEventOnEntity('when_object_click', entity);
     });
-    Entry.addEventListener('entityClickCanceled', function(entity){
+    Entry.addEventListener('entityClickCanceled', function(entity) {
         Entry.engine.fireEventOnEntity('when_object_click_canceled', entity);
     });
+
     if (Entry.type != 'phone') {
         Entry.addEventListener('stageMouseMove', function(e){
             Entry.engine.updateMouseView();
@@ -51,8 +52,7 @@ Entry.Engine = function() {
         var arrows = [37,38,39,40,32];
         var code = (e.keyCode || e.which);
         var input = Entry.stage.inputField;
-        if (code == 32 && input &&
-                input.hasFocus())
+        if (code == 32 && input && input.hasFocus())
             return;
         if(arrows.indexOf(code) > -1)
             e.preventDefault();
@@ -446,6 +446,11 @@ Entry.Engine.prototype.run = function() {
  * toggle this engine state run
  */
 Entry.Engine.prototype.toggleRun = function() {
+    if (this.state === 'pause') {
+        this.togglePause();
+        return;
+    }
+
     Entry.addActivity("run");
     if (this.state == 'stop') {
         Entry.container.mapEntity(function(entity){
@@ -543,15 +548,30 @@ Entry.Engine.prototype.toggleStop = function() {
  * toggle this engine state pause
  */
 Entry.Engine.prototype.togglePause = function() {
+    var timer = Entry.engine.projectTimer;
     if (this.state == 'pause') {
+        timer.pausedTime += (new Date()).getTime() - timer.pauseStart;
+        if (timer.isPaused)
+            timer.pauseStart = (new Date()).getTime()
+        else delete timer.pauseStart;
         this.state = 'run';
         this.pauseButton.innerHTML = Lang.Workspace.pause;
+        this.runButton.addClass('entryRemove');
+        if (this.runButton2)
+            this.runButton2.addClass('entryRemove');
     } else {
         this.state = 'pause';
+        if (!timer.isPaused)
+            timer.pauseStart = (new Date()).getTime();
+        else {
+            timer.pausedTime += (new Date()).getTime() - timer.pauseStart;
+            timer.pauseStart = (new Date()).getTime();
+        }
         this.pauseButton.innerHTML = Lang.Workspace.restart;
         this.runButton.removeClass('entryRemove');
         this.stopButton.removeClass('entryRemove');
-        //this.pauseButton.addClass('entryRemove');
+        if (this.runButton2)
+            this.runButton2.removeClass('entryRemove');
     }
 };
 
@@ -746,12 +766,12 @@ Entry.Engine.prototype.stopProjectTimer = function() {
 };
 
 Entry.Engine.prototype.updateProjectTimer = function(value) {
-    var timer = Entry.engine.projectTimer;
+    var engine = Entry.engine;
+    var timer = engine.projectTimer;
+    if (!timer) return;
     var current = (new Date()).getTime();
-    if (!timer)
-        return;
     if (typeof value == 'undefined') {
-        if (!timer.isPaused)
+        if (!timer.isPaused && !engine.isState('pause'))
             timer.setValue(((current - timer.start - timer.pausedTime)/1000));
     } else {
         timer.setValue(value);