# HG changeset patch # User Thierry Florac # Date 1544707709 -3600 # Node ID 63ea9a94bd47d9c15b086610aa728d62a38b857d # Parent efdf19b8f45393a06f4265497394c8c5c4a69b5d Added tests on activated modules diff -r efdf19b8f453 -r 63ea9a94bd47 src/pyams_skin/resources/js/myams-ajax.js --- a/src/pyams_skin/resources/js/myams-ajax.js Wed Dec 12 21:16:29 2018 +0100 +++ b/src/pyams_skin/resources/js/myams-ajax.js Thu Dec 13 14:28:29 2018 +0100 @@ -247,14 +247,14 @@ } break; case 'error': - ams.form.showErrors(form, result); + ams.form && ams.form.showErrors(form, result); break; case 'info': case 'success': if (form !== undefined) { - ams.form.resetChanged(form); + ams.form && ams.form.resetChanged(form); if (result.close_form !== false) { - ams.dialog.close(form); + ams.dialog && ams.dialog.close(form); } } break; @@ -265,20 +265,20 @@ case 'callback': case 'callbacks': if (form !== undefined) { - ams.form.resetChanged(form); + ams.form && ams.form.resetChanged(form); if (result.close_form !== false) { - ams.dialog.close(form); + ams.dialog && ams.dialog.close(form); } } break; case 'modal': - ams.dialog.open(result.location); + ams.dialog && ams.dialog.open(result.location); break; case 'reload': if (form !== undefined) { - ams.form.resetChanged(form); + ams.form && ams.form.resetChanged(form); if (result.close_form !== false) { - ams.dialog.close(form); + ams.dialog && ams.dialog.close(form); } } url = result.location || window.location.hash; @@ -286,7 +286,7 @@ url = url.substr(1); } var loadTarget = $(result.target || target || '#content'); - ams.skin.loadURL(url, loadTarget, { + ams.skin && ams.skin.loadURL(url, loadTarget, { preLoadCallback: ams.getFunctionByName(result.pre_reload) || function() { $('[data-ams-pre-reload]', loadTarget).each(function() { ams.executeFunctionByName($(this).data('ams-pre-reload')); @@ -303,9 +303,9 @@ break; case 'redirect': if (form !== undefined) { - ams.form.resetChanged(form); + ams.form && ams.form.resetChanged(form); if (result.close_form === true) { - ams.dialog.close(form); + ams.dialog && ams.dialog.close(form); } } url = result.location || window.location.href; @@ -338,7 +338,7 @@ container.text(content.text); } else { container.html(content.html); - ams.initContent(container); + ams.initContent && ams.initContent(container); } if (!content.keep_hidden) { container.removeClass('hidden'); @@ -353,7 +353,7 @@ container.text(content.text); } else { container.html(content.html); - ams.initContent(container); + ams.initContent && ams.initContent(container); } if (!content.keep_hidden) { container.removeClass('hidden'); @@ -366,32 +366,32 @@ message = result.message; if (typeof(message) === 'string') { if ((status === 'info') || (status === 'success')) { - ams.skin.smallBox(status, { - title: message, - icon: 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', - timeout: 3000 - }); + ams.skin && ams.skin.smallBox(status, { + title: message, + icon: 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', + timeout: 3000 + }); } else { - ams.skin.alert($(form || '#content'), status, message); + ams.skin && ams.skin.alert($(form || '#content'), status, message); } } else { - ams.skin.alert($(message.target || target || form || '#content'), - message.status || 'success', - message.header, - message.body, - message.subtitle); + ams.skin && ams.skin.alert($(message.target || target || form || '#content'), + message.status || 'success', + message.header, + message.body, + message.subtitle); } } if (result.smallbox) { message = result.smallbox; if (typeof(message) === 'string') { - ams.skin.smallBox(result.smallbox_status || status, { + ams.skin && ams.skin.smallBox(result.smallbox_status || status, { title: result.smallbox, icon: result.smallbox_icon || 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', timeout: result.smallbox_timeout || 3000 }); } else { - ams.skin.smallBox(message.status || status, { + ams.skin && ams.skin.smallBox(message.status || status, { title: message.message, icon: message.icon || 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', timeout: message.timeout || 3000 @@ -401,23 +401,23 @@ if (result.messagebox) { message = result.messagebox; if (typeof(message) === 'string') { - ams.skin.messageBox('info', { - title: ams.i18n.ERROR_OCCURED, - content: message, - timeout: 10000 - }); + ams.skin && ams.skin.messageBox('info', { + title: ams.i18n.ERROR_OCCURED, + content: message, + timeout: 10000 + }); } else { var messageStatus = message.status || 'info'; if (messageStatus === 'error' && form && target) { ams.executeFunctionByName(form.data('ams-form-submit-error') || 'MyAMS.form.finalizeSubmitOnError', form, target); } - ams.skin.messageBox(messageStatus, { - title: message.title || ams.i18n.ERROR_OCCURED, - content: message.content, - icon: message.icon, - number: message.number, - timeout: message.timeout === null ? undefined : (message.timeout || 10000) - }); + ams.skin && ams.skin.messageBox(messageStatus, { + title: message.title || ams.i18n.ERROR_OCCURED, + content: message.content, + icon: message.icon, + number: message.number, + timeout: message.timeout === null ? undefined : (message.timeout || 10000) + }); } } if (result.event) { diff -r efdf19b8f453 -r 63ea9a94bd47 src/pyams_skin/resources/js/myams-ajax.min.js --- a/src/pyams_skin/resources/js/myams-ajax.min.js Wed Dec 12 21:16:29 2018 +0100 +++ b/src/pyams_skin/resources/js/myams-ajax.min.js Thu Dec 13 14:28:29 2018 +0100 @@ -1,1 +1,1 @@ -!function(e,t){var o=t.MyAMS;o.ajax={check:function(t,n,a,s){function i(e,t){if(void 0!==a){a instanceof Array||(a=[a]);for(var n=0;n0?e.when.apply(e,l).then(function(){i(!0,s)}):i(!1,s)}else void 0===t?"string"==typeof n&&o.getScript(n,function(){i(!0,s)},c):i(!1,s)},getAddr:function(t){var o=t||e("HTML HEAD BASE").attr("href")||window.location.href;return o.substr(0,o.lastIndexOf("/")+1)},start:function(){e("#ajax-gear").show()},stop:function(){e("#ajax-gear").hide()},progress:function(e){e.lengthComputable&&(e.loaded>=e.total||console&&console.log&&console.log(parseInt(e.loaded/e.total*100,10)+"%"))},getJSON:function(){return function(e){var t=e.url;delete e.url,o.ajax.post(t,e,function(e,t,n){o.ajax.handleJSON(e)})}},post:function(n,a,s,i){var r;r=n.startsWith(window.location.protocol)?n:this.getAddr()+n,"function"==typeof s?(i=s,s={}):s||(s={}),void 0===i&&(i=s.callback),"string"==typeof i&&(i=o.getFunctionByName(i)),delete s.callback;var c,l={url:r,type:"post",cache:!1,async:"function"==typeof i,data:e.param(a),dataType:"json",beforeSend:function(e,n){if(void 0!==t.Cookies){var a=Cookies.get(o.csrfCookieName);a&&e.setRequestHeader(o.csrfHeaderName,a)}},success:i||function(e){c=e.result}},f=e.extend({},l,s);return e.ajax(f),c},getResponse:function(e){var t,n,a=e.getResponseHeader("content-type");if(a)if(a.startsWith("application/javascript"))t="script",n=e.responseText;else if(a.startsWith("text/html"))t="html",n=e.responseText;else if(a.startsWith("text/xml"))t="xml",n=e.responseText;else if(n=e.responseJSON)t="json";else try{n=JSON.parse(e.responseText),t="json"}catch(o){n=e.responseText,t="text"}else t="json",n={status:"alert",alert:{title:o.i18n.ERROR_OCCURED,content:o.i18n.NO_SERVER_RESPONSE}};return{contentType:t,data:n}},handleJSON:function(n,a,s){var i,r=n.status;switch(r){case"alert":t.alert&&t.alert(n.alert.title+"\n\n"+n.alert.content);break;case"error":o.form.showErrors(a,n);break;case"info":case"success":void 0!==a&&(o.form.resetChanged(a),!1!==n.close_form&&o.dialog.close(a));break;case"message":case"messagebox":break;case"notify":case"callback":case"callbacks":void 0!==a&&(o.form.resetChanged(a),!1!==n.close_form&&o.dialog.close(a));break;case"modal":o.dialog.open(n.location);break;case"reload":void 0!==a&&(o.form.resetChanged(a),!1!==n.close_form&&o.dialog.close(a)),(i=n.location||window.location.hash).startsWith("#")&&(i=i.substr(1));var c=e(n.target||s||"#content");o.skin.loadURL(i,c,{preLoadCallback:o.getFunctionByName(n.pre_reload)||function(){e("[data-ams-pre-reload]",c).each(function(){o.executeFunctionByName(e(this).data("ams-pre-reload"))})},preLoadCallbackOptions:n.pre_reload_options,afterLoadCallback:o.getFunctionByName(n.post_reload)||function(){e("[data-ams-post-reload]",c).each(function(){o.executeFunctionByName(e(this).data("ams-post-reload"))})},afterLoadCallbackOptions:n.post_reload_options});break;case"redirect":void 0!==a&&(o.form.resetChanged(a),!0===n.close_form&&o.dialog.close(a)),(i=n.location||window.location.href).endsWith("##")&&(i=i.replace(/##/,window.location.hash)),n.window?window.open(i,n.window,n.options):window.location.href===i?window.location.reload(!0):window.location.href=i;break;default:console&&console.log&&console.log("Unhandled status: "+r)}var l,f,d;if(n.content&&(f=n.content,d=e(f.target||s||a||"#content"),!0===f.raw?d.text(f.text):(d.html(f.html),o.initContent(d)),f.keep_hidden||d.removeClass("hidden")),n.contents){var u=n.contents;for(l=0;l0?e.when.apply(e,c).then(function(){i(!0,s)}):i(!1,s)}else void 0===t?"string"==typeof n&&o.getScript(n,function(){i(!0,s)},l):i(!1,s)},getAddr:function(t){var o=t||e("HTML HEAD BASE").attr("href")||window.location.href;return o.substr(0,o.lastIndexOf("/")+1)},start:function(){e("#ajax-gear").show()},stop:function(){e("#ajax-gear").hide()},progress:function(e){e.lengthComputable&&(e.loaded>=e.total||console&&console.log&&console.log(parseInt(e.loaded/e.total*100,10)+"%"))},getJSON:function(){return function(e){var t=e.url;delete e.url,o.ajax.post(t,e,function(e,t,n){o.ajax.handleJSON(e)})}},post:function(n,a,s,i){var r;r=n.startsWith(window.location.protocol)?n:this.getAddr()+n,"function"==typeof s?(i=s,s={}):s||(s={}),void 0===i&&(i=s.callback),"string"==typeof i&&(i=o.getFunctionByName(i)),delete s.callback;var l,c={url:r,type:"post",cache:!1,async:"function"==typeof i,data:e.param(a),dataType:"json",beforeSend:function(e,n){if(void 0!==t.Cookies){var a=Cookies.get(o.csrfCookieName);a&&e.setRequestHeader(o.csrfHeaderName,a)}},success:i||function(e){l=e.result}},f=e.extend({},c,s);return e.ajax(f),l},getResponse:function(e){var t,n,a=e.getResponseHeader("content-type");if(a)if(a.startsWith("application/javascript"))t="script",n=e.responseText;else if(a.startsWith("text/html"))t="html",n=e.responseText;else if(a.startsWith("text/xml"))t="xml",n=e.responseText;else if(n=e.responseJSON)t="json";else try{n=JSON.parse(e.responseText),t="json"}catch(o){n=e.responseText,t="text"}else t="json",n={status:"alert",alert:{title:o.i18n.ERROR_OCCURED,content:o.i18n.NO_SERVER_RESPONSE}};return{contentType:t,data:n}},handleJSON:function(n,a,s){var i,r=n.status;switch(r){case"alert":t.alert&&t.alert(n.alert.title+"\n\n"+n.alert.content);break;case"error":o.form&&o.form.showErrors(a,n);break;case"info":case"success":void 0!==a&&(o.form&&o.form.resetChanged(a),!1!==n.close_form&&o.dialog&&o.dialog.close(a));break;case"message":case"messagebox":break;case"notify":case"callback":case"callbacks":void 0!==a&&(o.form&&o.form.resetChanged(a),!1!==n.close_form&&o.dialog&&o.dialog.close(a));break;case"modal":o.dialog&&o.dialog.open(n.location);break;case"reload":void 0!==a&&(o.form&&o.form.resetChanged(a),!1!==n.close_form&&o.dialog&&o.dialog.close(a)),(i=n.location||window.location.hash).startsWith("#")&&(i=i.substr(1));var l=e(n.target||s||"#content");o.skin&&o.skin.loadURL(i,l,{preLoadCallback:o.getFunctionByName(n.pre_reload)||function(){e("[data-ams-pre-reload]",l).each(function(){o.executeFunctionByName(e(this).data("ams-pre-reload"))})},preLoadCallbackOptions:n.pre_reload_options,afterLoadCallback:o.getFunctionByName(n.post_reload)||function(){e("[data-ams-post-reload]",l).each(function(){o.executeFunctionByName(e(this).data("ams-post-reload"))})},afterLoadCallbackOptions:n.post_reload_options});break;case"redirect":void 0!==a&&(o.form&&o.form.resetChanged(a),!0===n.close_form&&o.dialog&&o.dialog.close(a)),(i=n.location||window.location.href).endsWith("##")&&(i=i.replace(/##/,window.location.hash)),n.window?window.open(i,n.window,n.options):window.location.href===i?window.location.reload(!0):window.location.href=i;break;default:console&&console.log&&console.log("Unhandled status: "+r)}var c,f,d;if(n.content&&(f=n.content,d=e(f.target||s||a||"#content"),!0===f.raw?d.text(f.text):(d.html(f.html),o.initContent&&o.initContent(d)),f.keep_hidden||d.removeClass("hidden")),n.contents){var u=n.contents;for(c=0;c 1 - ? ams.i18n.CLIPBOARD_TEXT_COPY_OK - : ams.i18n.CLIPBOARD_CHARACTER_COPY_OK, - icon: 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', - timeout: 3000 - }); + ams.skin && ams.skin.smallBox('success', { + title: text.length > 1 + ? ams.i18n.CLIPBOARD_TEXT_COPY_OK + : ams.i18n.CLIPBOARD_CHARACTER_COPY_OK, + icon: 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', + timeout: 3000 + }); } else if (globals.prompt) { globals.prompt(ams.i18n.CLIPBOARD_COPY, text); } diff -r efdf19b8f453 -r 63ea9a94bd47 src/pyams_skin/resources/js/myams-browser.min.js --- a/src/pyams_skin/resources/js/myams-browser.min.js Wed Dec 12 21:16:29 2018 +0100 +++ b/src/pyams_skin/resources/js/myams-browser.min.js Thu Dec 13 14:28:29 2018 +0100 @@ -1,1 +1,1 @@ -!function(e,o){var r=o.MyAMS;r.browser={getInternetExplorerVersion:function(){var e=-1;if("Microsoft Internet Explorer"===navigator.appName){var o=navigator.userAgent;null!==new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(o)&&(e=parseFloat(RegExp.$1))}return e},checkVersion:function(){var e="You're not using Windows Internet Explorer.",r=this.getInternetExplorerVersion();r>-1&&(e=r>=8?"You're using a recent copy of Windows Internet Explorer.":"You should upgrade your copy of Windows Internet Explorer."),o.alert&&o.alert(e)},isIE8orlower:function(){var e="0",o=this.getInternetExplorerVersion();return o>-1&&(e=o>=9?0:1),e},copyToClipboard:function(n){function t(n){var t=!1;if(window.clipboardData&&window.clipboardData.setData)t=clipboardData.setData("Text",n);else if(document.queryCommandSupported&&document.queryCommandSupported("copy")){var a=e("