# HG changeset patch # User Thierry Florac # Date 1523367121 -7200 # Node ID c034ad3fb601b7301ea16281144310ffd1e298b5 # Parent 30d4c663616346df5104f0c1b9de0d1573a1ea28 Updated row refresh event Handle null events in JSON response Updated default TinyMCE editor configuration diff -r 30d4c6636163 -r c034ad3fb601 src/pyams_skin/resources/js/myams.js --- a/src/pyams_skin/resources/js/myams.js Tue Apr 10 15:27:39 2018 +0200 +++ b/src/pyams_skin/resources/js/myams.js Tue Apr 10 15:32:01 2018 +0200 @@ -2,7 +2,7 @@ * MyAMS * « My Application Management Skin » * - * $Tag: 0.1.14 $ (rev. 1) + * $Tag$ (rev. 1) * A bootstrap based application/administration skin * * Custom administration and application skin tools @@ -1276,6 +1276,9 @@ } for (index =0; index < result.events.length; index++) { event = result.events[index]; + if (event === null) { + continue; + } if (typeof(event) === 'string') { form.trigger(event, result.events_options); } else { @@ -4352,14 +4355,19 @@ menubar: data.amsTinymceMenubar !== false, statusbar: data.amsTinymceStatusbar !== false, plugins: data.amsTinymcePlugins || [ - "advlist autosave autolink lists link image charmap print preview hr anchor pagebreak", + "advlist autosave autolink lists link charmap print preview hr anchor pagebreak", "searchreplace wordcount visualblocks visualchars code fullscreen", - "insertdatetime media nonbreaking save table contextmenu directionality", + "insertdatetime nonbreaking save table contextmenu directionality", "emoticons paste textcolor colorpicker textpattern autoresize" ], toolbar: data.amsTinymceToolbar, - toolbar1: data.amsTinymceToolbar1 === false ? false : "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent", - toolbar2: data.amsTinymceToolbar2 === false ? false : "forecolor backcolor emoticons | charmap link image media | fullscreen preview print | code", + toolbar1: data.amsTinymceToolbar1 === false ? false : + "undo redo | styleselect | bold italic | alignleft " + + "aligncenter alignright alignjustify | bullist numlist " + + "outdent indent", + toolbar2: data.amsTinymceToolbar2 === false ? false : + "forecolor backcolor emoticons | charmap link image media | " + + "fullscreen preview print | code", content_css: data.amsTinymceContentCss, formats: data.amsTinymceFormats, style_formats: data.amsTinymceStyleFormats, @@ -5211,9 +5219,9 @@ * Replace given table with new content */ refreshTable: function(changes) { - var widget = $('[id="' + changes.object_id + '"]').parent('.ams-widget'); + var widget = $('[id="' + changes.object_id + '"]').parents('.ams-widget:first'); widget.replaceWith($(changes.table)); - widget = $('[id="' + changes.object_id + '"]').parent('.ams-widget'); + widget = $('[id="' + changes.object_id + '"]').parents('.ams-widget:first'); MyAMS.initContent(widget); return widget; }, @@ -5238,12 +5246,14 @@ refreshRow: function(changes) { var tr = $('tr[id="' + changes.object_id + '"]'); var table = tr.parents('table').first(); - tr = tr.replaceWith($(changes.row)); - MyAMS.initContent(tr); + var new_tr = $(changes.row); + tr.replaceWith(new_tr); + MyAMS.initContent(new_tr); if (table.hasClass('table-dnd')) { + new_tr.addClass('no-drag-handle'); table.tableDnDUpdate(); } - return tr; + return new_tr; }, /** diff -r 30d4c6636163 -r c034ad3fb601 src/pyams_skin/resources/js/myams.min.js --- a/src/pyams_skin/resources/js/myams.min.js Tue Apr 10 15:27:39 2018 +0200 +++ b/src/pyams_skin/resources/js/myams.min.js Tue Apr 10 15:32:01 2018 +0200 @@ -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},contextMenu:function(a){function t(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)})}})}}),e.UTF8={encode:function(e){e=e.replace(/\r\n/g,"\n");for(var a="",t=0;t127&&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}},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,ismobile:/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase())});var n=a.MyAMS,s=n;n.baseURL=function(){var a=e('script[src*="/myams.js"], script[src*="/myams.min.js"]').attr("src");return s.devmode=a.indexOf(".min.js")<0,s.devext=s.devmode?"":".min",a.substring(0,a.lastIndexOf("/")+1)}(),n.log=function(){t&&t.debug&&t.debug(this,arguments)},n.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},n.rgb2hex=function(a){return"#"+e.map(a.match(/\b(\d+)\b/g),function(e){return("0"+parseInt(e).toString(16)).slice(-2)}).join("")},n.generateId=function(){function e(){return Math.floor(65536*(1+Math.random())).toString(16).substring(1)}return e()+e()+e()+e()},n.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)})},n.getObject=function(e,a){if(e){if("string"!=typeof e)return e;var t=e.split(".");a=void 0===a||null===a?window:a;for(var n=0;n").attr("data-ams-id",t).text('@import "'+s.getSource(a)+'";'),n)var c=setInterval(function(){try{o[0].sheet.cssRules;n.call(window,!0,i),clearInterval(c)}catch(e){}},10);o.appendTo(r)}else n&&n.call(window,!1,i)},n.event={stop:function(e){e||(e=window.event),e&&(e.stopPropagation?(e.stopPropagation(),e.preventDefault()):(e.cancelBubble=!0,e.returnValue=!1))}},n.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(i){function r(i){var r=!1;if(window.clipboardData&&window.clipboardData.setData)r=clipboardData.setData("Text",i);else if(document.queryCommandSupported&&document.queryCommandSupported("copy")){var o=e("