Merge pull request #20 from cosminpopescu14/issue/put-wrapper-xhr-fun…

…ction-into-their-own-js-file @all-contributors please add @cosminpopescu14 for Code Moved XHR GET in another file.
ignatandrei · Apr 22, 2020 · 51dc5e3 · 51dc5e3
2 parents 5a9ed63 + 5e189b3
commit 51dc5e3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html
@@ -11,6 +11,7 @@
     <script src="/blockly/wait_block.js"></script>
     <script src="others/jszip.min.js"></script>
     <script src="others/FileSaver.min.js"></script>
+    <script src="blockly/BlocklyXHRWrapper.js"></script>
 
     <!--doNotCopyToFinal-->
     <script src="doNotCopy/testing.js"></script>
@@ -860,29 +861,10 @@ <h1>
             //interpreter.setProperty(globalObject, 'resolveObject',
             //    interpreter.createNativeFunction(wrapper));
 
-            var wrapper = function (href, callback) {
-                var req = new XMLHttpRequest();
-                req.open('GET', href, true);
-                req.onreadystatechange = function () {
-                    if (req.readyState == 4) {
-                        if (req.status >= 200 && req.status < 300) {
-                            callback(req.responseText);
-                        } else {
-                            throw `${href} status :${req.status}`;
-                        }
-
-                    }
-                    else {
-                        //window.alert(`error ${href} ${req.status}`);
-                    }
-                };
-                req.send(null);
-            };
+            var wrapper = (href, callback) => doGet(href, callback)
             interpreter.setProperty(globalObject, 'getXhr',
                 interpreter.createAsyncFunction(wrapper));
 
-
-
             var wrapper = function (href, objectToPost, callback) {
                 var data = `postXhr: href: ${href} obj: ${objectToPost}`;
                 //console.log(data);

diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/BlocklyXHRWrapper.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/BlocklyXHRWrapper.js
@@ -0,0 +1,22 @@
+// XHR wrapper functions
+
+const doGet = (href, callback) => {
+
+    console.log(href, callback);
+    let req = new XMLHttpRequest();
+    req.open('GET', href, true);
+    req.onreadystatechange = function () {
+        if (req.readyState == 4) {
+            if (req.status >= 200 && req.status < 300) {
+                return callback(req.responseText);
+            } else {
+                throw `${href} status :${req.status}`;
+            }
+
+        }
+        else {
+            //window.alert(`error ${href} ${req.status}`);
+        }
+    };
+    req.send(null);
+}