Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into jsonp_deferred

  • Loading branch information...
commit 0cd7f51848f254106874647a7ca905ceb601d271 2 parents a521100 + 96f0918
@johnkpaul johnkpaul authored
Showing with 2 additions and 3 deletions.
  1. +1 −2  jquery.mockjax.js
  2. +1 −1  test/index.html
View
3  jquery.mockjax.js
@@ -142,7 +142,7 @@
if ( s.dataType === "jsonp" ) {
if ( s.type.toUpperCase() === "GET" ) {
if ( !jsre.test( s.url ) ) {
- s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+ s.url += (/\?/.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
}
} else if ( !s.data || !jsre.test(s.data) ) {
s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
@@ -315,7 +315,6 @@
url: m.proxy,
type: m.proxyType,
data: m.data,
- dataType: s.dataType,
complete: function(xhr, txt) {
m.responseXML = xhr.responseXML;
m.responseText = xhr.responseText;
View
2  test/index.html
@@ -5,7 +5,7 @@
<script src="../lib/qunit.js"></script>
<script src="../lib/testswarm.js"></script>
<script src="jquery.js"></script>
- <script src="json2.js"></script>
+ <script src="../lib/json2.js"></script>
<script src="../jquery.mockjax.js"></script>
<script src="test.js"></script>
<title>MockJax Tests - </title>
Please sign in to comment.
Something went wrong with that request. Please try again.