This commit is contained in:
Yuri Kuznetsov
2021-06-21 11:48:53 +03:00
parent 58d2a2460b
commit 6ccc65a85a
9 changed files with 62 additions and 1354 deletions
@@ -29,23 +29,31 @@
"exportsTo": "window",
"exportsAs": "Selectize"
},
"cronstrue": {
"path": "client/lib/cronstrue-i18n.js",
"devPath": "node_modules/cronstrue/dist/cronstrue-i18n.js",
"exportsTo": "window",
"exportsAs": "cronstrue"
},
"Cropper": {
"path": "client/lib/cropper.min.js",
"exportsTo": "$",
"path": "client/lib/cropper.js",
"devPath": "node_modules/cropper/dist/cropper.js",
"exportsTo": "$.fn",
"exportsAs": "cropper"
},
"gridstack": {
"path": "client/lib/gridstack.all.js",
"exportsTo": "window",
"exportsAs": "GridStack"
},
"Colorpicker": {
"path": "client/lib/bootstrap-colorpicker.js",
"exportsTo": "$",
"devPath": "node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js",
"exportsTo": "$.fn",
"exportsAs": "colorpicker"
},
"exif": {
"path": "client/lib/exif-js.js",
"path": "client/lib/exif.js",
"devPath": "node_modules/exif-js/exif.js",
"exportsTo": "window",
"exportsAs": "EXIF"
},
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
-9
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -27,7 +27,7 @@
************************************************************************/
define('views/scheduled-job/fields/scheduling',
['views/fields/varchar', 'lib!client/lib/cronstrue-i18n.min.js'], function (Dep) {
['views/fields/varchar', 'lib!cronstrue'], function (Dep, cronstrue) {
return Dep.extend({
@@ -63,8 +63,9 @@ define('views/scheduled-job/fields/scheduling',
return;
}
if (exp == '* * * * *') {
if (exp === '* * * * *') {
this.$text.text(this.translate('As often as possible', 'labels', 'ScheduledJob'));
return;
}
@@ -74,7 +75,8 @@ define('views/scheduled-job/fields/scheduling',
if (~localeList.indexOf(language)) {
locale = language;
} else if (~localeList.indexOf(language.split('_')[0])) {
}
else if (~localeList.indexOf(language.split('_')[0])) {
locale = language.split('_')[0];
}
@@ -84,7 +86,8 @@ define('views/scheduled-job/fields/scheduling',
locale: locale,
});
} catch (e) {
}
catch (e) {
text = this.translate('Not valid');
}
+12
View File
@@ -18,5 +18,17 @@
"gridstack/dist/gridstack.jQueryUI.js",
{
"path": "selectize/dist/js/standalone/selectize.js"
},
{
"path": "bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js"
},
{
"path": "cropper/dist/cropper.js"
},
{
"path": "cronstrue/dist/cronstrue-i18n.js"
},
{
"path": "exif-js/exif.js"
}
]
+26
View File
@@ -348,6 +348,14 @@
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz",
"integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="
},
"bootstrap-colorpicker": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.2.tgz",
"integrity": "sha512-krzBno9AMUwI2+IDwMvjnpqpa2f8womW0CCKmEcxGzVkolCFrt22jjMjzx1NZqB8C1DUdNgZP4LfyCsgpHRiYA==",
"requires": {
"jquery": ">=1.10"
}
},
"bootstrap-datepicker": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz",
@@ -638,6 +646,19 @@
}
}
},
"cronstrue": {
"version": "1.114.0",
"resolved": "https://registry.npmjs.org/cronstrue/-/cronstrue-1.114.0.tgz",
"integrity": "sha512-j1JuBHTJKKX41NUJVHmWn2ZYHnLipsIoq7bAZVeVzehA9+rmG6v9NgMiMa0KiiFzozihgt4yGNe5aMVc/IoYLg=="
},
"cropper": {
"version": "0.7.9",
"resolved": "https://registry.npmjs.org/cropper/-/cropper-0.7.9.tgz",
"integrity": "sha1-DiUXkB0VwMyGLWXfH3qPUzi31rA=",
"requires": {
"jquery": ">= 1.9.0"
}
},
"cson-parser": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.5.tgz",
@@ -809,6 +830,11 @@
"integrity": "sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=",
"dev": true
},
"exif-js": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/exif-js/-/exif-js-2.3.0.tgz",
"integrity": "sha1-nRCBm/Vx+HOBPnZAJBJVq5zhqBQ="
},
"exit": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+4
View File
@@ -38,10 +38,14 @@
"backbone": "^1.3.3",
"base-64": "^1.0.0",
"bootstrap": "^3.4.1",
"bootstrap-colorpicker": "^2.5.2",
"bootstrap-datepicker": "^1.9.0",
"bullbone": "git://github.com/yurikuzn/bull.git#1.0.3",
"cronstrue": "^1.114.0",
"cropper": "^0.7.9",
"devbridge-autocomplete": "^1.4.9",
"es6-promise": "^3.0.2",
"exif-js": "^2.3.0",
"gridstack": "^1.2.1",
"handlebars": "^4.7.7",
"jquery": "^3.6.0",