diff --git a/CHANGES.md b/CHANGES.md index b880219f..8eb3183e 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ ### Correction - Corrige un bug d'installation d'une fonte. - Corrige un bug de redirection vers la liste des fontes après édition ou ajout. +- Supprime le script imagemap non tenu à jour et bogué. ### Amélioration - Ajoute le filtrage et le tri des fontes de puis la liste du thème. diff --git a/core/core.php b/core/core.php index ebc8e0cf..d7444177 100644 --- a/core/core.php +++ b/core/core.php @@ -134,7 +134,7 @@ class common // 'codemirror', // Désactivé par défaut 'tippy', 'zwiico', - 'imagemap', + //'imagemap', 'simplelightbox' ], 'view' => '' diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 95857154..b428054b 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -684,7 +684,10 @@ class theme extends common // Valeurs en sortie $this->addOutput([ 'title' => helper::translate('Fontes'), - 'view' => 'font' + 'view' => 'font', + 'vendor' => [ + 'datatables' + ] ]); } diff --git a/core/module/theme/view/font/font.js.php b/core/module/theme/view/font/font.js.php index ff5e5bed..7c3eddfa 100644 --- a/core/module/theme/view/font/font.js.php +++ b/core/module/theme/view/font/font.js.php @@ -8,4 +8,26 @@ * @license CC Attribution-NonCommercial-NoDerivatives 4.0 International * @link http://zwiicms.fr/ */ -$(".themeFontDelete").on("click",(function(){var _this=$(this);return core.confirm("Êtes-vous sûr de vouloir supprimer cette fonte ?",(function(){$(location).attr("href",_this.attr("href"))}))})); \ No newline at end of file +$(".themeFontDelete").on("click", (function() { + var _this = $(this); + return core.confirm("Êtes-vous sûr de vouloir supprimer cette fonte ?", (function() { + $(location).attr("href", _this.attr("href")) + })) +})); +$('#dataTables').DataTable({ + language: { + url: "core/vendor/datatables/french.json", + }, + locale: 'fr', + "columnDefs": [{ + target: 5, + orderable: false, + searchable: false + }, + { + target: 6, + orderable: false, + searchable: false + } + ] +}); \ No newline at end of file diff --git a/core/module/theme/view/font/font.php b/core/module/theme/view/font/font.php index 1c62fbf0..2b69d8c9 100644 --- a/core/module/theme/view/font/font.php +++ b/core/module/theme/view/font/font.php @@ -24,7 +24,7 @@ - + 'dataTables']); ?> \ No newline at end of file diff --git a/core/vendor/imagemap/image-map.min.js b/core/vendor/imagemap/image-map.min.js deleted file mode 100755 index 6a3a02ce..00000000 --- a/core/vendor/imagemap/image-map.min.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) 2018, Travis Clarke (https://www.travismclarke.com/) - * - * This source code is licensed under the Apache-2.0 license found in the - * LICENSE file in the root directory of this source tree. - */ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],t):e.ImageMap=t(e.$)}(this,function(e){"use strict";function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;n1&&void 0!==arguments[1]?arguments[1]:500;return function(){for(var o=arguments.length,i=Array(o),a=0;a0&&void 0!==arguments[0]?arguments[0]:0,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;return function(r){var i=r.target.width,a=r.target.height,u=t/100,c=n/100,d=r.target.getAttribute("usemap").replace(/^#/,"") -;o(document.querySelectorAll(e.genAreaSelector(d))).forEach(function(e){var t=e.dataset.coords=e.dataset.coords||e.getAttribute("coords"),n=t.split(",");e.setAttribute("coords",""+n.map(function(e,t){return t%2==0?+(n[t]/i*100*u):+(n[t]/a*100*c)}))})}}}],[{key:"genAreaSelector",value:function(e){return'map[name="'.concat(e,'"] area')}}]),e}();return void 0!==e&&e.fn&&(e.fn.imageMap=function(e){return new s(this.toArray(),e)}),c.VERSION="1.1.5",c}); \ No newline at end of file diff --git a/core/vendor/imagemap/inc.json b/core/vendor/imagemap/inc.json deleted file mode 100755 index 34fd8001..00000000 --- a/core/vendor/imagemap/inc.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "image-map.min.js", - "init.js" -] \ No newline at end of file diff --git a/core/vendor/imagemap/init.js b/core/vendor/imagemap/init.js deleted file mode 100755 index 99b77c7f..00000000 --- a/core/vendor/imagemap/init.js +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Initialisation du redimensionner de mapf - */ -$(function() { - $('img[usemap]').imageMap(); -}); \ No newline at end of file diff --git a/core/vendor/imagemap/read.me b/core/vendor/imagemap/read.me deleted file mode 100755 index c473544d..00000000 --- a/core/vendor/imagemap/read.me +++ /dev/null @@ -1,2 +0,0 @@ -Article https://blog.travismclarke.com/project/imagemap/ -Générateur : https://www.image-map.net/ \ No newline at end of file