Changeset 5004 for branches/2.3

Timestamp:

08/29/11 18:07:50 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2047 - Calendário na pesquisa fica escondido.

Location:

branches/2.3

Files:

• expressoMail1_2/js/search.js (modified) (3 diffs)
• phpgwapi/js/jscalendar/calendar-setup.js (modified) (3 diffs)
• phpgwapi/js/jscalendar/calendar.js (modified) (3 diffs)

branches/2.3/expressoMail1_2/js/search.js

@@ -58 +58 @@
                             button      : 'since_date-trigger',
                             ifFormat    : '%d/%m/%Y',
-                            daFormat    : '%d/%m/%Y'
+                            daFormat    : '%d/%m/%Y',
+                            overMe      : 'window_search'
                         });
 
@@ -65 +66 @@
                             button      : 'before_date-trigger',
                             ifFormat    : '%d/%m/%Y',
-                            daFormat    : '%d/%m/%Y'
+                            daFormat    : '%d/%m/%Y',
+                            overMe      : 'window_search'
                         });
 
@@ -72 +74 @@
                             button      : 'on_date-trigger',
                             ifFormat    : '%d/%m/%Y',
-                            daFormat    : '%d/%m/%Y'
+                            daFormat    : '%d/%m/%Y',
+                            overMe      : 'window_search'
                         });
 

branches/2.3/phpgwapi/js/jscalendar/calendar-setup.js

@@ -100 +100 @@
         param_default("cache",          false);
         param_default("showOthers",     false);
+        param_default("overMe",         false);
 
         var tmp = ["inputField", "displayArea", "button"];
@@ -146 +147 @@
                 cal.time24 = (params.timeFormat == "24");
                 cal.params = params;
+                cal.setOverMe(params.overMe);
                 cal.weekNumbers = params.weekNumbers;
                 cal.setRange(params.range[0], params.range[1]);
@@ -175 +177 @@
                         cal.hide();
                 }
+                cal.setOverMe(params.overMe);
                 cal.showsOtherMonths = params.showOthers;
                 cal.yearStep = params.step;

branches/2.3/phpgwapi/js/jscalendar/calendar.js

@@ -41 +41 @@
         this.tbody = null;
         this.firstdayname = null;
+        this.overMe = null;
         // Combo boxes
         this.monthsCombo = null;
@@ -750 +751 @@
                 div.style.position = "absolute";
                 div.style.display = "none";
-                //TODO: tornar zIndex uma das opções de inicialização
-                div.style.zIndex = "100000"; // hardcoded,
+                if (this.overMe){
+                    var overMe = Element(this.overMe);
+                }
+                var zIndex = parseInt(overMe.style.zIndex)+10;
+                div.style.zIndex = zIndex;
         }
         div.appendChild(table);
@@ -1203 +1207 @@
         }
 };
+
+Calendar.prototype.setOverMe = function (overMe){
+    this.overMe = overMe;
+}
 
 /**