diff options
| author | Michael Williamson <mike@zwobble.org> | 2015-08-16 15:59:55 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2015-08-16 15:59:55 +0100 |
| commit | 4236b58ed1e5448b0ce43b87bf6b5df585db2a32 (patch) | |
| tree | c413fd0f91ad864dd2370f4047137304ce9d9f49 /lib | |
| parent | a2872927a9616ca63387c96e5c7c95b184bb6ebc (diff) | |
Don't include colon when using curly brace syntax for node names
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/docx/relationships-reader.js | 2 | ||||
| -rw-r--r-- | lib/docx/style-map.js | 2 | ||||
| -rw-r--r-- | lib/xml/reader.js | 4 | ||||
| -rw-r--r-- | lib/xml/writer.js | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/docx/relationships-reader.js b/lib/docx/relationships-reader.js index 7cae534..7747bda 100644 --- a/lib/docx/relationships-reader.js +++ b/lib/docx/relationships-reader.js @@ -4,7 +4,7 @@ exports.readRelationships = readRelationships; function readRelationships(relationshipsXml) { var relationships = {}; relationshipsXml.root.children.forEach(function(child) { - if (child.name === "{http://schemas.openxmlformats.org/package/2006/relationships}:Relationship") { + if (child.name === "{http://schemas.openxmlformats.org/package/2006/relationships}Relationship") { relationships[child.attributes.Id] = { target: child.attributes.Target }; diff --git a/lib/docx/style-map.js b/lib/docx/style-map.js index bd770bd..76f6903 100644 --- a/lib/docx/style-map.js +++ b/lib/docx/style-map.js @@ -19,7 +19,7 @@ function updateRelationships(docxFile) { return officeXml.readXmlFromZipFile(docxFile, path) .then(function(relationshipsDocument) { var relationships = relationshipsDocument.root; - relationships.children.push(xml.element("{" + relationshipsUri + "}:Relationship", { + relationships.children.push(xml.element("{" + relationshipsUri + "}Relationship", { "Id": "rMammothStyleMap", "Type": "http://schemas.zwobble.org/mammoth/style-map", "Target": "/" + styleMapPath diff --git a/lib/xml/reader.js b/lib/xml/reader.js index 6189851..67b69be 100644 --- a/lib/xml/reader.js +++ b/lib/xml/reader.js @@ -35,11 +35,11 @@ function readString(xmlString, namespaceMap) { var mappedPrefix = namespaceMap[node.uri]; var prefix; if (mappedPrefix) { - prefix = mappedPrefix; + prefix = mappedPrefix + ":"; } else { prefix = "{" + node.uri + "}"; } - return prefix + ":" + node.local; + return prefix + node.local; } else { return node.local; } diff --git a/lib/xml/writer.js b/lib/xml/writer.js index 9bf8c35..0c44982 100644 --- a/lib/xml/writer.js +++ b/lib/xml/writer.js @@ -25,7 +25,7 @@ function writeString(root, namespaces) { } function mapElementName(name) { - var longFormMatch = /^\{(.*)\}:(.*)$/.exec(name); + var longFormMatch = /^\{(.*)\}(.*)$/.exec(name); if (longFormMatch) { var prefix = uriToPrefix[longFormMatch[1]]; return prefix + (prefix === "" ? "" : ":") + longFormMatch[2]; |
