Merge remote-tracking branch 'origin/feature/stabilization'

exoplatform · Mar 24, 2014 · 1e510e5 · 1e510e5
2 parents a9dff69 + 0315e9a
commit 1e510e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/calendar-resources/src/main/webapp/javascript/eXo/cs/CSUtils.js b/calendar-resources/src/main/webapp/javascript/eXo/cs/CSUtils.js
@@ -700,7 +700,7 @@ EventManager.prototype.getEventTargetByClass = function(evt, className){
 
 EventManager.prototype.getEventTargetByTagName = function(evt, tagName){
 	var target = this.getEventTarget(evt);
-	if (target.tagName.toLowerCase() == tagName.trim())
+	if (target.tagName.toLowerCase() == gj.trim(tagName))
 		return target ;
 	else
 		return gj(target).parents(tagName)[0] ;

diff --git a/calendar-webapp/src/main/java/org/exoplatform/calendar/webui/UIMiniCalendar.java b/calendar-webapp/src/main/java/org/exoplatform/calendar/webui/UIMiniCalendar.java
@@ -141,12 +141,12 @@ public void refresh() throws Exception {
     UICalendarViewContainer viewContainer = calendarPortlet.findFirstComponentOfType(UICalendarViewContainer.class);
 
     String viewType = viewContainer.getCurrentViewType();
-    if (UICalendarViewContainer.DAY_VIEW.equals(viewType) || UICalendarViewContainer.WORKING_VIEW.equals(viewType)) {
+    if (UICalendarViewContainer.DAY_VIEW.equals(viewType)) {
       UIDayView dayView = viewContainer.getChild(UIDayView.class);
       if (dayView == null) dayView =  viewContainer.addChild(UIDayView.class, null, null) ;
       dayView.setEmptyEventCalendars(emptyEventCalendars);
       dayView.setEmptyRecurrentEventCalendars(emptyRecurrentEventCalendars);
-    } else if (UICalendarViewContainer.WEEK_VIEW.equals(viewType)) {
+    } else if (UICalendarViewContainer.WEEK_VIEW.equals(viewType) || UICalendarViewContainer.WORKING_VIEW.equals(viewType)) {
       UIWeekView weekView = viewContainer.getChild(UIWeekView.class);
       if (weekView == null) weekView = viewContainer.addChild(UIWeekView.class, null, null);
       weekView.setEmptyEventCalendars(emptyEventCalendars);