Skip to content

Commit

Permalink
Merge branch 'master' of github.com:doedje/jquery.soap
Browse files Browse the repository at this point in the history
  • Loading branch information
doedje committed Oct 20, 2014
2 parents 56ab7ac + ea074e1 commit 2541117
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 15 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jQuery Soap
===========
**file:** jquery.soap.js
**version:** 1.4.3
**version:** 1.4.4

jQuery plugin for communicating with a web service using SOAP.
--------------------------------------------------------------
Expand Down Expand Up @@ -292,6 +292,7 @@ Version numbers are [semver](http://semver.org/) compatible.

Version | Date | Changes
--- | --- | ---
1.4.4 | 2014-10-18 | pull request #65: fix namespace and type for nil attribute, Thanx [philipc](https://github.com/philipc)
1.4.3 | 2014-09-18 | fix for empty namespaces like xmlns="" as found by XGreen on [StackOverflow](http://stackoverflow.com/questions/25809803/cdata-gets-removed-before-being-sent)
1.4.2 | 2014-09-17 | pull request #61: hot fix for the CData issue [StackOverflow](http://stackoverflow.com/questions/25809803/cdata-gets-removed-before-being-sent), Thanx [josepot](https://github.com/josepot)
1.4.1 | 2014-09-11 | pull request #59: Encode XML special chars, thanx [Simon Stücher](https://github.com/stchr)
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery.soap",
"version": "1.4.3",
"version": "1.4.4",
"keywords": [
"soap",
"ajax",
Expand Down
2 changes: 1 addition & 1 deletion doc/classes.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jQuery.soap Description of Classes
==================================
**file:** jquery.soap.js
**version:** 1.4.3
**version:** 1.4.4

This document is giving an overview of the classes used within $.soap.

Expand Down
2 changes: 1 addition & 1 deletion doc/options.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
jQuery.soap Detailed Options List
=================================
**file:** jquery.soap.js
**version:** 1.4.3
**version:** 1.4.4

Note that all options are optional. To actually send a request [url](#url) en [data](#data) are the minimal requirements. More [general information about the usage of jQuery.soap](README.md)

Expand Down
18 changes: 11 additions & 7 deletions jquery.soap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*==========================
jquery.soap.js http://plugins.jquery.com/soap/ or https://github.com/doedje/jquery.soap
version: 1.4.3
version: 1.4.4
jQuery plugin for communicating with a web service using SOAP.
Expand Down Expand Up @@ -31,7 +31,7 @@ For information about how to use jQuery.soap, authors, changelog, the latest ver
Visit: https://github.com/doedje/jquery.soap
Documentation about THIS version is found here:
https://github.com/doedje/jquery.soap/blob/1.4.3/README.md
https://github.com/doedje/jquery.soap/blob/1.4.4/README.md
======================*/

Expand Down Expand Up @@ -209,8 +209,12 @@ https://github.com/doedje/jquery.soap/blob/1.4.3/README.md
if (!soapEnv.attr('xmlns:' + this.prefix)) {
soapEnv.addNamespace(this.prefix, this.soapConfig.namespaceURL);
}
// maybe add xsi here?
// xsi="http://www.w3.org/2001/XMLSchema-instance
if (!soapEnv.attr('xmlns:xsi')) {
soapEnv.addNamespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance');
}
if (!soapEnv.attr('xmlns:xsd')) {
soapEnv.addNamespace('xsd', 'http://www.w3.org/2001/XMLSchema');
}
return '<?xml version="1.0" encoding="UTF-8"?>' + soapEnv.toString();
},
send: function(options) {
Expand Down Expand Up @@ -283,7 +287,7 @@ https://github.com/doedje/jquery.soap/blob/1.4.3/README.md
};
this.val = function(value) {
if (value === undefined) {
if (this.attr('nil') === 'true') {
if (this.attr('xsi:nil') === 'true') {
return null;
} else {
return this.value;
Expand All @@ -292,7 +296,7 @@ https://github.com/doedje/jquery.soap/blob/1.4.3/README.md
this.value = value;
return this;
} else {
this.attr("nil","true");
this.attr("xsi:nil","true");
return this;
}
};
Expand Down Expand Up @@ -455,7 +459,7 @@ https://github.com/doedje/jquery.soap/blob/1.4.3/README.md
var childObject;
if (params === null) {
soapObject = new SOAPObject(prefix+name);
soapObject.attr('nil', true);
soapObject.attr('xsi:nil', 'true');
} else if (typeof params == 'object') {
// added by DT - check if object is in fact an Array and treat accordingly
if(params.constructor.toString().indexOf("Array") > -1) { // type is array
Expand Down
2 changes: 1 addition & 1 deletion soap.jquery.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "soap",
"title": "jQuery Soap",
"version": "1.4.3",
"version": "1.4.4",
"description": "jQuery plugin for communicating with a web service using SOAP. This script uses $.ajax to send the SOAP message. It can take XML DOM, XML string or JSON as input and the response can be returned as either XML DOM, XML string or JSON too. Big thanx to everybody that contributed! Let's $.soap()!",
"keywords": [
"soap",
Expand Down
2 changes: 1 addition & 1 deletion web/demo.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*==========================
demo.js http://plugins.jquery.com/soap/ or https://github.com/doedje/jquery.soap
part of the jQuery.soap distribution version: 1.4.3
part of the jQuery.soap distribution version: 1.4.4
this file contains the javascript for the jQuery.soap demo
===========================*/
Expand Down
2 changes: 1 addition & 1 deletion web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>
<header>
<h1>jQuery.soap demo page</h1>
In this demo you can test all features of jQuery.soap version 1.4.3
In this demo you can test all features of jQuery.soap version 1.4.4
</header>
<hr />
<form>
Expand Down
2 changes: 1 addition & 1 deletion web/main.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*==========================
main.css http://plugins.jquery.com/soap/ or https://github.com/doedje/jquery.soap
part of the jQuery.soap distribution version: 1.4.3
part of the jQuery.soap distribution version: 1.4.4
this file contains the css for the jQuery.soap demo
===========================*/
Expand Down

0 comments on commit 2541117

Please sign in to comment.