Commit cc2a099

committed

[javascript] Use arrow function with usePromises in ES6 ApiClient.js for superagent callback to preserve this context

1 parent 7cddd17 commit cc2a099Copy full SHA for cc2a099

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ export default class ApiClient {`
`447`	`447`	`}`
`448`	`448`
`449`	`449`	`{{#usePromises}}return new Promise((resolve, reject) => {`
`450`		`- request.end(function(error, response) {`
	`450`	`+ request.end((error, response) => {`
`451`	`451`	`if (error) {`
`452`	`452`	`reject(error);`
`453`	`453`	`} else {`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,15 @@`
`173`	`173`	`* @returns {Boolean} <code>true</code> if <code>param</code> represents a file.`
`174`	`174`	`*/`
`175`	`175`	`exports.prototype.isFileParam = function(param) {`
`176`		`- // fs.ReadStream in Node.js (but not in runtime like browserify)`
`177`		`- if (typeof window === 'undefined' &&`
`178`		`- typeof require === 'function' &&`
`179`		`- require('fs') &&`
`180`		`- param instanceof require('fs').ReadStream) {`
`181`		`- return true;`
	`176`	`+ // fs.ReadStream in Node.js and Electron (but not in runtime like browserify)`
	`177`	`+ if (typeof require === 'function') {`
	`178`	`+ var fs;`
	`179`	`+ try {`
	`180`	`+ fs = require('fs');`
	`181`	`+ } catch (err) {}`
	`182`	`+ if (fs && fs.ReadStream && param instanceof fs.ReadStream) {`
	`183`	`+ return true;`
	`184`	`+ }`
`182`	`185`	`}`
`183`	`186`	`// Buffer in Node.js`
`184`	`187`	`if (typeof Buffer === 'function' && param instanceof Buffer) {`

Comments

(0)