Browse Source

Show msg about JS error from server side JS

Vova Tkach 6 years ago
parent
commit
2f6a9944c2

+ 2 - 2
backend.go

@@ -7,6 +7,6 @@ import (
 )
 
 func handleBackEnd(e *wrapper.Wrapper) bool {
-	return e.TmplBackEnd(Templates.CpLogin, nil)
-	//return e.TmplBackEnd(Templates.CpMySQL, nil)
+	//return e.TmplBackEnd(Templates.CpLogin, nil)
+	return e.TmplBackEnd(Templates.CpMySQL, nil)
 }

+ 1 - 1
engine/wrapper/resources/scripts/assets.cp.scripts.js

@@ -55,8 +55,8 @@ $(document).ready(function() {
 					eval(data);
 				} catch(e) {
 					if(e instanceof SyntaxError) {
-						console.log('JavaScript eval error:', e.message);
 						console.log(data);
+						ModalShowMsg('JavaScript Eval Error', e.message)
 					}
 				}
 			}).fail(function() {

+ 1 - 1
engine/wrapper/resources/scripts/assets.cp.scripts.js.go

@@ -1,4 +1,4 @@
 package scripts
 
 // https://jscompress.com/
-var File_assets_cp_scripts_js = []byte(`function DetectBodyScroll(){var o=$("body");$(o).hasScrollBar()?$(o).removeClass("no-scroll"):$(o).addClass("no-scroll")}function ModalSysMsg(o,a){DetectBodyScroll();var e=$("#sys-modal-msg");return $("#sysModalMsgLabel").text(o),$("#sysModalMsgBody").html(a),e}function ModalShowMsg(o,a){ModalSysMsg(o,a).modal("show")}jQuery.fn.hasScrollBar=function(){return this.get(0).scrollHeight>this.get(0).clientHeight},$(document).ready(function(){$(window).resize(function(){DetectBodyScroll()}),DetectBodyScroll(),$("form").each(function(){$(this).submit(function(e){var form=$(this);if($(form).hasClass("loading"))e.preventDefault();else{$(form).addClass("loading");var button=$(this).find("button[type=submit]");$(button).addClass("progress-bar-striped").addClass("progress-bar-animated"),$.ajax({type:"POST",url:form.attr("action"),data:form.serialize()}).done(function(data){try{eval(data)}catch(o){o instanceof SyntaxError&&(console.log("JavaScript eval error:",o.message),console.log(data))}}).fail(function(){console.log("Form send fail, page will be reloaded"),window.location.reload(!1)}).always(function(){$(form).removeClass("loading"),$(button).removeClass("progress-bar-striped").removeClass("progress-bar-animated")}),e.preventDefault()}})})});`)
+var File_assets_cp_scripts_js = []byte(`function DetectBodyScroll(){var o=$("body");$(o).hasScrollBar()?$(o).removeClass("no-scroll"):$(o).addClass("no-scroll")}function ModalSysMsg(o,a){DetectBodyScroll();var t=$("#sys-modal-msg");return $("#sysModalMsgLabel").text(o),$("#sysModalMsgBody").html(a),t}function ModalShowMsg(o,a){ModalSysMsg(o,a).modal("show")}jQuery.fn.hasScrollBar=function(){return this.get(0).scrollHeight>this.get(0).clientHeight},$(document).ready(function(){$(window).resize(function(){DetectBodyScroll()}),DetectBodyScroll(),$("form").each(function(){$(this).submit(function(e){var form=$(this);if($(form).hasClass("loading"))e.preventDefault();else{$(form).addClass("loading");var button=$(this).find("button[type=submit]");$(button).addClass("progress-bar-striped").addClass("progress-bar-animated"),$.ajax({type:"POST",url:form.attr("action"),data:form.serialize()}).done(function(data){try{eval(data)}catch(o){o instanceof SyntaxError&&(console.log(data),ModalShowMsg("JavaScript Eval Error",o.message))}}).fail(function(){console.log("Form send fail, page will be reloaded"),window.location.reload(!1)}).always(function(){$(form).removeClass("loading"),$(button).removeClass("progress-bar-striped").removeClass("progress-bar-animated")}),e.preventDefault()}})})});`)