Skip to content

Commit cd911bc

Browse files
committed
uprade jquery to version 3.1.0
1 parent d787844 commit cd911bc

File tree

28 files changed

+88
-1506
lines changed

28 files changed

+88
-1506
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "orgchart",
3-
"version": "1.1.4",
3+
"version": "1.1.5",
44
"homepage": "https://github.com/dabeng/OrgChart",
55
"authors": [
66
"dabeng <dabeng413@gmail.com>"

dist/js/jquery.orgchart.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -837,10 +837,10 @@
837837
$table.append('<tr class="lines hidden"><td colspan="2"><div class="down"></div></td></tr>');
838838
var linesRow = '<td class="right">&nbsp;</td><td class="left">&nbsp;</td>';
839839
$table.append('<tr class="lines hidden">' + linesRow + '</tr>');
840-
var oc = that.children('.orgchart');
841-
oc.prepend($table)
840+
var $oc = that.children('.orgchart');
841+
$oc.prepend($table)
842842
.children('table:first').append('<tr class="nodes"><td colspan="2"></td></tr>')
843-
.children().children('tr:last').children().append(oc.children('table').last());
843+
.children('tr:last').children().append($oc.children('table').last());
844844
callback();
845845
})
846846
.fail(function() {
@@ -882,9 +882,9 @@
882882
var childCount = 0;
883883
buildChildNode.call($nodeChart.closest('.orgchart').parent(),$nodeChart.parent().closest('table'), nodeData, opts, function() {
884884
if (++childCount === newSiblingCount) {
885-
var $siblingTds = $nodeChart.parent().closest('table').children().children('tr:last').children('td');
885+
var $siblingTds = $nodeChart.parent().closest('table').children('tr:last').children('td');
886886
if (existingSibligCount > 1) {
887-
complementLine($siblingTds.eq(0).before($nodeChart.closest('td').siblings().andSelf().unwrap()), siblingCount, existingSibligCount);
887+
complementLine($siblingTds.eq(0).before($nodeChart.closest('td').siblings().addBack().unwrap()), siblingCount, existingSibligCount);
888888
$siblingTds.addClass('hidden').find('.node').addClass('slide-left');
889889
} else {
890890
complementLine($siblingTds.eq(insertPostion).after($nodeChart.closest('td').unwrap()), siblingCount, 1);
@@ -899,7 +899,7 @@
899899
var nodeCount = 0;
900900
buildHierarchy($nodeChart.closest('.orgchart'), nodeData, 0, opts, function() {
901901
if (++nodeCount === siblingCount) {
902-
complementLine($nodeChart.next().children().children('tr:last')
902+
complementLine($nodeChart.next().children('tr:last')
903903
.children().eq(insertPostion).after($('<td colspan="2">')
904904
.append($nodeChart)), siblingCount, 1);
905905
$nodeChart.closest('tr').siblings().eq(0).addClass('hidden').find('.node').addClass('slide-down');

examples/ajax-datasource/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<title>Organization Chart Plugin</title>
99

1010
<link rel="icon" type="image/x-icon" href="../img/logo.ico">
11-
<link rel="stylesheet" href="../css/font-awesome.min.css">
12-
<link rel="stylesheet" href="../css/jquery.orgchart.css">
11+
<link rel="stylesheet" href="https://cdn.rawgit.com/FortAwesome/Font-Awesome/master/css/font-awesome.min.css">
12+
<link rel="stylesheet" href="../../dist/css/jquery.orgchart.css">
1313
<link rel="stylesheet" href="../css/style.css">
1414

1515
</head>
@@ -19,9 +19,9 @@
1919
<a href="https://github.com/dabeng/OrgChart" >More orgcharts</a>
2020
<i class="fa fa-star"></i>
2121
</div>
22-
<script type="text/javascript" src="../js/jquery.min.js"></script>
23-
<script type="text/javascript" src="../js/jquery.mockjax.min.js"></script>
24-
<script type="text/javascript" src="../js/jquery.orgchart.js"></script>
22+
<script type="text/javascript" src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
23+
<script type="text/javascript" src="https://cdn.rawgit.com/jakerella/jquery-mockjax/master/dist/jquery.mockjax.min.js"></script>
24+
<script type="text/javascript" src="../../dist/js/jquery.orgchart.js"></script>
2525
<script type="text/javascript" src="scripts.js"></script>
2626
</body>
2727
</html>

examples/color-coded/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<title>Organization Chart Plugin</title>
99

1010
<link rel="icon" type="image/x-icon" href="../img/logo.ico">
11-
<link rel="stylesheet" href="../css/font-awesome.min.css">
12-
<link rel="stylesheet" href="../css/jquery.orgchart.css">
11+
<link rel="stylesheet" href="https://cdn.rawgit.com/FortAwesome/Font-Awesome/master/css/font-awesome.min.css">
12+
<link rel="stylesheet" href="../../dist/css/jquery.orgchart.css">
1313
<link rel="stylesheet" href="../css/style.css">
1414
<link rel="stylesheet" href="style.css">
1515

@@ -20,8 +20,8 @@
2020
<a href="https://github.com/dabeng/OrgChart" >More orgcharts</a>
2121
<i class="fa fa-star"></i>
2222
</div>
23-
<script type="text/javascript" src="../js/jquery.min.js"></script>
24-
<script type="text/javascript" src="../js/jquery.orgchart.js"></script>
23+
<script type="text/javascript" src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
24+
<script type="text/javascript" src="../../dist/js/jquery.orgchart.js"></script>
2525
<script type="text/javascript" src="scripts.js"></script>
2626
</body>
2727
</html>

examples/css/font-awesome.min.css

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)