Skip to content

Issue 66 #74

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

Merged
merged 5 commits into from
Jul 21, 2023
Merged

Issue 66 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cddc874
build: set version to 5.0.0-SNAPSHOT
paodb Jul 18, 2023
cc66565
feat!: update library dependency to 3.7.0
paodb Jul 18, 2023
ef5835d
feat: add styles to content to keep compatibility with previous version
paodb Jul 18, 2023
67a9cf1
fix(demo): update styles on demos
paodb Jul 18, 2023
073c6ae
chore: remove exclusions from license plugin
paodb Jul 18, 2023
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
8 changes: 3 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.flowingcode.vaadin.addons</groupId>
<artifactId>orgchart-addon</artifactId>
<version>4.2.3-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>OrgChart Add-on</name>

<properties>
Expand Down Expand Up @@ -192,10 +192,7 @@
<licenseName>apache_v2</licenseName>
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
<excludes>
<exclude>**/font-awesome.css</exclude>
<exclude>**/jquery.orgchart.js</exclude>
<exclude>**/jquery.orgchart.min.js</exclude>
<exclude>**/jquery.orgchart.min.css</exclude>
<exclude>**/font-awesome.css</exclude>
</excludes>
</configuration>
</plugin>
Expand Down Expand Up @@ -290,6 +287,7 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import com.vaadin.flow.component.ComponentEvent;
import com.vaadin.flow.component.ComponentEventListener;
import com.vaadin.flow.component.Tag;
import com.vaadin.flow.component.dependency.CssImport;
import com.vaadin.flow.component.dependency.JsModule;
import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.component.dependency.StyleSheet;
import com.vaadin.flow.component.html.Div;
import com.vaadin.flow.shared.Registration;
import java.util.List;
Expand All @@ -45,14 +45,15 @@
* @author pbartolo
*/
@SuppressWarnings("serial")
// @NpmPackage(value = "orgchart", version = "2.1.4")
@NpmPackage(value = "html2canvas", version = "^0.5.0-beta4")
@NpmPackage(value = "jquery", version = "3.4.1")
@NpmPackage(value = "orgchart", version = "3.7.0")
@NpmPackage(value = "html2canvas", version = "1.4.1")
@NpmPackage(value = "jquery", version = "3.6.2")
@JsModule("jquery/dist/jquery.js")
@JsModule("./orgchart/dist/js/jquery.orgchart.js")
@StyleSheet("context://frontend/jquery.orgchart.min.css")
@JsModule("orgchart/dist/js/jquery.orgchart.js")
@CssImport("orgchart/dist/css/jquery.orgchart.min.css")
@Tag("fc-orgchart")
@JsModule("./fc-orgchart.js")
@CssImport("./fc-orgchart-styles.css")
public class OrgChart extends Div {

private OrgChartItem orgChartItem;
Expand Down
Loading