# HG changeset patch # User Thierry Florac # Date 1505812760 -7200 # Node ID d3d38d0b3d18c31ec437ec2a90490dac0647fa5c # Parent afe6800e94ec61103fc4145393a88ac98c0c7a8f Remove all alerts and error messages on form reset diff -r afe6800e94ec -r d3d38d0b3d18 src/pyams_skin/resources/js/myams.js --- a/src/pyams_skin/resources/js/myams.js Tue Sep 19 11:17:30 2017 +0200 +++ b/src/pyams_skin/resources/js/myams.js Tue Sep 19 11:19:20 2017 +0200 @@ -2093,10 +2093,15 @@ // set widget status message var widgetData = errors.widgets[index]; var widget = $('[name="' + widgetData.name + '"]', form); - widget.parents('label:first') - .removeClassPrefix('state-') - .addClass('state-error') - .after('' + widgetData.message + ''); + if (!widget.exists()) { + widget = $('[name="' + widgetData.name + ':list"]', form); + } + if (widget.exists()) { + widget.parents('label:first') + .removeClassPrefix('state-') + .addClass('state-error') + .after('' + widgetData.message + ''); + } // complete form alert message if (widgetData.label) { message.push(widgetData.label + ' : ' + widgetData.message); @@ -5320,6 +5325,8 @@ $(document).on('reset', 'form', function(e) { var form = $(this); setTimeout(function() { + $('.alert-danger, SPAN.state-error', form).not('.persistent').remove(); + $('LABEL.state-error', form).removeClass('state-error'); $('INPUT.select2[type="hidden"]', form).each(function() { var input = $(this); var select = input.data('select2'); diff -r afe6800e94ec -r d3d38d0b3d18 src/pyams_skin/resources/js/myams.min.js --- a/src/pyams_skin/resources/js/myams.min.js Tue Sep 19 11:17:30 2017 +0200 +++ b/src/pyams_skin/resources/js/myams.min.js Tue Sep 19 11:19:20 2017 +0200 @@ -1,1 +1,1 @@ -(function(d,c){var b=c.console;String.prototype.startsWith=function(h){var f=this.length,g=h.length;if(f0};if(d.scrollbarWidth===undefined){d.scrollbarWidth=function(){var g=d('
').appendTo("body");var h=g.children();var f=h.innerWidth()-h.height(99).innerWidth();g.remove();return f}}d.fn.extend({exists:function(){return d(this).length>0},objectOrParentWithClass:function(f){if(this.hasClass(f)){return this}else{return this.parents("."+f)}},listattr:function(g){var f=[];this.each(function(){f.push(d(this).attr(g))});return f},style:function(g,j,f){var i=this.get(0);if(typeof(i)==="undefined"){return}var h=this.get(0).style;if(typeof(g)!=="undefined"){if(typeof(j)!=="undefined"){f=typeof(f)!=="undefined"?f:"";h.setProperty(g,j,f);return this}else{return h.getPropertyValue(g)}}else{return h}},removeClassPrefix:function(f){this.each(function(h,j){var g=j.className.split(" ").map(function(i){return i.startsWith(f)?"":i});j.className=d.trim(g.join(" "))});return this},contextMenu:function(g){function f(j,l,i){var k=d(window)[l](),m=d(g.menuSelector)[l](),h=j;if(j+m>k&&m',openedSign:''};var g=d.extend({},h,f);var i=d(this);i.find("LI").each(function(){var j=d(this);if(j.find("UL").size()>0){j.find("A:first").append(""+g.closedSign+"");var k=j.find("A:first");if(k.attr("href")==="#"){k.click(function(){return false})}}});i.find("LI.active").each(function(){var j=d(this).parents("UL");var k=j.parent("LI");j.slideDown(g.speed);k.find("b:first").html(g.openedSign);k.addClass("open")});i.find("LI A").on("click",function(){var m=d(this);if(m.hasClass("active")){return}var j=m.attr("href").replace(/^#/,"");var l=m.parent().find("UL");if(g.accordion){var k=m.parent().parents("UL");var n=i.find("UL:visible");n.each(function(p){var r=true;k.each(function(s){if(k[s]===n[p]){r=false;return false}});if(r){if(l!==n[p]){var q=d(n[p]);if(j||!q.hasClass("active")){q.slideUp(g.speed,function(){d(this).parent("LI").removeClass("open").find("B:first").delay(g.speed).html(g.closedSign)})}}}})}var o=m.parent().find("UL:first");if(!j&&o.is(":visible")&&!o.hasClass("active")){o.slideUp(g.speed,function(){m.parent("LI").removeClass("open").find("B:first").delay(g.speed).html(g.closedSign)})}else{o.slideDown(g.speed,function(){m.parent("LI").addClass("open").find("B:first").delay(g.speed).html(g.openedSign)})}})}});d.UTF8={encode:function(g){g=g.replace(/\r\n/g,"\n");var f="";for(var i=0;i127)&&(h<2048)){f+=String.fromCharCode((h>>6)|192);f+=String.fromCharCode((h&63)|128)}else{f+=String.fromCharCode((h>>12)|224);f+=String.fromCharCode(((h>>6)&63)|128);f+=String.fromCharCode((h&63)|128)}}}return f},decode:function(f){var h="";var k=0,l=0,j=0,g=0;while(k191)&&(l<224)){j=f.charCodeAt(k+1);h+=String.fromCharCode(((l&31)<<6)|(j&63));k+=2}else{j=f.charCodeAt(k+1);g=f.charCodeAt(k+2);h+=String.fromCharCode(((l&15)<<12)|((j&63)<<6)|(g&63));k+=3}}}return h}};if(c.MyAMS===undefined){c.MyAMS={devmode:true,devext:"",lang:"en",throttleDelay:350,menuSpeed:235,navbarHeight:49,ajaxNav:true,enableWidgets:true,enableMobile:false,enableFastclick:false,warnOnFormChange:false,ismobile:(/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase()))}}var e=c.MyAMS;var a=e;e.baseURL=(function(){var f=d('script[src*="/myams.js"], script[src*="/myams.min.js"]');var g=f.attr("src");a.devmode=g.indexOf(".min.js")<0;a.devext=a.devmode?"":".min";return g.substring(0,g.lastIndexOf("/")+1)})();e.log=function(){if(b){b.log&&b.log(this,arguments)}};e.getQueryVar=function(h,i){if(h.indexOf("?")<0){return false}if(!h.endsWith("&")){h+="&"}var f=new RegExp(".*?[&\\?]"+i+"=(.*?)&.*");var g=h.replace(f,"$1");return g===h?false:g};e.rgb2hex=function(f){return"#"+d.map(f.match(/\b(\d+)\b/g),function(g){return("0"+parseInt(g).toString(16)).slice(-2)}).join("")};e.generateId=function(){function f(){return Math.floor((1+Math.random())*65536).toString(16).substring(1)}return f()+f()+f()+f()};e.generateUUID=function(){var g=new Date().getTime();var f="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(i){var h=(g+Math.random()*16)%16|0;g=Math.floor(g/16);return(i==="x"?h:(h&3|8)).toString(16)});return f};e.getObject=function(k,g){if(!k){return undefined}if(typeof(k)!=="string"){return k}var h=k.split(".");g=(g===undefined||g===null)?window:g;for(var f=0;f").attr({rel:"stylesheet",type:"text/css",href:i,"data-ams-id":j}).appendTo(h)}};e.event={stop:function(f){if(!f){f=window.event}if(f){if(f.stopPropagation){f.stopPropagation();f.preventDefault()}else{f.cancelBubble=true;f.returnValue=false}}}};e.browser={getInternetExplorerVersion:function(){var h=-1;if(navigator.appName==="Microsoft Internet Explorer"){var f=navigator.userAgent;var g=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})");if(g.exec(f)!==null){h=parseFloat(RegExp.$1)}}return h},checkVersion:function(){var g="You're not using Windows Internet Explorer.";var f=this.getInternetExplorerVersion();if(f>-1){if(f>=8){g="You're using a recent copy of Windows Internet Explorer."}else{g="You should upgrade your copy of Windows Internet Explorer."}}if(c.alert){c.alert(g)}},isIE8orlower:function(){var g="0";var f=this.getInternetExplorerVersion();if(f>-1){if(f>=9){g=0}else{g=1}}return g},copyToClipboard:function(g){function f(k){var i=false;if(window.clipboardData&&window.clipboardData.setData){i=clipboardData.setData("Text",k)}else{if(document.queryCommandSupported&&document.queryCommandSupported("copy")){var h=d("