app_base.js

hnategh-2 2016-03-29 15:49:33 UTC #1

Author: hnategh
New Revision: 55561

URL: http://svn.stylite.de/viewvc/egroupware?rev=55561&view=rev
Log:
Mobile theme W.I.P:

Fix view destroy and close eg. used in mail view -> delete

Modified:
trunk/mail/js/app.js
trunk/phpgwapi/js/jsapi/app_base.js

Modified: trunk/mail/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/mail/js/app.js?rev=55561&r1=55560&r2=55561&view=diff

— trunk/mail/js/app.js (original)
+++ trunk/mail/js/app.js Tue Mar 29 17:49:33 2016
@@ -311,10 +311,7 @@
// we need to set mail_currentlyFocused var otherwise mail
// defined actions won’t work
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 @@
{
egw(window).close();
}

```
  else if (this.mail_viewMode)
```
```
  {
```
```
  	this.close();
```

  else if (typeof this.et2_view!='undefined' && typeof this.et2_view.close == 'function')

```
  {
```
```
  	this.et2_view.close();
  }
```
},

@@ -2091,7 +2088,7 @@
data = {
msg: [this.et2.getArrayMgr(“content”).getEntry(‘mail_id’)] || ‘’,
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)
  	},
  	rowClass = _action.id;

@@ -2115,7 +2112,7 @@
rowClass = ‘seen’;
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]');
  		}
  		else

Modified: trunk/phpgwapi/js/jsapi/app_base.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/js/jsapi/app_base.js?rev=55561&r1=55560&r2=55561&view=diff

— trunk/phpgwapi/js/jsapi/app_base.js (original)
+++ trunk/phpgwapi/js/jsapi/app_base.js Tue Mar 29 17:49:33 2016
@@ -418,7 +418,6 @@
delete self.viewTemplate;
delete self.viewContainer;
delete self.et2_view;

  	this.destroy(app);
  	// we need to reference back into parent context this
  	for (var v in self)
  	{

@@ -482,7 +481,7 @@

	// define a global close function for view template
	// in order to be able to destroy view on action

  app[this.appname]['close'] = destroy;

```
  this.et2_view.close = destroy;
```
},

/**

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs