0.0.82

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pxt-ev3",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
   "private": true,
   "keywords": [
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "pxt-common-packages": "0.17.13",
-    "pxt-core": "3.1.1"
+    "pxt-core": "3.1.3"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"

sim/visuals/board.ts

@@ -15,6 +15,12 @@ namespace pxsim.visuals {
             -webkit-filter: grayscale(1);
             filter: grayscale(1);
         }
+        .user-select-none, .sim-button {
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -ms-user-select: none;
+            user-select: none;                        
+        }
         .sim-button {
             cursor: pointer;
         }

sim/visuals/controls/colorGrid.ts

@@ -19,18 +19,18 @@ namespace pxsim.visuals {
                 if (c % 2 == 0) cy += 5;
                 if (colorIds[c]) {
                     const circle = pxsim.svg.child(this.group, "circle", { 'class': 'sim-color-grid-circle', 'cx': cx, 'cy': cy, 'r': '2', 'style': `fill: ${colors[c]}` });
-                    circle.addEventListener(pointerEvents.down, ev => {
+                    pointerEvents.down.forEach(evid => circle.addEventListener(evid, ev => {
                         this.setColor(colorValue[c]);
-                    })
+                    }));
                 }
             }
 
             const whiteCircleWrapper = pxsim.svg.child(this.group, "g", { 'id': 'white-cirlce-wrapper' });
             pxsim.svg.child(whiteCircleWrapper, "circle", { 'class': 'sim-color-grid-circle', 'cx': 2.2, 'cy': '11', 'r': '2', 'style': `fill: #fff` });
             pxsim.svg.child(whiteCircleWrapper, "circle", { 'cx': 2.2, 'cy': '11', 'r': '2', 'style': `fill: none;stroke: #94989b;stroke-width: 0.1px` });
-            whiteCircleWrapper.addEventListener(pointerEvents.down, ev => {
+            pointerEvents.down.forEach(evid => whiteCircleWrapper.addEventListener(evid, ev => {
                 this.setColor(6);
-            })
+            }));
             return this.group;
         }
 

sim/visuals/nodes/brickView.ts

@@ -47,14 +47,17 @@ namespace pxsim.visuals {
         }
 
         private lastLightPattern: number = -1;
-        private lastLightAnimationId: any;
+        private lastLightAnimationId: any = undefined;
         private updateLight() {
             let state = ev3board().getBrickNode().lightState;
 
             const lightPattern = state.lightPattern;
             if (lightPattern == this.lastLightPattern) return;
             this.lastLightPattern = lightPattern;
-            if (this.lastLightAnimationId) cancelAnimationFrame(this.lastLightAnimationId);
+            if (this.lastLightAnimationId) {
+                cancelAnimationFrame(this.lastLightAnimationId);
+                delete this.lastLightAnimationId;
+            }
             switch (lightPattern) {
                 case 0:  // LED_BLACK
                     this.setStyleFill(this.normalizeId(BrickView.EV3_LIGHT_ID), this.normalizeId(`linear-gradient-black`));
@@ -94,6 +97,7 @@ namespace pxsim.visuals {
         }
 
         private flashLightAnimation(id: string) {
+            const pattern = this.lastLightPattern;
             let fps = 3;
             let now;
             let then = Date.now();
@@ -101,8 +105,9 @@ namespace pxsim.visuals {
             let delta;
             let that = this;
             function draw() {
+                if (that.lastLightPattern != pattern) return;
                 that.lastLightAnimationId = requestAnimationFrame(draw);
-                now = Date.now();
+                now = pxsim.U.now();
                 delta = now - then;
                 if (delta > interval) {
                     then = now - (delta % interval);
@@ -124,6 +129,7 @@ namespace pxsim.visuals {
 
 
         private pulseLightAnimation(id: string) {
+            const pattern = this.lastLightPattern;
             let fps = 8;
             let now;
             let then = Date.now();
@@ -131,8 +137,9 @@ namespace pxsim.visuals {
             let delta;
             let that = this;
             function draw() {
+                if (that.lastLightPattern != pattern) return;
                 that.lastLightAnimationId = requestAnimationFrame(draw);
-                now = Date.now();
+                now = pxsim.U.now();
                 delta = now - then;
                 if (delta > interval) {
                     // update time stuffs
@@ -167,10 +174,10 @@ namespace pxsim.visuals {
             this.buttons.forEach((btn, index) => {
                 let button = stateButtons[index];
 
-                btn.addEventListener(pointerEvents.down, ev => {
+                pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
                     button.setPressed(true);
                     svg.fill(this.buttons[index], this.theme.buttonDown);
-                })
+                }));
                 btn.addEventListener(pointerEvents.leave, ev => {
                     button.setPressed(false);
                     svg.fill(this.buttons[index], this.theme.buttonUps[index]);

sim/visuals/nodes/touchSensorView.ts

@@ -38,10 +38,10 @@ namespace pxsim.visuals {
             this.content.style.cursor = "pointer";
             const btn = this.content;
             const state = ev3board().getSensor(this.port, DAL.DEVICE_TYPE_TOUCH) as TouchSensorNode;
-            btn.addEventListener(pointerEvents.down, ev => {
+            pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
                 this.setPressed(true);
                 state.setPressed(true);
-            })
+            }))
             btn.addEventListener(pointerEvents.leave, ev => {
                 this.setPressed(false);
                 state.setPressed(false);