extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mobile theme W.I.P:

Browse Source 
- Fix view destroy and close eg. used in mail view -> delete
This commit is contained in:
Hadi Nategh 2016-03-29 15:49:33 +00:00
parent 83b020b396
commit e58851c50f
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/js/app.js
View File

@ -311,10 +311,7 @@ app.classes.mail = AppJS.extend(
// we need to set mail_currentlyFocused var otherwise mail // we need to set mail_currentlyFocused var otherwise mail
// defined actions won't work // defined actions won't work
this.mail_currentlyFocussed = this.et2.mail_currentlyFocussed; this.mail_currentlyFocussed = this.et2.mail_currentlyFocussed;
// a replacement for is_popup to distinguishe whether
// the view should be considered like popup and it does indicate
// we are in view mode
this.mail_viewMode = true;
} }
}, },
@ -1585,9 +1582,9 @@ app.classes.mail = AppJS.extend(
{ {
egw(window).close(); egw(window).close();
} }
else if (this.mail_viewMode) else if (typeof this.et2_view!='undefined' && typeof this.et2_view.close == 'function')
{ {
this.close(); this.et2_view.close();
} }
}, },
@ -2091,7 +2088,7 @@ app.classes.mail = AppJS.extend(
data = { data = {
msg: [this.et2.getArrayMgr("content").getEntry('mail_id')] || '', msg: [this.et2.getArrayMgr("content").getEntry('mail_id')] || '',
all: _allMessagesChecked || false, all: _allMessagesChecked || false,
popup: this.mail_viewMode || egw(window).is_popup() || false, popup: typeof this.et2_view!='undefined' || egw(window).is_popup() || false,
activeFilters: _action.id == 'readall'? false : this.mail_getActiveFilters(_action) activeFilters: _action.id == 'readall'? false : this.mail_getActiveFilters(_action)
}, },
rowClass = _action.id; rowClass = _action.id;
@ -2115,7 +2112,7 @@ app.classes.mail = AppJS.extend(
rowClass = 'seen'; rowClass = 'seen';
if (data.popup) if (data.popup)
{ {
var et_2 = this.mail_viewMode? etemplate2:opener.etemplate2; var et_2 = typeof this.et2_view!='undefined'? etemplate2:opener.etemplate2;
tree = et_2.getByApplication('mail')[0].widgetContainer.getWidgetById(this.nm_index+'[foldertree]'); tree = et_2.getByApplication('mail')[0].widgetContainer.getWidgetById(this.nm_index+'[foldertree]');
} }
else else

3
phpgwapi/js/jsapi/app_base.js
View File

@ -418,7 +418,6 @@ var AppJS = (function(){ "use strict"; return Class.extend(
delete self.viewTemplate; delete self.viewTemplate;
delete self.viewContainer; delete self.viewContainer;
delete self.et2_view; delete self.et2_view;
this.destroy(app);
// we need to reference back into parent context this // we need to reference back into parent context this
for (var v in self) for (var v in self)
{ {
@ -482,7 +481,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
// define a global close function for view template // define a global close function for view template
// in order to be able to destroy view on action // in order to be able to destroy view on action
app[this.appname]['close'] = destroy; this.et2_view.close = destroy;
}, },
/** /**