milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dashboard-ui/apiclient/serverdiscovery.js
View file

@ -1,19 +1,18 @@
(function (globalScope) {
define([], function () {
globalScope.ServerDiscovery = {
return {
findServers: function (timeoutMs) {
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
var servers = [];
var servers = [];
// Expected server properties
// Name, Id, Address, EndpointAddress (optional)
deferred.resolveWith(null, [servers]);
return deferred.promise();
// Expected server properties
// Name, Id, Address, EndpointAddress (optional)
resolve(servers);
});
}
};
})(window);
});