Skip to content

#1155 - add type by js script tags #1176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
geopossachs wants to merge 3 commits into
base: master
Choose a base branch
from
Open

#1155 - add type by js script tags #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bc4e3a
#1155 - add type by js script tags
geopossachs Oct 17, 2021
befda17
clean up the code
geopossachs Oct 18, 2021
f3180b4
add for each file one tag and set also mime typ by resource
geopossachs Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.bootsfaces</groupId>
<artifactId>bootsfaces</artifactId>
Expand Down Expand Up @@ -65,11 +65,11 @@
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
<artifactId>owasp-java-html-sanitizer</artifactId>
<version>20191001.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
<artifactId>owasp-java-html-sanitizer</artifactId>
<version>20191001.1</version>
</dependency>
</dependencies>


Expand All @@ -85,7 +85,7 @@
<version>2.7</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/bootsfaces/component/datepicker/Datepicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ public void encodeBegin(FacesContext fc) throws IOException {
private void encodeDefaultLanguageJS(FacesContext fc) throws IOException {
ResponseWriter rw = fc.getResponseWriter();
rw.startElement("script", null);
rw.writeAttribute("type", "text/javascript", null);
rw.write("$.datepicker.setDefaults($.datepicker.regional['" + fc.getViewRoot().getLocale().getLanguage()
+ "']);");
rw.endElement("script");
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/net/bootsfaces/component/fullCalendar/FullCalendarRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
/**
* @author jottyfan
*/
/** This class generates the HTML code of &lt;b:fullcalendar /&gt;. */
/**
* This class generates the HTML code of &lt;b:fullcalendar /&gt;.
*/
@FacesRenderer(componentFamily = "net.bootsfaces.component", rendererType = "net.bootsfaces.component.fullCalendar.FullCalendar")
public class FullCalendarRenderer extends Renderer {

Expand Down Expand Up @@ -50,7 +52,7 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce

// activate the jquery plugin on that div
rw.startElement("script", null);

rw.writeAttribute("type", "text/javascript", null);
rw.writeText("$(document).ready(function() {", null);
rw.writeText(" $(\"[id='" + clientId + "']\").fullCalendar({", null);
rw.writeText(" lang: '" + lang + "',", null);
Expand All @@ -59,7 +61,7 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
}
rw.writeText(" allDaySlot: " + fullCalendar.isAllDaySlot() + ",", null);
if (fullCalendar.getSlotDuration() != null) {
rw.writeText(" slotDuration: '" + fullCalendar.getSlotDuration() + "',", null);
rw.writeText(" slotDuration: '" + fullCalendar.getSlotDuration() + "',", null);
}
if (fullCalendar.getDefaultView() != null) {
rw.writeText(" defaultView: '" + fullCalendar.getDefaultView() + "',", null);
Expand Down
Loading