R54926 - in /trunk/calendar: js/ templates/default/ templates/pixelegg/

nathangray 2016-02-04 21:05:31 UTC #1

Author: nathangray
New Revision: 54926

URL: http://svn.stylite.de/viewvc/egroupware?rev=54926&view=rev
Log:

Disable scrolling to change week (swipe & pg up/ pg dn kept)
Remove animations

Modified:
trunk/calendar/js/app.js
trunk/calendar/js/et2_widget_daycol.js
trunk/calendar/js/et2_widget_timegrid.js
trunk/calendar/templates/default/app.css
trunk/calendar/templates/pixelegg/app.css
trunk/calendar/templates/pixelegg/app.less

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

— trunk/calendar/js/app.js (original)
+++ trunk/calendar/js/app.js Thu Feb 4 22:05:31 2016
@@ -650,7 +650,8 @@
},this, et2_calendar_timegrid);
if(widget == null) return;
}

```
  	/* Disabled
```

  	 * 
  	// We clone the nodes so we can animate the transition
  	var original = $j(widget.getDOMNode()).closest('.et2_grid');
  	var cloned = original.clone(true).attr("id","CLONE");

@@ -756,7 +757,13 @@
}
// If detecting the transition end worked, we wouldn’t need to use a timeout.
window.setTimeout(remove,100);

```
  	*/
```
```
     window.setTimeout(function() {
```
```
  		if(app.calendar)
```
```
  		{
```

  			app.calendar._scroll_disabled = false;

```
  		}
```

  	}, 2000);
  	// Get the view to calculate - this actually loads the new data
  	// Using a timeout make it a little faster (in Chrome)
  	window.setTimeout(function() {

@@ -777,6 +784,7 @@
};

	// Bind only once, to the whole thing

  /* Disabled
  jQuery('body').off('.calendar')
  	//.on('wheel','.et2_container:#calendar-list,#calendar-sidebox)',
  	.on('wheel.calendar','.et2_container .calendar_calTimeGrid, .et2_container .calendar_plannerWidget',

@@ -806,6 +814,7 @@
return false;
}
);

  */
  if(framework.applications.calendar && framework.applications.calendar.tab)
  {
  	jQuery(framework.applications.calendar.tab.contentDiv).swipe('destroy')

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

— trunk/calendar/js/et2_widget_daycol.js (original)
+++ trunk/calendar/js/et2_widget_daycol.js Thu Feb 4 22:05:31 2016
@@ -393,31 +393,19 @@
this.title.toggleClass(‘et2_clickable et2_link’,label === ‘’);
},
set_left: function(left) {

```
  // Maybe?
```

  window.setTimeout(jQuery.proxy(function() {
  if(this.div)
  {
  	this.div.css('left',left);

```
  	// Headers are positioned relative
```
```
  	//this.header.css('left',left);
```
```
  }
```
```
  },this),1);
```

```
  }
```
},
set_width: function(width) {

```
  if(this.width_timeout)
```
```
  {
```

  	window.clearTimeout(this.width_timeout);

```
  }
  this.options.width = width;
```

  this.width_timeout = window.setTimeout(jQuery.proxy(function() {

```
  	this.width_timeout = null;
```
```
  	if(this.div)
```
```
  	{
```

  		this.div.outerWidth(this.options.width);

  		this.header.outerWidth(this.options.width);

```
  	}
```
```
  },this),1);
```

```
  if(this.div)
```
```
  {
```

  	this.div.outerWidth(this.options.width);

  	this.header.outerWidth(this.options.width);

```
  }
```
},

/**

Modified: trunk/calendar/js/et2_widget_timegrid.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/et2_widget_timegrid.js?rev=54926&r1=54925&r2=54926&view=diff

— trunk/calendar/js/et2_widget_timegrid.js (original)
+++ trunk/calendar/js/et2_widget_timegrid.js Thu Feb 4 22:05:31 2016
@@ -869,18 +869,15 @@
before = true;
}
if(delete_index < 0) delete_index = 0;

  	// Wait until any animations or other timeouts are done

  	window.setTimeout(jQuery.proxy(function() {

```
  		this.div.hide();
```
```
  		this.header.hide();
```
```
  		this.free();
```

  	},this.day_widgets[delete_index]),1000);

  	// Widgets that are before our date shrink, after just get pushed out
  	if(before)
  	{
  		this.day_widgets[delete_index].set_width('0px');
  	}

  	this.day_widgets[delete_index].div.hide();

  	this.day_widgets[delete_index].header.hide();

  	this.day_widgets[delete_index].destroy();
  	this.day_widgets.splice(delete_index--,1);
  }

Modified: trunk/calendar/templates/default/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/app.css?rev=54926&r1=54925&r2=54926&view=diff

— trunk/calendar/templates/default/app.css (original)
+++ trunk/calendar/templates/default/app.css Thu Feb 4 22:05:31 2016
@@ -107,14 +107,12 @@
#calendar-todo {
position: absolute;
width: 30%;

margin-top: 0px;/* Nice transition when changing days in a week */
transition: 1s ease-in-out;

margin-top: 0px;
z-index: 10;
}

#calendar-view {
width: 100%;

transition: width 1s ease-in-out;
}
#calendar-view_view td {
padding: 0px;
@@ -320,8 +318,8 @@

left:
width:
*/

border-left: 1px solid silver;/* Nice transition when changing days in a week */
-webkit-transition: 0.1s ease-in-out;

border-left: 1px solid silver;
transition: none;
}
/* Calendar Id #
*/
@@ -341,8 +339,8 @@
border-right: 1px solid silver;
height: initial;
min-height: 2em;

/* Nice transition when changing days in a week */
transition: width 1s ease-in-out;

transition: none;
z-index:30;
white-space: initial;
padding-bottom: 2ex;
@@ -1202,7 +1200,7 @@
/
.calendar_slide {
/ There is a cleanup timeout in calendar app.js line 563 that must match */

transition-duration: 2s;

transition-duration: 0s; /* was 2s */
transition-delay: 50ms;
}

Modified: trunk/calendar/templates/pixelegg/app.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.css?rev=54926&r1=54925&r2=54926&view=diff

— trunk/calendar/templates/pixelegg/app.css (original)
+++ trunk/calendar/templates/pixelegg/app.css Thu Feb 4 22:05:31 2016
@@ -11,7 +11,7 @@

@package calendar
@version $Id$
/
-/ $Id: app.css 54905 2016-02-02 22:59:13Z nathangray $ /
+/ $Id: app.css 54911 2016-02-03 16:52:28Z nathangray $ */
/Media print classes/
@media print {
.th td,
@@ -121,13 +121,10 @@
position: absolute;
width: 30%;
margin-top: 0px;

/* Nice transition when changing days in a week */
transition: 1s ease-in-out;
z-index: 10;
}
#calendar-view {
width: 100%;
transition: width 1s ease-in-out;
}
#calendar-view_view td {
padding: 0px;
@@ -333,8 +330,7 @@

width:
*/
border-left: 1px solid silver;

/* Nice transition when changing days in a week */
-webkit-transition: 0.1s ease-in-out;

transition: none;
}
/* Calendar Id #
*/
@@ -356,8 +352,7 @@
border-right: 1px solid silver;
height: initial;
min-height: 2em;

/* Nice transition when changing days in a week */
transition: width 1s ease-in-out;

transition: none;
z-index: 30;
white-space: initial;
padding-bottom: 2ex;
@@ -1186,7 +1181,8 @@
/
.calendar_slide {
/ There is a cleanup timeout in calendar app.js line 563 that must match */

transition-duration: 2s;

transition-duration: 0s;
/* was 2s /
transition-delay: 50ms;
}
/*

Modified: trunk/calendar/templates/pixelegg/app.less
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/pixelegg/app.less?rev=54926&r1=54925&r2=54926&view=diff

— trunk/calendar/templates/pixelegg/app.less (original)
+++ trunk/calendar/templates/pixelegg/app.less Thu Feb 4 22:05:31 2016
@@ -11,7 +11,6 @@

@package calendar
@version $Id$
*/

@import (reference) “…/…/…/pixelegg/less/definitions.less”;

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

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