Author: vdegtyarev
Date: Thu Aug 1 03:21:55 2013
New Revision: 1509073
URL: http://svn.apache.org/r1509073
Log:
OPENMEETINGS-722 minor changes.
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/openmeetings_functions.js
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/openmeetings_functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/openmeetings_functions.js?rev=1509073&r1=1509072&r2=1509073&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/openmeetings_functions.js
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/openmeetings/js/openmeetings_functions.js
Thu Aug 1 03:21:55 2013
@@ -47,10 +47,10 @@ function loadingComplete() {
lzApp.style.height = '100%';
}
-function getTimeZoneOffsetHours() {
- var rightNow = new Date(), std_time_offset =
-rightNow.getTimezoneOffset() / 60;
+function getTimeZoneOffsetMinutes() {
+ var rightNow = new Date(), std_time_offset =
-rightNow.getTimezoneOffset();
for (var i = 0; i < 12; ++i) {
- var d = new Date(rightNow.getFullYear(), i, 1, 0, 0, 0, 0),
offset = -d.getTimezoneOffset() / 60;
+ var d = new Date(rightNow.getFullYear(), i, 1, 0, 0, 0, 0),
offset = -d.getTimezoneOffset();
if (offset < std_time_offset) {
std_time_offset = offset;
break;
@@ -60,5 +60,5 @@ function getTimeZoneOffsetHours() {
}
function getTimeZoneOffset() {
-
document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetHours());
+
document.getElementById("lzapp").getTimeZoneOffsetCallback(getTimeZoneOffsetMinutes()/60);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1509073&r1=1509072&r2=1509073&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
Thu Aug 1 03:21:55 2013
@@ -248,14 +248,14 @@ public class WebSession extends Abstract
return states.get(0);
}
- public OmTimeZone getOmTimeZoneByBrowserLocale(double offset){
+ public OmTimeZone getOmTimeZoneByBrowserLocale(int offsetByMinutes){
TimeZone tz =
Calendar.getInstance(getBrowserLocale()).getTimeZone();
OmTimeZone omTZ =
getBean(OmTimeZoneDao.class).getOmTimeZoneByIcal(tz.getID());
if (omTZ == null){
List<OmTimeZone> omTimeZones =
getBean(OmTimeZoneDao.class).getOmTimeZones();
for (OmTimeZone timeZone : omTimeZones){
- double tzOffset =
TimeZone.getTimeZone(timeZone.getIcal()).getRawOffset() / 3600000;
- if (tzOffset == offset){
+ int tzOffsetByMinutes =
TimeZone.getTimeZone(timeZone.getIcal()).getRawOffset() / 60000;
+ if (tzOffsetByMinutes == offsetByMinutes){
return timeZone;
}
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1509073&r1=1509072&r2=1509073&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Thu Aug 1 03:21:55 2013
@@ -96,7 +96,7 @@ public class RegisterDialog extends Abst
this.s = s;
}
- public void setBrowserTZOffset(AjaxRequestTarget target, double
browserTZOffset) {
+ public void setBrowserTZOffset(AjaxRequestTarget target, int
browserTZOffset) {
tzModel.setObject(WebSession.get().getOmTimeZoneByBrowserLocale(browserTZOffset));
target.add(tzDropDown);
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1509073&r1=1509072&r2=1509073&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Thu Aug 1 03:21:55 2013
@@ -75,12 +75,12 @@ public class SignInDialog extends Abstra
private ForgetPasswordDialog f;
private LdapConfig domain;
private String ldapConfigFileName;
- private HiddenField<Double> browserTZOffset;
+ private HiddenField<Integer> browserTZOffset;
public SignInDialog(String id) {
super(id, WebSession.getString(108));
add(form = new SignInForm("signin"));
- browserTZOffset = new HiddenField<Double>("tzOffset",
Model.of(new Double(0)));
+ browserTZOffset = new HiddenField<Integer>("tzOffset",
Model.of(new Integer(0)));
add(browserTZOffset);
// This code is required to detect time zone offset
@@ -90,14 +90,14 @@ public class SignInDialog extends Abstra
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
-
response.render(JavaScriptHeaderItem.forScript(getCallbackFunctionBody(resolved("tzOffset",
"getTimeZoneOffsetHours()")), "getTzOffset"));
+
response.render(JavaScriptHeaderItem.forScript(getCallbackFunctionBody(resolved("tzOffset",
"getTimeZoneOffsetMinutes()")), "getTzOffset"));
}
@Override
protected void respond(AjaxRequestTarget target) {
StringValue offset =
getRequestCycle().getRequest().getRequestParameters().getParameterValue("tzOffset");
try {
-
browserTZOffset.setModelObject(Double.parseDouble(offset.toString()));
+
browserTZOffset.setModelObject(offset.toInteger());
} catch (NumberFormatException ex) { }
}
});
