Skip to content

Commit

Permalink
Merge 8a5b273 into 22510bc
Browse files Browse the repository at this point in the history
  • Loading branch information
peuter committed Aug 17, 2018
2 parents 22510bc + 8a5b273 commit 12784ab
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion client/source/class/cv/io/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ qx.Class.define('cv.io.Client', {
}, options || {}));
if (callback) {
ajaxRequest.addListener("success", callback, context);
ajaxRequest.addListener("statusError", this._onError, this);
}
ajaxRequest.addListener("statusError", this._onError, this);
ajaxRequest.send();
return ajaxRequest;
}
Expand Down
7 changes: 6 additions & 1 deletion source/class/cv/ui/PopupHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ qx.Class.define('cv.ui.PopupHandler', {
'cv.error': {
type: "error",
icon: "message_attention"
},
'cv.client.connection': {
type: "error",
icon: "message_attention",
deletable: true
}
});
},
Expand All @@ -56,7 +61,7 @@ qx.Class.define('cv.ui.PopupHandler', {
var popupConfig = {
title: message.title,
content: message.message,
closable: message.deletable,
closable: config.deletable || message.deletable,
icon: message.icon || config.icon,
iconClasses: message.iconClasses,
actions: message.actions,
Expand Down

0 comments on commit 12784ab

Please sign in to comment.