Alex Trofimov 1 год назад
Родитель
Сommit
d83663a5f7
3 измененных файлов с 87 добавлено и 3 удалено
  1. 75 1
      package-lock.json
  2. 11 1
      package.json
  3. 1 1
      template/scripts/BxBaseUploaderHTML5.php

+ 75 - 1
package-lock.json

@@ -8,7 +8,15 @@
       "dependencies": {
         "at.js": "^1.5.4",
         "codemirror": "^5.65.18",
-        "croppie": "^2.6.5"
+        "croppie": "^2.6.5",
+        "fancybox": "^3.0.1",
+        "filepond": "^4.32.6",
+        "filepond-plugin-file-validate-size": "^2.2.8",
+        "filepond-plugin-file-validate-type": "^1.2.9",
+        "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"
       },
       "devDependencies": {
         "bower": "^1.8.14",
@@ -475,6 +483,72 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/fancybox": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fancybox/-/fancybox-3.0.1.tgz",
+      "integrity": "sha512-HZ57O6j5Zk4Uvusd5pNUgWi7CCjKx+HFlCzjMPeRJ//0bQWUK+xVpkn3EzXWJate4ZSKNFP9kU2l49MP1g+oow==",
+      "license": "CC BY-NC 3.0 (http://creativecommons.org/licenses/by-nc/3.0/)"
+    },
+    "node_modules/filepond": {
+      "version": "4.32.6",
+      "resolved": "https://registry.npmjs.org/filepond/-/filepond-4.32.6.tgz",
+      "integrity": "sha512-9EM6Vvny3K5s7guxegedByQx8n6ycUFaoF+Wo20+t1DYNt+vQaOtkGy2jnY8/2roAlskUnwJI1rAnAhzBPXwiw==",
+      "license": "MIT"
+    },
+    "node_modules/filepond-plugin-file-validate-size": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/filepond-plugin-file-validate-size/-/filepond-plugin-file-validate-size-2.2.8.tgz",
+      "integrity": "sha512-yzb8scATmkWqPTP7oKQz6L8WwJm6Xmgc/fuq6DFGRaLz0I7372BUvBsxagBk/hypMIjvieNzhggm33Y60x3rcw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "filepond": ">=3.1.2 <5.x"
+      }
+    },
+    "node_modules/filepond-plugin-file-validate-type": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/filepond-plugin-file-validate-type/-/filepond-plugin-file-validate-type-1.2.9.tgz",
+      "integrity": "sha512-Tzv07aNdZvjUXDRA3XL16QMEvh6llDrXlcZ6W0eTHQ+taHaVg/JKJTFs/AViO+6ZcpPCcQStbhYEL2HoS+vldw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "filepond": ">=1.x <5.x"
+      }
+    },
+    "node_modules/filepond-plugin-image-crop": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/filepond-plugin-image-crop/-/filepond-plugin-image-crop-2.0.6.tgz",
+      "integrity": "sha512-bSy/KND4EP/QtW8MxIj23qgSEPUVRrT8XdktJ+OU9y8xRjFjTG+qcuw1LsycARQYRtzi8cZrD3P4POOITfkywQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "filepond": ">=3.x <5.x"
+      }
+    },
+    "node_modules/filepond-plugin-image-preview": {
+      "version": "4.6.12",
+      "resolved": "https://registry.npmjs.org/filepond-plugin-image-preview/-/filepond-plugin-image-preview-4.6.12.tgz",
+      "integrity": "sha512-Y8ETX5QVV0mbPB0586UH8AUmG9tZg8PuN5bdEAIlZVJFTct5ebViJ7+Am94/VhTPjLqZjBf1zmDq5JU6XRsZKw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "filepond": ">=4.x <5.x"
+      }
+    },
+    "node_modules/filepond-plugin-image-resize": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/filepond-plugin-image-resize/-/filepond-plugin-image-resize-2.0.10.tgz",
+      "integrity": "sha512-irX+J275u8Ph1KcciCeSQmxeFjbu0+co5XVCkiwdSNnz6KiqrCKN7RXTvEbdgSdDzyi5omr2oP1rKWps5L1RsQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "filepond": ">=3.x <5.x"
+      }
+    },
+    "node_modules/filepond-plugin-image-transform": {
+      "version": "3.8.7",
+      "resolved": "https://registry.npmjs.org/filepond-plugin-image-transform/-/filepond-plugin-image-transform-3.8.7.tgz",
+      "integrity": "sha512-vgKwyIDG2y5twanf7YpqZvxkaLudTjwd9vRcoq5sQDB8egUlX5/NA0bQ0823pocrm0fjbFeetICu44mkqeDkIA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "filepond": ">=3.6.0 <5.x"
+      }
+    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",

+ 11 - 1
package.json

@@ -4,7 +4,15 @@
   "dependencies": {
     "at.js": "^1.5.4",
     "codemirror": "^5.65.18",
-    "croppie": "^2.6.5"
+    "croppie": "^2.6.5",
+    "fancybox": "^3.0.1",
+    "filepond": "^4.32.6",
+    "filepond-plugin-file-validate-size": "^2.2.8",
+    "filepond-plugin-file-validate-type": "^1.2.9",
+    "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"
   },
   "scripts": {
     "install-bower-components": "bower install",
@@ -12,6 +20,8 @@
     "build:codemirror": "mkdir -p plugins_public/codemirror; cd node_modules/codemirror; cp -r lib/* ../../plugins_public/codemirror; uglifyjs lib/codemirror.js mode/clike/clike.js mode/coffeescript/coffeescript.js mode/commonlisp/commonlisp.js mode/css/css.js mode/diff/diff.js mode/dtd/dtd.js mode/fortran/fortran.js mode/go/go.js mode/htmlembedded/htmlembedded.js mode/htmlmixed/htmlmixed.js mode/javascript/javascript.js mode/lua/lua.js mode/markdown/markdown.js mode/pascal/pascal.js mode/perl/perl.js mode/php/php.js mode/properties/properties.js mode/python/python.js mode/ruby/ruby.js mode/sass/sass.js mode/shell/shell.js mode/sql/sql.js mode/sparql/sparql.js mode/turtle/turtle.js mode/vb/vb.js mode/vbscript/vbscript.js mode/xml/xml.js mode/xquery/xquery.js mode/yaml/yaml.js addon/edit/matchbrackets.js -c -m > ../../plugins_public/codemirror/codemirror-ext.min.js; uglifyjs lib/codemirror.js -c -m > ../../plugins_public/codemirror/codemirror.min.js",
     "build:combodate": "mkdir -p plugins_public/combodate; cp bower_components/combodate/src/combodate.js plugins_public/combodate",
     "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": "npm run install-bower-components; npm-run-all --parallel build:*"
   },
   "devDependencies": {

+ 1 - 1
template/scripts/BxBaseUploaderHTML5.php

@@ -30,7 +30,7 @@ class BxBaseUploaderHTML5 extends BxDolUploader
         $this->_sJsTemplate = 'uploader_button_html5_js.html';
         $this->_sUploaderFormTemplate = 'uploader_form_html5.html';
 
-        $aUploaderLangs = array('ar-ar' => 1, 'cs-cz' => 1, 'da-dk' => 1, 'de-de' => 1, 'el-el' => 1, 'en-en' => 1, 'es-es' => 1, 'fa-ir' => 1, 'fi-fi' => 1, 'fr-fr' => 1, 'he-he' => 1, 'hr-hr' => 1, 'hu-hu' => 1, 'id-id' => 1, 'it-it' => 1, 'ja-ja' => 1, 'lt-lt' => 1, 'nl-nl' => 1, 'no-nb' => 1, 'pl-pl' => 1, 'pt-br' => 1, 'ro-ro' => 1, 'ru-ru' => 1, 'sk-sk' => 1, 'sv-se' => 1, 'tr-tr' => 1, 'uk-ua' => 1, 'vi-vi' => 1, 'zh-cn' => 1, 'zh-tw' => 1);
+        $aUploaderLangs = array('am-et' => 1, 'ar-ar' => 1, 'az-az' => 1, 'ca-ca' => 1, 'cs-cz' => 1, 'da-dk' => 1, 'de-de' => 1, 'el-el' => 1, 'en-en' => 1, 'es-es' => 1, 'et-ee' => 1, 'fa_ir' => 1, 'fi-fi' => 1, 'fr-fr' => 1, 'he-he' => 1, 'hr-hr' => 1, 'hu-hu' => 1, 'id-id' => 1, 'it-it' => 1, 'ja-ja' => 1, 'km-km' => 1, 'ko-kr' => 1, 'ku-ckb' => 1, 'lt-lt' => 1, 'lv-lv' => 1, 'nl-nl' => 1, 'no_nb' => 1, 'pl-pl' => 1, 'pt-br' => 1, 'pt-pt' => 1, 'ro-ro' => 1, 'ru-ru' => 1, 'sk-sk' => 1, 'sv_se' => 1, 'tr-tr' => 1, 'uk-ua' => 1, 'vi-vi' => 1, 'zh-cn' => 1, 'zh-tw' => 1);
         $sUploaderLang = BxDolLanguages::getInstance()->getCurrentLanguage() . '-' . BxDolLanguages::getInstance()->getLangFlag();
         if (!isset($aUploaderLangs[$sUploaderLang]))
             $sUploaderLang = 'en-en';