[pve-devel] [PATCH widget-toolkit 15/15] reintroduce api2request checks for toolkit
Dominik Csapak
d.csapak at proxmox.com
Mon Jan 15 15:17:48 CET 2018
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
Utils.js | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/Utils.js b/Utils.js
index ac243ce..a8d7b6f 100644
--- a/Utils.js
+++ b/Utils.js
@@ -283,7 +283,11 @@ Ext.define('Proxmox.Utils', { utilities: {
Ext.apply(newopts, {
success: function(response, options) {
if (options.waitMsgTarget) {
- options.waitMsgTarget.setLoading(false);
+ if (Proxmox.Utils.toolkit === 'touch') {
+ options.waitMsgTarget.setMasked(false);
+ } else {
+ options.waitMsgTarget.setLoading(false);
+ }
}
var result = Ext.decode(response.responseText);
response.result = result;
@@ -298,7 +302,11 @@ Ext.define('Proxmox.Utils', { utilities: {
},
failure: function(response, options) {
if (options.waitMsgTarget) {
- options.waitMsgTarget.setLoading(false);
+ if (Proxmox.Utils.toolkit === 'touch') {
+ options.waitMsgTarget.setMasked(false);
+ } else {
+ options.waitMsgTarget.setLoading(false);
+ }
}
response.result = {};
try {
@@ -323,8 +331,12 @@ Ext.define('Proxmox.Utils', { utilities: {
var target = newopts.waitMsgTarget;
if (target) {
- // Note: ExtJS bug - this does not work when component is not rendered
- target.setLoading(newopts.waitMsg);
+ if (Proxmox.Utils.toolkit === 'touch') {
+ target.setMasked({ xtype: 'loadmask', message: newopts.waitMsg} );
+ } else {
+ // Note: ExtJS bug - this does not work when component is not rendered
+ target.setLoading(newopts.waitMsg);
+ }
}
Ext.Ajax.request(newopts);
},
--
2.11.0
More information about the pve-devel
mailing list