#672 use the same libraries as <b:dateTimePicker>; get rid of momen…

…t.js (for favor of moment-all-languages.js)
TheCoder4eu · Aug 4, 2019 · 4be04f5 · 4be04f5
1 parent f14cf03
commit 4be04f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/gradleResources/build.gradle b/gradleResources/build.gradle
@@ -80,7 +80,6 @@
    	from 'staticResources/js/jquery.inputmask.bundle.min.js'
    	from 'staticResources/js/jquery.scrollUp.min.js'
    	from 'staticResources/js/jquery.minicolors.min.js'
-   	from 'staticResources/js/moment.min.js'
    	from 'staticResources/js/select2.min.js'
   	from 'staticResources/js/typeahead.js'
    	from 'staticResources/ie8support/respond.js'

diff --git a/gradleResources/staticResources/js/moment.min.js b/gradleResources/staticResources/js/moment.min.js
diff --git a/mavenResources/META-INF/resources/bsf/js/moment.min.js b/mavenResources/META-INF/resources/bsf/js/moment.min.js
diff --git a/src/main/java/net/bootsfaces/component/fullCalendar/FullCalendar.java b/src/main/java/net/bootsfaces/component/fullCalendar/FullCalendar.java
@@ -22,9 +22,6 @@
  * @author jottyfan
  *
  */
-@ResourceDependencies({ @ResourceDependency(library = "bsf", name = "js/moment.min.js", target = "head"),
-		@ResourceDependency(library = "bsf", name = "js/fullcalendar.min.js", target = "head"),
-		@ResourceDependency(library = "bsf", name = "js/fullcalendar-lang-all.js", target = "head")})
 @ListenersFor({ @ListenerFor(systemEventClass = PostAddToViewEvent.class) })
 @FacesComponent(FullCalendar.COMPONENT_TYPE)
 public class FullCalendar extends FullCalendarCore implements net.bootsfaces.render.IHasTooltip, net.bootsfaces.render.IResponsive {
@@ -37,9 +34,12 @@ public class FullCalendar extends FullCalendarCore implements net.bootsfaces.ren
 
     public FullCalendar() {
         Tooltip.addResourceFiles();
+		AddResourcesListener.addBasicJSResource(C.BSF_LIBRARY, "js/moment-with-locales.min.js");
+		AddResourcesListener.addResourceToHeadButAfterJQuery(C.BSF_LIBRARY, "js/fullcalendar.min.js");
+		AddResourcesListener.addResourceToHeadButAfterJQuery(C.BSF_LIBRARY, "js/fullcalendar-lang-all.js");
+
         AddResourcesListener.addThemedCSSResource("core.css");
-        //AddResourcesListener.addThemedCSSResource("bsf.css");
-				AddResourcesListener.addExtCSSResource("fullcalendar.min.css");
+        AddResourcesListener.addExtCSSResource("fullcalendar.min.css");
         setRendererType(DEFAULT_RENDERER);
     }