Löst den Merge Konflikt auf.

1 files changed, 31 insertions, 0 deletions

diff --git a/static/captcha.js b/static/captcha.js
new file mode 100644
index 0000000..7b16e7c
--- /dev/null
+++ b/static/captcha.js
@@ -0,0 +1,31 @@
+function loadJSON(path, success, error)
+{
+    var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function()
+    {
+        if (xhr.readyState === XMLHttpRequest.DONE) {
+            if (xhr.status === 200) {
+                if (success)
+                    success(JSON.parse(xhr.responseText));
+            } else {
+                if (error)
+                    error(xhr);
+            }
+        }
+    };
+    xhr.open("GET", path, true);
+    xhr.send();
+};
+loadJSON('/json/newcaptcha',
+	 function(data){
+		 console.log("success", data);
+		 var captcha = document.getElementById('captcha-img');
+		 captcha.src = "/captcha/" + data.captcha_id + ".png";
+		 var captcha_input = document.getElementById('captcha-id');
+		 captcha_input.value = data.captcha_id; 
+	},
+	function(data) {
+		 console.log("error", data);
+		console.log(data);
+	}
+);