11/*!
2- * # Semantic UI 2.1.6 - API
2+ * # Semantic UI 2.1.7 - API
33 * http://github.com/semantic-org/semantic-ui/
44 *
55 *
@@ -213,12 +213,12 @@ $.api = $.fn.api = function(parameters) {
213213
214214 // replace variables
215215 url = module . add . urlData ( url ) ;
216-
217216 // missing url parameters
218217 if ( ! url && ! module . is . mocked ( ) ) {
219218 return ;
220219 }
221220
221+ requestSettings . url = settings . base + url ;
222222
223223 // look for jQuery ajax parameters in settings
224224 ajaxSettings = $ . extend ( true , { } , settings , {
@@ -280,7 +280,7 @@ $.api = $.fn.api = function(parameters) {
280280 return $module . is ( 'form' ) || $context . is ( 'form' ) ;
281281 } ,
282282 mocked : function ( ) {
283- return ( settings . mockResponse || settings . mockResponseAsync ) ;
283+ return ( settings . mockResponse || settings . mockResponseAsync || settings . response || settings . responseAsync ) ;
284284 } ,
285285 input : function ( ) {
286286 return $module . is ( 'input' ) ;
@@ -592,9 +592,11 @@ $.api = $.fn.api = function(parameters) {
592592 mockedXHR : function ( ) {
593593 var
594594 // xhr does not simulate these properties of xhr but must return them
595- textStatus = false ,
596- status = false ,
597- httpMessage = false ,
595+ textStatus = false ,
596+ status = false ,
597+ httpMessage = false ,
598+ responder = settings . mockResponse || settings . response ,
599+ asyncResponder = settings . mockResponseAsync || settings . responseAsync ,
598600 asyncCallback ,
599601 response ,
600602 mockedXHR
@@ -606,19 +608,19 @@ $.api = $.fn.api = function(parameters) {
606608 . fail ( module . event . xhr . fail )
607609 ;
608610
609- if ( settings . mockResponse ) {
610- if ( $ . isFunction ( settings . mockResponse ) ) {
611- module . debug ( 'Using mocked callback returning response ' , settings . mockResponse ) ;
612- response = settings . mockResponse . call ( context , settings ) ;
611+ if ( responder ) {
612+ if ( $ . isFunction ( responder ) ) {
613+ module . debug ( 'Using specified synchronous callback ' , responder ) ;
614+ response = responder . call ( context , requestSettings ) ;
613615 }
614616 else {
615- module . debug ( 'Using specified response' , settings . mockResponse ) ;
616- response = settings . mockResponse ;
617+ module . debug ( 'Using settings specified response' , responder ) ;
618+ response = responder ;
617619 }
618620 // simulating response
619621 mockedXHR . resolveWith ( context , [ response , textStatus , { responseText : response } ] ) ;
620622 }
621- else if ( $ . isFunction ( settings . mockResponseAsync ) ) {
623+ else if ( $ . isFunction ( asyncResponder ) ) {
622624 asyncCallback = function ( response ) {
623625 module . debug ( 'Async callback returned response' , response ) ;
624626
@@ -629,8 +631,8 @@ $.api = $.fn.api = function(parameters) {
629631 mockedXHR . rejectWith ( context , [ { responseText : response } , status , httpMessage ] ) ;
630632 }
631633 } ;
632- module . debug ( 'Using async mocked response' , settings . mockResponseAsync ) ;
633- settings . mockResponseAsync . call ( context , settings , asyncCallback ) ;
634+ module . debug ( 'Using specified async response callback ' , asyncResponder ) ;
635+ asyncResponder . call ( context , requestSettings , asyncCallback ) ;
634636 }
635637 return mockedXHR ;
636638 } ,
@@ -722,8 +724,8 @@ $.api = $.fn.api = function(parameters) {
722724 module . error ( error . noReturnedValue ) ;
723725 }
724726 return ( runSettings !== undefined )
725- ? runSettings
726- : settings
727+ ? $ . extend ( true , { } , runSettings )
728+ : $ . extend ( true , { } , settings )
727729 ;
728730 } ,
729731 urlEncodedValue : function ( value ) {
@@ -1066,6 +1068,10 @@ $.api.settings = {
10661068 mockResponse : false ,
10671069 mockResponseAsync : false ,
10681070
1071+ // aliases for mock
1072+ response : false ,
1073+ responseAsync : false ,
1074+
10691075 // callbacks before request
10701076 beforeSend : function ( settings ) { return settings ; } ,
10711077 beforeXHR : function ( xhr ) { } ,
0 commit comments