[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    plugins/calendar
From:       Thomas_Brüderli <bruederli () kolabsys ! com>
Date:       2012-06-27 19:49:53
Message-ID: 20120627194953.C6DCD1FB8FA () app01 ! kolabsys ! com
[Download RAW message or body]

 plugins/calendar/lib/js/fullcalendar.js |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 1c9e7d2698e2cac4135292e4f30d8feb79cc7038
Author: Thomas Bruederli <thomas@roundcube.net>
Date:   Wed Jun 27 21:50:18 2012 +0200

    Fix overflow link computation in month view + pull in upstream changes

diff --git a/plugins/calendar/lib/js/fullcalendar.js \
b/plugins/calendar/lib/js/fullcalendar.js index bffc0e7..09b655f 100644
--- a/plugins/calendar/lib/js/fullcalendar.js
+++ b/plugins/calendar/lib/js/fullcalendar.js
@@ -1,6 +1,6 @@
 /**
  * @preserve
- * FullCalendar v1.5.3-rcube-0.7.1
+ * FullCalendar v1.5.3-rcube-0.7.2
  * https://github.com/roundcube/fullcalendar
  *
  * Use fullcalendar.css for basic styling.
@@ -12,7 +12,7 @@
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Mon Feb 13 23:00:46 2012 +0100
+ * Date: Sun Mar 4 14:35:09 2012 +0100
  *
  */
  
@@ -137,7 +137,7 @@ var rtlDefaults = {
 
 
 
-var fc = $.fullCalendar = { version: "1.5.3-rcube-0.7.1" };
+var fc = $.fullCalendar = { version: "1.5.3-rcube-0.7.2" };
 var fcViews = fc.views = {};
 
 
@@ -4655,11 +4655,11 @@ function DayEventRenderer() {
 					if (overflows[k])
 						seg.overflow = true;
 					if (seg.overflow) {
-						if (seg.isStart && !overflowLinks[k])
-							overflowLinks[k] = { seg:seg, top:top, date:cloneDate(seg.start, true), \
                count:0 };
-						if (overflowLinks[k])
-							overflowLinks[k].count++;
 						overflows[k]++;
+						if (seg.isStart && k == seg.startCol && !overflowLinks[k])
+							overflowLinks[k] = { seg:seg, top:top, date:cloneDate(seg.start, true), \
count:(overflows[k]||0) }; +						else if (overflowLinks[k])
+							overflowLinks[k].count++;
 					}
 					else
 						colHeights[k] = top;
@@ -5672,7 +5672,8 @@ function ListView(element, calendar) {
 	}
 	
 	function setHeight(height, dateChanged) {
-		body.css('height', (height-1)+'px').css('overflow', 'auto');
+	  if (!opt('listNoHeight'))
+		  body.css('height', (height-1)+'px').css('overflow', 'auto');
 	}
 
 	function setWidth(width) {
@@ -5777,7 +5778,7 @@ function TableEventRenderer() {
 							s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
 						}
 					} else {
-						s += "<td class='fc-event-" + col + "'>" + (htmlEscape(event[col]) || \
'&nbsp;') + "</td>"; +						s += "<td class='fc-event-" + col + "'>" + (event[col] ? \
htmlEscape(event[col]) : '&nbsp;') + "</td>";  }
 				}
 				s += "</tr>";
@@ -5903,7 +5904,8 @@ function TableView(element, calendar) {
 	}
 	
 	function setHeight(height, dateChanged) {
-		div.css('height', (height-1)+'px').css('overflow', 'auto');
+	  if (!opt('listNoHeight'))
+		  div.css('height', (height-1)+'px').css('overflow', 'auto');
 	}
 
 	function setWidth(width) {


_______________________________________________
kolab-commits mailing list
kolab-commits@kolab.org
https://www.intevation.de/mailman/listinfo/kolab-commits


[prev in list] [next in list] [prev in thread] [next in thread]