Skip to content

Commit

Permalink
Update xmldom
Browse files Browse the repository at this point in the history
  • Loading branch information
edemaine committed Aug 20, 2021
1 parent b4f8ae1 commit 9bfae1a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dist/fold.js
Original file line number Diff line number Diff line change
Expand Up @@ -3049,7 +3049,7 @@ viewer.makeModel = function(fold) {
if (m.fs[f1].ord[`f${f2}`] != null) {
console.log(`Warning: duplicate ordering input information for faces ${f1} and ${f2}. Using first found in the faceOrder list.`);
if (m.fs[f1].ord[`f${f2}`] !== o) {
console.log(`Error: duplicat ordering [${f1},${f2},${o}] is inconsistant with a previous entry.`);
console.log(`Error: duplicate ordering [${f1},${f2},${o}] is inconsistent with a previous entry.`);
}
} else {
m.fs[f1].ord[`f${f2}`] = o;
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fold",
"version": "0.11.1",
"version": "0.11.2",
"description": "FOLD file format for origami models, crease patterns, etc.",
"main": "lib/index.js",
"bin": {
Expand Down Expand Up @@ -46,9 +46,6 @@
"jest-matcher-deep-close-to": "^2.0.1",
"jest-preset-coffeescript": "1.1.1"
},
"dependencies": {
"xmldom": "^0.5.0"
},
"browser": {
"xmldom": false,
"./src/file.coffee": false
Expand All @@ -58,5 +55,8 @@
"testPathIgnorePatterns": [
"/node_modules/"
]
},
"dependencies": {
"@xmldom/xmldom": "^0.7.2"
}
}
6 changes: 3 additions & 3 deletions src/oripa.coffee
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
##TODO: match spec (no frame_designer, no frame_reference, fix cw -> ccw)
##TODO: oripa folded state format

DOMParser = require('xmldom').DOMParser unless DOMParser?
#XMLSerializer = require('xmldom').XMLSerializer unless XMLSerializer?
#DOMImplementation = require('xmldom').DOMImplementation unless DOMImplementation?
DOMParser = require('@xmldom/xmldom').DOMParser unless DOMParser?
#XMLSerializer = require('@xmldom/xmldom').XMLSerializer unless XMLSerializer?
#DOMImplementation = require('@xmldom/xmldom').DOMImplementation unless DOMImplementation?
convert = require './convert'
filter = require './filter'
oripa = exports
Expand Down

0 comments on commit 9bfae1a

Please sign in to comment.