js: app.js et2_widget_daycol.js

nathangray 2016-05-04 16:45:43 UTC #1

Author: nathangray
New Revision: 56014

URL: http://svn.stylite.de/viewvc/egroupware?rev=56014&view=rev
Log:
Stop day view resize while hidden - it gets the size wrong.
Another attempt, preventing events from resizing incorrectly

Modified:
trunk/calendar/js/app.js
trunk/calendar/js/et2_widget_daycol.js

Modified: trunk/calendar/js/app.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/app.js?rev=56014&r1=56013&r2=56014&view=diff

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Wed May 4 18:45:42 2016
@@ -2197,24 +2197,21 @@
if(state.state.last && state.state.last.toJSON) state.state.last = state.state.last.toJSON();

		// Toggle todos

  	if(state.state.view == 'day' || this.state.view == 'day')

  	if((state.state.view == 'day' || this.state.view == 'day') && $j(view.etemplates[0].DOMContainer).is(':visible'))
  	{
  		if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0 && !egwIsMobile())
  		{

  			if($j(view.etemplates[0].DOMContainer).is(':visible'))

```
  			{
```

  				view.etemplates[0].widgetContainer.iterateOver(function(w) {

  					w.set_width($j(view.etemplates[0].DOMContainer).width() * 0.69);

```
  				},this,et2_calendar_timegrid);
```

  				$j(view.etemplates[1].DOMContainer).css({"left":"69%", "height":($j(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'});

```
  				// TODO: Maybe some caching here
```

  				this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) {

  					this.getWidgetById('label').set_value(data.label||'');

  					this.getWidgetById('todos').set_value({content:data.todos||''});

  				},view.etemplates[1].widgetContainer);

```
  				view.etemplates[0].resize();
```
```
  			}
```

  			view.etemplates[0].widgetContainer.iterateOver(function(w) {

  				w.set_width($j(view.etemplates[0].DOMContainer).width() * 0.69);

```
  			},this,et2_calendar_timegrid);
```

  			$j(view.etemplates[1].DOMContainer).css({"left":"69%", "height":($j(framework.tabsUi.activeTab.contentDiv).height()-30)+'px'});

```
  			// TODO: Maybe some caching here
```

  			this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) {

  				this.getWidgetById('label').set_value(data.label||'');

  				this.getWidgetById('todos').set_value({content:data.todos||''});

  			},view.etemplates[1].widgetContainer);

  			view.etemplates[0].resize();
  		}
  		else
  		{

Modified: trunk/calendar/js/et2_widget_daycol.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_daycol.js?rev=56014&r1=56013&r2=56014&view=diff

— trunk/calendar/js/et2_widget_daycol.js (original)
+++ trunk/calendar/js/et2_widget_daycol.js Wed May 4 18:45:42 2016
@@ -857,10 +857,6 @@
*/
position_event: function(event)
{

```
  // Not visible?  Skip it for speed.
```

  // Should be called again as part of resize when shown.

```
  if(!this.div.is(':visible')) return;
```

  // Sort events into minimally-overlapping columns
  var columns = this._spread_events();

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z

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