Преглед изворни кода

#4852 Update outdated JS packages: flag-icons

Alex Trofimov пре 1 година
родитељ
комит
4678409647
3 измењених фајлова са 13 додато и 4 уклоњено
  1. 2 2
      inc/utils.inc.php
  2. 8 1
      package-lock.json
  3. 3 1
      package.json

+ 2 - 2
inc/utils.inc.php

@@ -673,9 +673,9 @@ function genFlag($sLang = '', $oTemplate = null)
 {
     if (!$oTemplate)
         $oTemplate = BxDolTemplate::getInstance();
-    $oTemplate->addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flag-icon-css/css/|flag-icon.min.css');
+    $oTemplate->addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flag-icons/css/|flag-icons.min.css');
     $sFlag = BxDolLanguages::getInstance()->getLangFlag($sLang);
-    return '<span title="' . $sFlag . '" class="flag-icon flag-icon-' . $sFlag . '"></span>';
+    return '<span title="' . $sFlag . '" class="fi fi-' . $sFlag . '"></span>';
 }
 
 // print debug information ( e.g. arrays )

+ 8 - 1
package-lock.json

@@ -16,7 +16,8 @@
         "filepond-plugin-image-crop": "^2.0.6",
         "filepond-plugin-image-preview": "^4.6.12",
         "filepond-plugin-image-resize": "^2.0.10",
-        "filepond-plugin-image-transform": "^3.8.7"
+        "filepond-plugin-image-transform": "^3.8.7",
+        "flag-icons": "^7.2.3"
       },
       "devDependencies": {
         "bower": "^1.8.14",
@@ -549,6 +550,12 @@
         "filepond": ">=3.6.0 <5.x"
       }
     },
+    "node_modules/flag-icons": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/flag-icons/-/flag-icons-7.2.3.tgz",
+      "integrity": "sha512-X2gUdteNuqdNqob2KKTJTS+ZCvyWeLCtDz9Ty8uJP17Y4o82Y+U/Vd4JNrdwTAjagYsRznOn9DZ+E/Q52qbmqg==",
+      "license": "MIT"
+    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",

+ 3 - 1
package.json

@@ -12,7 +12,8 @@
     "filepond-plugin-image-crop": "^2.0.6",
     "filepond-plugin-image-preview": "^4.6.12",
     "filepond-plugin-image-resize": "^2.0.10",
-    "filepond-plugin-image-transform": "^3.8.7"
+    "filepond-plugin-image-transform": "^3.8.7",
+    "flag-icons": "^7.2.3"
   },
   "scripts": {
     "install-bower-components": "bower install",
@@ -22,6 +23,7 @@
     "build:croppie": "mkdir -p plugins_public/croppie; cd node_modules/croppie; cp -r croppie.* ../../plugins_public/croppie",
     "build:fancybox": "mkdir -p plugins_public/fancybox; cd node_modules/fancybox/dist; cp -r css/* ../../../plugins_public/fancybox; cp -r helpers ../../../plugins_public/fancybox; cp -r img/* ../../../plugins_public/fancybox; cp -r js/* ../../../plugins_public/fancybox",
     "build:filepond": "mkdir -p plugins_public/filepond; cd node_modules/filepond; cp -r dist/filepond.min.* ../../plugins_public/filepond; cp -r locale ../../plugins_public/filepond; cd ../../plugins_public/filepond; cp ../../node_modules/filepond-plugin-file-validate-size/dist/filepond-plugin-file-validate-size.min.js .; cp ../../node_modules/filepond-plugin-file-validate-type/dist/filepond-plugin-file-validate-type.min.js .; cp ../../node_modules/filepond-plugin-image-crop/dist/filepond-plugin-image-crop.min.js .; cp ../../node_modules/filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.* .; cp ../../node_modules/filepond-plugin-image-resize/dist/filepond-plugin-image-resize.min.js .; cp ../../node_modules/filepond-plugin-image-transform/dist/filepond-plugin-image-transform.min.js .",
+    "build:flag-icons": "mkdir -p plugins_public/flag-icons; cd node_modules/flag-icons; cp -r css ../../plugins_public/flag-icons; cp -r flags ../../plugins_public/flag-icons",
     "build": "npm run install-bower-components; npm-run-all --parallel build:*"
   },
   "devDependencies": {