diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignParticipantLog.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignParticipantLog.xml
index feb64016d7fa3df9cf99212167dde3c277fadf7e..eafc67e596a16b39cd2a74010e4b21ec8db08af2 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignParticipantLog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignParticipantLog.xml
@@ -14,6 +14,7 @@
<column name="CAMPAIGNSTEP_ID" type="CHAR(36)">
<constraints nullable="false"/>
</column>
+ <column name="PREVIOUS_CAMPAIGNSTEP_ID" type="CHAR(36)"/>
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index d631bbcd062f37f762cef7cdd60e346912dc7203..542ef65ff2e3e72c3ac86375a983fb1a91fb6541 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -8825,6 +8825,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PREVIOUS_CAMPAIGNSTEP_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
index c471c8a13c8c91ffa5916745d7e8c6080f5c92ef..8e30f7b7188c852aa11b7d1bbb20963ed6c570a1 100644
--- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("system.vars");
import("system.db");
import("system.util");
@@ -62,12 +63,23 @@ function _handleCondition(pCampaignId, pTargetTableName, pCondition)
function _handleRowIds(pParticipantRowIds)
{
+ var oldStepIds = {};
if(isUpdate == "true")
{
cols = [ "CAMPAIGNSTEP_ID",
- "USER_EDIT",
- "DATE_EDIT"
+ "USER_EDIT",
+ "DATE_EDIT"
];
+
+ let oldSteps = db.table(SqlCondition.begin()
+ .orIn("CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID", pParticipantRowIds)
+ .orIn("CAMPAIGNPARTICIPANT.CONTACT_ID", pParticipantRowIds)
+ .buildSql("select CAMPAIGNPARTICIPANTID, CAMPAIGNSTEP_ID from CAMPAIGNPARTICIPANT", "1=2")
+ );
+ oldSteps.forEach(function (step)
+ {
+
+ }, oldStepIds);
}
else
{
@@ -89,12 +101,22 @@ function _handleRowIds(pParticipantRowIds)
if(isUpdate == "true")
{
+ let oldCampaignStepId = "";
let updatedValues = [newCampaignStepId,
+ oldCampaignStepId,
vars.get("$sys.user"),
vars.get("$sys.date")];
let condition = "CONTACT_ID = '" + pParticipantRowIds[participant] + "' OR CAMPAIGNPARTICIPANTID = '" + pParticipantRowIds[participant] + "'";
- let valsCampaignParticipantLog = new Array(pParticipantRowIds[participant], campaignId, newCampaignStepId, campaignParticipantLogId, vars.get("$sys.user"), vars.get("$sys.date"));
+ let valsCampaignParticipantLog = [
+ pParticipantRowIds[participant],
+ campaignId,
+ newCampaignStepId,
+ campaignParticipantLogId,
+ vars.get("$sys.user"),
+ vars.get("$sys.date"),
+ oldCampaignStepId
+ ];
statementArray.push(["CAMPAIGNPARTICIPANT", cols, null, updatedValues, condition]);
logArray.push(["CAMPAIGNPARTICIPANTLOG", colNamesCampaignParticipantLog, null, valsCampaignParticipantLog]);
diff --git a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
index f3a905214eece4720bb4675a6e9e4febf06a57c5..3d6816c656ace8a7fc942212f1f4b28e8f1d9a6a 100644
--- a/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js
@@ -9,7 +9,7 @@ var campaignId = vars.get("$param.CampaignId_param");
var sqlSelect = "select CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, count(distinct CAMPAIGNPARTICIPANTID), MAXPARTICIPANTS, count(distinct CAMPAIGNPARTICIPANTLOG.CAMPAIGNPARTICIPANT_ID) \n\
from CAMPAIGNSTEP \n\
left join CAMPAIGNPARTICIPANT on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID \n\
- left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.CAMPAIGNSTEP_ID";
+ left join CAMPAIGNPARTICIPANTLOG on CAMPAIGNSTEPID = CAMPAIGNPARTICIPANTLOG.PREVIOUS_CAMPAIGNSTEP_ID";
var sqlGroupOrderBy = "group by CAMPAIGNSTEPID, CAMPAIGNSTEP.NAME, MAXPARTICIPANTS, CAMPAIGNSTEP.SORTING order by CAMPAIGNSTEP.SORTING";
var sqlQuery = SqlCondition.begin()
@@ -19,9 +19,9 @@ var sqlQuery = SqlCondition.begin()
var stepData = db.table(sqlQuery);
var categories = {
- CURRENT : "CURRENT",
- MAX : "MAX",
- LOGGED : "LOGGED"
+ CURRENT : "_CURRENT",
+ MAX : "_MAX",
+ LOGGED : "_LOGGED"
};
var records = [];
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index d6ab3e662ae9e1181893f8d93377221f532fafa5..71f472999b3fec4e91d5e5d067cc1facd1872730 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -265,6 +265,10 @@
<name>CAMPAIGNPARTICIPANTID.displayValue</name>
<recordfield>CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADVERTISINGBAN.value</name>
+ <expression>%aditoprj%/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/advertisingban.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/advertisingban.value/expression.js b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/advertisingban.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..6d7b0fbce0469fbb63c347dd3e019e50def57e25
--- /dev/null
+++ b/entity/CampaignParticipant_entity/recordcontainers/participantsdbrecordcontainer/recordfieldmappings/advertisingban.value/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+
+result.string("(select MEDIUM from CAMPAIGNSTEP \n\
+ join COMMRESTRICTION on MEDIUM = STEPMEDIUM \n\
+ where COMMRESTRICTION.CONTACT_ID = CAMPAIGNPARTICIPANT.CONTACT_ID \n\
+ and CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID)");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index fe5dceb87a1ffa9ada00f399ce63e2b0dc5e1a43..abacf71907e091242f5a1c81ecc8b28f67e84a58 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5097,6 +5097,9 @@
<entry>
<key>dada</key>
</entry>
+ <entry>
+ <key>Document templates</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index ac6f86a72d734c0cb7390cb9d57a896b9d3979fb..e9d86979187c1fbbd7f725e3fd12d219c6495ee6 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5146,6 +5146,9 @@
<entry>
<key>dada</key>
</entry>
+ <entry>
+ <key>Document templates</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 4557361ebd07d298834c1708421918a2dbd5b97d..9ecff8ffe06daa0b119170979a107e068edcf9db 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -144,7 +144,7 @@ CampaignUtils.createLogEntry = function(pCampaignId, pCampaignStepId, pContactId
CampaignUtils.getParticipantLogInsertColumnNames = function()
{
- return ["CAMPAIGNPARTICIPANT_ID", "CAMPAIGN_ID", "CAMPAIGNSTEP_ID", "CAMPAIGNPARTICIPANTLOGID", "USER_NEW", "DATE_NEW"];
+ return ["CAMPAIGNPARTICIPANT_ID", "CAMPAIGN_ID", "CAMPAIGNSTEP_ID", "CAMPAIGNPARTICIPANTLOGID", "USER_NEW", "DATE_NEW", "PREVIOUS_CAMPAIGNSTEP_ID"];
}
CampaignUtils.openSetCampaignStepViewByRowIds = function(pParticipantIds, pCampaignId, pCampaignStepId)
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index f182936863c5909b8ce50614de09b34363e5d2f3..d43a480aa427019e311a21da0bc6f64ff6acc992 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -97,8 +97,6 @@ DocumentTemplate.types = {
* @param {String} [pAssignmentTable="DOCUMENTTEMPLATE"] the LOB assignment table
*
* @return {DocumentTemplate} template object
- *
- * @throws {Error} if the type can't be used
*/
DocumentTemplate.loadTemplate = function (pAssignmentRowId, pAssignmentTable)
{
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index ba89d5b72fe127a05af388ffdd0cb0cb3803c612..4eca03e20fefab5ae808dbcb36e4dad08c282dbd 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -20,8 +20,8 @@ if (vars.exists("$local.templateFilePath"))
else
fileContent = vars.get("$local.templateb64");
-var zip = new JSZip();
-zip = zip.load(fileContent, {base64: true});
+var zip = new JSZip(fileContent, {base64: true});
+//zip = zip.load();
var docx = new Docxtemplater();
//use ADITO-default delimiters instead of doxtemplater-delimiters
docx.delimiters.start = "{@";
@@ -135,6 +135,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
function initJsZip()
{
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.JSZip = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
var DataReader = require('./dataReader');
function ArrayReader(data) {
@@ -180,13 +181,14 @@ ArrayReader.prototype.readData = function(size) {
if(size === 0) {
return [];
}
- var res = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+ var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
this.index += size;
- return res;
+ return result;
};
module.exports = ArrayReader;
},{"./dataReader":6}],2:[function(require,module,exports){
+'use strict';
// private property
var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
@@ -258,6 +260,7 @@ exports.decode = function(input, utf8) {
};
},{}],3:[function(require,module,exports){
+'use strict';
function CompressedObject() {
this.compressedSize = 0;
this.uncompressedSize = 0;
@@ -287,6 +290,7 @@ CompressedObject.prototype = {
module.exports = CompressedObject;
},{}],4:[function(require,module,exports){
+'use strict';
exports.STORE = {
magic: "\x00\x00",
compress: function(content, compressionOptions) {
@@ -301,6 +305,7 @@ exports.STORE = {
exports.DEFLATE = require('./flate');
},{"./flate":9}],5:[function(require,module,exports){
+'use strict';
var utils = require('./utils');
@@ -404,7 +409,7 @@ module.exports = function crc32(input, crc) {
// vim: set shiftwidth=4 softtabstop=4:
},{"./utils":22}],6:[function(require,module,exports){
-
+'use strict';
var utils = require('./utils');
function DataReader(data) {
@@ -463,14 +468,14 @@ DataReader.prototype = {
* @return {number} the corresponding number.
*/
readInt: function(size) {
- var res = 0,
+ var result = 0,
i;
this.checkOffset(size);
for (i = this.index + size - 1; i >= this.index; i--) {
- res = (res << 8) + this.byteAt(i);
+ result = (result << 8) + this.byteAt(i);
}
this.index += size;
- return res;
+ return result;
},
/**
* Get the next string with a given byte size.
@@ -514,6 +519,7 @@ DataReader.prototype = {
module.exports = DataReader;
},{"./utils":22}],7:[function(require,module,exports){
+'use strict';
exports.base64 = false;
exports.binary = false;
exports.dir = false;
@@ -526,6 +532,7 @@ exports.unixPermissions = null;
exports.dosPermissions = null;
},{}],8:[function(require,module,exports){
+'use strict';
var utils = require('./utils');
/**
@@ -632,6 +639,7 @@ exports.isRegExp = function (object) {
},{"./utils":22}],9:[function(require,module,exports){
+'use strict';
var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
var pako = require("pako");
@@ -649,6 +657,7 @@ exports.uncompress = function(input) {
};
},{"pako":25}],10:[function(require,module,exports){
+'use strict';
var base64 = require('./base64');
@@ -729,6 +738,7 @@ JSZip.compressions = require('./compressions');
module.exports = JSZip;
},{"./base64":2,"./compressions":4,"./defaults":7,"./deprecatedPublicUtils":8,"./load":11,"./object":14,"./support":18}],11:[function(require,module,exports){
+'use strict';
var base64 = require('./base64');
var utf8 = require('./utf8');
var utils = require('./utils');
@@ -770,6 +780,7 @@ module.exports = function(data, options) {
},{"./base64":2,"./utf8":21,"./utils":22,"./zipEntries":23}],12:[function(require,module,exports){
(function (Buffer){
+'use strict';
module.exports = function(data, encoding){
return new Buffer(data, encoding);
};
@@ -779,6 +790,7 @@ module.exports.test = function(b){
}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
},{}],13:[function(require,module,exports){
+'use strict';
var Uint8ArrayReader = require('./uint8ArrayReader');
function NodeBufferReader(data) {
@@ -794,14 +806,14 @@ NodeBufferReader.prototype = new Uint8ArrayReader();
*/
NodeBufferReader.prototype.readData = function(size) {
this.checkOffset(size);
- var res = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+ var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
this.index += size;
- return res;
+ return result;
};
module.exports = NodeBufferReader;
},{"./uint8ArrayReader":19}],14:[function(require,module,exports){
-
+'use strict';
var support = require('./support');
var utils = require('./utils');
var crc32 = require('./crc32');
@@ -846,49 +858,49 @@ var getRawData = function(file) {
* @return {String|ArrayBuffer|Uint8Array|Buffer} the data.
*/
var getBinaryData = function(file) {
- var res = getRawData(file),
- type = utils.getTypeOf(res);
+ var result = getRawData(file),
+ type = utils.getTypeOf(result);
if (type === "string") {
if (!file.options.binary) {
// unicode text !
// unicode string => binary string is a painful process, check if we can avoid it.
if (support.nodebuffer) {
- return nodeBuffer(res, "utf-8");
+ return nodeBuffer(result, "utf-8");
}
}
return file.asBinary();
}
- return res;
+ return result;
};
/**
* Transform this._data into a string.
- * @param {function} filter a function String -> String, applied if not null on the res.
+ * @param {function} filter a function String -> String, applied if not null on the result.
* @return {String} the string representing this._data.
*/
var dataToString = function(asUTF8) {
- var res = getRawData(this);
- if (res === null || typeof res === "undefined") {
+ var result = getRawData(this);
+ if (result === null || typeof result === "undefined") {
return "";
}
// if the data is a base64 string, we decode it before checking the encoding !
if (this.options.base64) {
- res = base64.decode(res);
+ result = base64.decode(result);
}
if (asUTF8 && this.options.binary) {
// JSZip.prototype.utf8decode supports arrays as input
// skip to array => string step, utf8decode will do it.
- res = out.utf8decode(res);
+ result = out.utf8decode(result);
}
else {
// no utf8 transformation, do the array => string step.
- res = utils.transformTo("string", res);
+ result = utils.transformTo("string", result);
}
if (!asUTF8 && !this.options.binary) {
- res = utils.transformTo("string", out.utf8encode(res));
+ result = utils.transformTo("string", out.utf8encode(result));
}
- return res;
+ return result;
};
/**
* A simple object representing a file in the zip file.
@@ -939,16 +951,16 @@ ZipObject.prototype = {
* @return {Buffer} the content as a Buffer.
*/
asNodeBuffer: function() {
- var res = getBinaryData(this);
- return utils.transformTo("nodebuffer", res);
+ var result = getBinaryData(this);
+ return utils.transformTo("nodebuffer", result);
},
/**
* Returns the content as an Uint8Array.
* @return {Uint8Array} the content as an Uint8Array.
*/
asUint8Array: function() {
- var res = getBinaryData(this);
- return utils.transformTo("uint8array", res);
+ var result = getBinaryData(this);
+ return utils.transformTo("uint8array", result);
},
/**
* Returns the content as an ArrayBuffer.
@@ -964,7 +976,7 @@ ZipObject.prototype = {
* @private
* @param {number} dec the number to convert.
* @param {number} bytes the number of bytes to generate.
- * @returns {string} the res.
+ * @returns {string} the result.
*/
var decToHex = function(dec, bytes) {
var hex = "",
@@ -1122,29 +1134,29 @@ var folderAdd = function(name, createFolders) {
* @param {ZipObject} file the object to read.
* @param {JSZip.compression} compression the compression to use.
* @param {Object} compressionOptions the options to use when compressing.
- * @return {JSZip.CompressedObject} the compressed res.
+ * @return {JSZip.CompressedObject} the compressed result.
*/
var generateCompressedObjectFrom = function(file, compression, compressionOptions) {
- var res = new CompressedObject(),
+ var result = new CompressedObject(),
content;
// the data has not been decompressed, we might reuse things !
if (file._data instanceof CompressedObject) {
- res.uncompressedSize = file._data.uncompressedSize;
- res.crc32 = file._data.crc32;
+ result.uncompressedSize = file._data.uncompressedSize;
+ result.crc32 = file._data.crc32;
- if (res.uncompressedSize === 0 || file.dir) {
+ if (result.uncompressedSize === 0 || file.dir) {
compression = compressions['STORE'];
- res.compressedContent = "";
- res.crc32 = 0;
+ result.compressedContent = "";
+ result.crc32 = 0;
}
else if (file._data.compressionMethod === compression.magic) {
- res.compressedContent = file._data.getCompressedContent();
+ result.compressedContent = file._data.getCompressedContent();
}
else {
content = file._data.getContent();
// need to decompress / recompress
- res.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
+ result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
}
}
else {
@@ -1154,15 +1166,15 @@ var generateCompressedObjectFrom = function(file, compression, compressionOption
compression = compressions['STORE'];
content = "";
}
- res.uncompressedSize = content.length;
- res.crc32 = crc32(content);
- res.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
+ result.uncompressedSize = content.length;
+ result.crc32 = crc32(content);
+ result.compressedContent = compression.compress(utils.transformTo(compression.compressInputType, content), compressionOptions);
}
- res.compressedSize = res.compressedContent.length;
- res.compressionMethod = compression.magic;
+ result.compressedSize = result.compressedContent.length;
+ result.compressionMethod = compression.magic;
- return res;
+ return result;
};
@@ -1185,15 +1197,15 @@ var generateCompressedObjectFrom = function(file, compression, compressionOption
*/
var generateUnixExternalFileAttr = function (unixPermissions, isDir) {
- var res = unixPermissions;
+ var result = unixPermissions;
if (!unixPermissions) {
// I can't use octal values in strict mode, hence the hexa.
// 040775 => 0x41fd
// 0100664 => 0x81b4
- res = isDir ? 0x41fd : 0x81b4;
+ result = isDir ? 0x41fd : 0x81b4;
}
- return (res & 0xFFFF) << 16;
+ return (result & 0xFFFF) << 16;
};
/**
@@ -1415,7 +1427,7 @@ var out = {
* @return {Array} An array of matching elements.
*/
filter: function(search) {
- var res = [],
+ var result = [],
filename, relativePath, file, fileClone;
for (filename in this.files) {
if (!this.files.hasOwnProperty(filename)) {
@@ -1427,10 +1439,10 @@ var out = {
relativePath = filename.slice(this.root.length, filename.length);
if (filename.slice(0, this.root.length) === this.root && // the file is in the current root
search(relativePath, fileClone)) { // and the file matches the function
- res.push(fileClone);
+ result.push(fileClone);
}
}
- return res;
+ return result;
},
/**
@@ -1673,7 +1685,7 @@ var out = {
module.exports = out;
},{"./base64":2,"./compressedObject":3,"./compressions":4,"./crc32":5,"./defaults":7,"./nodeBuffer":12,"./signature":15,"./stringWriter":17,"./support":18,"./uint8ArrayWriter":20,"./utf8":21,"./utils":22}],15:[function(require,module,exports){
-
+'use strict';
exports.LOCAL_FILE_HEADER = "PK\x03\x04";
exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
@@ -1682,7 +1694,7 @@ exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
exports.DATA_DESCRIPTOR = "PK\x07\x08";
},{}],16:[function(require,module,exports){
-
+'use strict';
var DataReader = require('./dataReader');
var utils = require('./utils');
@@ -1714,14 +1726,14 @@ StringReader.prototype.lastIndexOfSignature = function(sig) {
StringReader.prototype.readData = function(size) {
this.checkOffset(size);
// this will work because the constructor applied the "& 0xff" mask.
- var res = this.data.slice(this.zero + this.index, this.zero + this.index + size);
+ var result = this.data.slice(this.zero + this.index, this.zero + this.index + size);
this.index += size;
- return res;
+ return result;
};
module.exports = StringReader;
},{"./dataReader":6,"./utils":22}],17:[function(require,module,exports){
-
+'use strict';
var utils = require('./utils');
@@ -1742,7 +1754,7 @@ StringWriter.prototype = {
this.data.push(input);
},
/**
- * Finalize the construction an return the res.
+ * Finalize the construction an return the result.
* @return {string} the generated string.
*/
finalize: function() {
@@ -1754,7 +1766,7 @@ module.exports = StringWriter;
},{"./utils":22}],18:[function(require,module,exports){
(function (Buffer){
-
+'use strict';
exports.base64 = true;
exports.array = true;
exports.string = true;
@@ -1791,7 +1803,7 @@ else {
}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
},{}],19:[function(require,module,exports){
-
+'use strict';
var ArrayReader = require('./arrayReader');
function Uint8ArrayReader(data) {
@@ -1812,14 +1824,14 @@ Uint8ArrayReader.prototype.readData = function(size) {
// in IE10, when using subarray(idx, idx), we get the array [0x00] instead of [].
return new Uint8Array(0);
}
- var res = this.data.subarray(this.zero + this.index, this.zero + this.index + size);
+ var result = this.data.subarray(this.zero + this.index, this.zero + this.index + size);
this.index += size;
- return res;
+ return result;
};
module.exports = Uint8ArrayReader;
},{"./arrayReader":1}],20:[function(require,module,exports){
-
+'use strict';
var utils = require('./utils');
@@ -1846,7 +1858,7 @@ Uint8ArrayWriter.prototype = {
}
},
/**
- * Finalize the construction an return the res.
+ * Finalize the construction an return the result.
* @return {Uint8Array} the generated array.
*/
finalize: function() {
@@ -1857,7 +1869,7 @@ Uint8ArrayWriter.prototype = {
module.exports = Uint8ArrayWriter;
},{"./utils":22}],21:[function(require,module,exports){
-
+'use strict';
var utils = require('./utils');
var support = require('./support');
@@ -2050,23 +2062,23 @@ exports.utf8decode = function utf8decode(buf) {
// Chrome prefers to work with "small" chunks of data
// for the method buf2string.
// Firefox and Chrome has their own shortcut, IE doesn't seem to really care.
- var res = [], k = 0, len = buf.length, chunk = 65536;
+ var result = [], k = 0, len = buf.length, chunk = 65536;
while (k < len) {
var nextBoundary = utf8border(buf, Math.min(k + chunk, len));
if (support.uint8array) {
- res.push(buf2string(buf.subarray(k, nextBoundary)));
+ result.push(buf2string(buf.subarray(k, nextBoundary)));
} else {
- res.push(buf2string(buf.slice(k, nextBoundary)));
+ result.push(buf2string(buf.slice(k, nextBoundary)));
}
k = nextBoundary;
}
- return res.join("");
+ return result.join("");
};
// vim: set shiftwidth=4 softtabstop=4:
},{"./nodeBuffer":12,"./support":18,"./utils":22}],22:[function(require,module,exports){
-
+'use strict';
var support = require('./support');
var compressions = require('./compressions');
var nodeBuffer = require('./nodeBuffer');
@@ -2076,11 +2088,11 @@ var nodeBuffer = require('./nodeBuffer');
* @return {String} the binary string.
*/
exports.string2binary = function(str) {
- var res = "";
+ var result = "";
for (var i = 0; i < str.length; i++) {
- res += String.fromCharCode(str.charCodeAt(i) & 0xff);
+ result += String.fromCharCode(str.charCodeAt(i) & 0xff);
}
- return res;
+ return result;
};
exports.arrayBuffer2Blob = function(buffer, mimeType) {
exports.checkSupport("blob");
@@ -2135,7 +2147,7 @@ function stringToArrayLike(str, array) {
/**
* Transform an array-like object to a string.
* @param {Array|ArrayBuffer|Uint8Array|Buffer} array the array to transform.
- * @return {String} the res.
+ * @return {String} the result.
*/
function arrayLikeToString(array) {
// Performances notes :
@@ -2144,11 +2156,11 @@ function arrayLikeToString(array) {
// see http://jsperf.com/converting-a-uint8array-to-a-string/2
// but the stack is limited (and we can get huge arrays !).
//
- // res += String.fromCharCode(array[i]); generate too many strings !
+ // result += String.fromCharCode(array[i]); generate too many strings !
//
// This code is inspired by http://jsperf.com/arraybuffer-to-string-apply-performance/2
var chunk = 65536;
- var res = [],
+ var result = [],
len = array.length,
type = exports.getTypeOf(array),
k = 0,
@@ -2169,19 +2181,19 @@ function arrayLikeToString(array) {
// no apply : slow and painful algorithm
// default browser on android 4.*
if (!canUseApply) {
- var resStr = "";
+ var resultStr = "";
for(var i = 0; i < array.length;i++) {
- resStr += String.fromCharCode(array[i]);
+ resultStr += String.fromCharCode(array[i]);
}
- return resStr;
+ return resultStr;
}
while (k < len && chunk > 1) {
try {
if (type === "array" || type === "nodebuffer") {
- res.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
+ result.push(String.fromCharCode.apply(null, array.slice(k, Math.min(k + chunk, len))));
}
else {
- res.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
+ result.push(String.fromCharCode.apply(null, array.subarray(k, Math.min(k + chunk, len))));
}
k += chunk;
}
@@ -2189,7 +2201,7 @@ function arrayLikeToString(array) {
chunk = Math.floor(chunk / 2);
}
}
- return res.join("");
+ return result.join("");
}
exports.applyFromCharCode = arrayLikeToString;
@@ -2309,8 +2321,8 @@ exports.transformTo = function(outputType, input) {
}
exports.checkSupport(outputType);
var inputType = exports.getTypeOf(input);
- var res = transform[inputType][outputType](input);
- return res;
+ var result = transform[inputType][outputType](input);
+ return result;
};
/**
@@ -2399,20 +2411,20 @@ exports.isRegExp = function (object) {
* @return {Object} a new object with the data of the others.
*/
exports.extend = function() {
- var res = {}, i, attr;
+ var result = {}, i, attr;
for (i = 0; i < arguments.length; i++) { // arguments is not enumerable in some browsers
for (attr in arguments[i]) {
- if (arguments[i].hasOwnProperty(attr) && typeof res[attr] === "undefined") {
- res[attr] = arguments[i][attr];
+ if (arguments[i].hasOwnProperty(attr) && typeof result[attr] === "undefined") {
+ result[attr] = arguments[i][attr];
}
}
}
- return res;
+ return result;
};
},{"./compressions":4,"./nodeBuffer":12,"./support":18}],23:[function(require,module,exports){
-
+'use strict';
var StringReader = require('./stringReader');
var NodeBufferReader = require('./nodeBufferReader');
var Uint8ArrayReader = require('./uint8ArrayReader');
@@ -2458,9 +2470,9 @@ ZipEntries.prototype = {
var currentIndex = this.reader.index;
this.reader.setIndex(askedIndex);
var signature = this.reader.readString(4);
- var res = signature === expectedSignature;
+ var result = signature === expectedSignature;
this.reader.setIndex(currentIndex);
- return res;
+ return result;
},
/**
* Read the end of the central directory.
@@ -2694,7 +2706,7 @@ ZipEntries.prototype = {
module.exports = ZipEntries;
},{"./arrayReader":1,"./nodeBufferReader":13,"./object":14,"./signature":15,"./stringReader":16,"./support":18,"./uint8ArrayReader":19,"./utils":22,"./zipEntry":24}],24:[function(require,module,exports){
-
+'use strict';
var StringReader = require('./stringReader');
var utils = require('./utils');
var CompressedObject = require('./compressedObject');
@@ -3016,7 +3028,7 @@ module.exports = ZipEntry;
},{"./compressedObject":3,"./object":14,"./stringReader":16,"./support":18,"./utils":22}],25:[function(require,module,exports){
// Top level file is just a mixin of submodules & constants
-
+'use strict';
var assign = require('./lib/utils/common').assign;
@@ -3031,7 +3043,7 @@ assign(pako, deflate, inflate, constants);
module.exports = pako;
},{"./lib/deflate":26,"./lib/inflate":27,"./lib/utils/common":28,"./lib/zlib/constants":31}],26:[function(require,module,exports){
-
+'use strict';
var zlib_deflate = require('./zlib/deflate');
@@ -3076,9 +3088,9 @@ var Z_DEFLATED = 8;
**/
/**
- * Deflate.res -> Uint8Array|Array
+ * Deflate.result -> Uint8Array|Array
*
- * Compressed res, generated by default [[Deflate#onData]]
+ * Compressed result, generated by default [[Deflate#onData]]
* and [[Deflate#onEnd]] handlers. Filled after you push last chunk
* (call [[Deflate#push]] with `Z_FINISH` / `true` param) or if you
* push a chunk with explicit flush (call [[Deflate#push]] with
@@ -3122,7 +3134,7 @@ var Z_DEFLATED = 8;
* - `chunkSize` - size of generated data chunks (16K by default)
* - `raw` (Boolean) - do raw deflate
* - `gzip` (Boolean) - create gzip wrapper
- * - `to` (String) - if equal to 'string', then res will be "binary string"
+ * - `to` (String) - if equal to 'string', then result will be "binary string"
* (each char code [0..255])
* - `header` (Object) - custom header for gzip
* - `text` (Boolean) - true if compressed data believed to be text
@@ -3147,7 +3159,7 @@ var Z_DEFLATED = 8;
*
* if (deflate.err) { throw new Error(deflate.err); }
*
- * console.log(deflate.res);
+ * console.log(deflate.result);
* ```
**/
function Deflate(options) {
@@ -3301,7 +3313,7 @@ Deflate.prototype.push = function (data, mode) {
return status === Z_OK;
}
- // callback interim ress if Z_SYNC_FLUSH.
+ // callback interim results if Z_SYNC_FLUSH.
if (_mode === Z_SYNC_FLUSH) {
this.onEnd(Z_OK);
strm.avail_out = 0;
@@ -3334,15 +3346,15 @@ Deflate.prototype.onData = function (chunk) {
* Called once after you tell deflate that the input stream is
* complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
* or if an error happened. By default - join collected chunks,
- * free memory and fill `ress` / `err` properties.
+ * free memory and fill `results` / `err` properties.
**/
Deflate.prototype.onEnd = function (status) {
// On success - join
if (status === Z_OK) {
if (this.options.to === 'string') {
- this.res = this.chunks.join('');
+ this.result = this.chunks.join('');
} else {
- this.res = utils.flattenChunks(this.chunks);
+ this.result = utils.flattenChunks(this.chunks);
}
}
this.chunks = [];
@@ -3373,7 +3385,7 @@ Deflate.prototype.onEnd = function (status) {
*
* - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
* negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then res will be "binary string"
+ * - `to` (String) - if equal to 'string', then result will be "binary string"
* (each char code [0..255])
*
* ##### Example:
@@ -3393,7 +3405,7 @@ function deflate(input, options) {
// That will never happens, if you don't cheat with options :)
if (deflator.err) { throw deflator.msg; }
- return deflator.res;
+ return deflator.result;
}
@@ -3433,7 +3445,7 @@ exports.deflateRaw = deflateRaw;
exports.gzip = gzip;
},{"./utils/common":28,"./utils/strings":29,"./zlib/deflate":33,"./zlib/messages":38,"./zlib/zstream":40}],27:[function(require,module,exports){
-
+'use strict';
var zlib_inflate = require('./zlib/inflate');
@@ -3461,9 +3473,9 @@ var toString = Object.prototype.toString;
**/
/**
- * Inflate.res -> Uint8Array|Array|String
+ * Inflate.result -> Uint8Array|Array|String
*
- * Uncompressed res, generated by default [[Inflate#onData]]
+ * Uncompressed result, generated by default [[Inflate#onData]]
* and [[Inflate#onEnd]] handlers. Filled after you push last chunk
* (call [[Inflate#push]] with `Z_FINISH` / `true` param) or if you
* push a chunk with explicit flush (call [[Inflate#push]] with
@@ -3501,7 +3513,7 @@ var toString = Object.prototype.toString;
*
* - `chunkSize` - size of generated data chunks (16K by default)
* - `raw` (Boolean) - do raw inflate
- * - `to` (String) - if equal to 'string', then res will be converted
+ * - `to` (String) - if equal to 'string', then result will be converted
* from utf8 to utf16 (javascript) string. When string output requested,
* chunk length can differ from `chunkSize`, depending on content.
*
@@ -3522,7 +3534,7 @@ var toString = Object.prototype.toString;
*
* if (inflate.err) { throw new Error(inflate.err); }
*
- * console.log(inflate.res);
+ * console.log(inflate.result);
* ```
**/
function Inflate(options) {
@@ -3719,7 +3731,7 @@ Inflate.prototype.push = function (data, mode) {
return status === c.Z_OK;
}
- // callback interim ress if Z_SYNC_FLUSH.
+ // callback interim results if Z_SYNC_FLUSH.
if (_mode === c.Z_SYNC_FLUSH) {
this.onEnd(c.Z_OK);
strm.avail_out = 0;
@@ -3752,7 +3764,7 @@ Inflate.prototype.onData = function (chunk) {
* Called either after you tell inflate that the input stream is
* complete (Z_FINISH) or should be flushed (Z_SYNC_FLUSH)
* or if an error happened. By default - join collected chunks,
- * free memory and fill `ress` / `err` properties.
+ * free memory and fill `results` / `err` properties.
**/
Inflate.prototype.onEnd = function (status) {
// On success - join
@@ -3760,9 +3772,9 @@ Inflate.prototype.onEnd = function (status) {
if (this.options.to === 'string') {
// Glue & convert here, until we teach pako to send
// utf8 alligned strings to onData
- this.res = this.chunks.join('');
+ this.result = this.chunks.join('');
} else {
- this.res = utils.flattenChunks(this.chunks);
+ this.result = utils.flattenChunks(this.chunks);
}
}
this.chunks = [];
@@ -3791,7 +3803,7 @@ Inflate.prototype.onEnd = function (status) {
*
* - `raw` (Boolean) - say that we work with raw stream, if you don't wish to specify
* negative windowBits implicitly.
- * - `to` (String) - if equal to 'string', then res will be converted
+ * - `to` (String) - if equal to 'string', then result will be converted
* from utf8 to utf16 (javascript) string. When string output requested,
* chunk length can differ from `chunkSize`, depending on content.
*
@@ -3818,7 +3830,7 @@ function inflate(input, options) {
// That will never happens, if you don't cheat with options :)
if (inflator.err) { throw inflator.msg; }
- return inflator.res;
+ return inflator.result;
}
@@ -3853,7 +3865,7 @@ exports.inflateRaw = inflateRaw;
exports.ungzip = inflate;
},{"./utils/common":28,"./utils/strings":29,"./zlib/constants":31,"./zlib/gzheader":34,"./zlib/inflate":36,"./zlib/messages":38,"./zlib/zstream":40}],28:[function(require,module,exports){
-
+'use strict';
var TYPED_OK = (typeof Uint8Array !== 'undefined') &&
@@ -3904,7 +3916,7 @@ var fnTyped = {
},
// Join array of chunks to single array.
flattenChunks: function (chunks) {
- var i, l, len, pos, chunk, res;
+ var i, l, len, pos, chunk, result;
// calculate data length
len = 0;
@@ -3913,15 +3925,15 @@ var fnTyped = {
}
// join chunks
- res = new Uint8Array(len);
+ result = new Uint8Array(len);
pos = 0;
for (i = 0, l = chunks.length; i < l; i++) {
chunk = chunks[i];
- res.set(chunk, pos);
+ result.set(chunk, pos);
pos += chunk.length;
}
- return res;
+ return result;
}
};
@@ -3958,7 +3970,7 @@ exports.setTyped(TYPED_OK);
},{}],29:[function(require,module,exports){
// String encode/decode helpers
-
+'use strict';
var utils = require('./common');
@@ -4049,11 +4061,11 @@ function buf2binstring(buf, len) {
}
}
- var res = '';
+ var result = '';
for (var i = 0; i < len; i++) {
- res += String.fromCharCode(buf[i]);
+ result += String.fromCharCode(buf[i]);
}
- return res;
+ return result;
}
@@ -4144,7 +4156,7 @@ exports.utf8border = function (buf, max) {
};
},{"./common":28}],30:[function(require,module,exports){
-
+'use strict';
// Note: adler32 takes 12% for level 0 and 2% for level 6.
// It doesn't worth to make additional optimizationa as in original.
@@ -4178,7 +4190,7 @@ function adler32(adler, buf, len, pos) {
module.exports = adler32;
},{}],31:[function(require,module,exports){
-
+'use strict';
module.exports = {
@@ -4230,7 +4242,7 @@ module.exports = {
};
},{}],32:[function(require,module,exports){
-
+'use strict';
// Note: we can't get significant speed boost here.
// So write code to minimize size - no pregenerated tables
@@ -4273,7 +4285,7 @@ function crc32(crc, buf, len, pos) {
module.exports = crc32;
},{}],33:[function(require,module,exports){
-
+'use strict';
var utils = require('../utils/common');
var trees = require('./trees');
@@ -4478,7 +4490,7 @@ function read_buf(strm, buf, start, size) {
/* ===========================================================================
* Set match_start to the longest match starting at the given string and
* return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the res is equal to prev_length and match_start is
+ * in which case the result is equal to prev_length and match_start is
* garbage.
* IN assertions: cur_match is the head of the hash chain for the current
* string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
@@ -6130,7 +6142,7 @@ exports.deflateTune = deflateTune;
*/
},{"../utils/common":28,"./adler32":30,"./crc32":32,"./messages":38,"./trees":39}],34:[function(require,module,exports){
-
+'use strict';
function GZheader() {
@@ -6172,14 +6184,14 @@ function GZheader() {
module.exports = GZheader;
},{}],35:[function(require,module,exports){
-
+'use strict';
// See state defs from inflate.js
var BAD = 30; /* got a data error -- remain here until reset */
var TYPE = 12; /* i: waiting for type bits, including last-flag bit */
/*
- Decode literal, length, and distance codes and write out the resing
+ Decode literal, length, and distance codes and write out the resulting
literal and match bytes until either not enough input or output is
available, an end-of-block is encountered, or a data error is encountered.
When large enough input and output buffers are supplied to inflate(), for
@@ -6500,7 +6512,7 @@ module.exports = function inflate_fast(strm, start) {
};
},{}],36:[function(require,module,exports){
-
+'use strict';
var utils = require('../utils/common');
@@ -7844,7 +7856,7 @@ function inflate(strm, flush) {
while (bits < 32) {
if (have === 0) { break inf_leave; }
have--;
- // Use '|' insdead of '+' to make sure that res is signed
+ // Use '|' insdead of '+' to make sure that result is signed
hold |= input[next++] << bits;
bits += 8;
}
@@ -8040,7 +8052,7 @@ exports.inflateUndermine = inflateUndermine;
*/
},{"../utils/common":28,"./adler32":30,"./crc32":32,"./inffast":35,"./inftrees":37}],37:[function(require,module,exports){
-
+'use strict';
var utils = require('../utils/common');
@@ -8369,7 +8381,7 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
};
},{"../utils/common":28}],38:[function(require,module,exports){
-
+'use strict';
module.exports = {
2: 'need dictionary', /* Z_NEED_DICT 2 */
@@ -8384,7 +8396,7 @@ module.exports = {
};
},{}],39:[function(require,module,exports){
-
+'use strict';
var utils = require('../utils/common');
@@ -9588,7 +9600,7 @@ exports._tr_tally = _tr_tally;
exports._tr_align = _tr_align;
},{"../utils/common":28}],40:[function(require,module,exports){
-
+'use strict';
function ZStream() {
@@ -9620,7 +9632,7 @@ module.exports = ZStream;
},{}]},{},[10])(10)
});
-}
+};
//templater
@@ -9643,7 +9655,7 @@ function initTemplater()
initJsZip();
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Docxtemplater = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-
+"use strict";
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -9772,9 +9784,9 @@ DocUtils.cloneDeep = function (obj) {
};
DocUtils.concatArrays = function (arrays) {
- return arrays.reduce(function (res, array) {
- Array.prototype.push.apply(res, array);
- return res;
+ return arrays.reduce(function (result, array) {
+ Array.prototype.push.apply(result, array);
+ return result;
}, []);
};
@@ -9835,7 +9847,7 @@ DocUtils.getLeft = function (parsed, element, index) {
module.exports = DocUtils;
},{"./errors":2,"./memoize":5,"xmldom":19}],2:[function(require,module,exports){
-
+"use strict";
function XTError(message) {
this.name = "GenericError";
@@ -9873,7 +9885,7 @@ module.exports = {
XTScopeParserError: XTScopeParserError
};
},{}],3:[function(require,module,exports){
-
+"use strict";
var loopModule = require("./modules/loop");
var spacePreserveModule = require("./modules/space-preserve");
@@ -9918,7 +9930,7 @@ module.exports = {
pptx: PptXFileTypeConfig
};
},{"./modules/expand-pair-trait":8,"./modules/loop":9,"./modules/rawxml":10,"./modules/render":11,"./modules/space-preserve":12}],4:[function(require,module,exports){
-
+"use strict";
var Errors = require("./errors");
var DocUtils = require("./doc-utils");
@@ -10161,7 +10173,7 @@ module.exports = {
}
};
},{"./doc-utils":1,"./errors":2}],5:[function(require,module,exports){
-
+"use strict";
function memoize(func) {
var stringifyJson = JSON.stringify,
@@ -10175,7 +10187,7 @@ function memoize(func) {
module.exports = memoize;
},{}],6:[function(require,module,exports){
-
+"use strict";
function getMinFromArrays(arrays, state) {
var minIndex = -1;
@@ -10201,7 +10213,7 @@ module.exports = function (arrays) {
return array.length > 0;
});
- var resArray = new Array(totalLength);
+ var resultArray = new Array(totalLength);
var state = arrays.map(function () {
return 0;
@@ -10211,15 +10223,15 @@ module.exports = function (arrays) {
while (i <= totalLength - 1) {
var arrayIndex = getMinFromArrays(arrays, state);
- resArray[i] = arrays[arrayIndex][state[arrayIndex]];
+ resultArray[i] = arrays[arrayIndex][state[arrayIndex]];
state[arrayIndex]++;
i++;
}
- return resArray;
+ return resultArray;
};
},{}],7:[function(require,module,exports){
-
+"use strict";
function emptyFun() {}
function identity(i) {
@@ -10246,7 +10258,7 @@ module.exports = function (module) {
return module;
};
},{}],8:[function(require,module,exports){
-
+"use strict";
var traitName = "expandPair";
var mergeSort = require("../mergesort");
@@ -10377,7 +10389,7 @@ module.exports = function () {
return wrapper(expandPairTrait);
};
},{"../doc-utils":1,"../errors":2,"../mergesort":6,"../module-wrapper":7,"../traits":16}],9:[function(require,module,exports){
-
+"use strict";
var DocUtils = require("../doc-utils");
var dashInnerRegex = /^-([^\s]+)\s(.+)$/;
@@ -10440,7 +10452,7 @@ module.exports = function () {
return wrapper(loopModule);
};
},{"../doc-utils":1,"../module-wrapper":7}],10:[function(require,module,exports){
-
+"use strict";
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -10531,7 +10543,7 @@ module.exports = function () {
return wrapper(new RawXmlModule());
};
},{"../doc-utils":1,"../errors":2,"../module-wrapper":7}],11:[function(require,module,exports){
-
+"use strict";
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -10575,7 +10587,7 @@ module.exports = function () {
return wrapper(new Render());
};
},{"../module-wrapper":7}],12:[function(require,module,exports){
-
+"use strict";
var wrapper = require("../module-wrapper");
var spacePreserve = {
@@ -10583,7 +10595,7 @@ var spacePreserve = {
postparse: function postparse(parsed) {
var chunk = [];
var inChunk = false;
- var res = parsed.reduce(function (parsed, part) {
+ var result = parsed.reduce(function (parsed, part) {
if (part.type === "tag" && part.position === "start" && part.text && part.value === "<w:t>") {
inChunk = true;
}
@@ -10602,15 +10614,15 @@ var spacePreserve = {
}
return parsed;
}, []);
- Array.prototype.push.apply(res, chunk);
- return res;
+ Array.prototype.push.apply(result, chunk);
+ return result;
}
};
module.exports = function () {
return wrapper(spacePreserve);
};
},{"../module-wrapper":7}],13:[function(require,module,exports){
-
+"use strict";
var DocUtils = require("./doc-utils");
@@ -10676,7 +10688,7 @@ var parser = {
module.exports = parser;
},{"./doc-utils":1}],14:[function(require,module,exports){
-
+"use strict";
var ScopeManager = require("./scope-manager");
var DocUtils = require("./doc-utils");
@@ -10720,7 +10732,7 @@ function render(options) {
module.exports = render;
},{"./doc-utils":1,"./scope-manager":15}],15:[function(require,module,exports){
-
+"use strict";
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -10785,7 +10797,7 @@ var ScopeManager = function () {
this.num = num == null ? this.scopeList.length - 1 : num;
var err = void 0;
var parser = void 0;
- var res = void 0;
+ var result = void 0;
var scope = this.scopeList[this.num];
try {
parser = this.parser(tag);
@@ -10800,7 +10812,7 @@ var ScopeManager = function () {
throw err;
}
try {
- res = parser.get(scope, { num: this.num, scopeList: this.scopeList });
+ result = parser.get(scope, { num: this.num, scopeList: this.scopeList });
} catch (error) {
err = new Errors.XTScopeParserError("Scope parser execution failed");
err.properties = {
@@ -10812,10 +10824,10 @@ var ScopeManager = function () {
};
throw err;
}
- if (res == null && this.num > 0) {
+ if (result == null && this.num > 0) {
return this.getValue(tag, this.num - 1);
}
- return res;
+ return result;
}
}, {
key: "createSubScopeManager",
@@ -10847,7 +10859,7 @@ ScopeManager.createBaseScopeManager = function (_ref) {
module.exports = ScopeManager;
},{"./errors":2}],16:[function(require,module,exports){
-
+"use strict";
var DocUtils = require("./doc-utils");
var Errors = require("./errors");
@@ -10893,22 +10905,22 @@ function getListXmlElements(parts) {
return part.value;
});
- var res = [];
+ var result = [];
for (var i = 0, tag; i < tags.length; i++) {
tag = tags[i];
// closing tag
if (tag[1] === "/") {
- if (lastTagIsOpenTag(res, tag)) {
- res.pop();
+ if (lastTagIsOpenTag(result, tag)) {
+ result.pop();
} else {
- res = addTag(res, tag);
+ result = addTag(result, tag);
}
} else if (tag[tag.length - 1] !== "/") {
- res = addTag(res, tag);
+ result = addTag(result, tag);
}
}
- return res;
+ return result;
}
function getExpandToDefault(parts) {
@@ -10968,7 +10980,7 @@ module.exports = {
getExpandToDefault: getExpandToDefault
};
},{"./doc-utils":1,"./errors":2}],17:[function(require,module,exports){
-
+"use strict";
// res class responsibility is to parse the XML.
var DocUtils = require("./doc-utils");
@@ -11046,7 +11058,7 @@ module.exports = function (content, tagsXmlArray) {
return DocUtils.cloneDeep(memoized(content, tagsXmlArray));
};
},{"./doc-utils":1,"./memoize":5}],18:[function(require,module,exports){
-
+"use strict";
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -11062,10 +11074,10 @@ var _render = require("./render.js");
function _getFullText(content, tagsXmlArray) {
var matcher = xmlMatcher(content, tagsXmlArray);
- var res = matcher.matches.map(function (match) {
+ var result = matcher.matches.map(function (match) {
return match.array[2];
});
- return DocUtils.wordToUtf8(DocUtils.convertSpaces(res.join("")));
+ return DocUtils.wordToUtf8(DocUtils.convertSpaces(result.join("")));
}
module.exports = function () {
@@ -11431,7 +11443,7 @@ function _extends(Class,Super){
pt.__proto__ = ppt;
}
if(!(pt instanceof Super)){
- function t(){}
+ function t(){};
t.prototype = Super.prototype;
t = new t();
copy(pt,t);
@@ -11493,7 +11505,7 @@ function DOMException(code, message) {
error.code = code;
if(message) this.message = this.message + ": " + message;
return error;
-}
+};
DOMException.prototype = Error.prototype;
copy(ExceptionCode,DOMException)
/**
@@ -11502,7 +11514,7 @@ copy(ExceptionCode,DOMException)
* The items in the NodeList are accessible via an integral index, starting from 0.
*/
function NodeList() {
-}
+};
NodeList.prototype = {
/**
* The number of nodes in the list. The range of valid child node indices is 0 to length-1 inclusive.
@@ -11555,7 +11567,7 @@ _extends(LiveNodeList,NodeList);
* used for attributes or DocumentType entities
*/
function NamedNodeMap() {
-}
+};
function _findNodeIndex(list,node){
var i = list.length;
@@ -11672,7 +11684,7 @@ function DOMImplementation(/* Object */ features) {
this._features = features[feature];
}
}
-}
+};
DOMImplementation.prototype = {
hasFeature: function(/* string */ feature, /* string */ version) {
@@ -11721,7 +11733,7 @@ DOMImplementation.prototype = {
*/
function Node() {
-}
+};
Node.prototype = {
firstChild : null,
@@ -12123,7 +12135,7 @@ _extends(Document,Node);
function Element() {
this._nsMap = {};
-}
+};
Element.prototype = {
nodeType : ELEMENT_NODE,
hasAttribute : function(name){
@@ -12216,13 +12228,13 @@ Document.prototype.getElementsByTagNameNS = Element.prototype.getElementsByTagNa
_extends(Element,Node);
function Attr() {
-}
+};
Attr.prototype.nodeType = ATTRIBUTE_NODE;
_extends(Attr,Node);
function CharacterData() {
-}
+};
CharacterData.prototype = {
data : '',
substringData : function(offset, count) {
@@ -12253,7 +12265,7 @@ CharacterData.prototype = {
}
_extends(CharacterData,Node);
function Text() {
-}
+};
Text.prototype = {
nodeName : "#text",
nodeType : TEXT_NODE,
@@ -12272,7 +12284,7 @@ Text.prototype = {
}
_extends(Text,CharacterData);
function Comment() {
-}
+};
Comment.prototype = {
nodeName : "#comment",
nodeType : COMMENT_NODE
@@ -12280,7 +12292,7 @@ Comment.prototype = {
_extends(Comment,CharacterData);
function CDATASection() {
-}
+};
CDATASection.prototype = {
nodeName : "#cdata-section",
nodeType : CDATA_SECTION_NODE
@@ -12289,27 +12301,27 @@ _extends(CDATASection,CharacterData);
function DocumentType() {
-}
+};
DocumentType.prototype.nodeType = DOCUMENT_TYPE_NODE;
_extends(DocumentType,Node);
function Notation() {
-}
+};
Notation.prototype.nodeType = NOTATION_NODE;
_extends(Notation,Node);
function Entity() {
-}
+};
Entity.prototype.nodeType = ENTITY_NODE;
_extends(Entity,Node);
function EntityReference() {
-}
+};
EntityReference.prototype.nodeType = ENTITY_REFERENCE_NODE;
_extends(EntityReference,Node);
function DocumentFragment() {
-}
+};
DocumentFragment.prototype.nodeName = "#document-fragment";
DocumentFragment.prototype.nodeType = DOCUMENT_FRAGMENT_NODE;
_extends(DocumentFragment,Node);
@@ -13263,7 +13275,7 @@ function _set_proto_(thiz,parent){
}
if(!(_set_proto_({},_set_proto_.prototype) instanceof _set_proto_)){
_set_proto_ = function(thiz,parent){
- function p(){}
+ function p(){};
p.prototype = parent;
p = new p();
for(parent in thiz){
@@ -13289,7 +13301,7 @@ exports.XMLReader = XMLReader;
},{}],"/src/js/docxtemplater.js":[function(require,module,exports){
-
+"use strict";
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();