0010152: Loadmask won't disappear
authorAlexander Stintzing <a.stintzing@metaways.de>
Tue, 19 Aug 2014 12:09:07 +0000 (14:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 19 Aug 2014 15:03:00 +0000 (17:03 +0200)
The loadmask of the Timetracker export (Select
export definition) dialog won't disappear.

https://forge.tine20.org/mantisbt/view.php?id=10152

Change-Id: I5b2a6f997afdc3bc8ed9df92caba47e734aaa4fa
Reviewed-on: http://gerrit.tine20.com/customers/1016
Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Tested-by: Philipp Schüle <p.schuele@metaways.de>
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/dialog/ExportDialog.js

index e99f1b7..4a6ad07 100644 (file)
@@ -207,6 +207,14 @@ Tine.widgets.dialog.EditDialog = Ext.extend(Ext.FormPanel, {
      */
     attachmentsPanel: null,
     
+    /**
+     * holds the loadMask
+     * set this to false, if no loadMask should be shown
+     * 
+     * @type {Ext.LoadMask}
+     */
+    loadMask: null,
+    
     //private
     initComponent: function() {
         this.relationPanelRegistry = this.relationPanelRegistry ? this.relationPanelRegistry : [];
@@ -437,8 +445,7 @@ Tine.widgets.dialog.EditDialog = Ext.extend(Ext.FormPanel, {
                 
         if (Tine.Tinebase.registry && Tine.Tinebase.registry.get('preferences') && Tine.Tinebase.registry.get('preferences').get('dialogButtonsOrderStyle') === 'Windows') {
             this.fbar.push(this.action_saveAndClose, this.action_cancel);
-        }
-        else {
+        } else {
             this.fbar.push(this.action_cancel, this.action_saveAndClose);
         }
        
@@ -688,9 +695,8 @@ Tine.widgets.dialog.EditDialog = Ext.extend(Ext.FormPanel, {
             }
         ]);
         
-        this.loadMask = new Ext.LoadMask(ct, {msg: String.format(_('Transferring {0}...'), this.i18nRecordName)});
-
-        if (this.i18nRecordName) {
+        if (this.loadMask !== false && this.i18nRecordName) {
+            this.loadMask = new Ext.LoadMask(ct, {msg: String.format(_('Transferring {0}...'), this.i18nRecordName)});
             this.loadMask.show();
         }
     },
index d8c474a..b5aca52 100644 (file)
@@ -34,7 +34,7 @@ Tine.widgets.dialog.ExportDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
      * @private
      */
     windowNamePrefix: 'ExportWindow_',
-    loadRecord: false,
+    loadMask: false,
     tbarItems: [],
     evalGrants: false,
     sendRequest: true,