You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/08/01 14:16:36 UTC
svn commit: r1615080 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard...
Author: lofwyr
Date: Fri Aug 1 12:16:36 2014
New Revision: 1615080
URL: http://svn.apache.org/r1615080
Log:
Merged from trunk
update slf4j [from revision 1614827]
TOBAGO-1415: DatePicker look-and-feel should be more similar to previous [from revision 1614853]
TOBAGO-1416: Time tag should not display date by default [from revision 1615053]
Modified:
myfaces/tobago/branches/tobago-3.0.x/ (props changed)
myfaces/tobago/branches/tobago-3.0.x/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js
Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1614827,1614853,1615053
Modified: myfaces/tobago/branches/tobago-3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/pom.xml?rev=1615080&r1=1615079&r2=1615080&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/pom.xml Fri Aug 1 12:16:36 2014
@@ -41,7 +41,7 @@
<mojarra20.version>2.0.11</mojarra20.version>
<mojarra21.version>2.1.28</mojarra21.version>
<mojarra22.version>2.2.6</mojarra22.version>
- <slf4j.version>1.7.6</slf4j.version>
+ <slf4j.version>1.7.7</slf4j.version>
<logback.version>1.1.1</logback.version>
<commons-collection.version>3.2.1</commons-collection.version>
<maven.compile.source>1.6</maven.compile.source>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java?rev=1615080&r1=1615079&r2=1615080&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITime.java Fri Aug 1 12:16:36 2014
@@ -36,11 +36,14 @@ public abstract class AbstractUITime ext
= FacesContext.getCurrentInstance().getApplication();
final DateTimeConverter dateTimeConverter
= (DateTimeConverter) application.createConverter(DateTimeConverter.CONVERTER_ID);
- dateTimeConverter.setPattern("HH:mm");
- dateTimeConverter.setTimeZone(TimeZone.getDefault());
+ dateTimeConverter.setTimeStyle("short");
+ dateTimeConverter.setType("time");
+ dateTimeConverter.setTimeZone(TimeZone.getDefault()); // TBD
setConverter(dateTimeConverter);
+ return dateTimeConverter;
+ } else {
+ return converter;
}
- return converter;
}
@Override
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js?rev=1615080&r1=1615079&r2=1615080&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js Fri Aug 1 12:16:36 2014
@@ -500,11 +500,13 @@ Tobago.DateTime.init = function (element
var analyzed = Tobago.DateTime.analyzePattern(date.data("tobago-pattern"));
var options = {
- showOn: "both",
+ showOn: "button",
buttonImageOnly: true,
// tbd changeMonth: true,
// tbd changeYear: true,
- showAnim: "" // just show it directly
+ showAnim: "", // just show it directly
+ showOtherMonths: true,
+ selectOtherMonths: true
};
var icon = date.data("tobago-date-time-icon");
if (icon) {