NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Promise is already defined in ES6.

Browse Source
This commit is contained in:
Julien Fontanet 2015-02-05 11:46:56 +01:00
parent 09b39a4bf9
commit ebee1a02fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/xo-lib/index.js
View File

@ -5,7 +5,7 @@
var assign = require('lodash.assign'); var assign = require('lodash.assign');
var forEach = require('lodash.foreach'); var forEach = require('lodash.foreach');
var parseUrl = require('url').parse; var parseUrl = require('url').parse;
var Promise = require('bluebird'); var Bluebird = require('bluebird');
// Support browsers. // Support browsers.
var WebSocket = (function (root) { var WebSocket = (function (root) {
@ -81,10 +81,10 @@ assign(Xo.prototype, {
connect: function () { connect: function () {
if (this.status === 'connected') if (this.status === 'connected')
{ {
return Promise.cast(); return Bluebird.cast();
} }
var deferred = Promise.defer(); var deferred = Bluebird.defer();
this.status = 'connecting'; this.status = 'connecting';
@ -174,7 +174,7 @@ assign(Xo.prototype, {
params: params || [], params: params || [],
})); }));
var deferred = this._deferreds[id] = Promise.defer(); var deferred = this._deferreds[id] = Bluebird.defer();
return deferred.promise; return deferred.promise;
}.bind(this)); }.bind(this));