From c871d9e66ba86d0d6c356a88c705e50ba6b545ce Mon Sep 17 00:00:00 2001
From: Daniel Katzberg
Date: Tue, 20 Feb 2018 09:22:12 +0100
Subject: [PATCH 01/15] Prepared Sprint 64 #1579
---
pom.xml | 2 +-
src/main/webapp/scripts/app.constants.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index cc42c8878b..57b891b959 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
eu.dzhw.fdz.metadatamanagement
metadatamanagement
- 1.0.63
+ 1.0.64-SNAPSHOT
war
metadatamanagement
diff --git a/src/main/webapp/scripts/app.constants.js b/src/main/webapp/scripts/app.constants.js
index 9fc7dba9e0..d1e08bdeeb 100644
--- a/src/main/webapp/scripts/app.constants.js
+++ b/src/main/webapp/scripts/app.constants.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
.constant('ENV', 'local')
-.constant('VERSION', '1.0.63')
+.constant('VERSION', '1.0.64-SNAPSHOT')
.constant('ElasticSearchProperties', {apiVersion:'5.1',logLevel:'error',pageSize:10})
From 9f92d5430677315d17502c544111a946fb3a4a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 10:08:44 +0100
Subject: [PATCH 02/15] #1546 removed deprecated config properties
---
deploy/manifest-dev.yml | 3 +-
deploy/manifest-test.yml | 3 +-
package-lock.json | 1379 +++++++-------------------------------
3 files changed, 241 insertions(+), 1144 deletions(-)
diff --git a/deploy/manifest-dev.yml b/deploy/manifest-dev.yml
index e3429a2ba0..40bca80fdb 100644
--- a/deploy/manifest-dev.yml
+++ b/deploy/manifest-dev.yml
@@ -6,7 +6,6 @@ applications:
memory: 1024M
disk_quota: 1024M
instances: 2
- host: metadatamanagement-dev
buildpack: https://github.com/cloudfoundry/java-buildpack
env:
SPRING_PROFILES_ACTIVE: dev
@@ -20,3 +19,5 @@ applications:
timeout: 180
health-check-type: http
health-check-http-endpoint: /management/info
+ routes:
+ - route: metadatamanagement-dev.cfapps.io
diff --git a/deploy/manifest-test.yml b/deploy/manifest-test.yml
index 6fb8038411..ce34a22884 100644
--- a/deploy/manifest-test.yml
+++ b/deploy/manifest-test.yml
@@ -6,7 +6,6 @@ applications:
memory: 1024M
disk_quota: 1024M
instances: 3
- host: metadatamanagement-test
buildpack: https://github.com/cloudfoundry/java-buildpack
env:
SPRING_PROFILES_ACTIVE: test
@@ -20,3 +19,5 @@ applications:
timeout: 180
health-check-type: http
health-check-http-endpoint: /management/info
+ routes:
+ - route: metadatamanagement-test.cfapps.io
diff --git a/package-lock.json b/package-lock.json
index 67dfe5427e..2ca461945d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,22 +22,6 @@
"integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
"dev": true
},
- "JSONStream": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
- "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
- "dev": true,
- "requires": {
- "jsonparse": "1.3.1",
- "through": "2.3.8"
- }
- },
- "JSV": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
- "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
- "dev": true
- },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -639,9 +623,9 @@
"integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"combine-source-map": "0.7.2",
"defined": "1.0.0",
+ "JSONStream": "1.3.2",
"through2": "2.0.3",
"umd": "3.0.1"
}
@@ -710,7 +694,6 @@
"integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"assert": "1.4.1",
"browser-pack": "6.0.2",
"browser-resolve": "1.11.2",
@@ -732,6 +715,7 @@
"https-browserify": "1.0.0",
"inherits": "2.0.3",
"insert-module-globals": "7.0.1",
+ "JSONStream": "1.3.2",
"labeled-stream-splicer": "2.0.0",
"module-deps": "4.1.1",
"os-browserify": "0.3.0",
@@ -1073,7 +1057,6 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.1.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -2440,1129 +2423,225 @@
"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
"dev": true,
- "requires": {
- "websocket-driver": "0.7.0"
- }
- },
- "fd-slicer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
- "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
- "dev": true,
- "requires": {
- "pend": "1.2.0"
- }
- },
- "figures": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
- "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
- "dev": true,
- "requires": {
- "escape-string-regexp": "1.0.5",
- "object-assign": "4.1.1"
- }
- },
- "file-sync-cmp": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
- "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
- "dev": true
- },
- "file-uri-to-path": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
- "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
- "dev": true
- },
- "filename-regex": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
- "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
- "dev": true
- },
- "filendir": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/filendir/-/filendir-1.0.0.tgz",
- "integrity": "sha1-dFtEWvzElwpM2wD9lTnHftlCrfY=",
- "dev": true,
- "requires": {
- "mkdirp": "0.5.1"
- },
- "dependencies": {
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true
- },
- "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
- }
- }
- }
- },
- "fill-range": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
- "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
- "dev": true,
- "requires": {
- "is-number": "2.1.0",
- "isobject": "2.1.0",
- "randomatic": "1.1.7",
- "repeat-element": "1.1.2",
- "repeat-string": "1.6.1"
- }
- },
- "finalhandler": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
- "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
- "dev": true,
- "requires": {
- "debug": "2.2.0",
- "escape-html": "1.0.3",
- "on-finished": "2.3.0",
- "statuses": "1.3.1",
- "unpipe": "1.0.0"
- }
- },
- "find-up": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
- "dev": true,
- "requires": {
- "path-exists": "2.1.0",
- "pinkie-promise": "2.0.1"
- }
- },
- "findup-sync": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
- "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
- "dev": true,
- "requires": {
- "glob": "5.0.15"
- },
- "dependencies": {
- "glob": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
- "dev": true,
- "requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
- }
- }
- },
- "follow-redirects": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
- "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "2.2.0"
- }
- },
- "for-in": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
- "dev": true
- },
- "for-own": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
- "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
- "dev": true,
- "requires": {
- "for-in": "1.0.2"
- }
- },
- "foreach": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
- "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
- "dev": true
- },
- "forever-agent": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
- "dev": true
- },
- "form-data": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
- "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
- "dev": true,
- "requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.17"
- }
- },
- "formidable": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
- "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
- "dev": true
- },
- "fresh": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
- "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
- "dev": true
- },
- "from": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
- "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
- "dev": true
- },
- "fs-access": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
- "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
- "dev": true,
- "requires": {
- "null-check": "1.0.0"
- }
- },
- "fs-extra": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
- "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "jsonfile": "3.0.1",
- "universalify": "0.1.1"
- }
- },
- "fs.realpath": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
- },
- "fsevents": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
- "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
- "dev": true,
- "optional": true,
- "requires": {
- "nan": "2.8.0",
- "node-pre-gyp": "0.6.39"
- },
- "dependencies": {
- "abbrev": {
- "version": "1.1.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "ajv": {
- "version": "4.11.8",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "co": "4.6.0",
- "json-stable-stringify": "1.0.1"
- }
- },
- "ansi-regex": {
- "version": "2.1.1",
- "bundled": true,
- "dev": true
- },
- "aproba": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "are-we-there-yet": {
- "version": "1.1.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.2.9"
- }
- },
- "asn1": {
- "version": "0.2.3",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "assert-plus": {
- "version": "0.2.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "asynckit": {
- "version": "0.4.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "aws-sign2": {
- "version": "0.6.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "aws4": {
- "version": "1.6.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "balanced-match": {
- "version": "0.4.2",
- "bundled": true,
- "dev": true
- },
- "bcrypt-pbkdf": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "tweetnacl": "0.14.5"
- }
- },
- "block-stream": {
- "version": "0.0.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "inherits": "2.0.3"
- }
- },
- "boom": {
- "version": "2.10.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "hoek": "2.16.3"
- }
- },
- "brace-expansion": {
- "version": "1.1.7",
- "bundled": true,
- "dev": true,
- "requires": {
- "balanced-match": "0.4.2",
- "concat-map": "0.0.1"
- }
- },
- "buffer-shims": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "caseless": {
- "version": "0.12.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "co": {
- "version": "4.6.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "code-point-at": {
- "version": "1.1.0",
- "bundled": true,
- "dev": true
- },
- "combined-stream": {
- "version": "1.0.5",
- "bundled": true,
- "dev": true,
- "requires": {
- "delayed-stream": "1.0.0"
- }
- },
- "concat-map": {
- "version": "0.0.1",
- "bundled": true,
- "dev": true
- },
- "console-control-strings": {
- "version": "1.1.0",
- "bundled": true,
- "dev": true
- },
- "core-util-is": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true
- },
- "cryptiles": {
- "version": "2.0.5",
- "bundled": true,
- "dev": true,
- "requires": {
- "boom": "2.10.1"
- }
- },
- "dashdash": {
- "version": "1.14.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "1.0.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "debug": {
- "version": "2.6.8",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "deep-extend": {
- "version": "0.4.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "delayed-stream": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "delegates": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "detect-libc": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "ecc-jsbn": {
- "version": "0.1.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "jsbn": "0.1.1"
- }
- },
- "extend": {
- "version": "3.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "extsprintf": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true
- },
- "forever-agent": {
- "version": "0.6.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "form-data": {
- "version": "2.1.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.15"
- }
- },
- "fs.realpath": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "fstream": {
- "version": "1.0.11",
- "bundled": true,
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "inherits": "2.0.3",
- "mkdirp": "0.5.1",
- "rimraf": "2.6.1"
- }
- },
- "fstream-ignore": {
- "version": "1.0.5",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "fstream": "1.0.11",
- "inherits": "2.0.3",
- "minimatch": "3.0.4"
- }
- },
- "gauge": {
- "version": "2.7.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "aproba": "1.1.1",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
- }
- },
- "getpass": {
- "version": "0.1.7",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "1.0.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "glob": {
- "version": "7.1.2",
- "bundled": true,
- "dev": true,
- "requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
- },
- "graceful-fs": {
- "version": "4.1.11",
- "bundled": true,
- "dev": true
- },
- "har-schema": {
- "version": "1.0.5",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "har-validator": {
- "version": "4.2.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "ajv": "4.11.8",
- "har-schema": "1.0.5"
- }
- },
- "has-unicode": {
- "version": "2.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "hawk": {
- "version": "3.1.3",
- "bundled": true,
- "dev": true,
- "requires": {
- "boom": "2.10.1",
- "cryptiles": "2.0.5",
- "hoek": "2.16.3",
- "sntp": "1.0.9"
- }
- },
- "hoek": {
- "version": "2.16.3",
- "bundled": true,
- "dev": true
- },
- "http-signature": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "0.2.0",
- "jsprim": "1.4.0",
- "sshpk": "1.13.0"
- }
- },
- "inflight": {
- "version": "1.0.6",
- "bundled": true,
- "dev": true,
- "requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
- }
- },
- "inherits": {
- "version": "2.0.3",
- "bundled": true,
- "dev": true
- },
- "ini": {
- "version": "1.3.4",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "requires": {
- "number-is-nan": "1.0.1"
- }
- },
- "is-typedarray": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "isarray": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "isstream": {
- "version": "0.1.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "jodid25519": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "jsbn": "0.1.1"
- }
- },
- "jsbn": {
- "version": "0.1.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "json-schema": {
- "version": "0.2.3",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "json-stable-stringify": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "jsonify": "0.0.0"
- }
- },
- "json-stringify-safe": {
- "version": "5.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "jsonify": {
- "version": "0.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "jsprim": {
- "version": "1.4.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "1.0.0",
- "extsprintf": "1.0.2",
- "json-schema": "0.2.3",
- "verror": "1.3.6"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "mime-db": {
- "version": "1.27.0",
- "bundled": true,
- "dev": true
- },
- "mime-types": {
- "version": "2.1.15",
- "bundled": true,
- "dev": true,
- "requires": {
- "mime-db": "1.27.0"
- }
- },
- "minimatch": {
- "version": "3.0.4",
- "bundled": true,
- "dev": true,
- "requires": {
- "brace-expansion": "1.1.7"
- }
- },
- "minimist": {
- "version": "0.0.8",
- "bundled": true,
- "dev": true
- },
- "mkdirp": {
- "version": "0.5.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
- }
- },
- "ms": {
- "version": "2.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "node-pre-gyp": {
- "version": "0.6.39",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "detect-libc": "1.0.2",
- "hawk": "3.1.3",
- "mkdirp": "0.5.1",
- "nopt": "4.0.1",
- "npmlog": "4.1.0",
- "rc": "1.2.1",
- "request": "2.81.0",
- "rimraf": "2.6.1",
- "semver": "5.3.0",
- "tar": "2.2.1",
- "tar-pack": "3.4.0"
- }
- },
- "nopt": {
- "version": "4.0.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "abbrev": "1.1.0",
- "osenv": "0.1.4"
- }
- },
- "npmlog": {
- "version": "4.1.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
- }
- },
- "number-is-nan": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true
- },
- "oauth-sign": {
- "version": "0.8.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "object-assign": {
- "version": "4.1.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "once": {
- "version": "1.4.0",
- "bundled": true,
- "dev": true,
- "requires": {
- "wrappy": "1.0.2"
- }
- },
- "os-homedir": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "os-tmpdir": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "osenv": {
- "version": "0.1.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
- }
- },
- "path-is-absolute": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true
- },
- "performance-now": {
- "version": "0.2.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "process-nextick-args": {
- "version": "1.0.7",
- "bundled": true,
- "dev": true
- },
- "punycode": {
- "version": "1.4.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "qs": {
- "version": "6.4.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "rc": {
- "version": "1.2.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.4",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
- },
- "dependencies": {
- "minimist": {
- "version": "1.2.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "readable-stream": {
- "version": "2.2.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "buffer-shims": "1.0.0",
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "string_decoder": "1.0.1",
- "util-deprecate": "1.0.2"
- }
- },
- "request": {
- "version": "2.81.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "aws-sign2": "0.6.0",
- "aws4": "1.6.0",
- "caseless": "0.12.0",
- "combined-stream": "1.0.5",
- "extend": "3.0.1",
- "forever-agent": "0.6.1",
- "form-data": "2.1.4",
- "har-validator": "4.2.1",
- "hawk": "3.1.3",
- "http-signature": "1.1.1",
- "is-typedarray": "1.0.0",
- "isstream": "0.1.2",
- "json-stringify-safe": "5.0.1",
- "mime-types": "2.1.15",
- "oauth-sign": "0.8.2",
- "performance-now": "0.2.0",
- "qs": "6.4.0",
- "safe-buffer": "5.0.1",
- "stringstream": "0.0.5",
- "tough-cookie": "2.3.2",
- "tunnel-agent": "0.6.0",
- "uuid": "3.0.1"
- }
- },
- "rimraf": {
- "version": "2.6.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "glob": "7.1.2"
- }
- },
- "safe-buffer": {
- "version": "5.0.1",
- "bundled": true,
- "dev": true
- },
- "semver": {
- "version": "5.3.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "set-blocking": {
- "version": "2.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "signal-exit": {
- "version": "3.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "sntp": {
- "version": "1.0.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "hoek": "2.16.3"
- }
- },
- "sshpk": {
- "version": "1.13.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "asn1": "0.2.3",
- "assert-plus": "1.0.0",
- "bcrypt-pbkdf": "1.0.1",
- "dashdash": "1.14.1",
- "ecc-jsbn": "0.1.1",
- "getpass": "0.1.7",
- "jodid25519": "1.0.2",
- "jsbn": "0.1.1",
- "tweetnacl": "0.14.5"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "string-width": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
- }
- },
- "string_decoder": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "safe-buffer": "5.0.1"
- }
- },
- "stringstream": {
- "version": "0.0.5",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "strip-ansi": {
- "version": "3.0.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "ansi-regex": "2.1.1"
- }
- },
- "strip-json-comments": {
- "version": "2.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "tar": {
- "version": "2.2.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "block-stream": "0.0.9",
- "fstream": "1.0.11",
- "inherits": "2.0.3"
- }
- },
- "tar-pack": {
- "version": "3.4.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "2.6.8",
- "fstream": "1.0.11",
- "fstream-ignore": "1.0.5",
- "once": "1.4.0",
- "readable-stream": "2.2.9",
- "rimraf": "2.6.1",
- "tar": "2.2.1",
- "uid-number": "0.0.6"
- }
- },
- "tough-cookie": {
- "version": "2.3.2",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "punycode": "1.4.1"
- }
- },
- "tunnel-agent": {
- "version": "0.6.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "safe-buffer": "5.0.1"
- }
- },
- "tweetnacl": {
- "version": "0.14.5",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "uid-number": {
- "version": "0.0.6",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "util-deprecate": {
- "version": "1.0.2",
- "bundled": true,
+ "requires": {
+ "websocket-driver": "0.7.0"
+ }
+ },
+ "fd-slicer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+ "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+ "dev": true,
+ "requires": {
+ "pend": "1.2.0"
+ }
+ },
+ "figures": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "1.0.5",
+ "object-assign": "4.1.1"
+ }
+ },
+ "file-sync-cmp": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
+ "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
+ "dev": true
+ },
+ "file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "dev": true
+ },
+ "filename-regex": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+ "dev": true
+ },
+ "filendir": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/filendir/-/filendir-1.0.0.tgz",
+ "integrity": "sha1-dFtEWvzElwpM2wD9lTnHftlCrfY=",
+ "dev": true,
+ "requires": {
+ "mkdirp": "0.5.1"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
- "uuid": {
- "version": "3.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "verror": {
- "version": "1.3.6",
- "bundled": true,
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
- "optional": true,
"requires": {
- "extsprintf": "1.0.2"
+ "minimist": "0.0.8"
}
- },
- "wide-align": {
- "version": "1.1.2",
- "bundled": true,
+ }
+ }
+ },
+ "fill-range": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+ "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+ "dev": true,
+ "requires": {
+ "is-number": "2.1.0",
+ "isobject": "2.1.0",
+ "randomatic": "1.1.7",
+ "repeat-element": "1.1.2",
+ "repeat-string": "1.6.1"
+ }
+ },
+ "finalhandler": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
+ "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
+ "dev": true,
+ "requires": {
+ "debug": "2.2.0",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "statuses": "1.3.1",
+ "unpipe": "1.0.0"
+ }
+ },
+ "find-up": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "dev": true,
+ "requires": {
+ "path-exists": "2.1.0",
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "findup-sync": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+ "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+ "dev": true,
+ "requires": {
+ "glob": "5.0.15"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "5.0.15",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
"dev": true,
- "optional": true,
"requires": {
- "string-width": "1.0.2"
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
- },
- "wrappy": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true
}
}
},
+ "follow-redirects": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+ "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "2.2.0"
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "dev": true
+ },
+ "for-own": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+ "dev": true,
+ "requires": {
+ "for-in": "1.0.2"
+ }
+ },
+ "foreach": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+ "dev": true
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+ "dev": true,
+ "requires": {
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.5",
+ "mime-types": "2.1.17"
+ }
+ },
+ "formidable": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+ "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+ "dev": true
+ },
+ "fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+ "dev": true
+ },
+ "from": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+ "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+ "dev": true
+ },
+ "fs-access": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+ "dev": true,
+ "requires": {
+ "null-check": "1.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "jsonfile": "3.0.1",
+ "universalify": "0.1.1"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
+ },
"fstream": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -4903,10 +3982,10 @@
"integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"combine-source-map": "0.7.2",
"concat-stream": "1.5.2",
"is-buffer": "1.1.6",
+ "JSONStream": "1.3.2",
"lexical-scope": "1.2.0",
"process": "0.11.10",
"through2": "2.0.3",
@@ -5603,6 +4682,16 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
"dev": true
},
+ "JSONStream": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
+ "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+ "dev": true,
+ "requires": {
+ "jsonparse": "1.3.1",
+ "through": "2.3.8"
+ }
+ },
"jsprim": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -5623,6 +4712,12 @@
}
}
},
+ "JSV": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+ "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
+ "dev": true
+ },
"jszip": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
@@ -6618,7 +5713,6 @@
"integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"browser-resolve": "1.11.2",
"cached-path-relative": "1.0.1",
"concat-stream": "1.5.2",
@@ -6626,6 +5720,7 @@
"detective": "4.7.1",
"duplexer2": "0.1.4",
"inherits": "2.0.3",
+ "JSONStream": "1.3.2",
"parents": "1.0.1",
"readable-stream": "2.3.3",
"resolve": "1.1.7",
@@ -9120,6 +8215,15 @@
}
}
},
+ "string_decoder": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
"string-length": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -9146,15 +8250,6 @@
"integrity": "sha1-oZwg3uUamHd+mkfhDwm+OTubunU=",
"dev": true
},
- "string_decoder": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
- "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
- "dev": true,
- "requires": {
- "safe-buffer": "5.1.1"
- }
- },
"stringmap": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
From c5073f0110d5ca661cb6e51ed509e5471f397b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 12:00:07 +0100
Subject: [PATCH 03/15] #1547 fixed missing project changed events
---
.../data-acquisition-project-navbar-module.controller.js | 8 +++++---
.../views/release-project-dialog.controller.js | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js b/src/main/webapp/scripts/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js
index 4bb04e7276..3af7d77c04 100644
--- a/src/main/webapp/scripts/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js
+++ b/src/main/webapp/scripts/dataacquisitionprojectmanagement/directives/data-acquisition-project-navbar-module.controller.js
@@ -174,7 +174,7 @@ angular.module('metadatamanagementApp')
'views/release-project-dialog.html.tmpl',
clickOutsideToClose: false,
locals: {
- project: ctrl.selectedProject
+ project: angular.copy(ctrl.selectedProject)
}
}).catch(function() {
// user cancellled
@@ -216,14 +216,16 @@ angular.module('metadatamanagementApp')
.ok($translate.instant('global.buttons.ok'))
.cancel($translate.instant('global.buttons.cancel'));
$mdDialog.show(confirmDialog).then(function() {
- delete ctrl.selectedProject.release;
- DataAcquisitionProjectResource.save(ctrl.selectedProject)
+ var projectCopy = angular.copy(ctrl.selectedProject);
+ delete projectCopy.release;
+ DataAcquisitionProjectResource.save(projectCopy)
.$promise
.then(function() {
SimpleMessageToastService.openSimpleMessageToast(
i18nPrefix + 'unreleased-successfully', {
id: ctrl.selectedProject.id
}, true);
+ CurrentProjectService.setCurrentProject(projectCopy);
});
});
};
diff --git a/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js b/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js
index acf3365589..b2b3a9c48e 100644
--- a/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js
+++ b/src/main/webapp/scripts/dataacquisitionprojectmanagement/views/release-project-dialog.controller.js
@@ -3,7 +3,7 @@
angular.module('metadatamanagementApp')
.controller('ReleaseProjectDialogController', function($scope, $mdDialog,
project, SimpleMessageToastService, DataAcquisitionProjectResource,
- DaraReleaseResource, $rootScope) {
+ DaraReleaseResource, $rootScope, CurrentProjectService) {
$scope.bowser = $rootScope.bowser;
$scope.project = project;
var i18nPrefix = 'data-acquisition-project-management.log-messages.' +
@@ -25,6 +25,7 @@ angular.module('metadatamanagementApp')
i18nPrefix + 'released-successfully', {
id: project.id
});
+ CurrentProjectService.setCurrentProject(project);
});
}).catch(function() {
delete project.release;
From 3882b30176a41cc3ebb2edc5be55ac2265d621c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 12:20:38 +0100
Subject: [PATCH 04/15] #1562 removed automatic popup
---
.../fdz-welcome-dialog.controller.js | 11 +-----
.../directives/fdz-welcome-dialog.html.tmpl | 7 ----
.../services/fdz-welcome-dialog.js | 3 +-
.../services/fdz-welcome-dialog.service.js | 37 ++++++++++---------
.../i18n/configuration/translations-de.js | 3 --
.../i18n/configuration/translations-en.js | 3 --
6 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.controller.js b/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.controller.js
index 9e9a37fcc8..f40db356c4 100644
--- a/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.controller.js
+++ b/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.controller.js
@@ -2,13 +2,9 @@
/* Author Daniel Katzberg */
'use strict';
angular.module('metadatamanagementApp').controller('FdzWelcomeDialogController',
- function($scope, $mdDialog, localStorageService, bowser, $location,
- $translate, showCheckbox) {
+ function($scope, $mdDialog, bowser, $location,
+ $translate) {
$scope.bowser = bowser;
- $scope.checkBox = {
- closeWelcomeDialogForever: false
- };
- $scope.showCheckbox = showCheckbox;
var checkDomainManagement = function() {
var domainManagement = 'crosscutting';
@@ -67,9 +63,6 @@ angular.module('metadatamanagementApp').controller('FdzWelcomeDialogController',
};
$scope.closeDialog = function() {
- if ($scope.checkBox.closeWelcomeDialogForever) {
- localStorageService.set('closeWelcomeDialogForever', true);
- }
$mdDialog.hide();
};
});
diff --git a/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.html.tmpl b/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.html.tmpl
index b4cb779be1..749ecc6a0a 100644
--- a/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.html.tmpl
+++ b/src/main/webapp/scripts/common/fdzwelcomedialog/directives/fdz-welcome-dialog.html.tmpl
@@ -11,8 +11,6 @@
- {{"global.welcome-dialog.content-head" | translate}}
-
{{"global.welcome-dialog.content-body-feedback" | translate}}
{{"global.welcome-dialog.content-body-via" | translate}}
@@ -35,11 +33,6 @@
{{"global.welcome-dialog.content-body-thanks" | translate}}
-
-
- {{"global.buttons.closeDialogForEver" | translate}}
-
-
{{"global.buttons.close" | translate}}
diff --git a/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.js b/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.js
index 0fa2af6262..39f57bda3f 100644
--- a/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.js
+++ b/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.js
@@ -3,7 +3,6 @@
angular.module('metadatamanagementApp').run(function(FdzWelcomeDialogService,
$timeout) {
$timeout(function() {
- var openByNavbarFeedbackButton = false;
- FdzWelcomeDialogService.showDialog(openByNavbarFeedbackButton);
+ FdzWelcomeDialogService.deleteOption();
});
});
diff --git a/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.service.js b/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.service.js
index adf0f2abd0..64903eb07d 100644
--- a/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.service.js
+++ b/src/main/webapp/scripts/common/fdzwelcomedialog/services/fdz-welcome-dialog.service.js
@@ -2,24 +2,27 @@
angular.module('metadatamanagementApp').service('FdzWelcomeDialogService',
function($mdDialog, localStorageService, $rootScope) {
- var showDialog = function(openByNavbarFeedbackButton) {
- if (!localStorageService.get('closeWelcomeDialogForever') ||
- openByNavbarFeedbackButton) {
- $mdDialog.show({
- templateUrl: 'scripts/common/fdzwelcomedialog/directives/' +
- 'fdz-welcome-dialog.html.tmpl',
- controller: 'FdzWelcomeDialogController',
- locals: {
- bowser: $rootScope.bowser,
- showCheckbox: !openByNavbarFeedbackButton
- },
- clickOutsideToClose: true,
- closeTo: '#feedBackButton',
- fullscreen: true
- });
- }
+ var showDialog = function() {
+ $mdDialog.show({
+ templateUrl: 'scripts/common/fdzwelcomedialog/directives/' +
+ 'fdz-welcome-dialog.html.tmpl',
+ controller: 'FdzWelcomeDialogController',
+ locals: {
+ bowser: $rootScope.bowser
+ },
+ clickOutsideToClose: true,
+ closeTo: '#feedBackButton',
+ fullscreen: true
+ });
};
+
+ var deleteOption = function() {
+ //delete unused option from all browsers...
+ localStorageService.remove('closeWelcomeDialogForever');
+ };
+
return {
- showDialog: showDialog
+ showDialog: showDialog,
+ deleteOption: deleteOption
};
});
diff --git a/src/main/webapp/scripts/common/i18n/configuration/translations-de.js b/src/main/webapp/scripts/common/i18n/configuration/translations-de.js
index 82e725c247..33dc325686 100644
--- a/src/main/webapp/scripts/common/i18n/configuration/translations-de.js
+++ b/src/main/webapp/scripts/common/i18n/configuration/translations-de.js
@@ -47,7 +47,6 @@ angular.module('metadatamanagementApp').config(
'dialog': {
'tooltip': {
'close': 'Klicken, um den Dialog zu schließen',
- 'closeDialogForEver': 'Klicken, um diesen Hinweis nicht mehr anzuzeigen',
'save': 'Klicken, um das Protokoll zu speichern'
}
},
@@ -68,7 +67,6 @@ angular.module('metadatamanagementApp').config(
'ok': 'OK',
'save': 'Speichern',
'cancel': 'Abbrechen',
- 'closeDialogForEver': 'Diesen Hinweis nicht mehr anzeigen',
'closeDialogTemporarily': 'Jetzt nicht!'
},
'tooltips': {
@@ -105,7 +103,6 @@ angular.module('metadatamanagementApp').config(
},
'welcome-dialog': {
'toolbar-head': 'Feedback geben oder Fehler melden',
- 'content-head': 'Dies ist eine Pre-Release-Version unseres Metadata Management Systems.',
'content-body-feedback': 'Sie können Feedback geben oder Fehler melden ...',
'content-body-via': '... via',
'content-body-thanks': 'Vielen Dank, dass Sie sich Zeit nehmen, um uns Feedback zu geben!',
diff --git a/src/main/webapp/scripts/common/i18n/configuration/translations-en.js b/src/main/webapp/scripts/common/i18n/configuration/translations-en.js
index 3b964bcc22..03068b6f97 100644
--- a/src/main/webapp/scripts/common/i18n/configuration/translations-en.js
+++ b/src/main/webapp/scripts/common/i18n/configuration/translations-en.js
@@ -47,7 +47,6 @@ angular.module('metadatamanagementApp').config(
'dialog': {
'tooltip': {
'close': 'Click to close the dialog',
- 'closeDialogForEver': 'Click to close this message forever',
'save': 'Click to save the protocol'
}
},
@@ -68,7 +67,6 @@ angular.module('metadatamanagementApp').config(
'ok': 'OK',
'save': 'Save',
'cancel': 'Cancel',
- 'closeDialogForEver': 'Don\'t show this message again',
'closeDialogTemporarily': 'Not yet!'
},
'tooltips': {
@@ -105,7 +103,6 @@ angular.module('metadatamanagementApp').config(
},
'welcome-dialog': {
'toolbar-head': 'Give Feedback or report Bugs',
- 'content-head': 'This is a pre-release version of our Metadata Management System.',
'content-body-feedback': 'You can submit bugs and request enhancements ...',
'content-body-via': '... via',
'content-body-thanks': 'Thank you for taking the time to send us feedback!',
From 85c360bb2b34556dbf8783e4d1f854d1fd018458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 12:23:56 +0100
Subject: [PATCH 05/15] #1543 changed license
---
LICENSE | 153 ++++++++++++++++++++++++++------------------------------
1 file changed, 70 insertions(+), 83 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9cecc1d466..dbbe355815 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
Preamble
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
+software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
The precise terms and conditions for copying, distribution and
modification follow.
@@ -72,7 +60,7 @@ modification follow.
0. Definitions.
- "This License" refers to version 3 of the GNU General Public License.
+ "This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
- 13. Use with the GNU Affero General Public License.
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
@@ -631,44 +629,33 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
+
+ Copyright (C)
This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ it under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ GNU Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- {project} Copyright (C) {year} {fullname}
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
From bbe71b49e24acc055d8e159cfb247a1e1203e634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 13:16:15 +0100
Subject: [PATCH 06/15] #1562 removing popup from protractor tests
---
src/test/protractor/home/home.spec.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/test/protractor/home/home.spec.js b/src/test/protractor/home/home.spec.js
index 676dc14597..1043b586ed 100644
--- a/src/test/protractor/home/home.spec.js
+++ b/src/test/protractor/home/home.spec.js
@@ -16,9 +16,6 @@ var protractorWaitHelper = require('../utils/protractorWaitHelper');
describe('Home page', function() {
function callHomePage() {
browser.get('#!/de/search');
- protractorWaitHelper.waitFor('closeWelcomeDialog').then(function(button) {
- button.click();
- });
}
function testHomePage(description, language) {
From 59e0819808c101dcb0476c30649a2266d0bb405f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 14:40:13 +0100
Subject: [PATCH 07/15] #1425 added profile and link to usermanagement to mail
---
.../mailmanagement/service/MailService.java | 12 +++++++--
.../usermanagement/rest/AccountResource.java | 25 ++++++++++---------
.../mails/newAccountActivatedEmail.html | 9 +++++--
3 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/mailmanagement/service/MailService.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/mailmanagement/service/MailService.java
index e57ac6ac33..8f820d7504 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/mailmanagement/service/MailService.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/mailmanagement/service/MailService.java
@@ -12,11 +12,13 @@
import org.apache.commons.lang.CharEncoding;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
+import org.springframework.core.env.Environment;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.AsyncResult;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import org.thymeleaf.context.Context;
import org.thymeleaf.spring4.SpringTemplateEngine;
@@ -45,6 +47,9 @@ public class MailService {
@Autowired
private SpringTemplateEngine templateEngine;
+
+ @Autowired
+ private Environment env;
@Async
private Future sendEmail(String[] to, String subject, String content, boolean isMultipart,
@@ -107,12 +112,15 @@ public Future sendPasswordResetMail(User user, String baseUrl) {
* Send new account activated mail.
*/
@Async
- public Future sendNewAccountActivatedMail(List admins, User newUser) {
+ public Future sendNewAccountActivatedMail(List admins, User newUser, String baseUrl) {
log.debug("Sending new account e-mail to all admins");
Context context = new Context();
context.setVariable("user", newUser);
+ context.setVariable("profiles", env.getActiveProfiles());
+ context.setVariable("baseUrl", baseUrl);
String content = templateEngine.process("newAccountActivatedEmail", context);
- String subject = "New account " + newUser.getLogin() + " activated";
+ String subject = "New account " + newUser.getLogin() + " activated ("
+ + StringUtils.arrayToCommaDelimitedString(env.getActiveProfiles()) + ")";
List emailAddresses = admins.stream().map(User::getEmail).collect(Collectors.toList());
return sendEmail(emailAddresses.toArray(new String[emailAddresses.size()]),
subject, content, false, true);
diff --git a/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/rest/AccountResource.java b/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/rest/AccountResource.java
index 58f09442f4..da1337c9f6 100644
--- a/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/rest/AccountResource.java
+++ b/src/main/java/eu/dzhw/fdz/metadatamanagement/usermanagement/rest/AccountResource.java
@@ -63,13 +63,7 @@ public ResponseEntity> registerAccount(@Valid @RequestBody UserDto userDto,
userDto.getFirstName(), userDto.getLastName(), userDto.getEmail()
.toLowerCase(),
userDto.getLangKey());
- String baseUrl = request.getScheme() + // "http"
- "://" + // "://"
- request.getServerName() + // "myhost"
- ":" + // ":"
- request.getServerPort(); // "80"
-
- mailService.sendActivationEmail(user, baseUrl);
+ mailService.sendActivationEmail(user, getBaseUrl(request));
return new ResponseEntity<>(HttpStatus.CREATED);
}));
}
@@ -80,12 +74,13 @@ public ResponseEntity> registerAccount(@Valid @RequestBody UserDto userDto,
@RequestMapping(value = "/activate", method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE)
@Timed
- public ResponseEntity activateAccount(@RequestParam(value = "key") String key) {
+ public ResponseEntity activateAccount(@RequestParam(value = "key") String key,
+ HttpServletRequest request) {
return userService.activateRegistration(key)
.map(user -> {
List admins = userRepository.findAllByAuthoritiesContaining(
new Authority(AuthoritiesConstants.ADMIN));
- mailService.sendNewAccountActivatedMail(admins, user);
+ mailService.sendNewAccountActivatedMail(admins, user, getBaseUrl(request));
return new ResponseEntity(HttpStatus.OK);
})
.orElse(new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR));
@@ -156,9 +151,7 @@ public ResponseEntity> requestPasswordReset(@RequestBody String mail,
HttpServletRequest request) {
return userService.requestPasswordReset(mail)
.map(user -> {
- String baseUrl =
- request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort();
- mailService.sendPasswordResetMail(user, baseUrl);
+ mailService.sendPasswordResetMail(user, getBaseUrl(request));
return new ResponseEntity<>("e-mail was sent", HttpStatus.OK);
})
.orElse(new ResponseEntity<>("e-mail address not registered", HttpStatus.BAD_REQUEST));
@@ -184,4 +177,12 @@ private boolean checkPasswordLength(String password) {
return !StringUtils.isEmpty(password) && password.length() >= UserDto.PASSWORD_MIN_LENGTH
&& password.length() <= UserDto.PASSWORD_MAX_LENGTH;
}
+
+ private String getBaseUrl(HttpServletRequest request) {
+ return request.getScheme() + // "http"
+ "://" + // "://"
+ request.getServerName() + // "myhost"
+ ":" + // ":"
+ request.getServerPort(); // "80"
+ }
}
diff --git a/src/main/resources/mails/newAccountActivatedEmail.html b/src/main/resources/mails/newAccountActivatedEmail.html
index 19f19606c9..44278a0f12 100644
--- a/src/main/resources/mails/newAccountActivatedEmail.html
+++ b/src/main/resources/mails/newAccountActivatedEmail.html
@@ -1,7 +1,7 @@
- New account username activated
+ New account username activated
@@ -13,10 +13,15 @@
username
+
+ Go to user management and assign appropriate roles:
+
+ user-management
+
Regards,
- Your Metadatasystem ;-)
+ Your Metadatasystem ;)
From 30ce3955f3964cf4fae080bc23f6709882732acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 15:08:22 +0100
Subject: [PATCH 08/15] #1350 changed strings
---
.../datasetmanagement/configuration/translations-de.js | 1 +
.../datasetmanagement/configuration/translations-en.js | 1 +
.../scripts/datasetmanagement/views/dataSet-detail.html.tmpl | 4 ++--
.../directives/data-set-search-result.html.tmpl | 2 +-
.../scripts/studymanagement/configuration/translations-de.js | 3 ++-
.../scripts/studymanagement/configuration/translations-en.js | 3 ++-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/datasetmanagement/configuration/translations-de.js b/src/main/webapp/scripts/datasetmanagement/configuration/translations-de.js
index 9fbdaee862..957aa44fb1 100644
--- a/src/main/webapp/scripts/datasetmanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/datasetmanagement/configuration/translations-de.js
@@ -52,6 +52,7 @@ angular.module('metadatamanagementApp').config(
'unknownNumberOfAnalyzedVariables': 'Nicht bekannt',
'numberOfAnalyzedVariables-tooltip': 'Klicken, um alle analysierbaren Variablen dieses Subdatensatzes anzuzeigen',
'numberOfObservations': 'Fälle',
+ 'numberOfEpisodes': 'Episoden',
'citate': 'Zitieren',
'citation': 'Zitation',
'citate-tooltipp': 'Klicken, um Zitationsinformationen zu erhalten und zu kopieren.',
diff --git a/src/main/webapp/scripts/datasetmanagement/configuration/translations-en.js b/src/main/webapp/scripts/datasetmanagement/configuration/translations-en.js
index 5fe8a4e69a..c8af69611d 100644
--- a/src/main/webapp/scripts/datasetmanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/datasetmanagement/configuration/translations-en.js
@@ -52,6 +52,7 @@ angular.module('metadatamanagementApp').config(
'unknownNumberOfAnalyzedVariables': 'Unknown',
'numberOfAnalyzedVariables-tooltip': 'Click to show all analyzable variables of this sub data set',
'numberOfObservations': 'Observations',
+ 'numberOfEpisodes': 'Episodes',
'citate': 'Citate',
'citation': 'Citation',
'citate-tooltipp': 'Click to show citation information and to copy them.',
diff --git a/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl b/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl
index dc8a151d0d..1b77de8c14 100644
--- a/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl
+++ b/src/main/webapp/scripts/datasetmanagement/views/dataSet-detail.html.tmpl
@@ -182,9 +182,9 @@
{{'data-set-management.detail.label.sub-data-sets.numberOfAnalyzedVariables' | translate }}
- {{'data-set-management.detail.label.sub-data-sets.numberOfObservations' | translate }}
+ | {{(ctrl.dataSet.type.en !== 'Spell Data'?'data-set-management.detail.label.sub-data-sets.numberOfObservations' : 'data-set-management.detail.label.sub-data-sets.numberOfEpisodes')| translate }}
- {{'data-set-management.detail.label.sub-data-sets.numberOfObservations' | translate }}
+ {{(ctrl.dataSet.type.en !== 'Spell Data'?'data-set-management.detail.label.sub-data-sets.numberOfObservations' : 'data-set-management.detail.label.sub-data-sets.numberOfEpisodes')| translate }}
|
diff --git a/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl b/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl
index 6a8f495f47..b91aa84bb5 100644
--- a/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl
@@ -25,7 +25,7 @@
{{searchResult.accessWays.join(', ')}}
- {{'study-management.detail.label.data-set.maxNumberOfObservations' | translate }} (max):
+ {{(searchResult.type.en !== 'Spell Data'?'study-management.detail.label.data-set.maxNumberOfObservations':'study-management.detail.label.data-set.maxNumberOfEpisodes')| translate }} (max):
{{searchResult.maxNumberOfObservations | number: 0}}
diff --git a/src/main/webapp/scripts/studymanagement/configuration/translations-de.js b/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
index 969af2a1a5..0f89b719af 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
@@ -31,7 +31,8 @@ angular.module('metadatamanagementApp').config(
'accessWays': 'Zugangswege',
'description': 'Beschreibung',
'description-tooltip': 'Klicken, um den Datensatz "{{id}}" anzuzeigen',
- 'maxNumberOfObservations': 'Fälle'
+ 'maxNumberOfObservations': 'Fälle',
+ 'maxNumberOfEpisodes': 'Episoden'
},
'doi': 'DOI'
},
diff --git a/src/main/webapp/scripts/studymanagement/configuration/translations-en.js b/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
index eb969983c4..af282aa801 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
@@ -31,7 +31,8 @@ angular.module('metadatamanagementApp').config(
'accessWays': 'Access Ways',
'description': 'Description',
'description-tooltip': 'Click to show data set "{{id}}"',
- 'maxNumberOfObservations': 'Observations'
+ 'maxNumberOfObservations': 'Observations',
+ 'maxNumberOfEpisodes': 'Episodes'
},
'doi': 'DOI'
},
From aba339bd035d7c9d4db066bc5aad4c51ba44d802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Tue, 20 Feb 2018 15:29:48 +0100
Subject: [PATCH 09/15] #1368 changed string and removed some unrequired
strings
---
.../scripts/common/i18n/configuration/translations-de.js | 3 +--
.../scripts/common/i18n/configuration/translations-en.js | 3 +--
.../directives/data-set-search-result.html.tmpl | 2 +-
.../directives/variable-search-result.html.tmpl | 2 +-
.../scripts/studymanagement/configuration/translations-de.js | 3 ++-
.../scripts/studymanagement/configuration/translations-en.js | 3 ++-
.../variablemanagement/configuration/translations-de.js | 4 ----
.../variablemanagement/configuration/translations-en.js | 4 ----
8 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/common/i18n/configuration/translations-de.js b/src/main/webapp/scripts/common/i18n/configuration/translations-de.js
index 33dc325686..42b4b06e4e 100644
--- a/src/main/webapp/scripts/common/i18n/configuration/translations-de.js
+++ b/src/main/webapp/scripts/common/i18n/configuration/translations-de.js
@@ -59,8 +59,7 @@ angular.module('metadatamanagementApp').config(
'metadata': 'Metadaten zu der Datei',
'file': 'Datei',
'details': 'Details',
- 'related-objects': 'Verbundene Objekte',
- 'labels-surveyed-in': 'Erhoben in'
+ 'related-objects': 'Verbundene Objekte'
},
'buttons': {
'close': 'Schließen',
diff --git a/src/main/webapp/scripts/common/i18n/configuration/translations-en.js b/src/main/webapp/scripts/common/i18n/configuration/translations-en.js
index 03068b6f97..66f55eea38 100644
--- a/src/main/webapp/scripts/common/i18n/configuration/translations-en.js
+++ b/src/main/webapp/scripts/common/i18n/configuration/translations-en.js
@@ -59,8 +59,7 @@ angular.module('metadatamanagementApp').config(
'metadata': 'Metadata for the File',
'file': 'File',
'details': 'Details',
- 'related-objects': 'Related objects',
- 'labels-surveyed-in': 'Surveyed in'
+ 'related-objects': 'Related objects'
},
'buttons': {
'close': 'Close',
diff --git a/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl b/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl
index b91aa84bb5..b21e9da178 100644
--- a/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/directives/data-set-search-result.html.tmpl
@@ -12,7 +12,7 @@
- {{'global.cards.labels-surveyed-in' | translate}}:
+ {{'study-management.detail.label.data-set.surveyed-in' | translate}}:
diff --git a/src/main/webapp/scripts/searchmanagement/directives/variable-search-result.html.tmpl b/src/main/webapp/scripts/searchmanagement/directives/variable-search-result.html.tmpl
index 9db64f5dba..bdb611f670 100644
--- a/src/main/webapp/scripts/searchmanagement/directives/variable-search-result.html.tmpl
+++ b/src/main/webapp/scripts/searchmanagement/directives/variable-search-result.html.tmpl
@@ -13,7 +13,7 @@
- {{'global.cards.labels-surveyed-in' | translate}}:
+ {{'study-management.detail.label.data-set.surveyed-in' | translate}}:
diff --git a/src/main/webapp/scripts/studymanagement/configuration/translations-de.js b/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
index 0f89b719af..4a25a9d3d0 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/translations-de.js
@@ -32,7 +32,8 @@ angular.module('metadatamanagementApp').config(
'description': 'Beschreibung',
'description-tooltip': 'Klicken, um den Datensatz "{{id}}" anzuzeigen',
'maxNumberOfObservations': 'Fälle',
- 'maxNumberOfEpisodes': 'Episoden'
+ 'maxNumberOfEpisodes': 'Episoden',
+ 'surveyed-in': 'Enthält Daten aus diesen Erhebungen'
},
'doi': 'DOI'
},
diff --git a/src/main/webapp/scripts/studymanagement/configuration/translations-en.js b/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
index af282aa801..6e9bb482fb 100644
--- a/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/studymanagement/configuration/translations-en.js
@@ -32,7 +32,8 @@ angular.module('metadatamanagementApp').config(
'description': 'Description',
'description-tooltip': 'Click to show data set "{{id}}"',
'maxNumberOfObservations': 'Observations',
- 'maxNumberOfEpisodes': 'Episodes'
+ 'maxNumberOfEpisodes': 'Episodes',
+ 'surveyed-in': 'Contains data from these surveys'
},
'doi': 'DOI'
},
diff --git a/src/main/webapp/scripts/variablemanagement/configuration/translations-de.js b/src/main/webapp/scripts/variablemanagement/configuration/translations-de.js
index 884f7ad274..274b31aad1 100644
--- a/src/main/webapp/scripts/variablemanagement/configuration/translations-de.js
+++ b/src/main/webapp/scripts/variablemanagement/configuration/translations-de.js
@@ -122,10 +122,6 @@ angular.module('metadatamanagementApp').config(
}
}
},
- 'labels': {
- 'part-of-data-set': 'Enthalten in Datensatz:',
- 'surveyed-in': 'Erhoben in:'
- },
'error': {
'distribution': {
'valid-responses': {
diff --git a/src/main/webapp/scripts/variablemanagement/configuration/translations-en.js b/src/main/webapp/scripts/variablemanagement/configuration/translations-en.js
index 85cd2a6e71..9aa80bee5b 100644
--- a/src/main/webapp/scripts/variablemanagement/configuration/translations-en.js
+++ b/src/main/webapp/scripts/variablemanagement/configuration/translations-en.js
@@ -122,10 +122,6 @@ angular.module('metadatamanagementApp').config(
}
}
},
- 'labels': {
- 'part-of-data-set': 'Part of Data Set:',
- 'surveyed-in': 'Surveyed in:'
- },
'error': {
'distribution': {
'valid-responses': {
From 9f5870a8a129589398f6b1d1be9a99e62f104cb4 Mon Sep 17 00:00:00 2001
From: Daniel Katzberg
Date: Fri, 23 Feb 2018 12:13:04 +0100
Subject: [PATCH 10/15] updated packagelock
---
package-lock.json | 1269 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 1087 insertions(+), 182 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2ca461945d..67dfe5427e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,6 +22,22 @@
"integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
"dev": true
},
+ "JSONStream": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
+ "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+ "dev": true,
+ "requires": {
+ "jsonparse": "1.3.1",
+ "through": "2.3.8"
+ }
+ },
+ "JSV": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+ "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
+ "dev": true
+ },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -623,9 +639,9 @@
"integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
"dev": true,
"requires": {
+ "JSONStream": "1.3.2",
"combine-source-map": "0.7.2",
"defined": "1.0.0",
- "JSONStream": "1.3.2",
"through2": "2.0.3",
"umd": "3.0.1"
}
@@ -694,6 +710,7 @@
"integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
"dev": true,
"requires": {
+ "JSONStream": "1.3.2",
"assert": "1.4.1",
"browser-pack": "6.0.2",
"browser-resolve": "1.11.2",
@@ -715,7 +732,6 @@
"https-browserify": "1.0.0",
"inherits": "2.0.3",
"insert-module-globals": "7.0.1",
- "JSONStream": "1.3.2",
"labeled-stream-splicer": "2.0.0",
"module-deps": "4.1.1",
"os-browserify": "0.3.0",
@@ -1057,6 +1073,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
+ "fsevents": "1.1.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -2479,169 +2496,1073 @@
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
- "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ }
+ }
+ },
+ "fill-range": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+ "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+ "dev": true,
+ "requires": {
+ "is-number": "2.1.0",
+ "isobject": "2.1.0",
+ "randomatic": "1.1.7",
+ "repeat-element": "1.1.2",
+ "repeat-string": "1.6.1"
+ }
+ },
+ "finalhandler": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
+ "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
+ "dev": true,
+ "requires": {
+ "debug": "2.2.0",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "statuses": "1.3.1",
+ "unpipe": "1.0.0"
+ }
+ },
+ "find-up": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "dev": true,
+ "requires": {
+ "path-exists": "2.1.0",
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "findup-sync": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+ "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+ "dev": true,
+ "requires": {
+ "glob": "5.0.15"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "5.0.15",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+ "dev": true,
+ "requires": {
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ }
+ }
+ },
+ "follow-redirects": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+ "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "2.2.0"
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "dev": true
+ },
+ "for-own": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+ "dev": true,
+ "requires": {
+ "for-in": "1.0.2"
+ }
+ },
+ "foreach": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+ "dev": true
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+ "dev": true,
+ "requires": {
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.5",
+ "mime-types": "2.1.17"
+ }
+ },
+ "formidable": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+ "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+ "dev": true
+ },
+ "fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+ "dev": true
+ },
+ "from": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+ "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+ "dev": true
+ },
+ "fs-access": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+ "dev": true,
+ "requires": {
+ "null-check": "1.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "jsonfile": "3.0.1",
+ "universalify": "0.1.1"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
+ },
+ "fsevents": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
+ "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "nan": "2.8.0",
+ "node-pre-gyp": "0.6.39"
+ },
+ "dependencies": {
+ "abbrev": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "ajv": {
+ "version": "4.11.8",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "co": "4.6.0",
+ "json-stable-stringify": "1.0.1"
+ }
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "aproba": {
+ "version": "1.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "are-we-there-yet": {
+ "version": "1.1.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "delegates": "1.0.0",
+ "readable-stream": "2.2.9"
+ }
+ },
+ "asn1": {
+ "version": "0.2.3",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "assert-plus": {
+ "version": "0.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "aws-sign2": {
+ "version": "0.6.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "aws4": {
+ "version": "1.6.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "balanced-match": {
+ "version": "0.4.2",
+ "bundled": true,
+ "dev": true
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "tweetnacl": "0.14.5"
+ }
+ },
+ "block-stream": {
+ "version": "0.0.9",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.3"
+ }
+ },
+ "boom": {
+ "version": "2.10.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "hoek": "2.16.3"
+ }
+ },
+ "brace-expansion": {
+ "version": "1.1.7",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "balanced-match": "0.4.2",
+ "concat-map": "0.0.1"
+ }
+ },
+ "buffer-shims": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "caseless": {
+ "version": "0.12.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "co": {
+ "version": "4.6.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
+ "combined-stream": {
+ "version": "1.0.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "delayed-stream": "1.0.0"
+ }
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "console-control-strings": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "cryptiles": {
+ "version": "2.0.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "boom": "2.10.1"
+ }
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "debug": {
+ "version": "2.6.8",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "deep-extend": {
+ "version": "0.4.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "delayed-stream": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "detect-libc": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "ecc-jsbn": {
+ "version": "0.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "jsbn": "0.1.1"
+ }
+ },
+ "extend": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "extsprintf": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "form-data": {
+ "version": "2.1.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.5",
+ "mime-types": "2.1.15"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "fstream": {
+ "version": "1.0.11",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "inherits": "2.0.3",
+ "mkdirp": "0.5.1",
+ "rimraf": "2.6.1"
+ }
+ },
+ "fstream-ignore": {
+ "version": "1.0.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "fstream": "1.0.11",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4"
+ }
+ },
+ "gauge": {
+ "version": "2.7.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "aproba": "1.1.1",
+ "console-control-strings": "1.1.0",
+ "has-unicode": "2.0.1",
+ "object-assign": "4.1.1",
+ "signal-exit": "3.0.2",
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wide-align": "1.1.2"
+ }
+ },
+ "getpass": {
+ "version": "0.1.7",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "glob": {
+ "version": "7.1.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "graceful-fs": {
+ "version": "4.1.11",
+ "bundled": true,
+ "dev": true
+ },
+ "har-schema": {
+ "version": "1.0.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "har-validator": {
+ "version": "4.2.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ajv": "4.11.8",
+ "har-schema": "1.0.5"
+ }
+ },
+ "has-unicode": {
+ "version": "2.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "hawk": {
+ "version": "3.1.3",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "boom": "2.10.1",
+ "cryptiles": "2.0.5",
+ "hoek": "2.16.3",
+ "sntp": "1.0.9"
+ }
+ },
+ "hoek": {
+ "version": "2.16.3",
+ "bundled": true,
+ "dev": true
+ },
+ "http-signature": {
+ "version": "1.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "0.2.0",
+ "jsprim": "1.4.0",
+ "sshpk": "1.13.0"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "ini": {
+ "version": "1.3.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "number-is-nan": "1.0.1"
+ }
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "jodid25519": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "jsbn": "0.1.1"
+ }
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "json-stable-stringify": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "jsonify": "0.0.0"
+ }
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "jsonify": {
+ "version": "0.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "jsprim": {
+ "version": "1.4.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.0.2",
+ "json-schema": "0.2.3",
+ "verror": "1.3.6"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "mime-db": {
+ "version": "1.27.0",
+ "bundled": true,
+ "dev": true
+ },
+ "mime-types": {
+ "version": "2.1.15",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "mime-db": "1.27.0"
+ }
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "brace-expansion": "1.1.7"
+ }
+ },
+ "minimist": {
+ "version": "0.0.8",
+ "bundled": true,
+ "dev": true
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "node-pre-gyp": {
+ "version": "0.6.39",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "detect-libc": "1.0.2",
+ "hawk": "3.1.3",
+ "mkdirp": "0.5.1",
+ "nopt": "4.0.1",
+ "npmlog": "4.1.0",
+ "rc": "1.2.1",
+ "request": "2.81.0",
+ "rimraf": "2.6.1",
+ "semver": "5.3.0",
+ "tar": "2.2.1",
+ "tar-pack": "3.4.0"
+ }
+ },
+ "nopt": {
+ "version": "4.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "abbrev": "1.1.0",
+ "osenv": "0.1.4"
+ }
+ },
+ "npmlog": {
+ "version": "4.1.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "are-we-there-yet": "1.1.4",
+ "console-control-strings": "1.1.0",
+ "gauge": "2.7.4",
+ "set-blocking": "2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "oauth-sign": {
+ "version": "0.8.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "osenv": {
+ "version": "0.1.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "performance-now": {
+ "version": "0.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "process-nextick-args": {
+ "version": "1.0.7",
+ "bundled": true,
+ "dev": true
+ },
+ "punycode": {
+ "version": "1.4.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "qs": {
+ "version": "6.4.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "rc": {
+ "version": "1.2.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "deep-extend": "0.4.2",
+ "ini": "1.3.4",
+ "minimist": "1.2.0",
+ "strip-json-comments": "2.0.1"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "readable-stream": {
+ "version": "2.2.9",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "buffer-shims": "1.0.0",
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "1.0.7",
+ "string_decoder": "1.0.1",
+ "util-deprecate": "1.0.2"
+ }
+ },
+ "request": {
+ "version": "2.81.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "aws-sign2": "0.6.0",
+ "aws4": "1.6.0",
+ "caseless": "0.12.0",
+ "combined-stream": "1.0.5",
+ "extend": "3.0.1",
+ "forever-agent": "0.6.1",
+ "form-data": "2.1.4",
+ "har-validator": "4.2.1",
+ "hawk": "3.1.3",
+ "http-signature": "1.1.1",
+ "is-typedarray": "1.0.0",
+ "isstream": "0.1.2",
+ "json-stringify-safe": "5.0.1",
+ "mime-types": "2.1.15",
+ "oauth-sign": "0.8.2",
+ "performance-now": "0.2.0",
+ "qs": "6.4.0",
+ "safe-buffer": "5.0.1",
+ "stringstream": "0.0.5",
+ "tough-cookie": "2.3.2",
+ "tunnel-agent": "0.6.0",
+ "uuid": "3.0.1"
+ }
+ },
+ "rimraf": {
+ "version": "2.6.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "glob": "7.1.2"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "semver": {
+ "version": "5.3.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "sntp": {
+ "version": "1.0.9",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "hoek": "2.16.3"
+ }
+ },
+ "sshpk": {
+ "version": "1.13.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "asn1": "0.2.3",
+ "assert-plus": "1.0.0",
+ "bcrypt-pbkdf": "1.0.1",
+ "dashdash": "1.14.1",
+ "ecc-jsbn": "0.1.1",
+ "getpass": "0.1.7",
+ "jodid25519": "1.0.2",
+ "jsbn": "0.1.1",
+ "tweetnacl": "0.14.5"
+ },
+ "dependencies": {
+ "assert-plus": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "bundled": true,
"dev": true,
"requires": {
- "minimist": "0.0.8"
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
}
- }
- }
- },
- "fill-range": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
- "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
- "dev": true,
- "requires": {
- "is-number": "2.1.0",
- "isobject": "2.1.0",
- "randomatic": "1.1.7",
- "repeat-element": "1.1.2",
- "repeat-string": "1.6.1"
- }
- },
- "finalhandler": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
- "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
- "dev": true,
- "requires": {
- "debug": "2.2.0",
- "escape-html": "1.0.3",
- "on-finished": "2.3.0",
- "statuses": "1.3.1",
- "unpipe": "1.0.0"
- }
- },
- "find-up": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
- "dev": true,
- "requires": {
- "path-exists": "2.1.0",
- "pinkie-promise": "2.0.1"
- }
- },
- "findup-sync": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
- "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
- "dev": true,
- "requires": {
- "glob": "5.0.15"
- },
- "dependencies": {
- "glob": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+ },
+ "string_decoder": {
+ "version": "1.0.1",
+ "bundled": true,
"dev": true,
"requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
+ "safe-buffer": "5.0.1"
+ }
+ },
+ "stringstream": {
+ "version": "0.0.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "tar": {
+ "version": "2.2.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "block-stream": "0.0.9",
+ "fstream": "1.0.11",
+ "inherits": "2.0.3"
+ }
+ },
+ "tar-pack": {
+ "version": "3.4.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "2.6.8",
+ "fstream": "1.0.11",
+ "fstream-ignore": "1.0.5",
"once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "readable-stream": "2.2.9",
+ "rimraf": "2.6.1",
+ "tar": "2.2.1",
+ "uid-number": "0.0.6"
+ }
+ },
+ "tough-cookie": {
+ "version": "2.3.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "punycode": "1.4.1"
+ }
+ },
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "safe-buffer": "5.0.1"
+ }
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "uid-number": {
+ "version": "0.0.6",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "uuid": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "verror": {
+ "version": "1.3.6",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "extsprintf": "1.0.2"
+ }
+ },
+ "wide-align": {
+ "version": "1.1.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "string-width": "1.0.2"
}
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
}
}
},
- "follow-redirects": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
- "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "2.2.0"
- }
- },
- "for-in": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
- "dev": true
- },
- "for-own": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
- "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
- "dev": true,
- "requires": {
- "for-in": "1.0.2"
- }
- },
- "foreach": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
- "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
- "dev": true
- },
- "forever-agent": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
- "dev": true
- },
- "form-data": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
- "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
- "dev": true,
- "requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.17"
- }
- },
- "formidable": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
- "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
- "dev": true
- },
- "fresh": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
- "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
- "dev": true
- },
- "from": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
- "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
- "dev": true
- },
- "fs-access": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
- "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
- "dev": true,
- "requires": {
- "null-check": "1.0.0"
- }
- },
- "fs-extra": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
- "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "jsonfile": "3.0.1",
- "universalify": "0.1.1"
- }
- },
- "fs.realpath": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
- },
"fstream": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -3982,10 +4903,10 @@
"integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
"dev": true,
"requires": {
+ "JSONStream": "1.3.2",
"combine-source-map": "0.7.2",
"concat-stream": "1.5.2",
"is-buffer": "1.1.6",
- "JSONStream": "1.3.2",
"lexical-scope": "1.2.0",
"process": "0.11.10",
"through2": "2.0.3",
@@ -4682,16 +5603,6 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
"dev": true
},
- "JSONStream": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
- "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
- "dev": true,
- "requires": {
- "jsonparse": "1.3.1",
- "through": "2.3.8"
- }
- },
"jsprim": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -4712,12 +5623,6 @@
}
}
},
- "JSV": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
- "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
- "dev": true
- },
"jszip": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
@@ -5713,6 +6618,7 @@
"integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
"dev": true,
"requires": {
+ "JSONStream": "1.3.2",
"browser-resolve": "1.11.2",
"cached-path-relative": "1.0.1",
"concat-stream": "1.5.2",
@@ -5720,7 +6626,6 @@
"detective": "4.7.1",
"duplexer2": "0.1.4",
"inherits": "2.0.3",
- "JSONStream": "1.3.2",
"parents": "1.0.1",
"readable-stream": "2.3.3",
"resolve": "1.1.7",
@@ -8215,15 +9120,6 @@
}
}
},
- "string_decoder": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
- "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
- "dev": true,
- "requires": {
- "safe-buffer": "5.1.1"
- }
- },
"string-length": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -8250,6 +9146,15 @@
"integrity": "sha1-oZwg3uUamHd+mkfhDwm+OTubunU=",
"dev": true
},
+ "string_decoder": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
"stringmap": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
From de36185939e8e2eb5c95f68fbcb931185481be45 Mon Sep 17 00:00:00 2001
From: Daniel Katzberg
Date: Fri, 2 Mar 2018 08:44:13 +0100
Subject: [PATCH 11/15] Upgraded jasmine to 3.1.0 (package.json) #1584
---
package-lock.json | 6 +++---
package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 67dfe5427e..81a51d1067 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5344,9 +5344,9 @@
}
},
"jasmine-core": {
- "version": "2.99.1",
- "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
- "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz",
+ "integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw=",
"dev": true
},
"jasminewd2": {
diff --git a/package.json b/package.json
index 4fef332092..81239619e5 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"grunt-text-replace": "0.4.0",
"grunt-usemin": "3.1.1",
"grunt-wiredep": "3.0.1",
- "jasmine-core": "2.99.1",
+ "jasmine-core": "3.1.0",
"jshint-stylish": "2.2.1",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
From 85d970184ab388b99b7a5a59503e6d514ecce381 Mon Sep 17 00:00:00 2001
From: Daniel Katzberg
Date: Fri, 2 Mar 2018 09:01:59 +0100
Subject: [PATCH 12/15] #1584 fixed js test
---
src/test/javascript/spec/app.spec.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/javascript/spec/app.spec.js b/src/test/javascript/spec/app.spec.js
index b8f0dbf982..20c930513a 100644
--- a/src/test/javascript/spec/app.spec.js
+++ b/src/test/javascript/spec/app.spec.js
@@ -145,11 +145,10 @@ describe('Specification for app ', function() {
it('should call back function', function() {
fromState = {};
fromParams = {};
- toState = {};
+ toState = function() {};
toParams = {};
$rootScope.toState = toState;
$rootScope.previousStateName = 'previousStateName';
- $rootScope.toState = toState;
$rootScope.fromState = fromState;
$rootScope.toParams = toParams;
$rootScope.fromParams = fromParams;
From 2d4ab7fd0b63627d27be4137e34cd53a58e42306 Mon Sep 17 00:00:00 2001
From: Daniel Katzberg
Date: Fri, 2 Mar 2018 09:20:33 +0100
Subject: [PATCH 13/15] #1584 roll back
---
package-lock.json | 6 +++---
package.json | 2 +-
src/test/javascript/spec/app.spec.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 81a51d1067..67dfe5427e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5344,9 +5344,9 @@
}
},
"jasmine-core": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz",
- "integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw=",
+ "version": "2.99.1",
+ "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-2.99.1.tgz",
+ "integrity": "sha1-5kAN8ea1bhMLYcS80JPap/boyhU=",
"dev": true
},
"jasminewd2": {
diff --git a/package.json b/package.json
index 81239619e5..d0802e650e 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"grunt-text-replace": "0.4.0",
"grunt-usemin": "3.1.1",
"grunt-wiredep": "3.0.1",
- "jasmine-core": "3.1.0",
+ "jasmine-core": "^2.99.1",
"jshint-stylish": "2.2.1",
"karma": "2.0.0",
"karma-chrome-launcher": "2.2.0",
diff --git a/src/test/javascript/spec/app.spec.js b/src/test/javascript/spec/app.spec.js
index 20c930513a..8287d4afa9 100644
--- a/src/test/javascript/spec/app.spec.js
+++ b/src/test/javascript/spec/app.spec.js
@@ -145,7 +145,7 @@ describe('Specification for app ', function() {
it('should call back function', function() {
fromState = {};
fromParams = {};
- toState = function() {};
+ toState = {};
toParams = {};
$rootScope.toState = toState;
$rootScope.previousStateName = 'previousStateName';
From 5664a663ca4a5ee2021ca5c68898759535a39426 Mon Sep 17 00:00:00 2001
From: Daniel Katzberg
Date: Fri, 2 Mar 2018 09:35:46 +0100
Subject: [PATCH 14/15] Upgraded js-xlsx to 0.12.3 (bower.json) #1585
---
bower.json | 2 +-
.../bower_components/js-xlsx/.bower.json | 10 +-
.../webapp/bower_components/js-xlsx/README.md | 8 +-
.../js-xlsx/demos/altjs/Makefile | 2 +-
.../js-xlsx/demos/angular2/Makefile | 24 +-
.../demos/extendscript/aftereffects.jsx | 2 +-
.../js-xlsx/demos/extendscript/estoolkit.jsx | 2 +-
.../demos/extendscript/illustrator.jsx | 2 +-
.../js-xlsx/demos/extendscript/indesign.jsx | 2 +-
.../js-xlsx/demos/extendscript/photoshop.jsx | 2 +-
.../js-xlsx/demos/extendscript/test.jsx | 2 +-
.../js-xlsx/demos/rollup/Makefile | 2 +-
.../js-xlsx/demos/rollup/rollup.config.js | 7 +-
.../demos/rollup/rollup.config.node.js | 10 +-
.../demos/rollup/rollup.config.worker.js | 7 +-
.../bower_components/js-xlsx/dist/shim.min.js | 2 +-
.../js-xlsx/dist/xlsx.core.min.js | 28 +-
.../js-xlsx/dist/xlsx.core.min.map | 2 +-
.../js-xlsx/dist/xlsx.extendscript.js | 664 +++++++-----------
.../js-xlsx/dist/xlsx.full.min.js | 32 +-
.../js-xlsx/dist/xlsx.full.min.map | 2 +-
.../bower_components/js-xlsx/dist/xlsx.js | 194 +++--
.../bower_components/js-xlsx/dist/xlsx.min.js | 24 +-
.../js-xlsx/dist/xlsx.min.map | 2 +-
.../js-xlsx/docbits/12_optional.md | 6 +-
.../js-xlsx/docbits/82_util.md | 2 +-
.../bower_components/js-xlsx/package.json | 10 +-
.../webapp/bower_components/js-xlsx/shim.js | 470 +++----------
.../webapp/bower_components/js-xlsx/test.js | 10 +-
.../webapp/bower_components/js-xlsx/tests.lst | 2 +-
.../bower_components/js-xlsx/tests/base64.js | 67 ++
.../bower_components/js-xlsx/tests/core.js | 10 +-
.../bower_components/js-xlsx/tests/fs_.js | 6 +-
.../bower_components/js-xlsx/tests/index.html | 1 +
.../bower_components/js-xlsx/tests/sauce.html | 1 +
.../bower_components/js-xlsx/tests/write.js | 1 +
.../bower_components/js-xlsx/types/index.d.ts | 3 +-
.../js-xlsx/types/xlsx-tests.ts | 3 +-
.../bower_components/js-xlsx/xlsx.flow.js | 194 +++--
.../webapp/bower_components/js-xlsx/xlsx.js | 194 +++--
40 files changed, 1018 insertions(+), 996 deletions(-)
create mode 100644 src/main/webapp/bower_components/js-xlsx/tests/base64.js
diff --git a/bower.json b/bower.json
index 5fe01b73db..46c9f57bf0 100644
--- a/bower.json
+++ b/bower.json
@@ -27,7 +27,7 @@
"jszip-utils": "~0.0.2",
"angular-translate-handler-log": "2.17.0",
"angular-nvd3": "^1.0.9",
- "js-xlsx": "^0.12.1",
+ "js-xlsx": "^0.12.3",
"cheet.js": "^0.3.3",
"angular-material": "^1.1.7",
"angular-block-ui": "^0.2.2",
diff --git a/src/main/webapp/bower_components/js-xlsx/.bower.json b/src/main/webapp/bower_components/js-xlsx/.bower.json
index daced94fb5..e605877057 100644
--- a/src/main/webapp/bower_components/js-xlsx/.bower.json
+++ b/src/main/webapp/bower_components/js-xlsx/.bower.json
@@ -19,14 +19,14 @@
"js-xls",
"js-xlsx"
],
- "version": "0.12.1",
- "_release": "0.12.1",
+ "version": "0.12.3",
+ "_release": "0.12.3",
"_resolution": {
"type": "version",
- "tag": "v0.12.1",
- "commit": "19620da30be2a7d7b9801938a0b9b1fd3c4c4b00"
+ "tag": "v0.12.3",
+ "commit": "5dd16ae6405e84156789e9288d3aa4e40a6158b8"
},
"_source": "https://github.com/SheetJS/js-xlsx.git",
- "_target": "^0.12.1",
+ "_target": "^0.12.3",
"_originalSource": "js-xlsx"
}
\ No newline at end of file
diff --git a/src/main/webapp/bower_components/js-xlsx/README.md b/src/main/webapp/bower_components/js-xlsx/README.md
index 31e9d26819..16199df067 100644
--- a/src/main/webapp/bower_components/js-xlsx/README.md
+++ b/src/main/webapp/bower_components/js-xlsx/README.md
@@ -257,11 +257,15 @@ To use the shim, add the shim before the script tag that loads `xlsx.js`:
```html
-
+
```
+The script also includes `IE_LoadFile` and `IE_SaveFile` for loading and saving
+files in Internet Explorer versions 6-9. The `xlsx.extendscript.js` script
+bundles the shim in a format suitable for Photoshop and other Adobe products.
+
## Philosophy
@@ -2050,7 +2054,7 @@ For the example sheet:
```js
> var o = XLSX.utils.sheet_to_formulae(ws);
-> o.filter(function(v, i) { return i % 5 === 0; });
+> [o[0], o[5], o[10], o[15], o[20]];
[ 'A1=\'S', 'F1=\'J', 'D2=4', 'B3=3', 'G3=8' ]
```
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/altjs/Makefile b/src/main/webapp/bower_components/js-xlsx/demos/altjs/Makefile
index 21a607cfba..49047c4d63 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/altjs/Makefile
+++ b/src/main/webapp/bower_components/js-xlsx/demos/altjs/Makefile
@@ -40,7 +40,7 @@ SheetJSRhino.class: $(RHDEPS)
javac -cp .:SheetJS.jar:rhino.jar SheetJSRhino.java
rhino.jar:
- if [ ! -e rhino ]; then git clone https://github.com/mozilla/rhino; fi
+ if [ ! -e rhino ]; then git clone --depth=1 https://github.com/mozilla/rhino; fi
#if [ ! -e rhino/build/rhino*/js.jar ]; then cd rhino; ant jar; fi
#cp rhino/build/rhino*/js.jar rhino.jar
if [ ! -e rhino/buildGradle/libs/rhino*.jar ]; then cd rhino; ./gradlew jar; fi
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/angular2/Makefile b/src/main/webapp/bower_components/js-xlsx/demos/angular2/Makefile
index f11f28fb89..8500b6b7dd 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/angular2/Makefile
+++ b/src/main/webapp/bower_components/js-xlsx/demos/angular2/Makefile
@@ -1,23 +1,9 @@
-.PHONY: angular
-angular:
- # Test Angular2 build
- cp package.json-angular2 package.json
- rm -rf node_modules
- npm install
- if [ ! -e node_modules ]; then mkdir node_modules; fi
- if [ ! -e node_modules/xlsx ]; then cd node_modules; ln -s ../../../ xlsx; cd -; fi
- npm run build
-
- # Test Angular4 build
- cp package.json-angular4 package.json
- rm -rf node_modules
- npm install
- if [ ! -e node_modules ]; then mkdir node_modules; fi
- if [ ! -e node_modules/xlsx ]; then cd node_modules; ln -s ../../../ xlsx; cd -; fi
- npm run build
+.PHONY: all
+all: angular5
- # Test Angular5 build
- cp package.json-angular5 package.json
+.PHONY: angular2 angular4 angular5
+angular2 angular4 angular5:
+ cp package.json-$@ package.json
rm -rf node_modules
npm install
if [ ! -e node_modules ]; then mkdir node_modules; fi
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/aftereffects.jsx b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/aftereffects.jsx
index 99a6425d80..f0aac56a24 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/aftereffects.jsx
+++ b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/aftereffects.jsx
@@ -7,7 +7,7 @@ var basePath = thisFile.path;
var filename = "/sheetjs.xlsx";
/* Read file from disk */
-var workbook = XLSX.readFile(basePath + filename);
+var workbook = XLSX.readFile(basePath + filename, {cellDates:true});
/* Display first worksheet */
var first_sheet_name = workbook.SheetNames[0], first_worksheet = workbook.Sheets[first_sheet_name];
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/estoolkit.jsx b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/estoolkit.jsx
index 6231836bf3..e3e30ec5fc 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/estoolkit.jsx
+++ b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/estoolkit.jsx
@@ -7,7 +7,7 @@ var basePath = thisFile.path;
var filename = "/sheetjs.xlsx";
/* Read file from disk */
-var workbook = XLSX.readFile(basePath + filename);
+var workbook = XLSX.readFile(basePath + filename, {cellDates:true});
/* Display first worksheet */
var first_sheet_name = workbook.SheetNames[0], first_worksheet = workbook.Sheets[first_sheet_name];
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/illustrator.jsx b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/illustrator.jsx
index 6ef0195ee3..c1a16c4c65 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/illustrator.jsx
+++ b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/illustrator.jsx
@@ -7,7 +7,7 @@ var basePath = thisFile.path;
var filename = "/sheetjs.xlsx";
/* Read file from disk */
-var workbook = XLSX.readFile(basePath + filename);
+var workbook = XLSX.readFile(basePath + filename, {cellDates:true});
/* Display first worksheet */
var first_sheet_name = workbook.SheetNames[0], first_worksheet = workbook.Sheets[first_sheet_name];
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/indesign.jsx b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/indesign.jsx
index acc47759a5..c95d0173a8 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/indesign.jsx
+++ b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/indesign.jsx
@@ -7,7 +7,7 @@ var basePath = thisFile.path;
var filename = "/sheetjs.xlsx";
/* Read file from disk */
-var workbook = XLSX.readFile(basePath + filename);
+var workbook = XLSX.readFile(basePath + filename, {cellDates:true});
/* Display first worksheet */
var first_sheet_name = workbook.SheetNames[0], first_worksheet = workbook.Sheets[first_sheet_name];
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/photoshop.jsx b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/photoshop.jsx
index ac59b7d632..9e5ad45200 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/photoshop.jsx
+++ b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/photoshop.jsx
@@ -7,7 +7,7 @@ var basePath = thisFile.path;
var filename = "/sheetjs.xlsx";
/* Read file from disk */
-var workbook = XLSX.readFile(basePath + filename);
+var workbook = XLSX.readFile(basePath + filename, {cellDates:true});
/* Display first worksheet */
var first_sheet_name = workbook.SheetNames[0], first_worksheet = workbook.Sheets[first_sheet_name];
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/test.jsx b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/test.jsx
index 94eb5d3298..b483229348 100755
--- a/src/main/webapp/bower_components/js-xlsx/demos/extendscript/test.jsx
+++ b/src/main/webapp/bower_components/js-xlsx/demos/extendscript/test.jsx
@@ -6,7 +6,7 @@ var basePath = thisFile.path;
var filename = "/sheetjs.xlsx";
/* Read file from disk */
-var workbook = XLSX.readFile(basePath + filename);
+var workbook = XLSX.readFile(basePath + filename, {cellDates:true});
/* Display first worksheet */
var first_sheet_name = workbook.SheetNames[0], first_worksheet = workbook.Sheets[first_sheet_name];
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/rollup/Makefile b/src/main/webapp/bower_components/js-xlsx/demos/rollup/Makefile
index 4041ee5548..bea726402d 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/rollup/Makefile
+++ b/src/main/webapp/bower_components/js-xlsx/demos/rollup/Makefile
@@ -20,4 +20,4 @@ worker.min.js: worker.js
.PHONY: init
init:
@npm install rollup-plugin-node-resolve rollup-plugin-commonjs
- @mkdir -p node_modules; cd node_modules; ln -s ../../../ xlsx; cd -
+ @mkdir -p node_modules; cd node_modules; if [ ! -e xlsx ]; then ln -s ../../../ xlsx; fi; cd -
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.js b/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.js
index b9a2e4345e..3b62c00420 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.js
+++ b/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.js
@@ -2,8 +2,13 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
export default {
+ input: 'app.js',
+ output: {
+ file: 'rollup.js',
+ format: 'iife'
+ },
entry: 'app.js',
- dest: 'rollup.js',
+ //dest: 'rollup.js',
plugins: [
resolve({
module: false,
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.node.js b/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.node.js
index 0947f8f8af..7aaf1b1ff3 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.node.js
+++ b/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.node.js
@@ -2,12 +2,16 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
export default {
+ input: 'main.js',
+ output: {
+ file: 'rollup.node.js',
+ format: 'cjs'
+ },
entry: 'main.js',
- dest: 'rollup.node.js',
+ //dest: 'rollup.node.js',
plugins: [
resolve({
- module: false,
- browser: true,
+ module: false
}),
commonjs()
],
diff --git a/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.worker.js b/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.worker.js
index 61a4d33e76..966332c6a6 100644
--- a/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.worker.js
+++ b/src/main/webapp/bower_components/js-xlsx/demos/rollup/rollup.config.worker.js
@@ -2,8 +2,13 @@
import resolve from 'rollup-plugin-node-resolve';
import commonjs from 'rollup-plugin-commonjs';
export default {
+ input: 'xlsxworker.js',
+ output: {
+ file: 'worker.js',
+ format: 'iife'
+ },
entry: 'xlsxworker.js',
- dest: 'worker.js',
+ //dest: 'worker.js',
plugins: [
resolve({
module: false,
diff --git a/src/main/webapp/bower_components/js-xlsx/dist/shim.min.js b/src/main/webapp/bower_components/js-xlsx/dist/shim.min.js
index 2f669b44c8..4b72440044 100644
--- a/src/main/webapp/bower_components/js-xlsx/dist/shim.min.js
+++ b/src/main/webapp/bower_components/js-xlsx/dist/shim.min.js
@@ -1,2 +1,2 @@
/* xlsx.js (C) 2013-present SheetJS -- http://sheetjs.com */
-if(!Object.keys){Object.keys=function(){var t=Object.prototype.hasOwnProperty,e=!{toString:null}.propertyIsEnumerable("toString"),r=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],i=r.length;return function(n){if(typeof n!=="object"&&typeof n!=="function"||n===null)throw new TypeError("Object.keys called on non-object");var o=[];for(var a in n){if(t.call(n,a))o.push(a)}if(e){for(var f=0;f>>0;if(typeof t!="function")throw new TypeError;var i=[];var n=arguments[1];for(var o=0;o>>0;if(typeof t!=="function")throw new TypeError;var i=arguments.length>=2?arguments[1]:void 0;for(var n=0;n>>0;if(typeof t!=="function"){throw new TypeError(t+" is not a function")}if(e){r=e}i=new Array(a);n=0;while(n>>0;e=+e||0;if(Math.abs(e)===Infinity){e=0}if(e<0){e+=r;if(e<0){e=0}}for(;e=r||t>=e){return new ArrayBuffer(0)}var i=Math.min(r-t,e-t);var n=new ArrayBuffer(i);var o=new Uint8Array(n);o.set(new Uint8Array(this,t,i));return n}}(function(){var t=typeof exports!="undefined"?exports:typeof self!="undefined"?self:$.global;var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function r(t){this.message=t}r.prototype=new Error;r.prototype.name="InvalidCharacterError";t.btoa||(t.btoa=function(t){var i=String(t);for(var n,o,a=0,f=e,l="";i.charAt(a|0)||(f="=",a%1);l+=f.charAt(63&n>>8-a%1*8)){o=i.charCodeAt(a+=3/4);if(o>255){throw new r("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.")}n=n<<8|o}return l});t.atob||(t.atob=function(t){var i=String(t).replace(/[=]+$/,"");if(i.length%4==1){throw new r("'atob' failed: The string to be decoded is not correctly encoded.")}for(var n=0,o,a,f=0,l="";a=i.charAt(f++);~a&&(o=n%4?o*64+a:a,n++%4)?l+=String.fromCharCode(255&o>>(-2*n&6)):0){a=e.indexOf(a)}return l})})();if(!Date.prototype.toISOString){(function(){function t(t){if(t<10){return"0"+t}return t}Date.prototype.toISOString=function(){return this.getUTCFullYear()+"-"+t(this.getUTCMonth()+1)+"-"+t(this.getUTCDate())+"T"+t(this.getUTCHours())+":"+t(this.getUTCMinutes())+":"+t(this.getUTCSeconds())+"."+(this.getUTCMilliseconds()/1e3).toFixed(3).slice(2,5)+"Z"}})()}if(typeof Uint8Array!=="undefined"&&!Uint8Array.prototype.slice)Uint8Array.prototype.slice=function(t,e){if(t<0){t+=this.length;if(t<0)t=0}if(t>=this.length)return new Uint8Array(0);if(e==null)e=this.length;if(e<0){e+=this.length;if(e<0)e=0}if(e>this.length)e=this.length;var r=new Uint8Array(e-t);while(t<=--e)r[e-t]=this[e];return r};var IE_SaveFile=function(){try{if(typeof IE_SaveFile_Impl=="undefined")document.write(['
+
```
+The script also includes `IE_LoadFile` and `IE_SaveFile` for loading and saving
+files in Internet Explorer versions 6-9. The `xlsx.extendscript.js` script
+bundles the shim in a format suitable for Photoshop and other Adobe products.
+
diff --git a/src/main/webapp/bower_components/js-xlsx/docbits/82_util.md b/src/main/webapp/bower_components/js-xlsx/docbits/82_util.md
index 58cbe2fdef..1410da1180 100644
--- a/src/main/webapp/bower_components/js-xlsx/docbits/82_util.md
+++ b/src/main/webapp/bower_components/js-xlsx/docbits/82_util.md
@@ -254,7 +254,7 @@ For the example sheet:
```js
> var o = XLSX.utils.sheet_to_formulae(ws);
-> o.filter(function(v, i) { return i % 5 === 0; });
+> [o[0], o[5], o[10], o[15], o[20]];
[ 'A1=\'S', 'F1=\'J', 'D2=4', 'B3=3', 'G3=8' ]
```
diff --git a/src/main/webapp/bower_components/js-xlsx/package.json b/src/main/webapp/bower_components/js-xlsx/package.json
index 51a8101178..86aa9e3a2e 100644
--- a/src/main/webapp/bower_components/js-xlsx/package.json
+++ b/src/main/webapp/bower_components/js-xlsx/package.json
@@ -1,6 +1,6 @@
{
"name": "xlsx",
- "version": "0.12.1",
+ "version": "0.12.3",
"author": "sheetjs",
"description": "SheetJS Spreadsheet data parser and writer",
"keywords": [
@@ -31,12 +31,12 @@
},
"dependencies": {
"adler-32": "~1.2.0",
- "cfb": "~1.0.3",
- "codepage": "~1.12.0",
- "commander": "~2.13.0",
+ "cfb": "~1.0.4",
+ "codepage": "~1.12.1",
+ "commander": "~2.14.1",
"crc-32": "~1.2.0",
"exit-on-epipe": "~1.0.1",
- "ssf": "~0.10.1"
+ "ssf": "~0.10.2"
},
"devDependencies": {
"@sheetjs/uglify-js": "~2.7.3",
diff --git a/src/main/webapp/bower_components/js-xlsx/shim.js b/src/main/webapp/bower_components/js-xlsx/shim.js
index 314f71ff1a..45c6768267 100644
--- a/src/main/webapp/bower_components/js-xlsx/shim.js
+++ b/src/main/webapp/bower_components/js-xlsx/shim.js
@@ -1,385 +1,143 @@
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
-if (!Object.keys) {
- Object.keys = (function () {
- var hasOwnProperty = Object.prototype.hasOwnProperty,
- hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
- dontEnums = [
- 'toString',
- 'toLocaleString',
- 'valueOf',
- 'hasOwnProperty',
- 'isPrototypeOf',
- 'propertyIsEnumerable',
- 'constructor'
- ],
- dontEnumsLength = dontEnums.length;
-
- return function (obj) {
- if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object');
-
- var result = [];
-
- for (var prop in obj) {
- if (hasOwnProperty.call(obj, prop)) result.push(prop);
- }
-
- if (hasDontEnumBug) {
- for (var i=0; i < dontEnumsLength; i++) {
- if (hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]);
- }
- }
- return result;
- };
- })();
-}
-
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter
-if (!Array.prototype.filter)
-{
- Array.prototype.filter = function(fun /*, thisp */)
- {
- "use strict";
-
- if (this == null)
- throw new TypeError();
-
- var t = Object(this);
- var len = t.length >>> 0;
- if (typeof fun != "function")
- throw new TypeError();
-
- var res = [];
- var thisp = arguments[1];
- for (var i = 0; i < len; i++)
- {
- if (i in t)
- {
- var val = t[i]; // in case fun mutates this
- if (fun.call(thisp, val, i, t))
- res.push(val);
- }
- }
-
- return res;
- };
-}
-
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim
-if (!String.prototype.trim) {
- String.prototype.trim = function () {
- return this.replace(/^\s+|\s+$/g, '');
- };
-}
-
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach
-if (!Array.prototype.forEach)
-{
- Array.prototype.forEach = function(fun /*, thisArg */)
- {
- "use strict";
-
- if (this === void 0 || this === null)
- throw new TypeError();
-
- var t = Object(this);
- var len = t.length >>> 0;
- if (typeof fun !== "function")
- throw new TypeError();
-
- var thisArg = arguments.length >= 2 ? arguments[1] : void 0;
- for (var i = 0; i < len; i++)
- {
- if (i in t)
- fun.call(thisArg, t[i], i, t);
- }
- };
-}
-
-// Production steps of ECMA-262, Edition 5, 15.4.4.19
-// Reference: http://es5.github.com/#x15.4.4.19
-if (!Array.prototype.map) {
- Array.prototype.map = function(callback, thisArg) {
-
- var T, A, k;
-
- if (this == null) {
- throw new TypeError(" this is null or not defined");
- }
-
- // 1. Let O be the result of calling ToObject passing the |this| value as the argument.
- var O = Object(this);
-
- // 2. Let lenValue be the result of calling the Get internal method of O with the argument "length".
- // 3. Let len be ToUint32(lenValue).
- var len = O.length >>> 0;
-
- // 4. If IsCallable(callback) is false, throw a TypeError exception.
- // See: http://es5.github.com/#x9.11
- if (typeof callback !== "function") {
- throw new TypeError(callback + " is not a function");
- }
-
- // 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
- if (thisArg) {
- T = thisArg;
- }
-
- // 6. Let A be a new array created as if by the expression new Array(len) where Array is
- // the standard built-in constructor with that name and len is the value of len.
- A = new Array(len);
-
- // 7. Let k be 0
- k = 0;
-
- // 8. Repeat, while k < len
- while(k < len) {
-
- var kValue, mappedValue;
-
- // a. Let Pk be ToString(k).
- // This is implicit for LHS operands of the in operator
- // b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk.
- // This step can be combined with c
- // c. If kPresent is true, then
- if (k in O) {
-
- // i. Let kValue be the result of calling the Get internal method of O with argument Pk.
- kValue = O[ k ];
+/* shim.js (C) 2013-present SheetJS -- http://sheetjs.com */
+/* ES3/5 Compatibility shims and other utilities for older browsers. */
- // ii. Let mappedValue be the result of calling the Call internal method of callback
- // with T as the this value and argument list containing kValue, k, and O.
- mappedValue = callback.call(T, kValue, k, O);
-
- // iii. Call the DefineOwnProperty internal method of A with arguments
- // Pk, Property Descriptor {Value: mappedValue, : true, Enumerable: true, Configurable: true},
- // and false.
-
- // In browsers that support Object.defineProperty, use the following:
- // Object.defineProperty(A, Pk, { value: mappedValue, writable: true, enumerable: true, configurable: true });
-
- // For best browser support, use the following:
- A[ k ] = mappedValue;
- }
- // d. Increase k by 1.
- k++;
- }
-
- // 9. return A
- return A;
+// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
+if(!Object.keys) Object.keys = (function() {
+ var hasOwnProperty = Object.prototype.hasOwnProperty,
+ hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
+ dontEnums = [
+ 'toString',
+ 'toLocaleString',
+ 'valueOf',
+ 'hasOwnProperty',
+ 'isPrototypeOf',
+ 'propertyIsEnumerable',
+ 'constructor'
+ ],
+ dontEnumsLength = dontEnums.length;
+
+ return function(obj) {
+ if(typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object');
+
+ var result = [];
+
+ for(var prop in obj) if(hasOwnProperty.call(obj, prop)) result.push(prop);
+
+ if(hasDontEnumBug)
+ for(var i=0; i < dontEnumsLength; ++i)
+ if(hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]);
+ return result;
};
-}
-
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
- Array.prototype.indexOf = function (searchElement, fromIndex) {
- if ( this === undefined || this === null ) {
- throw new TypeError( '"this" is null or not defined' );
- }
-
- var length = this.length >>> 0; // Hack to convert object.length to a UInt32
-
- fromIndex = +fromIndex || 0;
+})();
- if (Math.abs(fromIndex) === Infinity) {
- fromIndex = 0;
- }
-
- if (fromIndex < 0) {
- fromIndex += length;
- if (fromIndex < 0) {
- fromIndex = 0;
- }
- }
-
- for (;fromIndex < length; fromIndex++) {
- if (this[fromIndex] === searchElement) {
- return fromIndex;
- }
- }
-
- return -1;
- };
-}
-// Based on https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray
+if(!String.prototype.trim) String.prototype.trim = function() {
+ var s = this.replace(/^\s+/, '');
+ for(var i = s.length - 1; i >=0 ; --i) if(!s.charAt(i).match(/^\s/)) return s.slice(0,i+1);
+ return "";
+};
-if (! Array.isArray) {
- Array.isArray = function(obj) {
- return Object.prototype.toString.call(obj) === "[object Array]";
- };
-}
+if(!Array.prototype.forEach) Array.prototype.forEach = function(cb) {
+ var len = (this.length>>>0), self = (arguments[1]||void 0);
+ for(var i=0; i
-// arraybuffer-slice may be freely distributed under the MIT license.
+if(!Array.prototype.map) Array.prototype.map = function(cb) {
+ var len = (this.length>>>0), self = (arguments[1]||void 0), A = new Array(len);
+ for(var i=0; i>>0), i = ((arguments[1]|0)||0);
+ for(i<0 && (i+=len)<0 && (i=0); i= num || begin >= end) {
- return new ArrayBuffer(0);
- }
+ return function _toISOString() {
+ var y = this.getUTCFullYear(), yr = "";
+ if(y>9999) yr = '+' + p( y, 6);
+ else if(y<0) yr = '-' + p(-y, 6);
+ else yr = p( y, 4);
- var length = Math.min(num - begin, end - begin);
- var target = new ArrayBuffer(length);
- var targetArray = new Uint8Array(target);
- targetArray.set(new Uint8Array(this, begin, length));
- return target;
+ return [
+ yr, p(this.getUTCMonth()+1), p(this.getUTCDate())
+ ].join('-') + 'T' + [
+ p(this.getUTCHours()), p(this.getUTCMinutes()), p(this.getUTCSeconds())
+ ].join(':') + '.' + p(this.getUTCMilliseconds(),3) + 'Z';
};
-}
-
-// https://github.com/davidchambers/Base64.js
-// (C) 2015 David Chambers
-// Base64.js may be freely distributed under the Apache 2.0 License.
-;(function () {
-
- var object =
- typeof exports != 'undefined' ? exports :
- typeof self != 'undefined' ? self : // #8: web workers
- $.global; // #31: ExtendScript
-
- var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
- function InvalidCharacterError(message) {
- this.message = message;
- }
- InvalidCharacterError.prototype = new Error;
- InvalidCharacterError.prototype.name = 'InvalidCharacterError';
-
- // encoder
- // [https://gist.github.com/999166] by [https://github.com/nignag]
- object.btoa || (
- object.btoa = function (input) {
- var str = String(input);
- for (
- // initialize result and counter
- var block, charCode, idx = 0, map = chars, output = '';
- // if the next str index does not exist:
- // change the mapping table to "="
- // check if d has no fractional digits
- str.charAt(idx | 0) || (map = '=', idx % 1);
- // "8 - idx % 1 * 8" generates the sequence 2, 4, 6, 8
- output += map.charAt(63 & block >> 8 - idx % 1 * 8)
- ) {
- charCode = str.charCodeAt(idx += 3/4);
- if (charCode > 0xFF) {
- throw new InvalidCharacterError("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.");
- }
- block = block << 8 | charCode;
- }
- return output;
- });
-
- // decoder
- // [https://gist.github.com/1020396] by [https://github.com/atk]
- object.atob || (
- object.atob = function (input) {
- var str = String(input).replace(/[=]+$/, ''); // #31: ExtendScript bad parse of /=
- if (str.length % 4 == 1) {
- throw new InvalidCharacterError("'atob' failed: The string to be decoded is not correctly encoded.");
- }
- for (
- // initialize result and counters
- var bc = 0, bs, buffer, idx = 0, output = '';
- // get next character
- buffer = str.charAt(idx++);
- // character found in table? initialize bit storage and add its ascii value;
- ~buffer && (bs = bc % 4 ? bs * 64 + buffer : buffer,
- // and if not first of each 4 characters,
- // convert the first 8 bits to one ascii character
- bc++ % 4) ? output += String.fromCharCode(255 & bs >> (-2 * bc & 6)) : 0
- ) {
- // try to find character in table (0-63, not found => -1)
- buffer = chars.indexOf(buffer);
- }
- return output;
- });
}());
-
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString
-if (!Date.prototype.toISOString) {
- (function() {
-
- function pad(number) {
- if (number < 10) {
- return '0' + number;
- }
- return number;
- }
-
- Date.prototype.toISOString = function() {
- return this.getUTCFullYear() +
- '-' + pad(this.getUTCMonth() + 1) +
- '-' + pad(this.getUTCDate()) +
- 'T' + pad(this.getUTCHours()) +
- ':' + pad(this.getUTCMinutes()) +
- ':' + pad(this.getUTCSeconds()) +
- '.' + (this.getUTCMilliseconds() / 1000).toFixed(3).slice(2, 5) +
- 'Z';
- };
-
- }());
-}
-
-// note: MDN shim will not work in IE
+if(typeof ArrayBuffer !== 'undefined' && !ArrayBuffer.prototype.slice) ArrayBuffer.prototype.slice = function(start, end) {
+ if(start == null) start = 0;
+ if(start < 0) { start += this.byteLength; if(start < 0) start = 0; }
+ if(start >= this.byteLength) return new Uint8Array(0);
+ if(end == null) end = this.byteLength;
+ if(end < 0) { end += this.byteLength; if(end < 0) end = 0; }
+ if(end > this.byteLength) end = this.byteLength;
+ if(start > end) return new Uint8Array(0);
+ var out = new ArrayBuffer(end - start);
+ var view = new Uint8Array(out);
+ var data = new Uint8Array(this, start, end - start)
+ /* IE10 should have Uint8Array#set */
+ if(view.set) view.set(data); else while(start <= --end) view[end - start] = data[end];
+ return out;
+};
if(typeof Uint8Array !== 'undefined' && !Uint8Array.prototype.slice) Uint8Array.prototype.slice = function(start, end) {
- if(start < 0) { start += this.length; if(start < 0) start = 0; }
- if(start >= this.length) return new Uint8Array(0);
- if(end == null) end = this.length;
- if(end < 0) { end += this.length; if(end < 0) end = 0; }
- if(end > this.length) end = this.length;
- var out = new Uint8Array(end - start);
- while(start <= --end) out[end - start] = this[end];
- return out;
+ if(start == null) start = 0;
+ if(start < 0) { start += this.length; if(start < 0) start = 0; }
+ if(start >= this.length) return new Uint8Array(0);
+ if(end == null) end = this.length;
+ if(end < 0) { end += this.length; if(end < 0) end = 0; }
+ if(end > this.length) end = this.length;
+ if(start > end) return new Uint8Array(0);
+ var out = new Uint8Array(end - start);
+ while(start <= --end) out[end - start] = this[end];
+ return out;
};
// VBScript + ActiveX fallback for IE5+
var IE_SaveFile = (function() { try {
- if(typeof IE_SaveFile_Impl == "undefined") document.write([
+ if(typeof IE_SaveFile_Impl == "undefined") document.write([
'
+
diff --git a/src/main/webapp/bower_components/js-xlsx/tests/sauce.html b/src/main/webapp/bower_components/js-xlsx/tests/sauce.html
index 4d4a63bcd1..a4a84eead8 100644
--- a/src/main/webapp/bower_components/js-xlsx/tests/sauce.html
+++ b/src/main/webapp/bower_components/js-xlsx/tests/sauce.html
@@ -36,6 +36,7 @@ JS-XLSX Browser-based Parsing Tests<
})();
+
diff --git a/src/main/webapp/bower_components/js-xlsx/tests/write.js b/src/main/webapp/bower_components/js-xlsx/tests/write.js
index abb48b87c5..9efec82dd7 100644
--- a/src/main/webapp/bower_components/js-xlsx/tests/write.js
+++ b/src/main/webapp/bower_components/js-xlsx/tests/write.js
@@ -14,6 +14,7 @@ var data = [
["hidden"],
["visible"]
];
+if(isNaN(data[2][2].getYear())) data[2][2] = new Date(Date.UTC(2014, 1, 19, 14, 30, 0));
var ws_name = "SheetJS";
diff --git a/src/main/webapp/bower_components/js-xlsx/types/index.d.ts b/src/main/webapp/bower_components/js-xlsx/types/index.d.ts
index 5363b75434..3c2bfe7357 100644
--- a/src/main/webapp/bower_components/js-xlsx/types/index.d.ts
+++ b/src/main/webapp/bower_components/js-xlsx/types/index.d.ts
@@ -1,12 +1,13 @@
/* index.d.ts (C) 2015-present SheetJS and contributors */
// TypeScript Version: 2.2
import * as CFB from "cfb";
+import * as SSF from "ssf";
/** Version string */
export const version: string;
/** SSF Formatter Library */
-export const SSF: any;
+export { SSF };
/** CFB Library */
export { CFB };
diff --git a/src/main/webapp/bower_components/js-xlsx/types/xlsx-tests.ts b/src/main/webapp/bower_components/js-xlsx/types/xlsx-tests.ts
index 2835743484..4681e33c7a 100644
--- a/src/main/webapp/bower_components/js-xlsx/types/xlsx-tests.ts
+++ b/src/main/webapp/bower_components/js-xlsx/types/xlsx-tests.ts
@@ -42,7 +42,8 @@ const WBSheets = WBProps.Sheets;
const WBSheet0 = WBSheets[0];
console.log(WBSheet0.Hidden);
-const fmt14 = XLSX.SSF._table[14];
+const fmt14 = XLSX.SSF.get_table()[14];
+XLSX.SSF.load('"This is a custom format "0.000');
const newwb = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(newwb, aoa2, "AOA");
diff --git a/src/main/webapp/bower_components/js-xlsx/xlsx.flow.js b/src/main/webapp/bower_components/js-xlsx/xlsx.flow.js
index f939bc72f0..23aaee49a3 100644
--- a/src/main/webapp/bower_components/js-xlsx/xlsx.flow.js
+++ b/src/main/webapp/bower_components/js-xlsx/xlsx.flow.js
@@ -4,7 +4,7 @@
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
var XLSX = {};
(function make_xlsx(XLSX){
-XLSX.version = '0.12.1';
+XLSX.version = '0.12.3';
var current_codepage = 1200, current_ansi = 1252;
/*:: declare var cptable:any; */
/*global cptable:true */
@@ -186,7 +186,7 @@ type WriteObjStrFactory = {from_sheet(ws:Worksheet, o:any, wb:?Workbook):string}
/*jshint -W041 */
var SSF/*:SSFModule*/ = ({}/*:any*/);
var make_ssf = function make_ssf(SSF/*:SSFModule*/){
-SSF.version = '0.10.0';
+SSF.version = '0.10.2';
function _strrev(x/*:string*/)/*:string*/ { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
function fill(c/*:string*/,l/*:number*/)/*:string*/ { var o = ""; while(o.length < l) o+=c; return o; }
function pad0(v/*:any*/,d/*:number*/)/*:string*/{var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@@ -975,7 +975,7 @@ function eval_fmt(fmt/*:string*/, v/*:any*/, opts/*:any*/, flen/*:number*/) {
}
SSF._eval = eval_fmt;
var cfregex = /\[[=<>]/;
-var cfregex2 = /\[([=<>]*)(-?\d+\.?\d*)\]/;
+var cfregex2 = /\[(=|>[=]?|<[>=]?)(-?\d+(?:\.\d*)?)\]/;
function chkcond(v, rr) {
if(rr == null) return false;
var thresh = parseFloat(rr[2]);
@@ -1954,7 +1954,11 @@ function read_binary(path/*:string*/) {
} catch(e) { if(!e.message || !e.message.match(/onstruct/)) throw e; }
throw new Error("Cannot access file " + path);
}
-function keys(o/*:any*/)/*:Array*/ { return Object.keys(o); }
+function keys(o/*:any*/)/*:Array*/ {
+ var ks = Object.keys(o), o2 = [];
+ for(var i = 0; i < ks.length; ++i) if(o.hasOwnProperty(ks[i])) o2.push(ks[i]);
+ return o2;
+}
function evert_key(obj/*:any*/, key/*:string*/)/*:EvertType*/ {
var o = ([]/*:any*/), K = keys(obj);
@@ -2146,6 +2150,12 @@ function getzipstr(zip, file/*:string*/, safe/*:?boolean*/)/*:?string*/ {
try { return getzipstr(zip, file); } catch(e) { return null; }
}
+function zipentries(zip) {
+ var k = keys(zip.files), o = [];
+ for(var i = 0; i < k.length; ++i) if(k[i].slice(-1) != '/') o.push(k[i]);
+ return o.sort();
+}
+
var jszip;
/*:: declare var JSZip:any; */
/*global JSZip:true */
@@ -2169,7 +2179,7 @@ function resolve_path(path/*:string*/, base/*:string*/)/*:string*/ {
}
var XML_HEADER = '\r\n';
var attregexg=/([^"\s?>\/]+)\s*=\s*((?:")([^"]*)(?:")|(?:')([^']*)(?:')|([^'">\s]+))/g;
-var tagregex=/<[\/\?]?[a-zA-Z0-9:]+(?:\s+[^"\s?>\/]+\s*=\s*(?:"[^"]*"|'[^']*'|[^'">\s]+))*\s?[\/\?]?>/g;
+var tagregex=/<[\/\?]?[a-zA-Z0-9:]+(?:\s+[^"\s?>\/]+\s*=\s*(?:"[^"]*"|'[^']*'|[^'">\s=]+))*\s?[\/\?]?>/g;
if(!(XML_HEADER.match(tagregex))) tagregex = /<[^>]*>/g;
var nsregex=/<\w*:/, nsregex2 = /<(\/?)\w+:/;
function parsexmltag(tag/*:string*/, skip_root/*:?boolean*/)/*:any*/ {
@@ -2445,13 +2455,14 @@ function write_double_le(b/*:RawBytes|CFBlob*/, v/*:number*/, idx/*:number*/) {
b[idx + 7] = (e >> 4) | bs;
}
-var __toBuffer = function(bufs/*:Array*/) { var x=[],w=10240; for(var i=0;i >*/)/*:RawBytes*/ { var x=[],w=10240; for(var i=0;i*/=[]; for(var i=s; i*/=[]; for(var i=s; i 0 ? __utf8(b, i+4,i+4+len-1) : "";};
var ___lpstr = __lpstr;
var __cpstr = function(b/*:RawBytes|CFBlob*/,i/*:number*/) { var len = __readUInt32LE(b,i); return len > 0 ? __utf8(b, i+4,i+4+len-1) : "";};
@@ -2474,7 +2485,7 @@ if(has_buf/*:: && typeof Buffer !== 'undefined'*/) {
__lpwstr = function lpwstr_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___lpwstr(b, i); var len = 2*b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len-1);};
__lpp4 = function lpp4_b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len);};
__8lpp4 = function lpp4_8b(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(!Buffer.isBuffer(b)/*:: || !(b instanceof Buffer)*/) return ___8lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf8',i+4,i+4+len);};
- __utf8 = function utf8_b(b/*:RawBytes|CFBlob*/, s/*:number*/, e/*:number*/) { return (Buffer.isBuffer(b)/*:: && (b instanceof Buffer)*/) ? b.toString('utf8',s,e) : __utf8(b,s,e); };
+ __utf8 = function utf8_b(b/*:RawBytes|CFBlob*/, s/*:number*/, e/*:number*/) { return (Buffer.isBuffer(b)/*:: && (b instanceof Buffer)*/) ? b.toString('utf8',s,e) : ___utf8(b,s,e); };
__toBuffer = function(bufs) { return (bufs[0].length > 0 && Buffer.isBuffer(bufs[0][0])) ? Buffer.concat(bufs[0]) : ___toBuffer(bufs);};
bconcat = function(bufs) { return Buffer.isBuffer(bufs[0]) ? Buffer.concat(bufs) : [].concat.apply([], bufs); };
__double = function double_(b/*:RawBytes|CFBlob*/, i/*:number*/) { if(Buffer.isBuffer(b)/*::&& b instanceof Buffer*/) return b.readDoubleLE(i); return ___double(b,i); };
@@ -2746,7 +2757,9 @@ function shift_range_xls(cell, range, opts) {
return out;
}
-function encode_cell_xls(c/*:CellAddress*/)/*:string*/ {
+function encode_cell_xls(c/*:CellAddress*/, biff/*:number*/)/*:string*/ {
+ if(c.cRel && c.c < 0) { c = dup(c); c.c += (biff > 8) ? 0x4000 : 0x100; }
+ if(c.rRel && c.r < 0) { c = dup(c); c.r += (biff > 8) ? 0x100000 : ((biff > 5) ? 0x10000 : 0x4000); }
var s = encode_cell(c);
if(c.cRel === 0) s = fix_col(s);
if(c.rRel === 0) s = fix_row(s);
@@ -2755,7 +2768,7 @@ function encode_cell_xls(c/*:CellAddress*/)/*:string*/ {
function encode_range_xls(r, opts)/*:string*/ {
if(r.s.r == 0 && !r.s.rRel) {
- if(r.e.r == (opts.biff >= 12 ? 0xFFFFF : 0xFFFF) && !r.e.rRel) {
+ if(r.e.r == (opts.biff >= 12 ? 0xFFFFF : (opts.biff >= 8 ? 0x10000 : 0x4000)) && !r.e.rRel) {
return (r.s.cRel ? "" : "$") + encode_col(r.s.c) + ":" + (r.e.cRel ? "" : "$") + encode_col(r.e.c);
}
}
@@ -2764,7 +2777,7 @@ function encode_range_xls(r, opts)/*:string*/ {
return (r.s.rRel ? "" : "$") + encode_row(r.s.r) + ":" + (r.e.rRel ? "" : "$") + encode_row(r.e.r);
}
}
- return encode_cell_xls(r.s) + ":" + encode_cell_xls(r.e);
+ return encode_cell_xls(r.s, opts.biff) + ":" + encode_cell_xls(r.e, opts.biff);
}
var OFFCRYPTO = {};
@@ -3244,7 +3257,7 @@ var VT_UI4 = 0x0013;
var VT_LPSTR = 0x001E;
//var VT_LPWSTR = 0x001F;
var VT_FILETIME = 0x0040;
-//var VT_BLOB = 0x0041;
+var VT_BLOB = 0x0041;
//var VT_STREAM = 0x0042;
//var VT_STORAGE = 0x0043;
//var VT_STREAMED_Object = 0x0044;
@@ -3282,6 +3295,7 @@ var DocSummaryPIDDSI = {
/*::[*/0x13/*::]*/: { n: 'SharedDoc', t: VT_BOOL },
/*::[*/0x16/*::]*/: { n: 'HLinksChanged', t: VT_BOOL },
/*::[*/0x17/*::]*/: { n: 'AppVersion', t: VT_I4, p: 'version' },
+ /*::[*/0x18/*::]*/: { n: 'DigSig', t: VT_BLOB },
/*::[*/0x1A/*::]*/: { n: 'ContentType', t: VT_STRING },
/*::[*/0x1B/*::]*/: { n: 'ContentStatus', t: VT_STRING },
/*::[*/0x1C/*::]*/: { n: 'Language', t: VT_STRING },
@@ -4355,6 +4369,7 @@ function parse_dictionary(blob,CodePage) {
function parse_BLOB(blob) {
var size = blob.read_shift(4);
var bytes = blob.slice(blob.l,blob.l+size);
+ blob.l += size;
if((size & 3) > 0) blob.l += (4 - (size & 3)) & 3;
return bytes;
}
@@ -4365,7 +4380,7 @@ function parse_ClipboardData(blob) {
var o = {};
o.Size = blob.read_shift(4);
//o.Format = blob.read_shift(4);
- blob.l += o.Size;
+ blob.l += o.Size + 3 - (o.Size - 1) % 4;
return o;
}
@@ -4511,6 +4526,7 @@ function parse_PropertySetStream(file, PIDSI, clsid) {
rval.FMTID = FMTID0;
//rval.PSet0 = PSet0;
if(NumSets === 1) return rval;
+ if(Offset1 - blob.l == 2) blob.l += 2;
if(blob.l !== Offset1) throw new Error("Length mismatch 2: " + blob.l + " !== " + Offset1);
var PSet1;
try { PSet1 = parse_PropertySet(blob, null); } catch(e) {/* empty */}
@@ -4903,6 +4919,9 @@ function parse_BOF(blob, length) {
switch(o.BIFFVer) {
case 0x0600: /* BIFF8 */
case 0x0500: /* BIFF5 */
+ case 0x0400: /* BIFF4 */
+ case 0x0300: /* BIFF3 */
+ case 0x0200: /* BIFF2 */
case 0x0002: case 0x0007: /* BIFF2 */
break;
default: if(length > 6) throw new Error("Unexpected BIFF Ver " + o.BIFFVer);
@@ -7578,7 +7597,7 @@ function parse_FilePassHeader(blob, length/*:number*/, oo) {
function parse_FilePass(blob, length/*:number*/, opts) {
var o = ({ Type: opts.biff >= 8 ? blob.read_shift(2) : 0 }/*:any*/); /* wEncryptionType */
if(o.Type) parse_FilePassHeader(blob, length-2, o);
- else parse_XORObfuscation(blob, length-2, opts, o);
+ else parse_XORObfuscation(blob, opts.biff >= 8 ? length : length - 2, opts, o);
return o;
}
@@ -9386,8 +9405,9 @@ function parse_RgceArea_BIFF2(blob/*::, length, opts*/) {
}
/* [MS-XLS] 2.5.198.105 ; [MS-XLSB] 2.5.97.90 */
-function parse_RgceAreaRel(blob, length/*::, opts*/) {
- var r=blob.read_shift(length == 12 ? 4 : 2), R=blob.read_shift(length == 12 ? 4 : 2);
+function parse_RgceAreaRel(blob, length, opts) {
+ if(opts.biff < 8) return parse_RgceArea_BIFF2(blob, length, opts);
+ var r=blob.read_shift(opts.biff == 12 ? 4 : 2), R=blob.read_shift(opts.biff == 12 ? 4 : 2);
var c=parse_ColRelU(blob, 2);
var C=parse_ColRelU(blob, 2);
return { s:{r:r, c:c[0], cRel:c[1], rRel:c[2]}, e:{r:R, c:C[0], cRel:C[1], rRel:C[2]} };
@@ -9458,7 +9478,7 @@ function parse_PtgArea3d(blob, length, opts) {
/* [MS-XLS] 2.5.198.29 ; [MS-XLSB] 2.5.97.20 */
function parse_PtgAreaErr(blob, length, opts) {
var type = (blob[blob.l++] & 0x60) >> 5;
- blob.l += opts && opts.biff > 8 ? 12 : 8;
+ blob.l += opts && (opts.biff > 8) ? 12 : (opts.biff < 8 ? 6 : 8);
return [type];
}
/* [MS-XLS] 2.5.198.30 ; [MS-XLSB] 2.5.97.21 */
@@ -9477,7 +9497,7 @@ function parse_PtgAreaErr3d(blob, length, opts) {
/* [MS-XLS] 2.5.198.31 ; [MS-XLSB] 2.5.97.22 */
function parse_PtgAreaN(blob, length, opts) {
var type = (blob[blob.l++] & 0x60) >> 5;
- var area = parse_RgceAreaRel(blob, opts && opts.biff > 8 ? 12 : 8, opts);
+ var area = parse_RgceAreaRel(blob, length - 1, opts);
return [type, area];
}
@@ -9590,8 +9610,8 @@ function parse_PtgFunc(blob, length, opts) {
}
/* [MS-XLS] 2.5.198.63 ; [MS-XLSB] 2.5.97.46 TODO */
function parse_PtgFuncVar(blob, length, opts) {
- blob.l++;
- var cparams = blob.read_shift(1), tab = opts && opts.biff <= 3 ? [0, blob.read_shift(1)]: parsetab(blob);
+ var type = blob[blob.l++];
+ var cparams = blob.read_shift(1), tab = opts && opts.biff <= 3 ? [(type == 0x58 ? -1 : 0), blob.read_shift(1)]: parsetab(blob);
return [cparams, (tab[0] === 0 ? Ftab : Cetab)[tab[1]]];
}
@@ -9731,6 +9751,7 @@ function parse_PtgMemFunc(blob, length, opts) {
function parse_PtgRefErr(blob, length, opts) {
var type = (blob.read_shift(1) >>> 5) & 0x03;
blob.l += 4;
+ if(opts.biff < 8) blob.l--;
if(opts.biff == 12) blob.l += 2;
return [type];
}
@@ -9787,12 +9808,35 @@ var parse_PtgElfRw = parse_PtgElfLoc;
/* [MS-XLS] 2.5.198.55 */
var parse_PtgElfRwV = parse_PtgElfLoc;
-/* [MS-XLSB] 2.5.97.52 */
+/* [MS-XLSB] 2.5.97.52 TODO */
+var PtgListRT = [
+ "Data",
+ "All",
+ "Headers",
+ "??",
+ "?Data2",
+ "??",
+ "?DataHeaders",
+ "??",
+ "Totals",
+ "??",
+ "??",
+ "??",
+ "?DataTotals",
+ "??",
+ "??",
+ "??",
+ "?Current"
+];
function parse_PtgList(blob/*::, length, opts*/) {
blob.l += 2;
var ixti = blob.read_shift(2);
- blob.l += 10;
- return {ixti: ixti};
+ var flags = blob.read_shift(2);
+ var idx = blob.read_shift(4);
+ var c = blob.read_shift(2);
+ var C = blob.read_shift(2);
+ var rt = PtgListRT[(flags >> 2) & 0x1F];
+ return {ixti: ixti, coltype:(flags&0x3), rt:rt, idx:idx, c:c, C:C};
}
/* [MS-XLS] 2.5.198.91 ; [MS-XLSB] 2.5.97.76 */
function parse_PtgSxName(blob/*::, length, opts*/) {
@@ -9800,6 +9844,32 @@ function parse_PtgSxName(blob/*::, length, opts*/) {
return [blob.read_shift(4)];
}
+/* [XLS] old spec */
+function parse_PtgSheet(blob, length, opts) {
+ blob.l += 5;
+ blob.l += 2;
+ blob.l += (opts.biff == 2 ? 1 : 4);
+ return ["PTGSHEET"];
+}
+function parse_PtgEndSheet(blob, length, opts) {
+ blob.l += (opts.biff == 2 ? 4 : 5);
+ return ["PTGENDSHEET"];
+}
+function parse_PtgMemAreaN(blob/*::, length, opts*/) {
+ var type = (blob.read_shift(1) >>> 5) & 0x03;
+ var cce = blob.read_shift(2);
+ return [type, cce];
+}
+function parse_PtgMemNoMemN(blob/*::, length, opts*/) {
+ var type = (blob.read_shift(1) >>> 5) & 0x03;
+ var cce = blob.read_shift(2);
+ return [type, cce];
+}
+function parse_PtgAttrNoop(blob/*::, length, opts*/) {
+ blob.l += 4;
+ return [0, 0];
+}
+
/* [MS-XLS] 2.5.198.25 ; [MS-XLSB] 2.5.97.16 */
var PtgTypes = {
/*::[*/0x01/*::]*/: { n:'PtgExp', f:parse_PtgExp },
@@ -9825,6 +9895,8 @@ var PtgTypes = {
/*::[*/0x15/*::]*/: { n:'PtgParen', f:parseread1 },
/*::[*/0x16/*::]*/: { n:'PtgMissArg', f:parseread1 },
/*::[*/0x17/*::]*/: { n:'PtgStr', f:parse_PtgStr },
+ /*::[*/0x1A/*::]*/: { n:'PtgSheet', f:parse_PtgSheet },
+ /*::[*/0x1B/*::]*/: { n:'PtgEndSheet', f:parse_PtgEndSheet },
/*::[*/0x1C/*::]*/: { n:'PtgErr', f:parse_PtgErr },
/*::[*/0x1D/*::]*/: { n:'PtgBool', f:parse_PtgBool },
/*::[*/0x1E/*::]*/: { n:'PtgInt', f:parse_PtgInt },
@@ -9843,6 +9915,8 @@ var PtgTypes = {
/*::[*/0x2B/*::]*/: { n:'PtgAreaErr', f:parse_PtgAreaErr },
/*::[*/0x2C/*::]*/: { n:'PtgRefN', f:parse_PtgRefN },
/*::[*/0x2D/*::]*/: { n:'PtgAreaN', f:parse_PtgAreaN },
+ /*::[*/0x2E/*::]*/: { n:'PtgMemAreaN', f:parse_PtgMemAreaN },
+ /*::[*/0x2F/*::]*/: { n:'PtgMemNoMemN', f:parse_PtgMemNoMemN },
/*::[*/0x39/*::]*/: { n:'PtgNameX', f:parse_PtgNameX },
/*::[*/0x3A/*::]*/: { n:'PtgRef3d', f:parse_PtgRef3d },
/*::[*/0x3B/*::]*/: { n:'PtgArea3d', f:parse_PtgArea3d },
@@ -9866,6 +9940,9 @@ var PtgDupes = {
/*::[*/0x4B/*::]*/: 0x2B, /*::[*/0x6B/*::]*/: 0x2B,
/*::[*/0x4C/*::]*/: 0x2C, /*::[*/0x6C/*::]*/: 0x2C,
/*::[*/0x4D/*::]*/: 0x2D, /*::[*/0x6D/*::]*/: 0x2D,
+ /*::[*/0x4E/*::]*/: 0x2E, /*::[*/0x6E/*::]*/: 0x2E,
+ /*::[*/0x4F/*::]*/: 0x2F, /*::[*/0x6F/*::]*/: 0x2F,
+ /*::[*/0x58/*::]*/: 0x22, /*::[*/0x78/*::]*/: 0x22,
/*::[*/0x59/*::]*/: 0x39, /*::[*/0x79/*::]*/: 0x39,
/*::[*/0x5A/*::]*/: 0x3A, /*::[*/0x7A/*::]*/: 0x3A,
/*::[*/0x5B/*::]*/: 0x3B, /*::[*/0x7B/*::]*/: 0x3B,
@@ -9890,6 +9967,7 @@ var Ptg18 = {
/*::[*/0xFF/*::]*/: {}
};
var Ptg19 = {
+ /*::[*/0x00/*::]*/: { n:'PtgAttrNoop', f:parse_PtgAttrNoop },
/*::[*/0x01/*::]*/: { n:'PtgAttrSemi', f:parse_PtgAttrSemi },
/*::[*/0x02/*::]*/: { n:'PtgAttrIf', f:parse_PtgAttrIf },
/*::[*/0x04/*::]*/: { n:'PtgAttrChoose', f:parse_PtgAttrChoose },
@@ -9946,10 +10024,7 @@ function parse_Rgce(blob, length, opts) {
length = target - blob.l;
id = blob[blob.l];
R = PtgTypes[id];
- if(id === 0x18 || id === 0x19) {
- id = blob[blob.l + 1];
- R = (id === 0x18 ? Ptg18 : Ptg19)[id];
- }
+ if(id === 0x18 || id === 0x19) R = (id === 0x18 ? Ptg18 : Ptg19)[blob[blob.l + 1]];
if(!R || !R.f) { /*ptgs.push*/(parsenoop(blob, length)); }
// $FlowIgnore
else { ptgs.push([R.n, R.f(blob, length, opts)]); }
@@ -10034,6 +10109,7 @@ function get_ixti(supbooks, ixti/*:number*/, opts)/*:string*/ {
return formula_quote_sheet_name(get_ixti_raw(supbooks, ixti, opts), opts);
}
function stringify_formula(formula/*Array*/, range, cell/*:any*/, supbooks, opts)/*:string*/ {
+ var biff = (opts && opts.biff) || 8;
var _range = /*range != null ? range :*/ {s:{c:0, r:0},e:{c:0, r:0}};
var stack/*:Array*/ = [], e1, e2, /*::type,*/ c/*:CellAddress*/, ixti=0, nameidx=0, r, sname="";
if(!formula[0] || !formula[0][0]) return "";
@@ -10105,17 +10181,17 @@ function stringify_formula(formula/*Array*/, range, cell/*:any*/, supbooks,
case 'PtgRef': /* [MS-XLS] 2.5.198.84 */
/*::type = f[1][0]; */c = shift_cell_xls((f[1][1]/*:any*/), _range, opts);
- stack.push(encode_cell_xls(c));
+ stack.push(encode_cell_xls(c, biff));
break;
case 'PtgRefN': /* [MS-XLS] 2.5.198.88 */
/*::type = f[1][0]; */c = cell ? shift_cell_xls((f[1][1]/*:any*/), cell, opts) : (f[1][1]/*:any*/);
- stack.push(encode_cell_xls(c));
+ stack.push(encode_cell_xls(c, biff));
break;
case 'PtgRef3d': /* [MS-XLS] 2.5.198.85 */
/*::type = f[1][0]; */ixti = /*::Number(*/f[1][1]/*::)*/; c = shift_cell_xls((f[1][2]/*:any*/), _range, opts);
sname = get_ixti(supbooks, ixti, opts);
var w = sname; /* IE9 fails on defined names */ // eslint-disable-line no-unused-vars
- stack.push(sname + "!" + encode_cell_xls(c));
+ stack.push(sname + "!" + encode_cell_xls(c, biff));
break;
case 'PtgFunc': /* [MS-XLS] 2.5.198.62 */
@@ -10123,6 +10199,7 @@ function stringify_formula(formula/*Array*/, range, cell/*:any*/, supbooks,
/* f[1] = [argc, func, type] */
var argc/*:number*/ = (f[1][0]/*:any*/), func/*:string*/ = (f[1][1]/*:any*/);
if(!argc) argc = 0;
+ argc &= 0x7F;
var args = argc == 0 ? [] : stack.slice(-argc);
stack.length -= argc;
if(func === 'User') func = args.shift();
@@ -10157,6 +10234,7 @@ function stringify_formula(formula/*Array*/, range, cell/*:any*/, supbooks,
stack.push("SUM(" + stack.pop() + ")");
break;
+ case 'PtgAttrBaxcel': /* [MS-XLS] 2.5.198.33 */
case 'PtgAttrSemi': /* [MS-XLS] 2.5.198.37 */
break;
@@ -10273,6 +10351,18 @@ function stringify_formula(formula/*Array*/, range, cell/*:any*/, supbooks,
case 'PtgAreaErr3d': /* [MS-XLS] 2.5.198.30 */
stack.push("#REF!"); break;
+ case 'PtgList': /* [MS-XLSB] 2.5.97.52 */
+ // $FlowIgnore
+ stack.push("Table" + f[1].idx + "[#" + f[1].rt + "]");
+ break;
+
+ case 'PtgMemAreaN':
+ case 'PtgMemNoMemN':
+ case 'PtgAttrNoop':
+ case 'PtgSheet':
+ case 'PtgEndSheet':
+ break;
+
case 'PtgMemFunc': /* [MS-XLS] 2.5.198.72 TODO */
break;
case 'PtgMemNoMem': /* [MS-XLS] 2.5.198.73 TODO */
@@ -10290,17 +10380,12 @@ function stringify_formula(formula/*Array*/, range, cell/*:any*/, supbooks,
case 'PtgElfRwV': /* [MS-XLS] 2.5.198.55 */
throw new Error("Unsupported ELFs");
- case 'PtgAttrBaxcel': /* [MS-XLS] 2.5.198.33 TODO -- find a test case*/
- throw new Error('Unrecognized Formula Token: ' + String(f));
case 'PtgSxName': /* [MS-XLS] 2.5.198.91 TODO -- find a test case */
throw new Error('Unrecognized Formula Token: ' + String(f));
- case 'PtgList': /* [MS-XLSB] 2.5.97.52 TODO -- find a test case */
- throw new Error('Unrecognized Formula Token: ' + String(f));
-
default: throw new Error('Unrecognized Formula Token: ' + String(f));
}
var PtgNonDisp = ['PtgAttrSpace', 'PtgAttrSpaceSemi', 'PtgAttrGoto'];
- if(last_sp >= 0 && PtgNonDisp.indexOf(formula[0][ff][0]) == -1) {
+ if(opts.biff != 3) if(last_sp >= 0 && PtgNonDisp.indexOf(formula[0][ff][0]) == -1) {
f = formula[0][last_sp];
var _left = true;
switch(f[1][0]) {
@@ -11303,6 +11388,7 @@ var Ftab = {
var FtabArgc = {
/*::[*/0x0002/*::]*/: 1, /* ISNA */
/*::[*/0x0003/*::]*/: 1, /* ISERROR */
+ /*::[*/0x000A/*::]*/: 0, /* NA */
/*::[*/0x000F/*::]*/: 1, /* SIN */
/*::[*/0x0010/*::]*/: 1, /* COS */
/*::[*/0x0011/*::]*/: 1, /* TAN */
@@ -11320,6 +11406,8 @@ var FtabArgc = {
/*::[*/0x001F/*::]*/: 3, /* MID */
/*::[*/0x0020/*::]*/: 1, /* LEN */
/*::[*/0x0021/*::]*/: 1, /* VALUE */
+ /*::[*/0x0022/*::]*/: 0, /* TRUE */
+ /*::[*/0x0023/*::]*/: 0, /* FALSE */
/*::[*/0x0026/*::]*/: 1, /* NOT */
/*::[*/0x0027/*::]*/: 2, /* MOD */
/*::[*/0x0028/*::]*/: 3, /* DCOUNT */
@@ -11332,6 +11420,7 @@ var FtabArgc = {
/*::[*/0x0030/*::]*/: 2, /* TEXT */
/*::[*/0x0035/*::]*/: 1, /* GOTO */
/*::[*/0x003D/*::]*/: 3, /* MIRR */
+ /*::[*/0x003F/*::]*/: 0, /* RAND */
/*::[*/0x0041/*::]*/: 3, /* DATE */
/*::[*/0x0042/*::]*/: 3, /* TIME */
/*::[*/0x0043/*::]*/: 1, /* DAY */
@@ -11341,6 +11430,7 @@ var FtabArgc = {
/*::[*/0x0047/*::]*/: 1, /* HOUR */
/*::[*/0x0048/*::]*/: 1, /* MINUTE */
/*::[*/0x0049/*::]*/: 1, /* SECOND */
+ /*::[*/0x004A/*::]*/: 0, /* NOW */
/*::[*/0x004B/*::]*/: 1, /* AREAS */
/*::[*/0x004C/*::]*/: 1, /* ROWS */
/*::[*/0x004D/*::]*/: 1, /* COLUMNS */
@@ -11349,13 +11439,18 @@ var FtabArgc = {
/*::[*/0x0053/*::]*/: 1, /* TRANSPOSE */
/*::[*/0x0055/*::]*/: 0, /* STEP */
/*::[*/0x0056/*::]*/: 1, /* TYPE */
+ /*::[*/0x0059/*::]*/: 0, /* CALLER */
/*::[*/0x005A/*::]*/: 1, /* DEREF */
+ /*::[*/0x005E/*::]*/: 0, /* ACTIVE.CELL */
+ /*::[*/0x005F/*::]*/: 0, /* SELECTION */
/*::[*/0x0061/*::]*/: 2, /* ATAN2 */
/*::[*/0x0062/*::]*/: 1, /* ASIN */
/*::[*/0x0063/*::]*/: 1, /* ACOS */
/*::[*/0x0065/*::]*/: 3, /* HLOOKUP */
/*::[*/0x0066/*::]*/: 3, /* VLOOKUP */
/*::[*/0x0069/*::]*/: 1, /* ISREF */
+ /*::[*/0x006A/*::]*/: 1, /* GET.FORMULA */
+ /*::[*/0x006C/*::]*/: 2, /* SET.VALUE */
/*::[*/0x006F/*::]*/: 1, /* CHAR */
/*::[*/0x0070/*::]*/: 1, /* LOWER */
/*::[*/0x0071/*::]*/: 1, /* UPPER */
@@ -11381,6 +11476,7 @@ var FtabArgc = {
/*::[*/0x008E/*::]*/: 3, /* SLN */
/*::[*/0x008F/*::]*/: 4, /* SYD */
/*::[*/0x0090/*::]*/: 4, /* DDB */
+ /*::[*/0x00A1/*::]*/: 1, /* DIALOG.BOX */
/*::[*/0x00A2/*::]*/: 1, /* CLEAN */
/*::[*/0x00A3/*::]*/: 1, /* MDETERM */
/*::[*/0x00A4/*::]*/: 1, /* MINVERSE */
@@ -11392,6 +11488,7 @@ var FtabArgc = {
/*::[*/0x00B2/*::]*/: 2, /* EXECUTE */
/*::[*/0x00B3/*::]*/: 1, /* TERMINATE */
/*::[*/0x00B8/*::]*/: 1, /* FACT */
+ /*::[*/0x00BA/*::]*/: 1, /* GET.WORKSPACE */
/*::[*/0x00BD/*::]*/: 3, /* DPRODUCT */
/*::[*/0x00BE/*::]*/: 1, /* ISNONTEXT */
/*::[*/0x00C3/*::]*/: 3, /* DSTDEVP */
@@ -11407,6 +11504,7 @@ var FtabArgc = {
/*::[*/0x00D5/*::]*/: 2, /* ROUNDDOWN */
/*::[*/0x00D6/*::]*/: 1, /* ASC */
/*::[*/0x00D7/*::]*/: 1, /* DBCS */
+ /*::[*/0x00E1/*::]*/: 0, /* END.IF */
/*::[*/0x00E5/*::]*/: 1, /* SINH */
/*::[*/0x00E6/*::]*/: 1, /* COSH */
/*::[*/0x00E7/*::]*/: 1, /* TANH */
@@ -13249,7 +13347,7 @@ function parse_numCache(data/*:string*/)/*:[Array, string]*/ {
/* 21.2.2.150 pt CT_NumVal */
(data.match(/(.*?)<\/c:pt>/mg)||[]).forEach(function(pt) {
- var q = pt.match(/(.*)<\/c:v><\/c:pt>/);
+ var q = pt.match(/(.*)<\/c:v><\/c:pt>/);
if(!q) return;
col[+q[1]] = +q[2];
});
@@ -14307,7 +14405,7 @@ function xlml_normalize(d)/*:string*/ {
/* TODO: Everything */
/* UOS uses CJK in tags */
-var xlmlregex = /<(\/?)([^\s?>!\/:]*:|)([^\s?>]*[^\s?>\/])[^>]*>/mg;
+var xlmlregex = /<(\/?)([^\s?>!\/:]*:|)([^\s?>:\/]+)[^>]*>/mg;
//var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg;
function parse_xlml_xml(d, _opts)/*:Workbook*/ {
var opts = _opts || {};
@@ -15503,7 +15601,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
last_Rn = R.n;
if(R.r === 2 || R.r == 12) {
var rt = blob.read_shift(2); length -= 2;
- if(!opts.enc && rt !== RecordType) throw new Error("rt mismatch: " + rt + "!=" + RecordType);
+ if(!opts.enc && rt !== RecordType && (((rt&0xFF)<<8)|(rt>>8)) !== RecordType) throw new Error("rt mismatch: " + rt + "!=" + RecordType);
if(R.r == 12){ blob.l += 10; length -= 10; } // skip FRT
}
//console.error(R,blob.l,length,blob.length);
@@ -15522,7 +15620,6 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
case 'FilePass':
if(!opts.enc) blob.l = 0;
opts.enc = val;
- if(opts.WTF) console.error(val);
if(!options.password) throw new Error("File is password-protected");
if(val.valid == null) throw new Error("Encryption scheme unsupported");
if(!val.valid) throw new Error("Password is incorrect");
@@ -15627,6 +15724,9 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
/*::[*/0x0209/*::]*/:3,
/*::[*/0x0409/*::]*/:4
}[RecordType] || {
+ /*::[*/0x0200/*::]*/:2,
+ /*::[*/0x0300/*::]*/:3,
+ /*::[*/0x0400/*::]*/:4,
/*::[*/0x0500/*::]*/:5,
/*::[*/0x0600/*::]*/:8,
/*::[*/0x0002/*::]*/:2,
@@ -15807,7 +15907,7 @@ function parse_workbook(blob, options/*:ParseOpts*/)/*:Workbook*/ {
for(rngR = val[0].s.r; rngR <= val[0].e.r; ++rngR)
for(rngC = val[0].s.c; rngC <= val[0].e.c; ++rngC) {
cc = options.dense ? (out[rngR]||[])[rngC] : out[encode_cell({c:rngC,r:rngR})];
- if(cc) cc.l.Tooltip = val[1];
+ if(cc && cc.l) cc.l.Tooltip = val[1];
}
} break;
@@ -18011,6 +18111,7 @@ var parse_content_xml = (function() {
if(merges.length) ws['!merges'] = merges;
if(rowinfo.length) ws["!rows"] = rowinfo;
sheetag.name = utf8read(sheetag['名称'] || sheetag.name);
+ if(typeof JSON !== 'undefined') JSON.stringify(sheetag);
SheetNames.push(sheetag.name);
Sheets[sheetag.name] = ws;
intable = false;
@@ -18825,7 +18926,6 @@ function safe_parse_sheet(zip, path/*:string*/, relsPath/*:string*/, sheet, idx/
} catch(e) { if(opts.WTF) throw e; }
}
-var nodirs = function nodirs(x/*:string*/)/*:boolean*/{return x.slice(-1) != '/';};
function strip_front_slash(x/*:string*/)/*:string*/ { return x.charAt(0) == '/' ? x.slice(1) : x; }
function parse_zip(zip/*:ZIP*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
@@ -18840,7 +18940,7 @@ function parse_zip(zip/*:ZIP*/, opts/*:?ParseOpts*/)/*:Workbook*/ {
/* Numbers */
if(safegetzipfile(zip, 'Index/Document.iwa')) throw new Error('Unsupported NUMBERS file');
- var entries = keys(zip.files).filter(nodirs).sort();
+ var entries = zipentries(zip);
var dir = parse_ct((getzipstr(zip, '[Content_Types].xml')/*:?any*/));
var xlsb = false;
var sheets, binname;
@@ -19042,8 +19142,12 @@ function write_zip(wb/*:Workbook*/, opts/*:WriteOpts*/)/*:ZIP*/ {
f = "docProps/app.xml";
if(wb.Props && wb.Props.SheetNames){/* empty */}
else if(!wb.Workbook || !wb.Workbook.Sheets) wb.Props.SheetNames = wb.SheetNames;
- // $FlowIgnore
- else wb.Props.SheetNames = wb.SheetNames.map(function(x,i) { return [(wb.Workbook.Sheets[i]||{}).Hidden != 2, x];}).filter(function(x) { return x[0]; }).map(function(x) { return x[1]; });
+ else {
+ var _sn = [];
+ for(var _i = 0; _i < wb.SheetNames.length; ++_i)
+ if((wb.Workbook.Sheets[_i]||{}).Hidden != 2) _sn.push(wb.SheetNames[_i]);
+ wb.Props.SheetNames = _sn;
+ }
wb.Props.Worksheets = wb.Props.SheetNames.length;
zip.file(f, write_ext_props(wb.Props, opts));
ct.extprops.push(f);
@@ -19578,7 +19682,7 @@ function sheet_add_json(_ws/*:?Worksheet*/, js/*:Array*/, opts)/*:Worksheet
var hdr/*:Array*/ = o.header || [], C = 0;
js.forEach(function (JS, R/*:number*/) {
- keys(JS).filter(function(x) { return JS.hasOwnProperty(x); }).forEach(function(k) {
+ keys(JS).forEach(function(k) {
if((C=hdr.indexOf(k)) == -1) hdr[C=hdr.length] = k;
var v = JS[k];
var t = 'z';
diff --git a/src/main/webapp/bower_components/js-xlsx/xlsx.js b/src/main/webapp/bower_components/js-xlsx/xlsx.js
index b81db21085..58fd9734e6 100644
--- a/src/main/webapp/bower_components/js-xlsx/xlsx.js
+++ b/src/main/webapp/bower_components/js-xlsx/xlsx.js
@@ -4,7 +4,7 @@
/*global global, exports, module, require:false, process:false, Buffer:false, ArrayBuffer:false */
var XLSX = {};
(function make_xlsx(XLSX){
-XLSX.version = '0.12.1';
+XLSX.version = '0.12.3';
var current_codepage = 1200, current_ansi = 1252;
/*global cptable:true */
if(typeof module !== "undefined" && typeof require !== 'undefined') {
@@ -165,7 +165,7 @@ var chr0 = /\u0000/g, chr1 = /[\u0001-\u0006]/g;
/*jshint -W041 */
var SSF = ({});
var make_ssf = function make_ssf(SSF){
-SSF.version = '0.10.0';
+SSF.version = '0.10.2';
function _strrev(x) { var o = "", i = x.length-1; while(i>=0) o += x.charAt(i--); return o; }
function fill(c,l) { var o = ""; while(o.length < l) o+=c; return o; }
function pad0(v,d){var t=""+v; return t.length>=d?t:fill('0',d-t.length)+t;}
@@ -945,7 +945,7 @@ out[i].v = write_date(out[i].t.charCodeAt(0), out[i].v, dt, ss0);
}
SSF._eval = eval_fmt;
var cfregex = /\[[=<>]/;
-var cfregex2 = /\[([=<>]*)(-?\d+\.?\d*)\]/;
+var cfregex2 = /\[(=|>[=]?|<[>=]?)(-?\d+(?:\.\d*)?)\]/;
function chkcond(v, rr) {
if(rr == null) return false;
var thresh = parseFloat(rr[2]);
@@ -1879,7 +1879,11 @@ function read_binary(path) {
} catch(e) { if(!e.message || !e.message.match(/onstruct/)) throw e; }
throw new Error("Cannot access file " + path);
}
-function keys(o) { return Object.keys(o); }
+function keys(o) {
+ var ks = Object.keys(o), o2 = [];
+ for(var i = 0; i < ks.length; ++i) if(o.hasOwnProperty(ks[i])) o2.push(ks[i]);
+ return o2;
+}
function evert_key(obj, key) {
var o = ([]), K = keys(obj);
@@ -2070,6 +2074,12 @@ function getzipstr(zip, file, safe) {
try { return getzipstr(zip, file); } catch(e) { return null; }
}
+function zipentries(zip) {
+ var k = keys(zip.files), o = [];
+ for(var i = 0; i < k.length; ++i) if(k[i].slice(-1) != '/') o.push(k[i]);
+ return o.sort();
+}
+
var jszip;
/*global JSZip:true */
if(typeof JSZip !== 'undefined') jszip = JSZip;
@@ -2092,7 +2102,7 @@ function resolve_path(path, base) {
}
var XML_HEADER = '\r\n';
var attregexg=/([^"\s?>\/]+)\s*=\s*((?:")([^"]*)(?:")|(?:')([^']*)(?:')|([^'">\s]+))/g;
-var tagregex=/<[\/\?]?[a-zA-Z0-9:]+(?:\s+[^"\s?>\/]+\s*=\s*(?:"[^"]*"|'[^']*'|[^'">\s]+))*\s?[\/\?]?>/g;
+var tagregex=/<[\/\?]?[a-zA-Z0-9:]+(?:\s+[^"\s?>\/]+\s*=\s*(?:"[^"]*"|'[^']*'|[^'">\s=]+))*\s?[\/\?]?>/g;
if(!(XML_HEADER.match(tagregex))) tagregex = /<[^>]*>/g;
var nsregex=/<\w*:/, nsregex2 = /<(\/?)\w+:/;
function parsexmltag(tag, skip_root) {
@@ -2368,13 +2378,14 @@ function write_double_le(b, v, idx) {
b[idx + 7] = (e >> 4) | bs;
}
-var __toBuffer = function(bufs) { var x=[],w=10240; for(var i=0;i 0 ? __utf8(b, i+4,i+4+len-1) : "";};
var ___lpstr = __lpstr;
var __cpstr = function(b,i) { var len = __readUInt32LE(b,i); return len > 0 ? __utf8(b, i+4,i+4+len-1) : "";};
@@ -2397,7 +2408,7 @@ if(has_buf) {
__lpwstr = function lpwstr_b(b, i) { if(!Buffer.isBuffer(b)) return ___lpwstr(b, i); var len = 2*b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len-1);};
__lpp4 = function lpp4_b(b, i) { if(!Buffer.isBuffer(b)) return ___lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf16le',i+4,i+4+len);};
__8lpp4 = function lpp4_8b(b, i) { if(!Buffer.isBuffer(b)) return ___8lpp4(b, i); var len = b.readUInt32LE(i); return b.toString('utf8',i+4,i+4+len);};
- __utf8 = function utf8_b(b, s, e) { return (Buffer.isBuffer(b)) ? b.toString('utf8',s,e) : __utf8(b,s,e); };
+ __utf8 = function utf8_b(b, s, e) { return (Buffer.isBuffer(b)) ? b.toString('utf8',s,e) : ___utf8(b,s,e); };
__toBuffer = function(bufs) { return (bufs[0].length > 0 && Buffer.isBuffer(bufs[0][0])) ? Buffer.concat(bufs[0]) : ___toBuffer(bufs);};
bconcat = function(bufs) { return Buffer.isBuffer(bufs[0]) ? Buffer.concat(bufs) : [].concat.apply([], bufs); };
__double = function double_(b, i) { if(Buffer.isBuffer(b)) return b.readDoubleLE(i); return ___double(b,i); };
@@ -2664,7 +2675,9 @@ function shift_range_xls(cell, range, opts) {
return out;
}
-function encode_cell_xls(c) {
+function encode_cell_xls(c, biff) {
+ if(c.cRel && c.c < 0) { c = dup(c); c.c += (biff > 8) ? 0x4000 : 0x100; }
+ if(c.rRel && c.r < 0) { c = dup(c); c.r += (biff > 8) ? 0x100000 : ((biff > 5) ? 0x10000 : 0x4000); }
var s = encode_cell(c);
if(c.cRel === 0) s = fix_col(s);
if(c.rRel === 0) s = fix_row(s);
@@ -2673,7 +2686,7 @@ function encode_cell_xls(c) {
function encode_range_xls(r, opts) {
if(r.s.r == 0 && !r.s.rRel) {
- if(r.e.r == (opts.biff >= 12 ? 0xFFFFF : 0xFFFF) && !r.e.rRel) {
+ if(r.e.r == (opts.biff >= 12 ? 0xFFFFF : (opts.biff >= 8 ? 0x10000 : 0x4000)) && !r.e.rRel) {
return (r.s.cRel ? "" : "$") + encode_col(r.s.c) + ":" + (r.e.cRel ? "" : "$") + encode_col(r.e.c);
}
}
@@ -2682,7 +2695,7 @@ function encode_range_xls(r, opts) {
return (r.s.rRel ? "" : "$") + encode_row(r.s.r) + ":" + (r.e.rRel ? "" : "$") + encode_row(r.e.r);
}
}
- return encode_cell_xls(r.s) + ":" + encode_cell_xls(r.e);
+ return encode_cell_xls(r.s, opts.biff) + ":" + encode_cell_xls(r.e, opts.biff);
}
var OFFCRYPTO = {};
@@ -3156,7 +3169,7 @@ var VT_UI4 = 0x0013;
var VT_LPSTR = 0x001E;
//var VT_LPWSTR = 0x001F;
var VT_FILETIME = 0x0040;
-//var VT_BLOB = 0x0041;
+var VT_BLOB = 0x0041;
//var VT_STREAM = 0x0042;
//var VT_STORAGE = 0x0043;
//var VT_STREAMED_Object = 0x0044;
@@ -3194,6 +3207,7 @@ var DocSummaryPIDDSI = {
0x13: { n: 'SharedDoc', t: VT_BOOL },
0x16: { n: 'HLinksChanged', t: VT_BOOL },
0x17: { n: 'AppVersion', t: VT_I4, p: 'version' },
+0x18: { n: 'DigSig', t: VT_BLOB },
0x1A: { n: 'ContentType', t: VT_STRING },
0x1B: { n: 'ContentStatus', t: VT_STRING },
0x1C: { n: 'Language', t: VT_STRING },
@@ -4265,6 +4279,7 @@ function parse_dictionary(blob,CodePage) {
function parse_BLOB(blob) {
var size = blob.read_shift(4);
var bytes = blob.slice(blob.l,blob.l+size);
+ blob.l += size;
if((size & 3) > 0) blob.l += (4 - (size & 3)) & 3;
return bytes;
}
@@ -4275,7 +4290,7 @@ function parse_ClipboardData(blob) {
var o = {};
o.Size = blob.read_shift(4);
//o.Format = blob.read_shift(4);
- blob.l += o.Size;
+ blob.l += o.Size + 3 - (o.Size - 1) % 4;
return o;
}
@@ -4421,6 +4436,7 @@ function parse_PropertySetStream(file, PIDSI, clsid) {
rval.FMTID = FMTID0;
//rval.PSet0 = PSet0;
if(NumSets === 1) return rval;
+ if(Offset1 - blob.l == 2) blob.l += 2;
if(blob.l !== Offset1) throw new Error("Length mismatch 2: " + blob.l + " !== " + Offset1);
var PSet1;
try { PSet1 = parse_PropertySet(blob, null); } catch(e) {/* empty */}
@@ -4813,6 +4829,9 @@ function parse_BOF(blob, length) {
switch(o.BIFFVer) {
case 0x0600: /* BIFF8 */
case 0x0500: /* BIFF5 */
+ case 0x0400: /* BIFF4 */
+ case 0x0300: /* BIFF3 */
+ case 0x0200: /* BIFF2 */
case 0x0002: case 0x0007: /* BIFF2 */
break;
default: if(length > 6) throw new Error("Unexpected BIFF Ver " + o.BIFFVer);
@@ -7486,7 +7505,7 @@ function parse_FilePassHeader(blob, length, oo) {
function parse_FilePass(blob, length, opts) {
var o = ({ Type: opts.biff >= 8 ? blob.read_shift(2) : 0 }); /* wEncryptionType */
if(o.Type) parse_FilePassHeader(blob, length-2, o);
- else parse_XORObfuscation(blob, length-2, opts, o);
+ else parse_XORObfuscation(blob, opts.biff >= 8 ? length : length - 2, opts, o);
return o;
}
@@ -9292,8 +9311,9 @@ function parse_RgceArea_BIFF2(blob) {
}
/* [MS-XLS] 2.5.198.105 ; [MS-XLSB] 2.5.97.90 */
-function parse_RgceAreaRel(blob, length) {
- var r=blob.read_shift(length == 12 ? 4 : 2), R=blob.read_shift(length == 12 ? 4 : 2);
+function parse_RgceAreaRel(blob, length, opts) {
+ if(opts.biff < 8) return parse_RgceArea_BIFF2(blob, length, opts);
+ var r=blob.read_shift(opts.biff == 12 ? 4 : 2), R=blob.read_shift(opts.biff == 12 ? 4 : 2);
var c=parse_ColRelU(blob, 2);
var C=parse_ColRelU(blob, 2);
return { s:{r:r, c:c[0], cRel:c[1], rRel:c[2]}, e:{r:R, c:C[0], cRel:C[1], rRel:C[2]} };
@@ -9364,7 +9384,7 @@ function parse_PtgArea3d(blob, length, opts) {
/* [MS-XLS] 2.5.198.29 ; [MS-XLSB] 2.5.97.20 */
function parse_PtgAreaErr(blob, length, opts) {
var type = (blob[blob.l++] & 0x60) >> 5;
- blob.l += opts && opts.biff > 8 ? 12 : 8;
+ blob.l += opts && (opts.biff > 8) ? 12 : (opts.biff < 8 ? 6 : 8);
return [type];
}
/* [MS-XLS] 2.5.198.30 ; [MS-XLSB] 2.5.97.21 */
@@ -9383,7 +9403,7 @@ function parse_PtgAreaErr3d(blob, length, opts) {
/* [MS-XLS] 2.5.198.31 ; [MS-XLSB] 2.5.97.22 */
function parse_PtgAreaN(blob, length, opts) {
var type = (blob[blob.l++] & 0x60) >> 5;
- var area = parse_RgceAreaRel(blob, opts && opts.biff > 8 ? 12 : 8, opts);
+ var area = parse_RgceAreaRel(blob, length - 1, opts);
return [type, area];
}
@@ -9496,8 +9516,8 @@ function parse_PtgFunc(blob, length, opts) {
}
/* [MS-XLS] 2.5.198.63 ; [MS-XLSB] 2.5.97.46 TODO */
function parse_PtgFuncVar(blob, length, opts) {
- blob.l++;
- var cparams = blob.read_shift(1), tab = opts && opts.biff <= 3 ? [0, blob.read_shift(1)]: parsetab(blob);
+ var type = blob[blob.l++];
+ var cparams = blob.read_shift(1), tab = opts && opts.biff <= 3 ? [(type == 0x58 ? -1 : 0), blob.read_shift(1)]: parsetab(blob);
return [cparams, (tab[0] === 0 ? Ftab : Cetab)[tab[1]]];
}
@@ -9637,6 +9657,7 @@ function parse_PtgMemFunc(blob, length, opts) {
function parse_PtgRefErr(blob, length, opts) {
var type = (blob.read_shift(1) >>> 5) & 0x03;
blob.l += 4;
+ if(opts.biff < 8) blob.l--;
if(opts.biff == 12) blob.l += 2;
return [type];
}
@@ -9693,12 +9714,35 @@ var parse_PtgElfRw = parse_PtgElfLoc;
/* [MS-XLS] 2.5.198.55 */
var parse_PtgElfRwV = parse_PtgElfLoc;
-/* [MS-XLSB] 2.5.97.52 */
+/* [MS-XLSB] 2.5.97.52 TODO */
+var PtgListRT = [
+ "Data",
+ "All",
+ "Headers",
+ "??",
+ "?Data2",
+ "??",
+ "?DataHeaders",
+ "??",
+ "Totals",
+ "??",
+ "??",
+ "??",
+ "?DataTotals",
+ "??",
+ "??",
+ "??",
+ "?Current"
+];
function parse_PtgList(blob) {
blob.l += 2;
var ixti = blob.read_shift(2);
- blob.l += 10;
- return {ixti: ixti};
+ var flags = blob.read_shift(2);
+ var idx = blob.read_shift(4);
+ var c = blob.read_shift(2);
+ var C = blob.read_shift(2);
+ var rt = PtgListRT[(flags >> 2) & 0x1F];
+ return {ixti: ixti, coltype:(flags&0x3), rt:rt, idx:idx, c:c, C:C};
}
/* [MS-XLS] 2.5.198.91 ; [MS-XLSB] 2.5.97.76 */
function parse_PtgSxName(blob) {
@@ -9706,6 +9750,32 @@ function parse_PtgSxName(blob) {
return [blob.read_shift(4)];
}
+/* [XLS] old spec */
+function parse_PtgSheet(blob, length, opts) {
+ blob.l += 5;
+ blob.l += 2;
+ blob.l += (opts.biff == 2 ? 1 : 4);
+ return ["PTGSHEET"];
+}
+function parse_PtgEndSheet(blob, length, opts) {
+ blob.l += (opts.biff == 2 ? 4 : 5);
+ return ["PTGENDSHEET"];
+}
+function parse_PtgMemAreaN(blob) {
+ var type = (blob.read_shift(1) >>> 5) & 0x03;
+ var cce = blob.read_shift(2);
+ return [type, cce];
+}
+function parse_PtgMemNoMemN(blob) {
+ var type = (blob.read_shift(1) >>> 5) & 0x03;
+ var cce = blob.read_shift(2);
+ return [type, cce];
+}
+function parse_PtgAttrNoop(blob) {
+ blob.l += 4;
+ return [0, 0];
+}
+
/* [MS-XLS] 2.5.198.25 ; [MS-XLSB] 2.5.97.16 */
var PtgTypes = {
0x01: { n:'PtgExp', f:parse_PtgExp },
@@ -9731,6 +9801,8 @@ var PtgTypes = {
0x15: { n:'PtgParen', f:parseread1 },
0x16: { n:'PtgMissArg', f:parseread1 },
0x17: { n:'PtgStr', f:parse_PtgStr },
+0x1A: { n:'PtgSheet', f:parse_PtgSheet },
+0x1B: { n:'PtgEndSheet', f:parse_PtgEndSheet },
0x1C: { n:'PtgErr', f:parse_PtgErr },
0x1D: { n:'PtgBool', f:parse_PtgBool },
0x1E: { n:'PtgInt', f:parse_PtgInt },
@@ -9749,6 +9821,8 @@ var PtgTypes = {
0x2B: { n:'PtgAreaErr', f:parse_PtgAreaErr },
0x2C: { n:'PtgRefN', f:parse_PtgRefN },
0x2D: { n:'PtgAreaN', f:parse_PtgAreaN },
+0x2E: { n:'PtgMemAreaN', f:parse_PtgMemAreaN },
+0x2F: { n:'PtgMemNoMemN', f:parse_PtgMemNoMemN },
0x39: { n:'PtgNameX', f:parse_PtgNameX },
0x3A: { n:'PtgRef3d', f:parse_PtgRef3d },
0x3B: { n:'PtgArea3d', f:parse_PtgArea3d },
@@ -9772,6 +9846,9 @@ var PtgDupes = {
0x4B: 0x2B, 0x6B: 0x2B,
0x4C: 0x2C, 0x6C: 0x2C,
0x4D: 0x2D, 0x6D: 0x2D,
+0x4E: 0x2E, 0x6E: 0x2E,
+0x4F: 0x2F, 0x6F: 0x2F,
+0x58: 0x22, 0x78: 0x22,
0x59: 0x39, 0x79: 0x39,
0x5A: 0x3A, 0x7A: 0x3A,
0x5B: 0x3B, 0x7B: 0x3B,
@@ -9796,6 +9873,7 @@ var Ptg18 = {
0xFF: {}
};
var Ptg19 = {
+0x00: { n:'PtgAttrNoop', f:parse_PtgAttrNoop },
0x01: { n:'PtgAttrSemi', f:parse_PtgAttrSemi },
0x02: { n:'PtgAttrIf', f:parse_PtgAttrIf },
0x04: { n:'PtgAttrChoose', f:parse_PtgAttrChoose },
@@ -9852,10 +9930,7 @@ function parse_Rgce(blob, length, opts) {
length = target - blob.l;
id = blob[blob.l];
R = PtgTypes[id];
- if(id === 0x18 || id === 0x19) {
- id = blob[blob.l + 1];
- R = (id === 0x18 ? Ptg18 : Ptg19)[id];
- }
+ if(id === 0x18 || id === 0x19) R = (id === 0x18 ? Ptg18 : Ptg19)[blob[blob.l + 1]];
if(!R || !R.f) { /*ptgs.push*/(parsenoop(blob, length)); }
// $FlowIgnore
else { ptgs.push([R.n, R.f(blob, length, opts)]); }
@@ -9939,6 +10014,7 @@ function get_ixti(supbooks, ixti, opts) {
return formula_quote_sheet_name(get_ixti_raw(supbooks, ixti, opts), opts);
}
function stringify_formula(formula/*Array*/, range, cell, supbooks, opts) {
+ var biff = (opts && opts.biff) || 8;
var _range = /*range != null ? range :*/ {s:{c:0, r:0},e:{c:0, r:0}};
var stack = [], e1, e2, c, ixti=0, nameidx=0, r, sname="";
if(!formula[0] || !formula[0][0]) return "";
@@ -10010,17 +10086,17 @@ function stringify_formula(formula/*Array*/, range, cell, supbooks, opts) {
case 'PtgRef': /* [MS-XLS] 2.5.198.84 */
c = shift_cell_xls((f[1][1]), _range, opts);
- stack.push(encode_cell_xls(c));
+ stack.push(encode_cell_xls(c, biff));
break;
case 'PtgRefN': /* [MS-XLS] 2.5.198.88 */
c = cell ? shift_cell_xls((f[1][1]), cell, opts) : (f[1][1]);
- stack.push(encode_cell_xls(c));
+ stack.push(encode_cell_xls(c, biff));
break;
case 'PtgRef3d': /* [MS-XLS] 2.5.198.85 */
ixti = f[1][1]; c = shift_cell_xls((f[1][2]), _range, opts);
sname = get_ixti(supbooks, ixti, opts);
var w = sname; /* IE9 fails on defined names */ // eslint-disable-line no-unused-vars
- stack.push(sname + "!" + encode_cell_xls(c));
+ stack.push(sname + "!" + encode_cell_xls(c, biff));
break;
case 'PtgFunc': /* [MS-XLS] 2.5.198.62 */
@@ -10028,6 +10104,7 @@ ixti = f[1][1]; c = shift_cell_xls((f[1][2]), _range, opts);
/* f[1] = [argc, func, type] */
var argc = (f[1][0]), func = (f[1][1]);
if(!argc) argc = 0;
+ argc &= 0x7F;
var args = argc == 0 ? [] : stack.slice(-argc);
stack.length -= argc;
if(func === 'User') func = args.shift();
@@ -10062,6 +10139,7 @@ ixti = f[1][1]; r = f[1][2];
stack.push("SUM(" + stack.pop() + ")");
break;
+ case 'PtgAttrBaxcel': /* [MS-XLS] 2.5.198.33 */
case 'PtgAttrSemi': /* [MS-XLS] 2.5.198.37 */
break;
@@ -10178,6 +10256,18 @@ ixti = f[1][1]; r = f[1][2];
case 'PtgAreaErr3d': /* [MS-XLS] 2.5.198.30 */
stack.push("#REF!"); break;
+ case 'PtgList': /* [MS-XLSB] 2.5.97.52 */
+ // $FlowIgnore
+ stack.push("Table" + f[1].idx + "[#" + f[1].rt + "]");
+ break;
+
+ case 'PtgMemAreaN':
+ case 'PtgMemNoMemN':
+ case 'PtgAttrNoop':
+ case 'PtgSheet':
+ case 'PtgEndSheet':
+ break;
+
case 'PtgMemFunc': /* [MS-XLS] 2.5.198.72 TODO */
break;
case 'PtgMemNoMem': /* [MS-XLS] 2.5.198.73 TODO */
@@ -10195,17 +10285,12 @@ ixti = f[1][1]; r = f[1][2];
case 'PtgElfRwV': /* [MS-XLS] 2.5.198.55 */
throw new Error("Unsupported ELFs");
- case 'PtgAttrBaxcel': /* [MS-XLS] 2.5.198.33 TODO -- find a test case*/
- throw new Error('Unrecognized Formula Token: ' + String(f));
case 'PtgSxName': /* [MS-XLS] 2.5.198.91 TODO -- find a test case */
throw new Error('Unrecognized Formula Token: ' + String(f));
- case 'PtgList': /* [MS-XLSB] 2.5.97.52 TODO -- find a test case */
- throw new Error('Unrecognized Formula Token: ' + String(f));
-
default: throw new Error('Unrecognized Formula Token: ' + String(f));
}
var PtgNonDisp = ['PtgAttrSpace', 'PtgAttrSpaceSemi', 'PtgAttrGoto'];
- if(last_sp >= 0 && PtgNonDisp.indexOf(formula[0][ff][0]) == -1) {
+ if(opts.biff != 3) if(last_sp >= 0 && PtgNonDisp.indexOf(formula[0][ff][0]) == -1) {
f = formula[0][last_sp];
var _left = true;
switch(f[1][0]) {
@@ -11208,6 +11293,7 @@ var Ftab = {
var FtabArgc = {
0x0002: 1, /* ISNA */
0x0003: 1, /* ISERROR */
+0x000A: 0, /* NA */
0x000F: 1, /* SIN */
0x0010: 1, /* COS */
0x0011: 1, /* TAN */
@@ -11225,6 +11311,8 @@ var FtabArgc = {
0x001F: 3, /* MID */
0x0020: 1, /* LEN */
0x0021: 1, /* VALUE */
+0x0022: 0, /* TRUE */
+0x0023: 0, /* FALSE */
0x0026: 1, /* NOT */
0x0027: 2, /* MOD */
0x0028: 3, /* DCOUNT */
@@ -11237,6 +11325,7 @@ var FtabArgc = {
0x0030: 2, /* TEXT */
0x0035: 1, /* GOTO */
0x003D: 3, /* MIRR */
+0x003F: 0, /* RAND */
0x0041: 3, /* DATE */
0x0042: 3, /* TIME */
0x0043: 1, /* DAY */
@@ -11246,6 +11335,7 @@ var FtabArgc = {
0x0047: 1, /* HOUR */
0x0048: 1, /* MINUTE */
0x0049: 1, /* SECOND */
+0x004A: 0, /* NOW */
0x004B: 1, /* AREAS */
0x004C: 1, /* ROWS */
0x004D: 1, /* COLUMNS */
@@ -11254,13 +11344,18 @@ var FtabArgc = {
0x0053: 1, /* TRANSPOSE */
0x0055: 0, /* STEP */
0x0056: 1, /* TYPE */
+0x0059: 0, /* CALLER */
0x005A: 1, /* DEREF */
+0x005E: 0, /* ACTIVE.CELL */
+0x005F: 0, /* SELECTION */
0x0061: 2, /* ATAN2 */
0x0062: 1, /* ASIN */
0x0063: 1, /* ACOS */
0x0065: 3, /* HLOOKUP */
0x0066: 3, /* VLOOKUP */
0x0069: 1, /* ISREF */
+0x006A: 1, /* GET.FORMULA */
+0x006C: 2, /* SET.VALUE */
0x006F: 1, /* CHAR */
0x0070: 1, /* LOWER */
0x0071: 1, /* UPPER */
@@ -11286,6 +11381,7 @@ var FtabArgc = {
0x008E: 3, /* SLN */
0x008F: 4, /* SYD */
0x0090: 4, /* DDB */
+0x00A1: 1, /* DIALOG.BOX */
0x00A2: 1, /* CLEAN */
0x00A3: 1, /* MDETERM */
0x00A4: 1, /* MINVERSE */
@@ -11297,6 +11393,7 @@ var FtabArgc = {
0x00B2: 2, /* EXECUTE */
0x00B3: 1, /* TERMINATE */
0x00B8: 1, /* FACT */
+0x00BA: 1, /* GET.WORKSPACE */
0x00BD: 3, /* DPRODUCT */
0x00BE: 1, /* ISNONTEXT */
0x00C3: 3, /* DSTDEVP */
@@ -11312,6 +11409,7 @@ var FtabArgc = {
0x00D5: 2, /* ROUNDDOWN */
0x00D6: 1, /* ASC */
0x00D7: 1, /* DBCS */
+0x00E1: 0, /* END.IF */
0x00E5: 1, /* SINH */
0x00E6: 1, /* COSH */
0x00E7: 1, /* TANH */
@@ -13153,7 +13251,7 @@ function parse_numCache(data) {
/* 21.2.2.150 pt CT_NumVal */
(data.match(/(.*?)<\/c:pt>/mg)||[]).forEach(function(pt) {
- var q = pt.match(/(.*)<\/c:v><\/c:pt>/);
+ var q = pt.match(/(.*)<\/c:v><\/c:pt>/);
if(!q) return;
col[+q[1]] = +q[2];
});
@@ -14207,7 +14305,7 @@ function xlml_normalize(d) {
/* TODO: Everything */
/* UOS uses CJK in tags */
-var xlmlregex = /<(\/?)([^\s?>!\/:]*:|)([^\s?>]*[^\s?>\/])[^>]*>/mg;
+var xlmlregex = /<(\/?)([^\s?>!\/:]*:|)([^\s?>:\/]+)[^>]*>/mg;
//var xlmlregex = /<(\/?)([a-z0-9]*:|)(\w+)[^>]*>/mg;
function parse_xlml_xml(d, _opts) {
var opts = _opts || {};
@@ -15396,7 +15494,7 @@ function parse_workbook(blob, options) {
last_Rn = R.n;
if(R.r === 2 || R.r == 12) {
var rt = blob.read_shift(2); length -= 2;
- if(!opts.enc && rt !== RecordType) throw new Error("rt mismatch: " + rt + "!=" + RecordType);
+ if(!opts.enc && rt !== RecordType && (((rt&0xFF)<<8)|(rt>>8)) !== RecordType) throw new Error("rt mismatch: " + rt + "!=" + RecordType);
if(R.r == 12){ blob.l += 10; length -= 10; } // skip FRT
}
//console.error(R,blob.l,length,blob.length);
@@ -15414,7 +15512,6 @@ wb.opts.Date1904 = Workbook.WBProps.date1904 = val; break;
case 'FilePass':
if(!opts.enc) blob.l = 0;
opts.enc = val;
- if(opts.WTF) console.error(val);
if(!options.password) throw new Error("File is password-protected");
if(val.valid == null) throw new Error("Encryption scheme unsupported");
if(!val.valid) throw new Error("Password is incorrect");
@@ -15519,6 +15616,9 @@ wb.opts.Date1904 = Workbook.WBProps.date1904 = val; break;
0x0209:3,
0x0409:4
}[RecordType] || {
+0x0200:2,
+0x0300:3,
+0x0400:4,
0x0500:5,
0x0600:8,
0x0002:2,
@@ -15699,7 +15799,7 @@ wb.opts.Date1904 = Workbook.WBProps.date1904 = val; break;
for(rngR = val[0].s.r; rngR <= val[0].e.r; ++rngR)
for(rngC = val[0].s.c; rngC <= val[0].e.c; ++rngC) {
cc = options.dense ? (out[rngR]||[])[rngC] : out[encode_cell({c:rngC,r:rngR})];
- if(cc) cc.l.Tooltip = val[1];
+ if(cc && cc.l) cc.l.Tooltip = val[1];
}
} break;
@@ -17901,6 +18001,7 @@ var parse_content_xml = (function() {
if(merges.length) ws['!merges'] = merges;
if(rowinfo.length) ws["!rows"] = rowinfo;
sheetag.name = utf8read(sheetag['名称'] || sheetag.name);
+ if(typeof JSON !== 'undefined') JSON.stringify(sheetag);
SheetNames.push(sheetag.name);
Sheets[sheetag.name] = ws;
intable = false;
@@ -18714,7 +18815,6 @@ function safe_parse_sheet(zip, path, relsPath, sheet, idx, sheetRels, sheets, st
} catch(e) { if(opts.WTF) throw e; }
}
-var nodirs = function nodirs(x){return x.slice(-1) != '/';};
function strip_front_slash(x) { return x.charAt(0) == '/' ? x.slice(1) : x; }
function parse_zip(zip, opts) {
@@ -18729,7 +18829,7 @@ function parse_zip(zip, opts) {
/* Numbers */
if(safegetzipfile(zip, 'Index/Document.iwa')) throw new Error('Unsupported NUMBERS file');
- var entries = keys(zip.files).filter(nodirs).sort();
+ var entries = zipentries(zip);
var dir = parse_ct((getzipstr(zip, '[Content_Types].xml')));
var xlsb = false;
var sheets, binname;
@@ -18927,8 +19027,12 @@ var zip = new jszip();
f = "docProps/app.xml";
if(wb.Props && wb.Props.SheetNames){/* empty */}
else if(!wb.Workbook || !wb.Workbook.Sheets) wb.Props.SheetNames = wb.SheetNames;
- // $FlowIgnore
- else wb.Props.SheetNames = wb.SheetNames.map(function(x,i) { return [(wb.Workbook.Sheets[i]||{}).Hidden != 2, x];}).filter(function(x) { return x[0]; }).map(function(x) { return x[1]; });
+ else {
+ var _sn = [];
+ for(var _i = 0; _i < wb.SheetNames.length; ++_i)
+ if((wb.Workbook.Sheets[_i]||{}).Hidden != 2) _sn.push(wb.SheetNames[_i]);
+ wb.Props.SheetNames = _sn;
+ }
wb.Props.Worksheets = wb.Props.SheetNames.length;
zip.file(f, write_ext_props(wb.Props, opts));
ct.extprops.push(f);
@@ -19462,7 +19566,7 @@ function sheet_add_json(_ws, js, opts) {
var hdr = o.header || [], C = 0;
js.forEach(function (JS, R) {
- keys(JS).filter(function(x) { return JS.hasOwnProperty(x); }).forEach(function(k) {
+ keys(JS).forEach(function(k) {
if((C=hdr.indexOf(k)) == -1) hdr[C=hdr.length] = k;
var v = JS[k];
var t = 'z';
From 44b98fc7f8fb8434189af895d21b836ce96bf020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Reitmann?=
Date: Mon, 5 Mar 2018 22:28:29 +0100
Subject: [PATCH 15/15] #1586 releasing sprint 64
---
package-lock.json | 1379 ++++------------------
pom.xml | 2 +-
src/main/webapp/scripts/app.constants.js | 2 +-
3 files changed, 239 insertions(+), 1144 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 67dfe5427e..2ca461945d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,22 +22,6 @@
"integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==",
"dev": true
},
- "JSONStream": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
- "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
- "dev": true,
- "requires": {
- "jsonparse": "1.3.1",
- "through": "2.3.8"
- }
- },
- "JSV": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
- "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
- "dev": true
- },
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -639,9 +623,9 @@
"integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"combine-source-map": "0.7.2",
"defined": "1.0.0",
+ "JSONStream": "1.3.2",
"through2": "2.0.3",
"umd": "3.0.1"
}
@@ -710,7 +694,6 @@
"integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"assert": "1.4.1",
"browser-pack": "6.0.2",
"browser-resolve": "1.11.2",
@@ -732,6 +715,7 @@
"https-browserify": "1.0.0",
"inherits": "2.0.3",
"insert-module-globals": "7.0.1",
+ "JSONStream": "1.3.2",
"labeled-stream-splicer": "2.0.0",
"module-deps": "4.1.1",
"os-browserify": "0.3.0",
@@ -1073,7 +1057,6 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
- "fsevents": "1.1.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
@@ -2440,1129 +2423,225 @@
"resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
"dev": true,
- "requires": {
- "websocket-driver": "0.7.0"
- }
- },
- "fd-slicer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
- "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
- "dev": true,
- "requires": {
- "pend": "1.2.0"
- }
- },
- "figures": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
- "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
- "dev": true,
- "requires": {
- "escape-string-regexp": "1.0.5",
- "object-assign": "4.1.1"
- }
- },
- "file-sync-cmp": {
- "version": "0.1.1",
- "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
- "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
- "dev": true
- },
- "file-uri-to-path": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
- "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
- "dev": true
- },
- "filename-regex": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
- "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
- "dev": true
- },
- "filendir": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/filendir/-/filendir-1.0.0.tgz",
- "integrity": "sha1-dFtEWvzElwpM2wD9lTnHftlCrfY=",
- "dev": true,
- "requires": {
- "mkdirp": "0.5.1"
- },
- "dependencies": {
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true
- },
- "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
- }
- }
- }
- },
- "fill-range": {
- "version": "2.2.3",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
- "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
- "dev": true,
- "requires": {
- "is-number": "2.1.0",
- "isobject": "2.1.0",
- "randomatic": "1.1.7",
- "repeat-element": "1.1.2",
- "repeat-string": "1.6.1"
- }
- },
- "finalhandler": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
- "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
- "dev": true,
- "requires": {
- "debug": "2.2.0",
- "escape-html": "1.0.3",
- "on-finished": "2.3.0",
- "statuses": "1.3.1",
- "unpipe": "1.0.0"
- }
- },
- "find-up": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
- "dev": true,
- "requires": {
- "path-exists": "2.1.0",
- "pinkie-promise": "2.0.1"
- }
- },
- "findup-sync": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
- "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
- "dev": true,
- "requires": {
- "glob": "5.0.15"
- },
- "dependencies": {
- "glob": {
- "version": "5.0.15",
- "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
- "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
- "dev": true,
- "requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
- }
- }
- },
- "follow-redirects": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
- "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "2.2.0"
- }
- },
- "for-in": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
- "dev": true
- },
- "for-own": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
- "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
- "dev": true,
- "requires": {
- "for-in": "1.0.2"
- }
- },
- "foreach": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
- "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
- "dev": true
- },
- "forever-agent": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
- "dev": true
- },
- "form-data": {
- "version": "2.1.4",
- "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
- "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
- "dev": true,
- "requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.17"
- }
- },
- "formidable": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
- "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
- "dev": true
- },
- "fresh": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
- "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
- "dev": true
- },
- "from": {
- "version": "0.1.7",
- "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
- "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
- "dev": true
- },
- "fs-access": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
- "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
- "dev": true,
- "requires": {
- "null-check": "1.0.0"
- }
- },
- "fs-extra": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
- "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "jsonfile": "3.0.1",
- "universalify": "0.1.1"
- }
- },
- "fs.realpath": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
- },
- "fsevents": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
- "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
- "dev": true,
- "optional": true,
- "requires": {
- "nan": "2.8.0",
- "node-pre-gyp": "0.6.39"
- },
- "dependencies": {
- "abbrev": {
- "version": "1.1.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "ajv": {
- "version": "4.11.8",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "co": "4.6.0",
- "json-stable-stringify": "1.0.1"
- }
- },
- "ansi-regex": {
- "version": "2.1.1",
- "bundled": true,
- "dev": true
- },
- "aproba": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "are-we-there-yet": {
- "version": "1.1.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.2.9"
- }
- },
- "asn1": {
- "version": "0.2.3",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "assert-plus": {
- "version": "0.2.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "asynckit": {
- "version": "0.4.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "aws-sign2": {
- "version": "0.6.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "aws4": {
- "version": "1.6.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "balanced-match": {
- "version": "0.4.2",
- "bundled": true,
- "dev": true
- },
- "bcrypt-pbkdf": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "tweetnacl": "0.14.5"
- }
- },
- "block-stream": {
- "version": "0.0.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "inherits": "2.0.3"
- }
- },
- "boom": {
- "version": "2.10.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "hoek": "2.16.3"
- }
- },
- "brace-expansion": {
- "version": "1.1.7",
- "bundled": true,
- "dev": true,
- "requires": {
- "balanced-match": "0.4.2",
- "concat-map": "0.0.1"
- }
- },
- "buffer-shims": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "caseless": {
- "version": "0.12.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "co": {
- "version": "4.6.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "code-point-at": {
- "version": "1.1.0",
- "bundled": true,
- "dev": true
- },
- "combined-stream": {
- "version": "1.0.5",
- "bundled": true,
- "dev": true,
- "requires": {
- "delayed-stream": "1.0.0"
- }
- },
- "concat-map": {
- "version": "0.0.1",
- "bundled": true,
- "dev": true
- },
- "console-control-strings": {
- "version": "1.1.0",
- "bundled": true,
- "dev": true
- },
- "core-util-is": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true
- },
- "cryptiles": {
- "version": "2.0.5",
- "bundled": true,
- "dev": true,
- "requires": {
- "boom": "2.10.1"
- }
- },
- "dashdash": {
- "version": "1.14.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "1.0.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "debug": {
- "version": "2.6.8",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "ms": "2.0.0"
- }
- },
- "deep-extend": {
- "version": "0.4.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "delayed-stream": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "delegates": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "detect-libc": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "ecc-jsbn": {
- "version": "0.1.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "jsbn": "0.1.1"
- }
- },
- "extend": {
- "version": "3.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "extsprintf": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true
- },
- "forever-agent": {
- "version": "0.6.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "form-data": {
- "version": "2.1.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.15"
- }
- },
- "fs.realpath": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "fstream": {
- "version": "1.0.11",
- "bundled": true,
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "inherits": "2.0.3",
- "mkdirp": "0.5.1",
- "rimraf": "2.6.1"
- }
- },
- "fstream-ignore": {
- "version": "1.0.5",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "fstream": "1.0.11",
- "inherits": "2.0.3",
- "minimatch": "3.0.4"
- }
- },
- "gauge": {
- "version": "2.7.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "aproba": "1.1.1",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
- }
- },
- "getpass": {
- "version": "0.1.7",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "1.0.0"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "glob": {
- "version": "7.1.2",
- "bundled": true,
- "dev": true,
- "requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
- },
- "graceful-fs": {
- "version": "4.1.11",
- "bundled": true,
- "dev": true
- },
- "har-schema": {
- "version": "1.0.5",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "har-validator": {
- "version": "4.2.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "ajv": "4.11.8",
- "har-schema": "1.0.5"
- }
- },
- "has-unicode": {
- "version": "2.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "hawk": {
- "version": "3.1.3",
- "bundled": true,
- "dev": true,
- "requires": {
- "boom": "2.10.1",
- "cryptiles": "2.0.5",
- "hoek": "2.16.3",
- "sntp": "1.0.9"
- }
- },
- "hoek": {
- "version": "2.16.3",
- "bundled": true,
- "dev": true
- },
- "http-signature": {
- "version": "1.1.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "0.2.0",
- "jsprim": "1.4.0",
- "sshpk": "1.13.0"
- }
- },
- "inflight": {
- "version": "1.0.6",
- "bundled": true,
- "dev": true,
- "requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
- }
- },
- "inherits": {
- "version": "2.0.3",
- "bundled": true,
- "dev": true
- },
- "ini": {
- "version": "1.3.4",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "is-fullwidth-code-point": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "requires": {
- "number-is-nan": "1.0.1"
- }
- },
- "is-typedarray": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "isarray": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true
- },
- "isstream": {
- "version": "0.1.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "jodid25519": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "jsbn": "0.1.1"
- }
- },
- "jsbn": {
- "version": "0.1.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "json-schema": {
- "version": "0.2.3",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "json-stable-stringify": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "jsonify": "0.0.0"
- }
- },
- "json-stringify-safe": {
- "version": "5.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "jsonify": {
- "version": "0.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "jsprim": {
- "version": "1.4.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "assert-plus": "1.0.0",
- "extsprintf": "1.0.2",
- "json-schema": "0.2.3",
- "verror": "1.3.6"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "mime-db": {
- "version": "1.27.0",
- "bundled": true,
- "dev": true
- },
- "mime-types": {
- "version": "2.1.15",
- "bundled": true,
- "dev": true,
- "requires": {
- "mime-db": "1.27.0"
- }
- },
- "minimatch": {
- "version": "3.0.4",
- "bundled": true,
- "dev": true,
- "requires": {
- "brace-expansion": "1.1.7"
- }
- },
- "minimist": {
- "version": "0.0.8",
- "bundled": true,
- "dev": true
- },
- "mkdirp": {
- "version": "0.5.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
- }
- },
- "ms": {
- "version": "2.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "node-pre-gyp": {
- "version": "0.6.39",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "detect-libc": "1.0.2",
- "hawk": "3.1.3",
- "mkdirp": "0.5.1",
- "nopt": "4.0.1",
- "npmlog": "4.1.0",
- "rc": "1.2.1",
- "request": "2.81.0",
- "rimraf": "2.6.1",
- "semver": "5.3.0",
- "tar": "2.2.1",
- "tar-pack": "3.4.0"
- }
- },
- "nopt": {
- "version": "4.0.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "abbrev": "1.1.0",
- "osenv": "0.1.4"
- }
- },
- "npmlog": {
- "version": "4.1.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
- }
- },
- "number-is-nan": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true
- },
- "oauth-sign": {
- "version": "0.8.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "object-assign": {
- "version": "4.1.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "once": {
- "version": "1.4.0",
- "bundled": true,
- "dev": true,
- "requires": {
- "wrappy": "1.0.2"
- }
- },
- "os-homedir": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "os-tmpdir": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "osenv": {
- "version": "0.1.4",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
- }
- },
- "path-is-absolute": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true
- },
- "performance-now": {
- "version": "0.2.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "process-nextick-args": {
- "version": "1.0.7",
- "bundled": true,
- "dev": true
- },
- "punycode": {
- "version": "1.4.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "qs": {
- "version": "6.4.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "rc": {
- "version": "1.2.1",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.4",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
- },
- "dependencies": {
- "minimist": {
- "version": "1.2.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "readable-stream": {
- "version": "2.2.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "buffer-shims": "1.0.0",
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "string_decoder": "1.0.1",
- "util-deprecate": "1.0.2"
- }
- },
- "request": {
- "version": "2.81.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "aws-sign2": "0.6.0",
- "aws4": "1.6.0",
- "caseless": "0.12.0",
- "combined-stream": "1.0.5",
- "extend": "3.0.1",
- "forever-agent": "0.6.1",
- "form-data": "2.1.4",
- "har-validator": "4.2.1",
- "hawk": "3.1.3",
- "http-signature": "1.1.1",
- "is-typedarray": "1.0.0",
- "isstream": "0.1.2",
- "json-stringify-safe": "5.0.1",
- "mime-types": "2.1.15",
- "oauth-sign": "0.8.2",
- "performance-now": "0.2.0",
- "qs": "6.4.0",
- "safe-buffer": "5.0.1",
- "stringstream": "0.0.5",
- "tough-cookie": "2.3.2",
- "tunnel-agent": "0.6.0",
- "uuid": "3.0.1"
- }
- },
- "rimraf": {
- "version": "2.6.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "glob": "7.1.2"
- }
- },
- "safe-buffer": {
- "version": "5.0.1",
- "bundled": true,
- "dev": true
- },
- "semver": {
- "version": "5.3.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "set-blocking": {
- "version": "2.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "signal-exit": {
- "version": "3.0.2",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "sntp": {
- "version": "1.0.9",
- "bundled": true,
- "dev": true,
- "requires": {
- "hoek": "2.16.3"
- }
- },
- "sshpk": {
- "version": "1.13.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "asn1": "0.2.3",
- "assert-plus": "1.0.0",
- "bcrypt-pbkdf": "1.0.1",
- "dashdash": "1.14.1",
- "ecc-jsbn": "0.1.1",
- "getpass": "0.1.7",
- "jodid25519": "1.0.2",
- "jsbn": "0.1.1",
- "tweetnacl": "0.14.5"
- },
- "dependencies": {
- "assert-plus": {
- "version": "1.0.0",
- "bundled": true,
- "dev": true,
- "optional": true
- }
- }
- },
- "string-width": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true,
- "requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
- }
- },
- "string_decoder": {
- "version": "1.0.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "safe-buffer": "5.0.1"
- }
- },
- "stringstream": {
- "version": "0.0.5",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "strip-ansi": {
- "version": "3.0.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "ansi-regex": "2.1.1"
- }
- },
- "strip-json-comments": {
- "version": "2.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "tar": {
- "version": "2.2.1",
- "bundled": true,
- "dev": true,
- "requires": {
- "block-stream": "0.0.9",
- "fstream": "1.0.11",
- "inherits": "2.0.3"
- }
- },
- "tar-pack": {
- "version": "3.4.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "debug": "2.6.8",
- "fstream": "1.0.11",
- "fstream-ignore": "1.0.5",
- "once": "1.4.0",
- "readable-stream": "2.2.9",
- "rimraf": "2.6.1",
- "tar": "2.2.1",
- "uid-number": "0.0.6"
- }
- },
- "tough-cookie": {
- "version": "2.3.2",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "punycode": "1.4.1"
- }
- },
- "tunnel-agent": {
- "version": "0.6.0",
- "bundled": true,
- "dev": true,
- "optional": true,
- "requires": {
- "safe-buffer": "5.0.1"
- }
- },
- "tweetnacl": {
- "version": "0.14.5",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "uid-number": {
- "version": "0.0.6",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "util-deprecate": {
- "version": "1.0.2",
- "bundled": true,
+ "requires": {
+ "websocket-driver": "0.7.0"
+ }
+ },
+ "fd-slicer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+ "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+ "dev": true,
+ "requires": {
+ "pend": "1.2.0"
+ }
+ },
+ "figures": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "1.0.5",
+ "object-assign": "4.1.1"
+ }
+ },
+ "file-sync-cmp": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz",
+ "integrity": "sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=",
+ "dev": true
+ },
+ "file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "dev": true
+ },
+ "filename-regex": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+ "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+ "dev": true
+ },
+ "filendir": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/filendir/-/filendir-1.0.0.tgz",
+ "integrity": "sha1-dFtEWvzElwpM2wD9lTnHftlCrfY=",
+ "dev": true,
+ "requires": {
+ "mkdirp": "0.5.1"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
"dev": true
},
- "uuid": {
- "version": "3.0.1",
- "bundled": true,
- "dev": true,
- "optional": true
- },
- "verror": {
- "version": "1.3.6",
- "bundled": true,
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
- "optional": true,
"requires": {
- "extsprintf": "1.0.2"
+ "minimist": "0.0.8"
}
- },
- "wide-align": {
- "version": "1.1.2",
- "bundled": true,
+ }
+ }
+ },
+ "fill-range": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+ "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+ "dev": true,
+ "requires": {
+ "is-number": "2.1.0",
+ "isobject": "2.1.0",
+ "randomatic": "1.1.7",
+ "repeat-element": "1.1.2",
+ "repeat-string": "1.6.1"
+ }
+ },
+ "finalhandler": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz",
+ "integrity": "sha1-6VCKvs6bbbqHGmlCodeRG5GRGsc=",
+ "dev": true,
+ "requires": {
+ "debug": "2.2.0",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "statuses": "1.3.1",
+ "unpipe": "1.0.0"
+ }
+ },
+ "find-up": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "dev": true,
+ "requires": {
+ "path-exists": "2.1.0",
+ "pinkie-promise": "2.0.1"
+ }
+ },
+ "findup-sync": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+ "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+ "dev": true,
+ "requires": {
+ "glob": "5.0.15"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "5.0.15",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
"dev": true,
- "optional": true,
"requires": {
- "string-width": "1.0.2"
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
}
- },
- "wrappy": {
- "version": "1.0.2",
- "bundled": true,
- "dev": true
}
}
},
+ "follow-redirects": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+ "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "2.2.0"
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "dev": true
+ },
+ "for-own": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+ "dev": true,
+ "requires": {
+ "for-in": "1.0.2"
+ }
+ },
+ "foreach": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+ "dev": true
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true
+ },
+ "form-data": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+ "dev": true,
+ "requires": {
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.5",
+ "mime-types": "2.1.17"
+ }
+ },
+ "formidable": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.1.1.tgz",
+ "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
+ "dev": true
+ },
+ "fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+ "dev": true
+ },
+ "from": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+ "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+ "dev": true
+ },
+ "fs-access": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+ "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+ "dev": true,
+ "requires": {
+ "null-check": "1.0.0"
+ }
+ },
+ "fs-extra": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.1.11",
+ "jsonfile": "3.0.1",
+ "universalify": "0.1.1"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
+ },
"fstream": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
@@ -4903,10 +3982,10 @@
"integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"combine-source-map": "0.7.2",
"concat-stream": "1.5.2",
"is-buffer": "1.1.6",
+ "JSONStream": "1.3.2",
"lexical-scope": "1.2.0",
"process": "0.11.10",
"through2": "2.0.3",
@@ -5603,6 +4682,16 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
"dev": true
},
+ "JSONStream": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
+ "integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+ "dev": true,
+ "requires": {
+ "jsonparse": "1.3.1",
+ "through": "2.3.8"
+ }
+ },
"jsprim": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -5623,6 +4712,12 @@
}
}
},
+ "JSV": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
+ "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
+ "dev": true
+ },
"jszip": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",
@@ -6618,7 +5713,6 @@
"integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
"browser-resolve": "1.11.2",
"cached-path-relative": "1.0.1",
"concat-stream": "1.5.2",
@@ -6626,6 +5720,7 @@
"detective": "4.7.1",
"duplexer2": "0.1.4",
"inherits": "2.0.3",
+ "JSONStream": "1.3.2",
"parents": "1.0.1",
"readable-stream": "2.3.3",
"resolve": "1.1.7",
@@ -9120,6 +8215,15 @@
}
}
},
+ "string_decoder": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.1"
+ }
+ },
"string-length": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -9146,15 +8250,6 @@
"integrity": "sha1-oZwg3uUamHd+mkfhDwm+OTubunU=",
"dev": true
},
- "string_decoder": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
- "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
- "dev": true,
- "requires": {
- "safe-buffer": "5.1.1"
- }
- },
"stringmap": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz",
diff --git a/pom.xml b/pom.xml
index 57b891b959..7d18ceecc0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
eu.dzhw.fdz.metadatamanagement
metadatamanagement
- 1.0.64-SNAPSHOT
+ 1.0.64
war
metadatamanagement
diff --git a/src/main/webapp/scripts/app.constants.js b/src/main/webapp/scripts/app.constants.js
index d1e08bdeeb..ed3cbd2738 100644
--- a/src/main/webapp/scripts/app.constants.js
+++ b/src/main/webapp/scripts/app.constants.js
@@ -6,7 +6,7 @@ angular.module('metadatamanagementApp')
.constant('ENV', 'local')
-.constant('VERSION', '1.0.64-SNAPSHOT')
+.constant('VERSION', '1.0.64')
.constant('ElasticSearchProperties', {apiVersion:'5.1',logLevel:'error',pageSize:10})
|