jsharmony 1.40.12 → 1.40.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/clientjs/XAPI.Grid.js +3 -1
- package/clientjs/XBarcode.js +2 -1
- package/jsHarmonyConfig.js +2 -2
- package/package.json +3 -1
- package/public/js/jsHarmony.js +1 -1
- package/test/images.js +11 -7
- package/test/models/src/images/base/tree.webp +0 -0
- package/themes/jsHarmony.theme.classic.css +1 -0
- package/themes/jsHarmony.theme.light.css +1 -0
package/clientjs/XAPI.Grid.js
CHANGED
|
@@ -108,7 +108,7 @@ exports = module.exports = function(jsh){
|
|
|
108
108
|
|
|
109
109
|
if(!_.includes(['null','notnull','contains','notcontains','=','<>','beginswith','endswith','>','<','>=','<='], exp.Comparison)){ exprslt.push(null); continue; }
|
|
110
110
|
|
|
111
|
-
for(var j=0;j<vals.length;j++){
|
|
111
|
+
for(var j=0;(j<vals.length)&&(cmprslt==false);j++){
|
|
112
112
|
val = vals[j];
|
|
113
113
|
var cmpval = exp.Value;
|
|
114
114
|
if(exp.Comparison=='null'){
|
|
@@ -227,6 +227,8 @@ exports = module.exports = function(jsh){
|
|
|
227
227
|
|
|
228
228
|
if(_.isString(col1)) col1 = col1.toUpperCase();
|
|
229
229
|
if(_.isString(col2)) col2 = col2.toUpperCase();
|
|
230
|
+
if(_.isNil(col1)) col1 = '';
|
|
231
|
+
if(_.isNil(col2)) col2 = '';
|
|
230
232
|
|
|
231
233
|
if(sortexp.dir=='^'){
|
|
232
234
|
if(col1 < col2) return -1;
|
package/clientjs/XBarcode.js
CHANGED
|
@@ -84,6 +84,7 @@ exports = module.exports = function(jsh){
|
|
|
84
84
|
startKeys: ['^17', '^66', '^85'],
|
|
85
85
|
endKeys: ['13'],
|
|
86
86
|
ignoreKeys: [],
|
|
87
|
+
scanlessEnd: false,
|
|
87
88
|
autoEnd: false, // Call onBarcodeEnd after timeout
|
|
88
89
|
onKey: null, // function(e, isScanning){}
|
|
89
90
|
destroyHandler: null, // [] Array of function(){}
|
|
@@ -152,7 +153,7 @@ exports = module.exports = function(jsh){
|
|
|
152
153
|
if(options.onKey) options.onKey(e, isScanning);
|
|
153
154
|
for(i=0;i<options.endKeys.length;i++){
|
|
154
155
|
if(keyMatches(options.endKeys[i])){
|
|
155
|
-
if(isScanning){
|
|
156
|
+
if(isScanning || options.scanlessEnd){
|
|
156
157
|
isScanning = false;
|
|
157
158
|
if (onBarcodeEnd){
|
|
158
159
|
if (onBarcodeEnd.call(this) === false) {
|
package/jsHarmonyConfig.js
CHANGED
|
@@ -155,9 +155,9 @@ function jsHarmonyConfig(config){
|
|
|
155
155
|
"validation_level": "standard"
|
|
156
156
|
};
|
|
157
157
|
//Valid file upload extensions
|
|
158
|
-
this.valid_extensions = [".jpg", ".jpeg", ".pdf", ".png", ".svg", ".tif", ".tiff", ".gif", ".mp4", ".ogv", ".webm", ".mp3", ".wav", ".avi", ".txt", ".xlsm", ".xls", ".xlsx", ".bak", ".zip", ".csv"];
|
|
158
|
+
this.valid_extensions = [".jpg", ".jpeg", ".webp", ".pdf", ".png", ".svg", ".tif", ".tiff", ".gif", ".mp4", ".ogv", ".webm", ".mp3", ".wav", ".avi", ".txt", ".xlsm", ".xls", ".xlsx", ".bak", ".zip", ".csv"];
|
|
159
159
|
//Valid image extensions
|
|
160
|
-
this.supported_images = ['.jpg','.jpeg','.gif','.png','.svg'];
|
|
160
|
+
this.supported_images = ['.jpg','.jpeg','.webp','.gif','.png','.svg'];
|
|
161
161
|
//File viewers
|
|
162
162
|
this.file_viewers = { /* '.ext': function(jsh, req, res, options, fpath, fname){ ... } */ };
|
|
163
163
|
//Time before log entries are flushed to disk
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "jsharmony",
|
|
3
|
-
"version": "1.40.
|
|
3
|
+
"version": "1.40.15",
|
|
4
4
|
"description": "Rapid Application Development (RAD) Platform for Node.js Database Application Development",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -44,6 +44,8 @@
|
|
|
44
44
|
"express": "^4.17.1",
|
|
45
45
|
"form-data": "^2.5.0",
|
|
46
46
|
"jsharmony-db": "^1.2.0",
|
|
47
|
+
"jsharmony-image-magick": "^1.1.0",
|
|
48
|
+
"jsharmony-image-sharp": "^1.1.0",
|
|
47
49
|
"jsharmony-validate": "^1.1.5",
|
|
48
50
|
"lodash": "^4.17.19",
|
|
49
51
|
"mime": "^1.3.4",
|