Skip to content

Commit

Permalink
Merge branch 'parser_issue'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomcx committed May 3, 2016
2 parents f992f8d + f1af067 commit f44d708
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Features

- Automatic structure padding for exchanging data with TwinCAT 2 and ARM-based devices (i.e. CX90xx) or with TwinCAT 3.

- Export/import functions for symbols and data types to/from files. Intented for the use with Tasker (Android).
- Export/import functions for symbols and data types to/from JSON. Intented for the use with Tasker (Android).

- Force synchronous XMLHttpRequests for easier scripting in Tasker.

Expand Down
8 changes: 4 additions & 4 deletions tame-w-comments.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* TAME [TwinCAT ADS Made Easy] V4.0 160317
* TAME [TwinCAT ADS Made Easy] V4.0.1 160416
*
* Copyright (c) 2009-2016 Thomas Schmidt; t.schmidt.p1 at freenet.de
*
Expand All @@ -17,7 +17,7 @@
*/
var TAME = {
//Version
version:'V4.0 160317',
version:'V4.0.1 160416',
//Names of days and months. This is for the formatted output of date values. You can
//simply add your own values if you need.
weekdShortNames: {
Expand Down Expand Up @@ -4376,15 +4376,15 @@ TAME.WebServiceClient = function (service) {
if ((xmlHttpReq.readyState === 4) && (xmlHttpReq.status === 200)) {

//Create a DOM object from XML
if (typeof DOMParser == 'function') {
if (typeof DOMParser != 'undefined') {
try {
configFile = (new DOMParser()).parseFromString(xmlHttpReq.responseText, "text/xml");
} catch (e) {
log('TAME library error: Creating a DOM object from TPY failed:' + e);
return;
}
} else {
log('TAME library error: Can\'t parse the symbol file cause your brower does not provide a DOMParser function.');
log('TAME library error: Can\'t parse the symbol file cause your browser does not provide a DOMParser function.');
}


Expand Down
4 changes: 2 additions & 2 deletions tame.js

Large diffs are not rendered by default.

0 comments on commit f44d708

Please sign in to comment.