Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace xmlshim with xmldom #190

Merged
merged 1 commit into from
Aug 31, 2015
Merged

replace xmlshim with xmldom #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"grunt-contrib-uglify": "~0.2.0",
"grunt-contrib-watch": "~0.3.1",
"grunt-jsdoc": "~0.6.0",
"grunt-karma": "^0.9.0",
"grunt-karma": "^0.12.0",
"grunt-mocha-test": "^0.11.0",
"karma-chai": "^0.1.0",
"karma-firefox-launcher": "~0.1.3",
Expand All @@ -28,7 +28,7 @@
"eventemitter2": "~0.4.13",
"object-assign": "^2.0.0",
"ws": "^0.4.32",
"xmlshim": "~0.0.9"
"xmldom": "^0.1.19"
},
"browserify": {
"transform": [
Expand All @@ -39,7 +39,8 @@
"aliases": {
"canvas": "./src/util/shim/canvas.js",
"eventemitter2": "./src/util/shim/EventEmitter2.js",
"ws": "./src/util/shim/WebSocket.js"
"ws": "./src/util/shim/WebSocket.js",
"xmldom": "./src/util/shim/xmldom.js"
}
},
"directories": {
Expand Down
4 changes: 2 additions & 2 deletions src/urdf/UrdfModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var UrdfMaterial = require('./UrdfMaterial');
var UrdfLink = require('./UrdfLink');
var UrdfJoint = require('./UrdfJoint');
var DOMParser = require('xmlshim').DOMParser;
var DOMParser = require('xmldom').DOMParser;

// See https://developer.mozilla.org/docs/XPathResult#Constants
var XPATH_FIRST_ORDERED_NODE_TYPE = 9;
Expand Down Expand Up @@ -36,7 +36,7 @@ function UrdfModel(options) {

// Initialize the model with the given XML node.
// Get the robot tag
var robotXml = xmlDoc.evaluate('//robot', xmlDoc, null, XPATH_FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
var robotXml = xmlDoc.documentElement;

// Get the robot name
this.name = robotXml.getAttribute('name');
Expand Down
3 changes: 3 additions & 0 deletions src/util/shim/xmldom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exports.DOMImplementation = global.DOMImplementation;
exports.XMLSerializer = global.XMLSerializer;
exports.DOMParser = global.DOMParser;
2 changes: 1 addition & 1 deletion test/require-shim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
window.require = function require(path) {
switch (path) {
case 'eventemitter2': return {EventEmitter2: EventEmitter2};
case 'xmlshim': return {DOMParser: DOMParser}
case 'xmldom': return {DOMParser: DOMParser}
}
var lastIdx = path.lastIndexOf('/'),
path = lastIdx >= 0 ? path.slice(lastIdx + 1) : path;
Expand Down
4 changes: 2 additions & 2 deletions test/urdf.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var expect = require('chai').expect;
var ROSLIB = require('..');

var DOMParser = require('xmlshim').DOMParser;
var DOMParser = require('xmldom').DOMParser;
// See https://developer.mozilla.org/docs/XPathResult#Constants
var XPATH_FIRST_ORDERED_NODE_TYPE = 9;

Expand Down Expand Up @@ -114,7 +114,7 @@ describe('URDF', function() {
it('is ignorant to the xml node', function(){
var parser = new DOMParser();
var xml = parser.parseFromString(sample_urdf(), 'text/xml');
var robotXml = xml.evaluate('//robot', xml, null, XPATH_FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
var robotXml = xml.documentElement;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!!! Great stuff @Rayman

expect(robotXml.getAttribute('name')).to.equal('test_robot');
});
});
Expand Down