Merge branch 'v1' of git.daplie.com:Daplie/oauth3.js into v1
This commit is contained in:
		
						commit
						dc67f63856
					
				| @ -148,6 +148,9 @@ | ||||
| 
 | ||||
|   , insertIframe: function (url, state, opts) { | ||||
|       opts = opts || {}; | ||||
|       if (opts.debug) { | ||||
|         opts.timeout = opts.timeout || 15 * 60 * 1000; | ||||
|       } | ||||
|       var promise = new OAUTH3.PromiseA(function (resolve, reject) { | ||||
|         var tok; | ||||
|         var iframeDiv; | ||||
| @ -191,6 +194,9 @@ | ||||
|     } | ||||
| 
 | ||||
|   , openWindow: function (url, state, opts) { | ||||
|       if (opts.debug) { | ||||
|         opts.timeout = opts.timeout || 15 * 60 * 1000; | ||||
|       } | ||||
|       var promise = new OAUTH3.PromiseA(function (resolve, reject) { | ||||
|         var tok; | ||||
| 
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user