Skip to content

Commit 24c807f

Browse files
committed
Fixed IE11 compatibility issue.
1 parent 8b73350 commit 24c807f

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

src/main/java/com/flowingcode/vaadin/addons/orgchart/OrgChart.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
*/
4848
@SuppressWarnings("serial")
4949
@NpmPackage(value = "orgchart", version = "2.1.4")
50+
@JsModule("jquery/dist/jquery.js")
5051
@JsModule("orgchart/dist/js/jquery.orgchart.js")
5152
@CssImport("orgchart/dist/css/jquery.orgchart.css")
5253
@Tag("fc-orgchart")

src/main/resources/META-INF/frontend/fc-orgchart.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {html, PolymerElement} from '@polymer/polymer/polymer-element.js';
2-
import $ from "jquery";
2+
import jQuery from "jquery";
33
import html2canvas from 'html2canvas';
44

55
/**
@@ -13,15 +13,20 @@ import html2canvas from 'html2canvas';
1313
class FCOrgChart extends PolymerElement {
1414

1515
initializeOrgChart(statestring,data,identifier) {
16+
var $ = window.jQuery || jQuery;
1617
var state = $.parseJSON(statestring);
1718

1819
let exportChart = state.chartExportButton;
1920
let exportExt = state.chartExportFileExtension;
2021
if(exportChart & exportExt == "pdf"){
21-
addJSfile("https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.debug.js");
22+
var src = "https://cdnjs.cloudflare.com/ajax/libs/jspdf/1.3.2/jspdf.debug.js";
23+
var jsfile = $("<script type='text/javascript' src='"+src+"'>");
24+
$("head").append(jsfile);
2225
}
2326
if(exportChart & this.isIEBrowser() > 0){
24-
addJSfile("https://cdn.jsdelivr.net/npm/es6-promise@4/dist/es6-promise.auto.js");
27+
var src = "https://cdn.jsdelivr.net/npm/es6-promise@4/dist/es6-promise.auto.js";
28+
var jsfile = $("<script type='text/javascript' src='"+src+"'>");
29+
$("head").append(jsfile);
2530
}
2631

2732
var nodeTemplate;
@@ -85,13 +90,13 @@ class FCOrgChart extends PolymerElement {
8590
*/
8691
var chartExpandCollapse = state.chartExpandCollapse;
8792
if(chartExpandCollapse){
88-
$('#' + identifier).find(".orgchart").addClass('noncollapsable');
93+
this.querySelector(".orgchart").classList.add("noncollapsable")
8994
} else {
90-
$('#' + identifier).find(".orgchart").removeClass('noncollapsable');
95+
this.querySelector(".orgchart").classList.remove("noncollapsable")
9196
}
9297

93-
$('#' + identifier).find(".orgchart").css("background-image", "none");
94-
$("div.orgchart").prev().closest("div").attr("id", "chart-container");
98+
$("div.orgchart").prev().closest("div").attr("id", "chart-container");
99+
this.querySelector(".orgchart").style.setProperty("background-image","none")
95100

96101
// if draggable
97102
var draggable = state.chartDraggable;
@@ -103,13 +108,12 @@ class FCOrgChart extends PolymerElement {
103108
let dragZone = extraParams.dragZone.attr('id');
104109
let dropZone = extraParams.dropZone.attr('id');
105110

106-
//rpcProxy.updateChart(draggedNode, dragZone, dropZone);
107111
currOrgChart.$server.updateDraggedNode(draggedNode, dragZone, dropZone);
108112
});
109113
}
110114

111115
}
112-
116+
113117
isIEBrowser() {
114118
var sAgent = window.navigator.userAgent;
115119
var Idx = sAgent.indexOf("MSIE");

0 commit comments

Comments
 (0)