# HG changeset patch # User Thierry Florac # Date 1607673171 -3600 # Node ID 5ea89334a1594f4d9621e86ca0d2b687d4b614da # Parent fa5083469321c9496783cca9a5b81a03de88fc01 Version 0.1.44 diff -r fa5083469321 -r 5ea89334a159 buildout.cfg --- a/buildout.cfg Fri Dec 11 08:47:56 2020 +0100 +++ b/buildout.cfg Fri Dec 11 08:52:51 2020 +0100 @@ -32,4 +32,4 @@ eggs = myams [test] [versions] -pyams_skin = 0.1.43 +pyams_skin = 0.1.44 diff -r fa5083469321 -r 5ea89334a159 package.json --- a/package.json Fri Dec 11 08:47:56 2020 +0100 +++ b/package.json Fri Dec 11 08:52:51 2020 +0100 @@ -1,6 +1,6 @@ { "name": "myams", - "version": "0.1.43", + "version": "0.1.44", "private": true, "scripts": { "gulp": "gulp" diff -r fa5083469321 -r 5ea89334a159 setup.py --- a/setup.py Fri Dec 11 08:47:56 2020 +0100 +++ b/setup.py Fri Dec 11 08:52:51 2020 +0100 @@ -25,7 +25,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.43' +version = '0.1.44' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r fa5083469321 -r 5ea89334a159 src/myams/resources/css/myams.css --- a/src/myams/resources/css/myams.css Fri Dec 11 08:47:56 2020 +0100 +++ b/src/myams/resources/css/myams.css Fri Dec 11 08:52:51 2020 +0100 @@ -2,7 +2,7 @@ * MyAMS * « My Application Management Skin » * - * Version: 0.1.43 (rev. 1) + * Version: 0.1.44 (rev. 1) * A bootstrap based application/administration skin * * Custom administration and application skin tools diff -r fa5083469321 -r 5ea89334a159 src/myams/resources/js/myams-require.js --- a/src/myams/resources/js/myams-require.js Fri Dec 11 08:47:56 2020 +0100 +++ b/src/myams/resources/js/myams-require.js Fri Dec 11 08:52:51 2020 +0100 @@ -2,7 +2,7 @@ * MyAMS * « My Application Management Skin » * - * Version: 0.1.42 (rev. 1) + * Version: 0.1.44 (rev. 1) * A bootstrap based application/administration skin * * Custom administration and application skin tools diff -r fa5083469321 -r 5ea89334a159 src/myams/resources/js/myams.js --- a/src/myams/resources/js/myams.js Fri Dec 11 08:47:56 2020 +0100 +++ b/src/myams/resources/js/myams.js Fri Dec 11 08:52:51 2020 +0100 @@ -2,7 +2,7 @@ * MyAMS * « My Application Management Skin » * - * Version: 0.1.43 (rev. 1) + * Version: 0.1.44 (rev. 1) * A bootstrap based application/administration skin * * Custom administration and application skin tools @@ -5085,69 +5085,64 @@ ams.ajax.check($.plot, ams.baseURL + 'ext/flot/jquery.flot' + ams.devext + '.js', function () { - ams.ajax.check($.plot.uiConstants, - ams.baseURL + 'ext/flot/jquery.flot.uiConstants' + ams.devext + '.js', - function() { - charts.each(function () { - - var chart = $(this), - data = chart.data(), - dataOptions = {}, - plugin, - flotPlugins = (data.amsChartPlugins || '').split(/\s+/); - - function checkPlugin(plugin) { - for (var index in $.plot.plugins) { - if ($.plot.plugins.hasOwnProperty(index)) { - var pluginInfo = $.plot.plugins[index]; - if (pluginInfo.name === plugin) { - return pluginInfo; - } - } - } - return null; + + var flotPlugins = new Set(); + charts.each(function() { + var chart = $(this), + data = chart.data(), + chartPlugins = (data.amsChartPlugins || '').split(/\s+/); + $.each(chartPlugins, function(idx, elt) { + flotPlugins.add(elt); + }); + }); + + function checkPlugin(plugin) { + for (var index in $.plot.plugins) { + if ($.plot.plugins.hasOwnProperty(index)) { + var pluginInfo = $.plot.plugins[index]; + if (pluginInfo.name === plugin) { + return pluginInfo; } - - function initChart() { - var settings = $.extend({}, dataOptions, data.amsChartOptions); - settings = ams.executeFunctionByName(data.amsChartInitCallback, chart, settings) || settings; - var chartData = data.amsChartData, - chartDataLoader = data.amsChartDataLoader; - if (chartDataLoader) { - $.getJSON(chartDataLoader, chartData).done(function (data) { - settings = $.extend({}, settings, data.settings); - createChart(data.data, settings); - }); - } else { - createChart(data, settings); - } - } - - function createChart(chartData, settings) { - chartData = ams.executeFunctionByName(data.amsChartInitData, chart, chartData) || chartData; - plugin = chart.plot(chartData, settings); - ams.executeFunctionByName(data.amsChartAfterInitCallback, chart, plugin, settings); - } - - var deferred = []; - if (flotPlugins.length > 0) { - for (var index in flotPlugins) { - if (flotPlugins.hasOwnProperty(index)) { - var pluginName = flotPlugins[index]; - if (!checkPlugin(pluginName)) { - deferred.push(ams.getScript(ams.baseURL + 'ext/flot/jquery.flot.' + pluginName + ams.devext + '.js')); - } - } - } - } - if (deferred.length > 0) { - $.when.apply($, deferred).then(function () { - initChart(); - }) - } else { - initChart(); - } - }); + } + } + return null; + } + + var deferred = []; + for (var pluginName of flotPlugins.values()) { + if (!checkPlugin(pluginName)) { + deferred.push(ams.getScript(ams.baseURL + 'ext/flot/jquery.flot.' + pluginName + ams.devext + '.js')); + } + } + + $.when.apply($, deferred).then(function() { + + charts.each(function() { + + var chart = $(this), + data = chart.data(), + dataOptions = {}; + + function createChart(chartData, settings) { + chartData = ams.executeFunctionByName(data.amsChartInitData, chart, chartData) || chartData; + var plugin = chart.plot(chartData, settings); + ams.executeFunctionByName(data.amsChartAfterInitCallback, chart, plugin, settings); + } + + var settings = $.extend({}, dataOptions, data.amsChartOptions); + settings = ams.executeFunctionByName(data.amsChartInitCallback, chart, settings) || settings; + var chartData = data.amsChartData, + chartDataLoader = data.amsChartDataLoader; + if (chartDataLoader) { + $.getJSON(chartDataLoader, chartData).done(function(data) { + settings = $.extend({}, settings, data.settings); + createChart(data.data, settings); + }); + } else { + createChart(chartData, settings); + } + + }); }); }); }); diff -r fa5083469321 -r 5ea89334a159 src/myams/resources/js/myams.min.js --- a/src/myams/resources/js/myams.min.js Fri Dec 11 08:47:56 2020 +0100 +++ b/src/myams/resources/js/myams.min.js Fri Dec 11 08:52:51 2020 +0100 @@ -1,1 +1,1 @@ -"use strict";!function(e,a){var t=a.console;String.prototype.startsWith=function(e){var a=this.length,t=e.length;return!(a0},void 0===e.scrollbarWidth&&(e.scrollbarWidth=function(){var a=e('
').appendTo("body"),t=a.children(),n=t.innerWidth()-t.height(99).innerWidth();return a.remove(),n}),e.fn.extend({exists:function(){return e(this).length>0},objectOrParentWithClass:function(e){return this.hasClass(e)?this:this.parents("."+e)},listattr:function(a){var t=[];return this.each((function(){t.push(e(this).attr(a))})),t},style:function(e,a,t){if(void 0!==this.get(0)){var n=this.get(0).style;return void 0!==e?void 0!==a?(t=void 0!==t?t:"",n.setProperty(e,a,t),this):n.getPropertyValue(e):n}},removeClassPrefix:function(a){return this.each((function(t,n){var s=n.className.split(" ").map((function(e){return e.startsWith(a)?"":e}));n.className=e.trim(s.join(" "))})),this}}),void 0===a.MyAMS&&(a.MyAMS={devmode:!0,devext:"",lang:"en",throttleDelay:350,menuSpeed:235,navbarHeight:49,ajaxNav:!0,safeMethods:["GET","HEAD","OPTIONS","TRACE"],csrfCookieName:"csrf_token",csrfHeaderName:"X-CSRF-Token",enableWidgets:!0,enableMobile:!1,enableFastclick:!1,warnOnFormChange:!1,formChangedCallback:null,ismobile:/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase())});var n,s=a.MyAMS,i=s;s.baseURL=(n=e('script[src*="/myams.js"], script[src*="/myams.min.js"], script[src*="/myams-core.js"], script[src*="/myams-core.min.js"], script[src*="/myams-require.js"], script[src*="/myams-require.min.js"]').attr("src"),i.devmode=n.indexOf(".min.js")<0,i.devext=i.devmode?"":".min",n.substring(0,n.lastIndexOf("/")+1)),s.log=function(){t&&t.debug&&t.debug(this,arguments)},s.getQueryVar=function(e,a){if(e.indexOf("?")<0)return!1;e.endsWith("&")||(e+="&");var t=new RegExp(".*?[&\\?]"+a+"=(.*?)&.*"),n=e.replace(t,"$1");return n!==e&&n},s.rgb2hex=function(a){return"#"+e.map(a.match(/\b(\d+)\b/g),(function(e){return("0"+parseInt(e).toString(16)).slice(-2)})).join("")},s.generateId=function(){function e(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return e()+e()+e()+e()},s.generateUUID=function(){var e=(new Date).getTime();return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(a){var t=(e+16*Math.random())%16|0;return e=Math.floor(e/16),("x"===a?t:3&t|8).toString(16)}))},s.getObject=function(e,a){if(e){if("string"!=typeof e)return e;var t=e.split(".");a=null==a?window:a;for(var n=0;n").attr("data-ams-id",t).text('@import "'+i.getSource(a)+'";'),n)var c=setInterval((function(){try{o[0].sheet.cssRules;n.call(window,!0,s),clearInterval(c)}catch(e){}}),10);o.appendTo(r)}else n&&n.call(window,!1,s)},s.initHandlers=function(a){e(a).on("click","[data-ams-click-handler]",(function(a){var t=e(this),n=t.data("ams-disabled-handlers");if(!0!==n&&"click"!==n&&"all"!==n){var s=t.data();if(s.amsClickHandler){!0!==s.amsStopPropagation&&!0!==s.amsClickStopPropagation||a.stopPropagation(),!0!==s.amsClickKeepDefault&&a.preventDefault();for(var r=s.amsClickHandler.split(/\s+/),o=0;o127&&n<2048?(a+=String.fromCharCode(n>>6|192),a+=String.fromCharCode(63&n|128)):(a+=String.fromCharCode(n>>12|224),a+=String.fromCharCode(n>>6&63|128),a+=String.fromCharCode(63&n|128))}return a},decode:function(e){for(var a="",t=0,n=0,s=0,i=0;t191&&n<224?(s=e.charCodeAt(t+1),a+=String.fromCharCode((31&n)<<6|63&s),t+=2):(s=e.charCodeAt(t+1),i=e.charCodeAt(t+2),a+=String.fromCharCode((15&n)<<12|(63&s)<<6|63&i),t+=3);return a}},function(e,a){var t=a.MyAMS;e.fn.extend({contextMenu:function(a){function n(t,n,s){var i=e(window)[n](),r=e(a.menuSelector)[n](),o=t;return t+r>i&&r',openedSign:''},a),n=e(this);n.find("LI").each((function(){var a=e(this);if(a.find("UL").size()>0){a.find("A:first").append(""+t.closedSign+"");var n=a.find("A:first");"#"===n.attr("href")&&n.click((function(){return!1}))}})),n.find("LI.active").each((function(){var a=e(this).parents("UL"),n=a.parent("LI");a.slideDown(t.speed),n.find("b:first").html(t.openedSign),n.addClass("open")})),n.find("LI A").on("click",(function(){var a=e(this);if(!a.hasClass("active")){var s=a.attr("href").replace(/^#/,""),i=a.parent().find("UL");if(t.accordion){var r=a.parent().parents("UL"),o=n.find("UL:visible");o.each((function(a){var n=!0;if(r.each((function(e){if(r[e]===o[a])return n=!1,!1})),n&&i!==o[a]){var c=e(o[a]);!s&&c.hasClass("active")||c.slideUp(t.speed,(function(){e(this).parent("LI").removeClass("open").find("B:first").delay(t.speed).html(t.closedSign)}))}}))}var c=a.parent().find("UL:first");s||!c.is(":visible")||c.hasClass("active")?c.slideDown(t.speed,(function(){a.parent("LI").addClass("open").find("B:first").delay(t.speed).html(t.openedSign)})):c.slideUp(t.speed,(function(){a.parent("LI").removeClass("open").find("B:first").delay(t.speed).html(t.closedSign)}))}}))}})}(jQuery,this),function(e,a){a.MyAMS.event={stop:function(e){e||(e=window.event),e&&"string"!=typeof e&&(e.stopPropagation?(e.stopPropagation(),e.preventDefault()):(e.cancelBubble=!0,e.returnValue=!1))}}}(jQuery,this),function(e,a){var t=a.MyAMS;t.browser={getInternetExplorerVersion:function(){var e=-1;if("Microsoft Internet Explorer"===navigator.appName){var a=navigator.userAgent;null!==new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})").exec(a)&&(e=parseFloat(RegExp.$1))}return e},checkVersion:function(){var e="You're not using Windows Internet Explorer.",t=this.getInternetExplorerVersion();t>-1&&(e=t>=8?"You're using a recent copy of Windows Internet Explorer.":"You should upgrade your copy of Windows Internet Explorer."),a.alert&&a.alert(e)},isIE8orlower:function(){var e="0",a=this.getInternetExplorerVersion();return a>-1&&(e=a>=9?0:1),e},copyToClipboard:function(n){function s(n){var s=!1;if(window.clipboardData&&window.clipboardData.setData)s=clipboardData.setData("Text",n);else if(document.queryCommandSupported&&document.queryCommandSupported("copy")){var i=e("