uprade jquery to version 3.1.0

dabeng · Sep 2, 2016 · cd911bc · cd911bc
1 parent d787844
commit cd911bc
Show file tree

Hide file tree

Showing 28 changed files with 88 additions and 1,506 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "orgchart",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "homepage": "https://github.com/dabeng/OrgChart",
   "authors": [
     "dabeng <[email protected]>"

diff --git a/dist/js/jquery.orgchart.js b/dist/js/jquery.orgchart.js
@@ -837,10 +837,10 @@
         $table.append('<tr class="lines hidden"><td colspan="2"><div class="down"></div></td></tr>');
         var linesRow = '<td class="right">&nbsp;</td><td class="left">&nbsp;</td>';
         $table.append('<tr class="lines hidden">' + linesRow + '</tr>');
-        var oc = that.children('.orgchart');
-        oc.prepend($table)
+        var $oc = that.children('.orgchart');
+        $oc.prepend($table)
           .children('table:first').append('<tr class="nodes"><td colspan="2"></td></tr>')
-          .children().children('tr:last').children().append(oc.children('table').last());
+          .children('tr:last').children().append($oc.children('table').last());
         callback();
       })
       .fail(function() {
@@ -882,9 +882,9 @@
       var childCount = 0;
       buildChildNode.call($nodeChart.closest('.orgchart').parent(),$nodeChart.parent().closest('table'), nodeData, opts, function() {
         if (++childCount === newSiblingCount) {
-          var $siblingTds = $nodeChart.parent().closest('table').children().children('tr:last').children('td');
+          var $siblingTds = $nodeChart.parent().closest('table').children('tr:last').children('td');
           if (existingSibligCount > 1) {
-            complementLine($siblingTds.eq(0).before($nodeChart.closest('td').siblings().andSelf().unwrap()), siblingCount, existingSibligCount);
+            complementLine($siblingTds.eq(0).before($nodeChart.closest('td').siblings().addBack().unwrap()), siblingCount, existingSibligCount);
             $siblingTds.addClass('hidden').find('.node').addClass('slide-left');
           } else {
             complementLine($siblingTds.eq(insertPostion).after($nodeChart.closest('td').unwrap()), siblingCount, 1);
@@ -899,7 +899,7 @@
       var nodeCount = 0;
       buildHierarchy($nodeChart.closest('.orgchart'), nodeData, 0, opts, function() {
         if (++nodeCount === siblingCount) {
-          complementLine($nodeChart.next().children().children('tr:last')
+          complementLine($nodeChart.next().children('tr:last')
             .children().eq(insertPostion).after($('<td colspan="2">')
             .append($nodeChart)), siblingCount, 1);
           $nodeChart.closest('tr').siblings().eq(0).addClass('hidden').find('.node').addClass('slide-down');

diff --git a/examples/ajax-datasource/index.html b/examples/ajax-datasource/index.html
@@ -8,8 +8,8 @@
     <title>Organization Chart Plugin</title>
 
     <link rel="icon" type="image/x-icon" href="../img/logo.ico">
-    <link rel="stylesheet" href="../css/font-awesome.min.css">
-    <link rel="stylesheet" href="../css/jquery.orgchart.css">
+    <link rel="stylesheet" href="https://cdn.rawgit.com/FortAwesome/Font-Awesome/master/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../dist/css/jquery.orgchart.css">
     <link rel="stylesheet" href="../css/style.css">
 
 </head>
@@ -19,9 +19,9 @@
     <a href="https://github.com/dabeng/OrgChart" >More orgcharts</a>
     <i class="fa fa-star"></i>
   </div>
-  <script type="text/javascript" src="../js/jquery.min.js"></script>
-  <script type="text/javascript" src="../js/jquery.mockjax.min.js"></script>
-  <script type="text/javascript" src="../js/jquery.orgchart.js"></script>
+  <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
+  <script type="text/javascript" src="https://cdn.rawgit.com/jakerella/jquery-mockjax/master/dist/jquery.mockjax.min.js"></script>
+  <script type="text/javascript" src="../../dist/js/jquery.orgchart.js"></script>
   <script type="text/javascript" src="scripts.js"></script>
   </body>
 </html>
diff --git a/examples/color-coded/index.html b/examples/color-coded/index.html
@@ -8,8 +8,8 @@
     <title>Organization Chart Plugin</title>
 
     <link rel="icon" type="image/x-icon" href="../img/logo.ico">
-    <link rel="stylesheet" href="../css/font-awesome.min.css">
-    <link rel="stylesheet" href="../css/jquery.orgchart.css">
+    <link rel="stylesheet" href="https://cdn.rawgit.com/FortAwesome/Font-Awesome/master/css/font-awesome.min.css">
+    <link rel="stylesheet" href="../../dist/css/jquery.orgchart.css">
     <link rel="stylesheet" href="../css/style.css">
     <link rel="stylesheet" href="style.css">
 
@@ -20,8 +20,8 @@
     <a href="https://github.com/dabeng/OrgChart" >More orgcharts</a>
     <i class="fa fa-star"></i>
   </div>
-  <script type="text/javascript" src="../js/jquery.min.js"></script>
-  <script type="text/javascript" src="../js/jquery.orgchart.js"></script>
+  <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
+  <script type="text/javascript" src="../../dist/js/jquery.orgchart.js"></script>
   <script type="text/javascript" src="scripts.js"></script>
   </body>
 </html>
diff --git a/examples/css/font-awesome.min.css b/examples/css/font-awesome.min.css