Skip to content

Commit 4cb7de0

Browse files
PeteGColePeteGCole
committed
Bump version to 1.7.0 and build
1 parent 9f4dc95 commit 4cb7de0

14 files changed

Lines changed: 383 additions & 379 deletions

‎ScriptXJSTest/ScriptXJSTest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
3+
<Import Project="..\packages\Microsoft.Net.Compilers.3.1.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.1.1\build\Microsoft.Net.Compilers.props')" />
44
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
66
<PropertyGroup>
@@ -217,7 +217,7 @@
217217
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
218218
</PropertyGroup>
219219
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
220-
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props'))" />
220+
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.1.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.1.1\build\Microsoft.Net.Compilers.props'))" />
221221
</Target>
222222
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
223223
Other similar extension points exist, see Microsoft.Common.targets.

‎ScriptXJSTest/Scripts/MeadCo.ScriptX/jQuery-MeadCo.ScriptX.Print.UI.js‎

Lines changed: 221 additions & 221 deletions
Large diffs are not rendered by default.

‎ScriptXJSTest/Scripts/MeadCo.ScriptX/meadco-core.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
// protected API
5656
var module = this;
57-
var version = "1.5.8.0";
57+
var version = "1.5.9.0";
5858
var bLog = false;
5959

6060
var log = function (str) {

‎ScriptXJSTest/Scripts/MeadCo.ScriptX/meadco-scriptxfactory.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
})('factory', function () {
8484
// If this is executing, we believe we are needed.
8585
// protected API
86-
var moduleversion = "1.5.8.0";
86+
var moduleversion = "1.5.9.0";
8787
var emulatedVersion = "8.2.0.0";
8888
var module = this;
8989

@@ -1169,7 +1169,7 @@
11691169

11701170
PolyfillInitAsync: function (resolve, reject) {
11711171
if (MeadCo.ScriptX.Print.isConnected) {
1172-
resolve();
1172+
resolve(2);
11731173
} else {
11741174
printHtml.connectAsync("", "", resolve, reject);
11751175
}

‎ScriptXJSTest/Scripts/MeadCo.ScriptX/meadco-scriptxprint.js‎

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,24 @@
1919
extendMeadCoNamespace(name, definition);
2020
})('MeadCo.ScriptX.Print', function () {
2121
// module version and the api we are coded for
22-
var version = "1.5.8.0";
22+
var version = "1.5.9.0";
2323
var htmlApiLocation = "v1/printHtml";
2424
var pdfApiLocation = "v1/printPdf";
2525

2626
// default printer
2727
var printerName = "";
2828

2929
/**
30-
* Enum to describe the units used on measurements
30+
* Enum to describe the units used on measurements. Please be aware that (sadly) these enum values do *not* match
31+
* the values by the MeadCo ScriptX COM Servers. Please use MeadCo.ScriptX.MeasurementUnits (declared in MeadCoScriptJS) form compatibility
3132
*
3233
* @memberof MeadCoScriptXPrint
3334
* @typedef {number} MeasurementUnits
3435
* @enum {MeasurementUnits}
3536
* @readonly
3637
* @property {number} DEFAULT 0 use the default at the print server
37-
* @property {number} MM 1 millimeters
38-
* @property {number} INCHES 2
38+
* @property {number} INCHES 1
39+
* @property {number} MM 2 millimeters
3940
*/
4041
var enumMeasurementUnits = {
4142
DEFAULT: 0,
@@ -295,7 +296,7 @@
295296
var devInfo;
296297

297298
if (content === null || typeof content === "undefined" || (typeof content === "string" && content.length === 0)) {
298-
MeadCo.ScriptX.Print.reportError("Request to print no content - access denied?");
299+
MeadCo.ScriptX.Print.reportError("Request to print no content - access denied?");
299300
if (typeof fnDone === "function") {
300301
fnDone("Request to print no content");
301302
}
@@ -318,70 +319,70 @@
318319
};
319320

320321
var serverApi = MeadCo.makeApiEndPoint(server, htmlApiLocation);
321-
return printAtServer(serverApi,requestData,
322-
{
323-
fail: function (jqXhr, textStatus, errorThrown) {
324-
var err = MeadCo.parseAjaxError("MeadCo.ScriptX.Print.printHtmlAtServer", jqXhr, textStatus, errorThrown);
325-
progress(requestData, enumPrintStatus.ERROR, err);
326-
MeadCo.ScriptX.Print.reportError(err);
327-
if (typeof fnDone === "function") {
328-
fnDone("Server error");
329-
}
330-
},
331-
332-
queuedToFile: function (data) {
333-
MeadCo.log("default handler on queued to file response");
334-
progress(requestData, enumPrintStatus.QUEUED);
335-
monitorJob(serverApi,requestData, data.jobIdentifier,
336-
-1,
337-
function (data) {
338-
if (data !== null) {
339-
MeadCo.log("Will download printed file");
340-
progress(requestData, enumPrintStatus.COMPLETED);
341-
window.open(server + "/download/" + data.jobIdentifier, "_self");
342-
}
322+
return printAtServer(serverApi, requestData,
323+
{
324+
fail: function (jqXhr, textStatus, errorThrown) {
325+
var err = MeadCo.parseAjaxError("MeadCo.ScriptX.Print.printHtmlAtServer", jqXhr, textStatus, errorThrown);
326+
progress(requestData, enumPrintStatus.ERROR, err);
327+
MeadCo.ScriptX.Print.reportError(err);
328+
if (typeof fnDone === "function") {
329+
fnDone("Server error");
330+
}
331+
},
343332

344-
if (typeof fnDone === "function") {
345-
fnDone(data === null ? "Server error" : null);
346-
}
347-
});
348-
},
349-
350-
queuedToDevice: function (data) {
351-
MeadCo.log("print was queued to device");
352-
progress(requestData, enumPrintStatus.QUEUED);
353-
monitorJob(serverApi,requestData, data.jobIdentifier,
354-
-1,
355-
function (data) {
356-
if (data !== null) {
357-
progress(requestData, enumPrintStatus.COMPLETED);
358-
}
333+
queuedToFile: function (data) {
334+
MeadCo.log("default handler on queued to file response");
335+
progress(requestData, enumPrintStatus.QUEUED);
336+
monitorJob(serverApi, requestData, data.jobIdentifier,
337+
-1,
338+
function (data) {
339+
if (data !== null) {
340+
MeadCo.log("Will download printed file");
341+
progress(requestData, enumPrintStatus.COMPLETED);
342+
window.open(server + "/download/" + data.jobIdentifier, "_self");
343+
}
359344

360-
if (typeof fnDone === "function") {
361-
fnDone(data === null ? "Server error" : null);
362-
}
363-
});
364-
},
365-
366-
softError: function (data) {
367-
progress(requestData, enumPrintStatus.ERROR, data.message);
368-
MeadCo.ScriptX.Print.reportError(data.message);
369-
MeadCo.log("print has soft error");
370-
removeJob(data.jobIdentifier);
371-
if (typeof fnDone === "function") {
372-
MeadCo.log("Call fnDone");
373-
fnDone("Server error");
374-
}
375-
},
345+
if (typeof fnDone === "function") {
346+
fnDone(data === null ? "Server error" : null);
347+
}
348+
});
349+
},
376350

377-
ok: function (data) {
378-
progress(requestData, enumPrintStatus.COMPLETED);
379-
MeadCo.log("printed ok, no further information");
380-
if (typeof fnDone === "function") {
381-
fnDone(null);
351+
queuedToDevice: function (data) {
352+
MeadCo.log("print was queued to device");
353+
progress(requestData, enumPrintStatus.QUEUED);
354+
monitorJob(serverApi, requestData, data.jobIdentifier,
355+
-1,
356+
function (data) {
357+
if (data !== null) {
358+
progress(requestData, enumPrintStatus.COMPLETED);
359+
}
360+
361+
if (typeof fnDone === "function") {
362+
fnDone(data === null ? "Server error" : null);
363+
}
364+
});
365+
},
366+
367+
softError: function (data) {
368+
progress(requestData, enumPrintStatus.ERROR, data.message);
369+
MeadCo.ScriptX.Print.reportError(data.message);
370+
MeadCo.log("print has soft error");
371+
removeJob(data.jobIdentifier);
372+
if (typeof fnDone === "function") {
373+
MeadCo.log("Call fnDone");
374+
fnDone("Server error");
375+
}
376+
},
377+
378+
ok: function (data) {
379+
progress(requestData, enumPrintStatus.COMPLETED);
380+
MeadCo.log("printed ok, no further information");
381+
if (typeof fnDone === "function") {
382+
fnDone(null);
383+
}
382384
}
383-
}
384-
});
385+
});
385386
}
386387

387388
/**
@@ -428,7 +429,7 @@
428429

429430
var serverApi = MeadCo.makeApiEndPoint(server, pdfApiLocation);
430431

431-
return printAtServer(serverApi,requestData,
432+
return printAtServer(serverApi, requestData,
432433
{
433434
fail: function (jqXhr, textStatus, errorThrown) {
434435
var err = MeadCo.parseAjaxError("MeadCo.ScriptX.Print.printPdfAtServer", jqXhr, textStatus, errorThrown);
@@ -442,7 +443,7 @@
442443
queuedToFile: function (data) {
443444
MeadCo.log("default handler on queued to file response");
444445
progress(requestData, enumPrintStatus.QUEUED);
445-
monitorJob(serverApi,requestData, data.jobIdentifier,
446+
monitorJob(serverApi, requestData, data.jobIdentifier,
446447
-1,
447448
function (data) {
448449
if (data !== null) {
@@ -460,7 +461,7 @@
460461
queuedToDevice: function (data) {
461462
MeadCo.log("print was queued to device");
462463
progress(requestData, enumPrintStatus.QUEUED);
463-
monitorJob(serverApi,requestData, data.jobIdentifier,
464+
monitorJob(serverApi, requestData, data.jobIdentifier,
464465
-1,
465466
function (data) {
466467
if (data !== null) {
@@ -547,7 +548,7 @@
547548
resolve(data);
548549
})
549550
.fail(function (jqXhr, textStatus, errorThrown) {
550-
errorThrown = MeadCo.parseAjaxError("MeadCo.ScriptX.Print.testServerConnection:",jqXhr, textStatus, errorThrown);
551+
errorThrown = MeadCo.parseAjaxError("MeadCo.ScriptX.Print.testServerConnection:", jqXhr, textStatus, errorThrown);
551552
if (typeof reject === "function")
552553
reject(errorThrown);
553554
});
@@ -692,7 +693,7 @@
692693
* @param {function({object})} functionComplete function to call when job is complete. Argument is null on error, the data returned from the status call on success,.
693694
* @private
694695
*/
695-
function monitorJob(serverAndApi,requestData, jobId, timeOut, functionComplete) {
696+
function monitorJob(serverAndApi, requestData, jobId, timeOut, functionComplete) {
696697
MeadCo.log("monitorJob: " + jobId);
697698
var counter = 0;
698699
var interval = 1000;
@@ -932,16 +933,16 @@
932933
if (!syncInit) {
933934
MeadCo.log("Async connectlite...");
934935
licenseApi.connectLite(server, data.meadcoLicense,
935-
data.meadcoLicenseRevision,
936-
data.meadcoLicensePath);
936+
data.meadcoLicenseRevision,
937+
data.meadcoLicensePath);
937938
printApi.connectLite(server, data.meadcoLicense);
938939
} else {
939940
console
940941
.warn("Synchronous connection is deprecated, please use data-meadco-syncinit='false'");
941942
licenseApi.connect(server, data.meadcoLicense);
942943
if (typeof data.meadcoLicensePath !== "undefined" &&
943944
typeof data
944-
.meadcoLicenseRevision !==
945+
.meadcoLicenseRevision !==
945946
"undefined") { // if these are not defined then you must use meadco-secmgr.js
946947
licenseApi.apply(data.meadcoLicense,
947948
data.meadcoLicenseRevision,
@@ -990,7 +991,7 @@
990991
ErrorAction: enumErrorAction,
991992

992993
CollateOptions: enumCollateOptions,
993-
DuplexOptions: enumDuplexOptions,
994+
DuplexOptions: enumDuplexOptions,
994995
MeasurementUnits: enumMeasurementUnits,
995996

996997
/**

0 commit comments

Comments
 (0)