Author: orudyy
Date: Thu May 28 08:18:41 2015
New Revision: 1682166
URL: http://svn.apache.org/r1682166
Log:
QPID-6527: Change web console management facade to return promise of type
dojo.promise.Promise
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js?rev=1682166&r1=1682165&r2=1682166&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
Thu May 28 08:18:41 2015
@@ -23,10 +23,11 @@ define(["dojo/_base/lang",
"dojo/request/xhr",
"dojo/io-query",
"dojo/json",
+ "dojo/promise/Promise",
"qpid/common/metadata",
"qpid/common/timezone",
"qpid/management/UserPreferences"],
- function (lang, array, xhr, ioQuery, json, Metadata, Timezone,
UserPreferences)
+ function (lang, array, xhr, ioQuery, json, Promise, Metadata, Timezone,
UserPreferences)
{
function shallowCopy(source, target, excludes)
@@ -119,7 +120,8 @@ define(["dojo/_base/lang",
var errorHandler = this.errorHandler;
// decorate promise in order to use a default error handler when
'then' method is invoked without providing error handler
- return {
+ return lang.mixin(new Promise(),
+ {
then: function(callback, errback, progback) {
return promise.then(callback, errback||errorHandler, progback ); },
cancel: function(reason, strict) { return
promise.cancel(reason, strict); },
isResolved: function(){return promise.isResolved();},
@@ -131,8 +133,7 @@ define(["dojo/_base/lang",
trace: function(){ return promise.trace();},
traceRejected: function(){return promise.traceRejected();},
toString: function(){return promise.toString();}
- };
-
+ });
};
Management.prototype.get = function(request)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]