Merge pull request #382 from mrhanlon/develop_2.0

Correctly use useJQuery from Client in Operation

Author: fehguy

lib/types/operation.js

@@ -141,7 +141,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
     response = responses['default'];
     defaultResponseCode = 'default';
   }
-  
+
   if (response && response.schema) {
     var resolvedModel = this.resolveModel(response.schema, definitions);
     var successResponse;
@@ -150,7 +150,7 @@ var Operation = module.exports = function (parent, scheme, operationId, httpMeth
 
     if (resolvedModel) {
       this.successResponse = {};
-      successResponse = this.successResponse[defaultResponseCode] = resolvedModel; 
+      successResponse = this.successResponse[defaultResponseCode] = resolvedModel;
     } else if (!response.schema.type || response.schema.type === 'object' || response.schema.type === 'array') {
       // Inline model
       this.successResponse = {};
@@ -539,8 +539,8 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
   success = (success || helpers.log);
   error = (error || helpers.log);
 
-  if (opts.useJQuery) {
-    this.useJQuery = opts.useJQuery;
+  if (typeof opts.useJQuery === 'undefined') {
+    opts.useJQuery = this.useJQuery;
   }
 
   var missingParams = this.getMissingParams(args);
@@ -579,7 +579,7 @@ Operation.prototype.execute = function (arg1, arg2, arg3, arg4, parent) {
     url: url,
     method: this.method.toUpperCase(),
     body: body,
-    useJQuery: this.useJQuery,
+    useJQuery: opts.useJQuery,
     headers: headers,
     on: {
       response: function (response) {
@@ -762,7 +762,7 @@ Operation.prototype.encodeQueryCollection = function (type, name, value) {
       separator = '\\t';
     } else if (type === 'pipes') {
       separator = '|';
-    } else if (type === 'brackets') { 
+    } else if (type === 'brackets') {
       for (i = 0; i < value.length; i++) {
         if (i !== 0) {
           encoded += '&';