Skip to content
This repository has been archived by the owner on Nov 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #173 from koljascasino/master
Browse files Browse the repository at this point in the history 
FullCalendar 2.3.1
  • Loading branch information
@jgodi
jgodi committed Apr 30, 2015
2 parents 2a056bf + 3eb6da8 commit 84e95c4
Show file tree
Hide file tree
Showing 106 changed files with 1,721 additions and 864 deletions.
108 changes: 60 additions & 48 deletions src/main/java/org/gwtbootstrap3/extras/fullcalendar/client/FullCalendarClientBundle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* #%L
* GwtBootstrap3
* %%
* Copyright (C) 2013 - 2014 GwtBootstrap3
* Copyright (C) 2013 - 2015 GwtBootstrap3
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -29,147 +29,159 @@ public interface FullCalendarClientBundle extends ClientBundle {

public static final FullCalendarClientBundle INSTANCE = GWT.create(FullCalendarClientBundle.class);

@Source("resource/css/fullcalendar-2.0.0.cache.css")
@Source("resource/css/fullcalendar-2.3.1.cache.css")
@CssResource.NotStrict
CssResource fullCalendarCss();

@Source("resource/css/fullcalendar-2.0.0.cache.print.css")
@Source("resource/css/fullcalendar-2.3.1.cache.print.css")
@CssResource.NotStrict
CssResource fullCalendarPrintCss();

@Source("resource/js/fullcalendar-2.0.0.min.cache.js")
@Source("resource/js/fullcalendar-2.3.1.min.cache.js")
TextResource getFullCalendarJS();

@Source("resource/js/gcal-2.0.0.cache.js")
@Source("resource/js/gcal-2.3.1.cache.js")
TextResource getGoogleCalJS();

@Source("resource/js/jquery-ui-1.10.4.custom.min.cache.js")
@Source("resource/js/jquery-ui-1.11.2.custom.min.cache.js")
TextResource getCustomDragResizeJS();

@Source("resource/js/moment-2.6.0.min.cache.js")
@Source("resource/js/moment-2.9.0.min.cache.js")
TextResource getMomentJS();

//langauge files
@Source("resource/js/lang.cache.2.0.0/ar-ma.js")
@Source("resource/js/lang.cache.2.3.1/ar-ma.js")
TextResource getArabicMorocan();

@Source("resource/js/lang.cache.2.0.0/ar.js")
@Source("resource/js/lang.cache.2.3.1/ar.js")
TextResource getArabic();

@Source("resource/js/lang.cache.2.0.0/bg.js")
@Source("resource/js/lang.cache.2.3.1/bg.js")
TextResource getBulgarian();

@Source("resource/js/lang.cache.2.0.0/ca.js")
@Source("resource/js/lang.cache.2.3.1/ca.js")
TextResource getCatalan();

@Source("resource/js/lang.cache.2.0.0/cs.js")
@Source("resource/js/lang.cache.2.3.1/cs.js")
TextResource getCzech();

@Source("resource/js/lang.cache.2.0.0/da.js")
@Source("resource/js/lang.cache.2.3.1/da.js")
TextResource getDanish();

@Source("resource/js/lang.cache.2.0.0/de.js")
@Source("resource/js/lang.cache.2.3.1/de.js")
TextResource getGerman();

@Source("resource/js/lang.cache.2.0.0/el.js")
@Source("resource/js/lang.cache.2.3.1/el.js")
TextResource getGreek();

@Source("resource/js/lang.cache.2.0.0/en-au.js")
@Source("resource/js/lang.cache.2.3.1/en-au.js")
TextResource getEnglishAustralian();

@Source("resource/js/lang.cache.2.0.0/en-ca.js")
@Source("resource/js/lang.cache.2.3.1/en-ca.js")
TextResource getEnglishCanadian();

@Source("resource/js/lang.cache.2.0.0/en-gb.js")
@Source("resource/js/lang.cache.2.3.1/en-gb.js")
TextResource getEnglishBritish();

@Source("resource/js/lang.cache.2.0.0/es.js")
@Source("resource/js/lang.cache.2.3.1/es.js")
TextResource getSpanish();

@Source("resource/js/lang.cache.2.0.0/fa.js")
@Source("resource/js/lang.cache.2.3.1/fa.js")
TextResource getFarsi();

@Source("resource/js/lang.cache.2.0.0/fi.js")
@Source("resource/js/lang.cache.2.3.1/fi.js")
TextResource getFinnish();

@Source("resource/js/lang.cache.2.0.0/fr-ca.js")
@Source("resource/js/lang.cache.2.3.1/fr-ca.js")
TextResource getFrenchCanadian();

@Source("resource/js/lang.cache.2.0.0/fr.js")
@Source("resource/js/lang.cache.2.3.1/fr.js")
TextResource getFrench();

@Source("resource/js/lang.cache.2.0.0/hi.js")
@Source("resource/js/lang.cache.2.3.1/hi.js")
TextResource getHindi();

@Source("resource/js/lang.cache.2.0.0/hr.js")
@Source("resource/js/lang.cache.2.3.1/he.js")
TextResource getHebrew();

@Source("resource/js/lang.cache.2.3.1/hr.js")
TextResource getCroatian();

@Source("resource/js/lang.cache.2.0.0/hu.js")
@Source("resource/js/lang.cache.2.3.1/hu.js")
TextResource getHungarian();

@Source("resource/js/lang.cache.2.0.0/it.js")
@Source("resource/js/lang.cache.2.3.1/id.js")
TextResource getIndonesian();

@Source("resource/js/lang.cache.2.3.1/is.js")
TextResource getIslandic();

@Source("resource/js/lang.cache.2.3.1/it.js")
TextResource getItalian();

@Source("resource/js/lang.cache.2.0.0/ja.js")
@Source("resource/js/lang.cache.2.3.1/ja.js")
TextResource getJapanese();

@Source("resource/js/lang.cache.2.0.0/ko.js")
@Source("resource/js/lang.cache.2.3.1/ko.js")
TextResource getKorean();

@Source("resource/js/lang.cache.2.0.0/lt.js")
@Source("resource/js/lang.cache.2.3.1/lt.js")
TextResource getLithuanian();

@Source("resource/js/lang.cache.2.0.0/lv.js")
@Source("resource/js/lang.cache.2.3.1/lv.js")
TextResource getLatvian();

@Source("resource/js/lang.cache.2.0.0/nl.js")
@Source("resource/js/lang.cache.2.3.1/nb.js")
TextResource getNowegianBokmal();

@Source("resource/js/lang.cache.2.3.1/nl.js")
TextResource getDutch();

@Source("resource/js/lang.cache.2.0.0/pl.js")
@Source("resource/js/lang.cache.2.3.1/pl.js")
TextResource getPolish();

@Source("resource/js/lang.cache.2.0.0/pt-br.js")
@Source("resource/js/lang.cache.2.3.1/pt-br.js")
TextResource getPortugeseBrazil();

@Source("resource/js/lang.cache.2.0.0/pt.js")
@Source("resource/js/lang.cache.2.3.1/pt.js")
TextResource getPortugese();

@Source("resource/js/lang.cache.2.0.0/ro.js")
@Source("resource/js/lang.cache.2.3.1/ro.js")
TextResource getRomanian();

@Source("resource/js/lang.cache.2.0.0/ru.js")
@Source("resource/js/lang.cache.2.3.1/ru.js")
TextResource getRussian();

@Source("resource/js/lang.cache.2.0.0/sk.js")
@Source("resource/js/lang.cache.2.3.1/sk.js")
TextResource getSlovak();

@Source("resource/js/lang.cache.2.0.0/sl.js")
@Source("resource/js/lang.cache.2.3.1/sl.js")
TextResource getSlovenian();

@Source("resource/js/lang.cache.2.0.0/sr-cyr.js")
@Source("resource/js/lang.cache.2.3.1/sr-cyrl.js")
TextResource getSerbianCyrillic();

@Source("resource/js/lang.cache.2.0.0/sr.js")
@Source("resource/js/lang.cache.2.3.1/sr.js")
TextResource getSerbian();

@Source("resource/js/lang.cache.2.0.0/sv.js")
@Source("resource/js/lang.cache.2.3.1/sv.js")
TextResource getSweedish();

@Source("resource/js/lang.cache.2.0.0/th.js")
@Source("resource/js/lang.cache.2.3.1/th.js")
TextResource getThai();

@Source("resource/js/lang.cache.2.0.0/tr.js")
@Source("resource/js/lang.cache.2.3.1/tr.js")
TextResource getTurkish();

@Source("resource/js/lang.cache.2.0.0/uk.js")
@Source("resource/js/lang.cache.2.3.1/uk.js")
TextResource getUkrainian();

@Source("resource/js/lang.cache.2.0.0/vi.js")
@Source("resource/js/lang.cache.2.3.1/vi.js")
TextResource getVietnamese();

@Source("resource/js/lang.cache.2.0.0/zh-cn.js")
@Source("resource/js/lang.cache.2.3.1/zh-cn.js")
TextResource getChineseChina();

@Source("resource/js/lang.cache.2.0.0/zh-tw.js")
@Source("resource/js/lang.cache.2.3.1/zh-tw.js")
TextResource getChineseTaiwan();
}
37 changes: 36 additions & 1 deletion src/main/java/org/gwtbootstrap3/extras/fullcalendar/client/ui/CalendarConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* #%L
* GwtBootstrap3
* %%
* Copyright (C) 2013 - 2014 GwtBootstrap3
* Copyright (C) 2013 - 2015 GwtBootstrap3
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -48,8 +48,12 @@ public class CalendarConfig {

private String weekNumberTitle;
private String timezone;
private String unselectCancel;
private String selectContraint;
private boolean selectable;
private boolean selectHelper;
private boolean unselectAuto = true;
private boolean selectOverlap = true;

public CalendarConfig() {
this(null);
Expand Down Expand Up @@ -209,7 +213,38 @@ public String getTimezone() {
public void setTimezone(final String timezone) {
this.timezone = timezone;
}
public boolean isUnselectAuto() {
return unselectAuto;
}

public void setUnselectAuto(final boolean unselectAuto) {
this.unselectAuto = unselectAuto;
}

public String getUnselectCancel() {
return unselectCancel;
}

public void setUnselectCancel(final String unselectCancel) {
this.unselectCancel = unselectCancel;
}

public boolean isSelectOverlap() {
return selectOverlap;
}

public void setSelectOverlap(final boolean selectOverlap) {
this.selectOverlap = selectOverlap;
}

public String getSelectContraint() {
return selectContraint;
}

public void setSelectContraint(final String selectContraint) {
this.selectContraint = selectContraint;
}

public JsArray<JavaScriptObject> getJavaScriptParameters() {
final JsArray<JavaScriptObject> params = (JsArray<JavaScriptObject>) JsArray.createArray();
setParameter(params, getGeneralDisplay());
Expand Down
51 changes: 48 additions & 3 deletions src/main/java/org/gwtbootstrap3/extras/fullcalendar/client/ui/Event.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* #%L
* GwtBootstrap3
* %%
* Copyright (C) 2013 - 2014 GwtBootstrap3
* Copyright (C) 2013 - 2015 GwtBootstrap3
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -92,7 +92,7 @@ public void setStart(final Date d) {
}
}

private native void setStart(String start) /*-{
public native void setStart(String start) /*-{
var theInstance = this;
theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.start = start;
}-*/;
Expand Down Expand Up @@ -135,7 +135,7 @@ public void setEnd(final Date d) {
}
}

private native void setEnd(String end) /*-{
public native void setEnd(String end) /*-{
var theInstance = this;
theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.end = end;
}-*/;
Expand Down Expand Up @@ -228,6 +228,51 @@ public native boolean getDurationEditable() /*-{
}
return false;
}-*/;

public native void setRendering(String rendering) /*-{
var theInstance = this;
theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.rendering = rendering;
}-*/;

public native String getRendering() /*-{
var theInstance = this;
if (theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.rendering) {
return theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.rendering;
}
return null;
}-*/;

public native void setOverlap(boolean overlap) /*-{
var theInstance = this;
theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.overlap = overlap;
}-*/;

public native boolean getOverlap() /*-{
var theInstance = this;
if (typeof theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.overlap != 'undefined') {
return theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.overlap;
}
return true;
}-*/;

public native void setConstraint(String constraint) /*-{
var theInstance = this;
theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.constraint = constraint;
}-*/;

public native void setConstraint(JavaScriptObject constraint) /*-{
var theInstance = this;
theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.constraint = constraint;
}-*/;

private native JavaScriptObject getJSOSource() /*-{
var theInstance = this;
return theInstance.@org.gwtbootstrap3.extras.fullcalendar.client.ui.Event::event.source;
}-*/;

public EventSource getSource() {
return new EventSource(getJSOSource());
}

public native void setColor(String color) /*-{
var theInstance = this;
Expand Down
Loading

0 comments on commit 84e95c4

Please sign in to comment.