Merge 7c924a6 into a9e5ec3

loopbackio · Aug 17, 2018 · a4f69c4 · a4f69c4
2 parents a9e5ec3 + 7c924a6
commit a4f69c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/example/xsds.js b/example/xsds.js
@@ -6,7 +6,7 @@ var path = require('path');
 //user can pass in WSDL options
 var options = {};
 
-WSDL.open('./wsdls/weather.wsdl', options,
+WSDL.open(path.resolve(__dirname, 'wsdls/weather.wsdl'), options,
   //User can traverse the WSDL tree and get to bindings - > operations, services, portTypes, messages, parts and XSD elements/Attributes
   function(err, wsdl) {
     var getCityForecastOp = wsdl.definitions.bindings.WeatherSoap.operations.GetCityForecastByZIP;

diff --git a/src/parser/xsd/element.js b/src/parser/xsd/element.js
@@ -52,7 +52,7 @@ class Element extends XSDElement {
         if (typeDescriptor) {
           descriptor.elements = typeDescriptor.elements;
           descriptor.attributes = typeDescriptor.attributes;
-          definitions.mixed = typeDescriptor.mixed;
+          descriptor.mixed = typeDescriptor.mixed;
           descriptor.extension = typeDescriptor.extension;
           if(descriptor.extension && descriptor.extension.isSimple === true) {
             descriptor.isSimple = true;
@@ -73,7 +73,7 @@ class Element extends XSDElement {
           if (childDescriptor) {
             descriptor.elements = childDescriptor.elements;
             descriptor.attributes = childDescriptor.attributes;
-            definitions.mixed = childDescriptor.mixed;
+            descriptor.mixed = childDescriptor.mixed;
           }
           break;
         } else if (child instanceof SimpleType) {