orgchart 3.1.0 → 3.1.2

package/src/js/jquery.orgchart.js

@@ -89,7 +89,7 @@
       $chartContainer.append($chart);
 
       // append the export button
-      if (this.options.exportButton && !$chartContainer.find('.oc-export-btn').length) {
+      if (this.options.exportButton && !$('.oc-export-btn').length) {
         this.attachExportButton();
       }
 
@@ -136,18 +136,18 @@
       var initEvent = $.Event('hide-' + rel + '.orgchart');
       $target.trigger(initEvent);
     },
-    //
+    // add export button for orgchart
     attachExportButton: function () {
       var that = this;
       var $exportBtn = $('<button>', {
-        'class': 'oc-export-btn' + (this.options.chartClass !== '' ? ' ' + this.options.chartClass : ''),
+        'class': 'oc-export-btn',
         'text': this.options.exportButtonName,
         'click': function(e) {
           e.preventDefault();
           that.export();
         }
       });
-      this.$chartContainer.append($exportBtn);
+      this.$chartContainer.after($exportBtn);
     },
     setOptions: function (opts, val) {
       if (typeof opts === 'string') {
@@ -471,6 +471,15 @@
       }
       return { 'exist': false, 'visible': false };
     },
+    getParent: function ($node) {
+      return this.getRelatedNodes($node, 'parent');
+    },
+    getChildren: function ($node) {
+      return this.getRelatedNodes($node, 'children');
+    },
+    getSiblings: function ($node) {
+      return this.getRelatedNodes($node, 'siblings');
+    },
     // find the related nodes
     getRelatedNodes: function ($node, relation) {
       if (!$node || !($node instanceof $) || !$node.is('.node')) {
@@ -693,7 +702,7 @@
       $edge.parent().append('<i class="oci oci-spinner spinner"></i>')
         .children().not('.spinner').css('opacity', 0.2);
       $chart.data('inAjax', true);
-      $('.oc-export-btn' + (this.options.chartClass !== '' ? '.' + this.options.chartClass : '')).prop('disabled', true);
+      $('.oc-export-btn').prop('disabled', true);
       return true;
     },
     // terminate loading status for requesting new nodes
@@ -703,7 +712,7 @@
       $node.find('.spinner').remove();
       $node.children().removeAttr('style');
       this.$chart.data('inAjax', false);
-      $('.oc-export-btn' + (this.options.chartClass !== '' ? '.' + this.options.chartClass : '')).prop('disabled', false);
+      $('.oc-export-btn').prop('disabled', false);
     },
     // whether the cursor is hovering over the node
     isInAction: function ($node) {
@@ -1041,7 +1050,7 @@
         event.originalEvent.dataTransfer.dropEffect = 'none';
       } else {
         // default action for drag-and-drop of div is not to drop, so preventing default action for nodes which have allowedDrop class
-        //to fix drag and drop on IE and Edge		
+        //to fix drag and drop on IE and Edge
         event.preventDefault();
       }
     },
@@ -1059,7 +1068,7 @@
         this.$chart.triggerHandler({ 'type': 'otherdropped.orgchart', 'draggedItem': $dragged, 'dropZone': $dropZone });
         return;
       }
-      
+
       if (!$dropZone.hasClass('allowedDrop')) {
           // We are trying to drop a node into a node which isn't allowed
           // IE/Edge have a habit of allowing this, so we need our own double-check
@@ -1461,7 +1470,7 @@
             .end().end().remove();
         }
       } else { // if $node is root node
-        $wrapper.closest('.orgchart').siblings('.oc-export-btn').addBack().remove();
+        $wrapper.closest('.orgchart').remove();
       }
     },
     //

package/test/integration/init-tests.js

@@ -181,7 +181,7 @@ describe('orgchart -- integration tests', function () {
         'data': ds,
         'exportButton': true
       });
-      $container.children('button').prop('outerHTML').should.equal('<button class="oc-export-btn">Export</button>');
+      $('.oc-export-btn').prop('outerHTML').should.equal('<button class="oc-export-btn">Export</button>');
     });
 
     it('initialize chart with "bottom to top" direction', function () {

package/test/unit/tests.js

@@ -184,7 +184,8 @@ describe('orgchart -- unit tests', function () {
 
   it('getRelatedNodes()', function () {
     oc.getRelatedNodes().should.deep.equal($());
-    oc.getRelatedNodes($('td:first'), 'children').should.deep.equal($());
+    oc.getRelatedNodes({}, 'children').should.deep.equal($());
+    oc.getRelatedNodes($('.hierarchy:first'), 'children').should.deep.equal($());
     oc.getRelatedNodes($('.node:first'), 'child').should.deep.equal($());
 
     oc.getRelatedNodes($laolao, 'parent').should.deep.equal($());
@@ -196,6 +197,37 @@ describe('orgchart -- unit tests', function () {
     oc.getRelatedNodes($bomiao, 'siblings').toArray().should.members([$sumiao[0], $hongmiao[0]]);
   });
 
+  it('getParent()', function () {
+    oc.getParent().should.deep.equal($());
+    oc.getParent({}).should.deep.equal($());
+    oc.getParent($('.hierarchy:first')).should.deep.equal($());
+
+    oc.getParent($laolao).should.deep.equal($());
+    oc.getParent($bomiao).should.deep.equal($laolao);
+    oc.getParent($sandan).should.deep.equal($pangpang);
+  });
+
+  it('getSiblings()', function () {
+    oc.getSiblings().should.deep.equal($());
+    oc.getSiblings({}).should.deep.equal($());
+    oc.getSiblings($('.hierarchy:first')).should.deep.equal($());
+
+    oc.getSiblings($laolao).should.deep.equal($());
+    oc.getSiblings($bomiao).toArray().should.members([$sumiao[0], $hongmiao[0]]);
+    oc.getSiblings($sandan).should.deep.equal($());
+  });
+
+  it('getChildren()', function () {
+    oc.getChildren().should.deep.equal($());
+    oc.getChildren({}).should.deep.equal($());
+    oc.getChildren($('.hierarchy:first')).should.deep.equal($());
+
+    oc.getChildren($laolao).toArray().should.members([$bomiao[0], $sumiao[0], $hongmiao[0]]);
+    oc.getChildren($bomiao).should.deep.equal($());
+    oc.getChildren($sumiao).toArray().should.members([$tiehua[0], $heihei[0], $pangpang[0]]);
+    oc.getChildren($sandan).should.deep.equal($());
+  });
+
   it('hideParent()', function () {
     var spy  = sinon.spy(oc, 'hideParent');
     var spy2  = sinon.spy(oc, 'hideSiblings');