You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/02/11 16:56:58 UTC
svn commit: r1658993 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/
trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/
Author: solomax
Date: Wed Feb 11 15:56:58 2015
New Revision: 1658993
URL: http://svn.apache.org/r1658993
Log:
[OPENMEETINGS-1177] select Date button works as expected in FF
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1658993&r1=1658992&r2=1658993&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Wed Feb 11 15:56:58 2015
@@ -117,7 +117,7 @@ public class CalendarPanel extends UserP
add(dialog);
boolean isRtl = Boolean.TRUE.equals(WebSession.getLanguageObj().getRtl());
- javaScriptAddDatepicker = String.format("addCalButton(%s, 'Datepicker', 'datepicker');", isRtl);
+ javaScriptAddDatepicker = String.format("addCalButton(%s, 'datepicker');", isRtl);
Options options = new Options();
options.set("isRTL", isRtl);
options.set("header", isRtl ? "{left: 'agendaDay,agendaWeek,month', center: 'title', right: 'today nextYear,next,prev,prevYear'}"
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1658993&r1=1658992&r2=1658993&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js Wed Feb 11 15:56:58 2015
@@ -34,17 +34,23 @@ $(function() {
$(window).load(function() { setCalendarHeight(); } );
});
-function addCalButton(rtl, text, id) {
+function toggleDatePicker(id) {
+ var dp = $("#" + id);
+ dp.datepicker(dp.datepicker("widget").is(":visible") ? "hide" : "show");
+ return false;
+}
+function addCalButton(rtl, id) {
var my_button =
- '<button class="fc-button fc-state-default fc-corner-right fc-corner-left">' +
- '<input type="text" id="' + id + '" value="' + text +'" /></button>';
+ '<button class="fc-button fc-state-default fc-corner-right fc-corner-left" onclick="return toggleDatePicker(\'' + id + '\');">' +
+ '<input type="text" id="' + id + '" /></button>';
+
if (rtl) {
$(".fc .fc-toolbar .fc-right").prepend(my_button);
} else {
$(".fc .fc-toolbar .fc-left").append(my_button);
}
- var dp = $("#"+id);
+ var dp = $("#" + id);
dp.datepicker({
showOn: "button",
buttonImage: "images/calendar.gif",
@@ -62,8 +68,8 @@ function addCalButton(rtl, text, id) {
$('#${markupId}').fullCalendar('gotoDate', year + '-' + ('0' + month).slice(-2) + '-' + inst.selectedDay);
},
onSelect: function(dateText, inst) {
- var date = new Date(dateText);
- $('#${markupId}').fullCalendar('gotoDate', date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + date.getDate());
+ var date = new Date(dateText);
+ $('#${markupId}').fullCalendar('gotoDate', date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + date.getDate());
}
});
dp.hide();
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1658993&r1=1658992&r2=1658993&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Wed Feb 11 15:56:58 2015
@@ -118,7 +118,7 @@ public class CalendarPanel extends UserP
add(dialog);
boolean isRtl = WebSession.getLanguageObj().isRtl();
- javaScriptAddDatepicker = String.format("addCalButton(%s, 'Datepicker', 'datepicker');", isRtl);
+ javaScriptAddDatepicker = String.format("addCalButton(%s, 'datepicker');", isRtl);
Options options = new Options();
options.set("isRTL", isRtl);
options.set("header", isRtl ? "{left: 'agendaDay,agendaWeek,month', center: 'title', right: 'today nextYear,next,prev,prevYear'}"
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js?rev=1658993&r1=1658992&r2=1658993&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js Wed Feb 11 15:56:58 2015
@@ -34,17 +34,23 @@ $(function() {
$(window).load(function() { setCalendarHeight(); } );
});
-function addCalButton(rtl, text, id) {
+function toggleDatePicker(id) {
+ var dp = $("#" + id);
+ dp.datepicker(dp.datepicker("widget").is(":visible") ? "hide" : "show");
+ return false;
+}
+function addCalButton(rtl, id) {
var my_button =
- '<button class="fc-button fc-state-default fc-corner-right fc-corner-left">' +
- '<input type="text" id="' + id + '" value="' + text +'" /></button>';
+ '<button class="fc-button fc-state-default fc-corner-right fc-corner-left" onclick="return toggleDatePicker(\'' + id + '\');">' +
+ '<input type="text" id="' + id + '" /></button>';
+
if (rtl) {
$(".fc .fc-toolbar .fc-right").prepend(my_button);
} else {
$(".fc .fc-toolbar .fc-left").append(my_button);
}
- var dp = $("#"+id);
+ var dp = $("#" + id);
dp.datepicker({
showOn: "button",
buttonImage: "images/calendar.gif",
@@ -62,8 +68,8 @@ function addCalButton(rtl, text, id) {
$('#${markupId}').fullCalendar('gotoDate', year + '-' + ('0' + month).slice(-2) + '-' + inst.selectedDay);
},
onSelect: function(dateText, inst) {
- var date = new Date(dateText);
- $('#${markupId}').fullCalendar('gotoDate', date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + date.getDate());
+ var date = new Date(dateText);
+ $('#${markupId}').fullCalendar('gotoDate', date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + date.getDate());
}
});
dp.hide();