diff --git a/js/app.js b/js/app.js index 7d2cbb64..8bd15050 100644 --- a/js/app.js +++ b/js/app.js @@ -64,13 +64,13 @@ requirejs.config({ easePack: 'lib/EasePack.min', tweenLite: 'lib/TweenLite.min', - // datatables // v1.10.12 DataTables - https://datatables.net + // datatables // v1.10.18 DataTables - https://datatables.net 'datatables.loader': './app/datatables.loader', - 'datatables.net': 'lib/datatables/DataTables-1.10.12/js/jquery.dataTables.min', - 'datatables.net-buttons': 'lib/datatables/Buttons-1.2.1/js/dataTables.buttons.min', - 'datatables.net-buttons-html': 'lib/datatables/Buttons-1.2.1/js/buttons.html5.min', - 'datatables.net-responsive': 'lib/datatables/Responsive-2.1.0/js/dataTables.responsive.min', - 'datatables.net-select': 'lib/datatables/Select-1.2.0/js/dataTables.select.min', + 'datatables.net': 'lib/datatables/DataTables-1.10.18/js/jquery.dataTables.min', + 'datatables.net-buttons': 'lib/datatables/Buttons-1.5.6/js/dataTables.buttons.min', + 'datatables.net-buttons-html': 'lib/datatables/Buttons-1.5.6/js/buttons.html5.min', + 'datatables.net-responsive': 'lib/datatables/Responsive-2.2.2/js/dataTables.responsive.min', + 'datatables.net-select': 'lib/datatables/Select-1.3.0/js/dataTables.select.min', 'datatables.plugins.render.ellipsis': 'lib/datatables/plugins/render/ellipsis', // notification plugin diff --git a/js/app/logging.js b/js/app/logging.js index aee42183..02f0b875 100644 --- a/js/app/logging.js +++ b/js/app/logging.js @@ -108,11 +108,13 @@ define([ buttons: [ { extend: 'copy', + tag: 'a', className: config.moduleHeadlineIconClass, text: ' copy' }, { extend: 'csv', + tag: 'a', className: config.moduleHeadlineIconClass, text: ' csv' } diff --git a/js/app/map/overlay/overlay.js b/js/app/map/overlay/overlay.js index d4816e03..74044a4b 100644 --- a/js/app/map/overlay/overlay.js +++ b/js/app/map/overlay/overlay.js @@ -393,8 +393,8 @@ define([ } }, mapSignatureOverlays: { - title: 'refresh signature overlays', - trigger: 'refresh', + title: 'active signature overlays', + trigger: 'active', class: 'pf-map-overlay-endpoint', iconClass: ['fas', 'fa-fw', 'fa-link'] }, diff --git a/js/app/map/scrollbar.js b/js/app/map/scrollbar.js index 1e1bb7df..6d983d43 100644 --- a/js/app/map/scrollbar.js +++ b/js/app/map/scrollbar.js @@ -34,6 +34,7 @@ define([ }, advanced: { + autoUpdateTimeout: 120, // auto-update timeout (default: 60) updateOnContentResize: true, autoExpandHorizontalScroll: false, // on resize css scale() scroll content should not change //autoExpandHorizontalScroll: 2, diff --git a/js/app/ui/dialog/map_info.js b/js/app/ui/dialog/map_info.js index da81dfc0..4fbc3cf7 100644 --- a/js/app/ui/dialog/map_info.js +++ b/js/app/ui/dialog/map_info.js @@ -1258,7 +1258,7 @@ define([ ] } ); - logDataTable.buttons().container().appendTo( $(this).find('.' + config.tableToolsClass)); + logDataTable.buttons().container().appendTo($(this).find('.' + config.tableToolsClass)); }; /** diff --git a/js/app/ui/dialog/stats.js b/js/app/ui/dialog/stats.js index 6e3f2a8a..7231d078 100644 --- a/js/app/ui/dialog/stats.js +++ b/js/app/ui/dialog/stats.js @@ -83,12 +83,14 @@ define([ buttons: [ { extend: 'copy', + tag: 'a', className: config.moduleHeadlineIconClass, text: ' copy', exportOptions: { orthogonal: 'filter' } }, { extend: 'csv', + tag: 'a', className: config.moduleHeadlineIconClass, text: ' csv', exportOptions: { orthogonal: 'filter' } diff --git a/js/app/ui/module/connection_info.js b/js/app/ui/module/connection_info.js index ed0e57b4..b0930a54 100644 --- a/js/app/ui/module/connection_info.js +++ b/js/app/ui/module/connection_info.js @@ -702,6 +702,7 @@ define([ buttons: [ { name: 'addLog', + tag: 'a', className: config.moduleHeadlineIconClass, text: '', action: function(e, tableApi, node, conf){ diff --git a/js/app/ui/module/system_intel.js b/js/app/ui/module/system_intel.js index 8ae99f7e..8c2f7631 100644 --- a/js/app/ui/module/system_intel.js +++ b/js/app/ui/module/system_intel.js @@ -53,7 +53,7 @@ define([ * @param statusData * @returns {string} */ - let getStatusData = (statusData) => { + let getStatusData = statusData => { return ''; }; @@ -430,7 +430,7 @@ define([ name: 'status', title: '', width: 2, - class: 'text-center', + className: ['text-center', 'all'].join(' '), data: 'status', render: { display: data => getStatusData(data), @@ -445,7 +445,7 @@ define([ title: '', width: 26, orderable: false, - className: [config.tableCellImageClass, 'text-center'].join(' '), + className: [config.tableCellImageClass, 'text-center', 'all'].join(' '), data: 'structure.id', defaultContent: '', render: { @@ -462,7 +462,7 @@ define([ name: 'structureType', title: 'type', width: 30, - className: [config.tableCellEllipsisClass].join(' '), + className: [config.tableCellEllipsisClass, 'all'].join(' '), data: 'structure.name', defaultContent: '', },{ @@ -470,7 +470,7 @@ define([ name: 'name', title: 'name', width: 60, - className: [config.tableCellEllipsisClass].join(' '), + className: [config.tableCellEllipsisClass, 'all'].join(' '), data: 'name' },{ targets: 4, @@ -478,7 +478,7 @@ define([ title: '', width: 26, orderable: false, - className: [config.tableCellImageClass, 'text-center'].join(' '), + className: [config.tableCellImageClass, 'text-center', 'all'].join(' '), data: 'owner.id', defaultContent: '', render: { @@ -497,14 +497,14 @@ define([ name: 'ownerName', title: 'owner', width: 50, - className: [config.tableCellEllipsisClass].join(' '), + className: [config.tableCellEllipsisClass, 'all'].join(' '), data: 'owner.name', defaultContent: '', },{ targets: 6, name: 'note', title: 'note', - className: [config.tableCellEllipsisClass].join(' '), + className: [config.tableCellEllipsisClass, 'all'].join(' '), data: 'description' },{ targets: 7, @@ -519,7 +519,7 @@ define([ title: '', orderable: false, width: 10, - class: ['text-center', config.dataTableActionCellClass, config.moduleHeadlineIconClass].join(' '), + className: ['text-center', config.dataTableActionCellClass, config.moduleHeadlineIconClass, 'all'].join(' '), data: null, render: { display: data => { @@ -550,7 +550,7 @@ define([ title: '', orderable: false, width: 10, - class: ['text-center', config.dataTableActionCellClass].join(' '), + className: ['text-center', config.dataTableActionCellClass, 'all'].join(' '), data: null, render: { display: data => { @@ -607,6 +607,7 @@ define([ },{ targets: 10, name: 'corporation', + className: 'never', // never show this column. see: https://datatables.net/extensions/responsive/classes data: 'corporation', visible: false, render: { diff --git a/js/app/ui/module/system_signature.js b/js/app/ui/module/system_signature.js index f50548ca..11960dcf 100644 --- a/js/app/ui/module/system_signature.js +++ b/js/app/ui/module/system_signature.js @@ -2186,21 +2186,25 @@ define([ buttons: [ { name: 'filterGroup', + tag: 'a', className: config.moduleHeadlineIconClass, text: '' // set by js (xEditable) }, { name: 'undo', + tag: 'a', className: config.moduleHeadlineIconClass, text: '' // set by js (xEditable) }, { name: 'selectAll', + tag: 'a', className: config.moduleHeadlineIconClass, text: 'select all' }, { name: 'delete', + tag: 'a', className: [config.moduleHeadlineIconClass, config.sigTableClearButtonClass].join(' '), text: 'delete (0)' } diff --git a/js/lib/datatables/Buttons-1.2.1/js/buttons.html5.min.js b/js/lib/datatables/Buttons-1.2.1/js/buttons.html5.min.js deleted file mode 100644 index 3fc13418..00000000 --- a/js/lib/datatables/Buttons-1.2.1/js/buttons.html5.min.js +++ /dev/null @@ -1,26 +0,0 @@ -(function(g){"function"===typeof define&&define.amd?define(["jquery","datatables.net","datatables.net-buttons"],function(j){return g(j,window,document)}):"object"===typeof exports?module.exports=function(j,i,q,r){j||(j=window);if(!i||!i.fn.dataTable)i=require("datatables.net")(j,i).$;i.fn.dataTable.Buttons||require("datatables.net-buttons")(j,i);return g(i,j,j.document,q,r)}:g(jQuery,window,document)})(function(g,j,i,q,r,m){function E(a,b){v===m&&(v=-1===y.serializeToString(g.parseXML(F["xl/worksheets/sheet1.xml"])).indexOf("xmlns:r")); -g.each(b,function(b,c){if(g.isPlainObject(c)){var e=a.folder(b);E(e,c)}else{if(v){var e=c.childNodes[0],f,h,n=[];for(f=e.attributes.length-1;0<=f;f--){h=e.attributes[f].nodeName;var k=e.attributes[f].nodeValue;-1!==h.indexOf(":")&&(n.push({name:h,value:k}),e.removeAttribute(h))}f=0;for(h=n.length;f'+ -e),e=e.replace(/_dt_b_namespace_token_/g,":"));e=e.replace(//g,"");a.file(b,e)}})}function o(a,b,d){var c=a.createElement(b);d&&(d.attr&&g(c).attr(d.attr),d.children&&g.each(d.children,function(a,b){c.appendChild(b)}),d.text&&c.appendChild(a.createTextNode(d.text)));return c}function N(a,b){var d=a.header[b].length,c;a.footer&&a.footer[b].length>d&&(d=a.footer[b].length);for(var e=0,f=a.body.length;ed&& -(d=c),400&&(b=b+f);b=b+(e?e+(""+a[c]).replace(g,h+e)+e:a[c])}return b},j=b.header?k(c.header)+d:"",i=b.footer&&c.footer?d+k(c.footer):"",u=[],D=0,l=c.body.length;D', -"xl/_rels/workbook.xml.rels":'',"[Content_Types].xml":'', -"xl/workbook.xml":'', -"xl/worksheets/sheet1.xml":'',"xl/styles.xml":''}; -s.ext.buttons.copyHtml5={className:"buttons-copy buttons-html5",text:function(a){return a.i18n("buttons.copy","Copy")},action:function(a,b,d,c){var a=L(b,c),e=a.str,d=g("
").css({height:1,width:1,overflow:"hidden",position:"fixed",top:0,left:0});c.customize&&(e=c.customize(e,c));c=g("