Paste regression fix (#4354)

* if paste div is open, paste contents when Enter is typed

* add check button and remove textMsg

---------

Co-authored-by: Walter Bender <[email protected]>

Author: walterbender

js/activity.js

@@ -2876,6 +2876,11 @@ class Activity {
                         if (this.searchWidget.style.visibility === 'visible') {
                             return;
                         }
+                        if (docById("paste").style.visibility === "visible") {
+                            this.pasted();
+			    docById("paste").style.visibility = "hidden";
+                            return;
+                        }
                         this.textMsg("Enter " + _("Play"));
                         let stopbt = document.getElementById("stop");
                         if (stopbt) {
@@ -2888,7 +2893,7 @@ class Activity {
                         this.logo.doStopTurtles();
                         break;
                     case 86: // 'V'
-                        this.textMsg("Alt-V " + _("Paste"));
+                        // this.textMsg("Alt-V " + _("Paste"));
                         this.blocks.pasteStack();
                         break;
                     case 72: // 'H' save block help
@@ -2910,7 +2915,7 @@ class Activity {
             } else if (event.ctrlKey) {
                 switch (event.keyCode) {
                     case V:
-                        this.textMsg("Ctl-V " + _("Paste"));
+                        // this.textMsg("Ctl-V " + _("Paste"));
                         this.pasteBox.createBox(this.turtleBlocksScale, 200, 200);
                         this.pasteBox.show();
                         docById("paste").style.left =

js/pastebox.js

@@ -10,18 +10,18 @@
 // Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
 
 const PASTEBOX =
-    '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="280" height="55"> <rect width="280" height="55" x="0" y="-3.5762787e-06" style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none" /> <g transform="translate(225,0)" style="fill:#000000;display:block"> <path d="m 27.557,5.053 c -12.43,0 -22.5,10.076 -22.5,22.497 0,12.432 10.07,22.503 22.5,22.503 12.431,0 22.5,-10.071 22.5,-22.503 0,-12.421 -10.07,-22.497 -22.5,-22.497 z m 10.199,28.159 c 1.254,1.256 1.257,3.291 0,4.545 -0.628,0.629 -1.451,0.943 -2.274,0.943 -0.822,0 -1.644,-0.314 -2.27,-0.94 l -5.76,-5.761 -5.76,5.761 c -0.627,0.626 -1.449,0.94 -2.271,0.94 -0.823,0 -1.647,-0.314 -2.275,-0.943 -1.254,-1.254 -1.254,-3.289 0.004,-4.545 l 5.758,-5.758 -5.758,-5.758 c -1.258,-1.254 -1.258,-3.292 -0.004,-4.546 1.255,-1.254 3.292,-1.259 4.546,0 l 5.76,5.759 5.76,-5.759 c 1.252,-1.259 3.288,-1.254 4.544,0 1.257,1.254 1.254,3.292 0,4.546 l -5.758,5.758 5.758,5.758 z" style="fill:#000000;display:inline" /> </g></svg>';
+      '<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg version="1.1" width="300" height="55" id="svg1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> <defs id="defs1" /> <rect width="300" height="55" x="0" y="0" style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.0351" id="rect1" /> <g transform="translate(244.943,-0.05299642)" style="display:block;fill:#000000" id="g1"> <path d="m 27.557,5.053 c -12.43,0 -22.5,10.076 -22.5,22.497 0,12.432 10.07,22.503 22.5,22.503 12.431,0 22.5,-10.071 22.5,-22.503 0,-12.421 -10.07,-22.497 -22.5,-22.497 z m 10.199,28.159 c 1.254,1.256 1.257,3.291 0,4.545 -0.628,0.629 -1.451,0.943 -2.274,0.943 -0.822,0 -1.644,-0.314 -2.27,-0.94 l -5.76,-5.761 -5.76,5.761 c -0.627,0.626 -1.449,0.94 -2.271,0.94 -0.823,0 -1.647,-0.314 -2.275,-0.943 -1.254,-1.254 -1.254,-3.289 0.004,-4.545 l 5.758,-5.758 -5.758,-5.758 c -1.258,-1.254 -1.258,-3.292 -0.004,-4.546 1.255,-1.254 3.292,-1.259 4.546,0 l 5.76,5.759 5.76,-5.759 c 1.252,-1.259 3.288,-1.254 4.544,0 1.257,1.254 1.254,3.292 0,4.546 l -5.758,5.758 z" style="display:inline;fill:#000000" id="path1" /> </g> <g id="g4" transform="translate(18,-0.05299642)"> <g transform="translate(176.943)" style="display:block;fill:#008000" id="g2"> <path d="m 27.557,5.053 c -12.43,0 -22.5,10.076 -22.5,22.497 0,12.432 10.07,22.503 22.5,22.503 12.431,0 22.5,-10.071 22.5,-22.503 0,-12.421 -10.07,-22.497 -22.5,-22.497 z" style="display:inline;fill:#008000" id="path1-3" /> </g> <path id="path3" style="fill:#ffffff;stroke:#ffffff;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1" d="m 216.1272,19.380148 -16.33945,16.345703 z m -23.25273,8.640234 6.91328,7.705469 z" /> </g></svg>'
 
 // A pop up for pasting from the browser clipboard
 
 /* global docById, createjs */
 
 /*
-   Global locations
+    Global locations
     js/utils/utils.js
-        _
+    _
     js/activity.js
-        createjs
+    createjs
 */
 
 /* exported PasteBox */
@@ -127,9 +127,15 @@ class PasteBox {
 
             const x = event.stageX / this._scale - this._container.x;
             const y = event.stageY / this._scale - this._container.y;
-            if (x > 125 && y < 55) {
+	    console.log(x,y);
+
+            if (x > 200 && x < 250 && y < 55) {
+		this.activity.pasted();
                 this.hide();
             }
+            if (x > 250 && y < 55) {
+                this.hide();
+            }	    
         });
     }
 
@@ -151,4 +157,4 @@ class PasteBox {
 }
 if (typeof module !== "undefined" && module.exports) {
     module.exports = PasteBox;
-}
+}