Changeset 5529 for trunk/prototype/plugins/fullcalendar/fullcalendar.js

Timestamp:

02/17/12 16:46:10 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcoes de bugs e atualizicao do fullcalendar

File:

• trunk/prototype/plugins/fullcalendar/fullcalendar.js (modified) (12 diffs)

trunk/prototype/plugins/fullcalendar/fullcalendar.js

@@ -1 +1 @@
 /**
  * @preserve
- * FullCalendar v1.5
+ * FullCalendar v1.5.3
  * http://arshaw.com/fullcalendar/
  *
@@ -12 +12 @@
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sat Mar 19 18:59:37 2011 -0700
+ * Date: Mon Feb 6 22:40:40 2012 -0800
  *
  */
@@ -116 +116 @@
 
 
-var fc = $.fullCalendar = { version: "1.5" };
+var fc = $.fullCalendar = { version: "1.5.3" };
 var fcViews = fc.views = {};
 
@@ -748 +748 @@
                                                 }
                                                 if (buttonClick) {
-                                                        var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null;
-                                                        var text = smartProperty(options.buttonText, buttonName);
+                                                        var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here?
+                                                        var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
                                                         var button = $(
                                                                 "<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
@@ -1379 +1379 @@
         }
         if (typeof s == 'string') {
-                if (s.match(/^\d+$/)) { // a UNIX timestamp
-                        return new Date(parseInt(s, 10) * 1000);
+                if (s.match(/^\d+(\.\d+)?$/)) { // a UNIX timestamp
+                        return new Date(parseFloat(s) * 1000);
                 }
                 if (ignoreTimezone === undefined) {
@@ -1395 +1395 @@
         // derived from http://delete.me.uk/2005/03/iso8601.html
         // TODO: for a know glitch/feature, read tests/issue_206_parseDate_dst.html
-        var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?$/);
+        var m = s.match(/^([0-9]{4})(-([0-9]{2})(-([0-9]{2})([T ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2})(:?([0-9]{2}))?))?)?)?)?$/);
         if (!m) {
                 return null;
         }
         var date = new Date(m[1], 0, 1);
-        if (ignoreTimezone || !m[14]) {
+        if (ignoreTimezone || !m[13]) {
                 var check = new Date(m[1], 0, 1, 9, 0);
                 if (m[3]) {
@@ -1436 +1436 @@
                         m[12] ? Number("0." + m[12]) * 1000 : 0
                 );
-                var offset = Number(m[16]) * 60 + Number(m[17]);
-                offset *= m[15] == '-' ? 1 : -1;
-                date = new Date(+date + (offset * 60 * 1000));
+                if (m[14]) {
+                        var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0);
+                        offset *= m[15] == '-' ? 1 : -1;
+                        date = new Date(+date + (offset * 60 * 1000));
+                }
         }
         return date;
@@ -2376 +2378 @@
                         trigger('drop', _dragElement, d, true, ev, ui);
                 }
-        }
+}
         
         
@@ -2715 +2717 @@
 
 // Year View END ----------------------------------------------------------------------------------
-
 fcViews.month = MonthView;
 
@@ -5022 +5023 @@
                 var v = options[name];
                 if (typeof v == 'object') {
-                        if ((typeof viewNameOverride != 'undefined') || (viewNameOverride) || (viewNameOverride === 0))
-                            return smartProperty(v, viewNameOverride);
-                        else
-                            return smartProperty(v, viewName);
+                //      return smartProperty(v, viewNameOverride || viewName);
+                        if ((typeof viewNameOverride != 'undefined') || (viewNameOverride) || (viewNameOverride === 0)) 
+                                        return smartProperty(v, viewNameOverride); 
+                        else 
+                                        return smartProperty(v, viewName); 
                 }
                 return v;
@@ -5919 +5921 @@
         
         function mouse(ev) {
+                _fixUIEvent(ev); // see below
                 var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
                 if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
@@ -5942 +5945 @@
 }
 
+
+
+// this fix was only necessary for jQuery UI 1.8.16 (and jQuery 1.7 or 1.7.1)
+// upgrading to jQuery UI 1.8.17 (and using either jQuery 1.7 or 1.7.1) fixed the problem
+// but keep this in here for 1.8.16 users
+// and maybe remove it down the line
+
+function _fixUIEvent(event) { // for issue 1168
+        if (event.pageX === undefined) {
+                event.pageX = event.originalEvent.pageX;
+                event.pageY = event.originalEvent.pageY;
+        }
+}
 function HorizontalPositionCache(getElement) {