Browse Source

Bootstrap do not supports multiple modals...

Vova Tkach 6 years ago
parent
commit
489ff20c76

+ 0 - 40
engine/wrapper/resources/scripts/assets.cp.scripts.js

@@ -1,20 +1,4 @@
-(function($) {
-	$.fn.hasScrollBar = function() {
-		return this.get(0).scrollHeight > this.get(0).clientHeight;
-	}
-})(jQuery);
-
-function DetectBodyScroll() {
-	var body = $('body');
-	if($(body).hasScrollBar()) {
-		$(body).removeClass('no-scroll');
-	} else {
-		$(body).addClass('no-scroll');
-	}
-}
-
 function ModalSysMsg(title, html) {
-	DetectBodyScroll();
 	var dialog = $('#sys-modal-msg');
 	$('#sysModalMsgLabel').text(title);
 	$('#sysModalMsgBody').html(html);
@@ -62,12 +46,6 @@ function ActionSingOut() {
 }
 
 $(document).ready(function() {
-	// Fix body scroll
-	$(window).resize(function() {
-		DetectBodyScroll();
-	});
-	DetectBodyScroll();
-
 	// Ajax forms
 	$('form').each(function() {
 		$(this).submit(function(e) {
@@ -97,22 +75,4 @@ $(document).ready(function() {
 			e.preventDefault();
 		});
 	});
-
-	// Fix navbar bottstrap menu hover
-	/*
-	$('#navbarCollapse ul').each(function() {
-		var ul = $(this);
-		ul.find('li').mouseover(function() {
-			if(ul.find('li.show').length > 0) {
-				var li = $(this);
-				ul.find('li').removeClass('show');
-				ul.find('li div.dropdown-menu').removeClass('show');
-				ul.find('li a[role=button]').attr('aria-expanded', false);
-				li.addClass('show');
-				li.find('div.dropdown-menu').addClass('show');
-				li.find('a[role=button]:first').attr('aria-expanded', true);
-			}
-		});
-	});
-	*/
 });

+ 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 a=$("body");$(a).hasScrollBar()?$(a).removeClass("no-scroll"):$(a).addClass("no-scroll")}function ModalSysMsg(a,o){DetectBodyScroll();var t=$("#sys-modal-msg");return $("#sysModalMsgLabel").text(a),$("#sysModalMsgBody").html(o),t}function ModalShowMsg(a,o){ModalSysMsg(a,o).modal("show")}function AjaxDone(data){try{eval(data)}catch(a){a instanceof SyntaxError&&(console.log(data),ModalShowMsg("JavaScript Eval Error",a.message))}}function AjaxFail(){console.log("Form send fail, page will be reloaded"),window.location.reload(!1)}function ActionUserSettings(){$("form.form-user-settings")[0].reset()}function ActionSingOut(){$.ajax({type:"POST",url:"/cp/",data:{action:"singout"}}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()})}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(a){var o=$(this);if($(o).hasClass("loading"))a.preventDefault();else{$(o).addClass("loading");var t=$(this).find("button[type=submit]");$(t).addClass("progress-bar-striped").addClass("progress-bar-animated"),$.ajax({type:"POST",url:o.attr("action"),data:o.serialize()}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()}).always(function(){$(o).removeClass("loading"),$(t).removeClass("progress-bar-striped").removeClass("progress-bar-animated")}),a.preventDefault()}})})});`)
+var File_assets_cp_scripts_js = []byte(`function ModalSysMsg(a,o){var s=$("#sys-modal-msg");return $("#sysModalMsgLabel").text(a),$("#sysModalMsgBody").html(o),s}function ModalShowMsg(a,o){ModalSysMsg(a,o).modal("show")}function AjaxDone(data){try{eval(data)}catch(a){a instanceof SyntaxError&&(console.log(data),ModalShowMsg("JavaScript Eval Error",a.message))}}function AjaxFail(){console.log("Form send fail, page will be reloaded"),window.location.reload(!1)}function ActionUserSettings(){$("form.form-user-settings")[0].reset()}function ActionSingOut(){$.ajax({type:"POST",url:"/cp/",data:{action:"singout"}}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()})}$(document).ready(function(){$("form").each(function(){$(this).submit(function(a){var o=$(this);if($(o).hasClass("loading"))a.preventDefault();else{$(o).addClass("loading");var s=$(this).find("button[type=submit]");$(s).addClass("progress-bar-striped").addClass("progress-bar-animated"),$.ajax({type:"POST",url:o.attr("action"),data:o.serialize()}).done(function(a){AjaxDone(a)}).fail(function(){AjaxFail()}).always(function(){$(o).removeClass("loading"),$(s).removeClass("progress-bar-striped").removeClass("progress-bar-animated")}),a.preventDefault()}})})});`)

+ 1 - 1
engine/wrapper/resources/styles/assets.cp.styles.css

@@ -1,5 +1,5 @@
 /* Bootstrap scroll fix */
-body.no-scroll {
+body.cp {
 	padding-right: 0px !important;
 }
 

File diff suppressed because it is too large
+ 0 - 0
engine/wrapper/resources/styles/assets.cp.styles.css.go


Some files were not shown because too many files changed in this diff