fix(toolbar): prevent scroll shrink being applied to md-content within the toolbar

Author: Benjamin Millagou

src/components/toolbar/toolbar.js

@@ -144,7 +144,7 @@ function mdToolbarDirective($$rAF, $mdConstant, $mdUtil, $mdTheming, $animate) {
          *
          */
         function onChangeScrollShrink(shrinkWithScroll) {
-          var closestContent = element.parent().find('md-content');
+          var closestContent = $mdUtil.getSiblings(element, 'md-content');
 
           // If we have a content element, fake the call; this might still fail
           // if the content element isn't a sibling of the toolbar

src/core/util/util.js

@@ -603,8 +603,22 @@ function UtilFactory($document, $timeout, $compile, $rootScope, $$mdAnimate, $in
     },
 
     /**
-     * getClosest replicates jQuery.closest() to walk up the DOM tree until it finds a matching
-     * nodeName.
+     * Get an element siblings matching a given tag name
+     *
+     * @param el Element to start walking the DOM from
+     * @param tagName Tag name to match
+     */
+    getSiblings: function getSiblings(element, tagName) {
+      var upperCasedTagName = tagName.toUpperCase();
+      if (element instanceof angular.element) element = element[0];
+      var siblings = Array.prototype.filter.call(element.parentNode.children, function(node) {
+        return element !== node && node.tagName.toUpperCase() === upperCasedTagName;
+      });
+      return angular.element(siblings);
+    },
+
+    /*
+     * getClosest replicates jQuery.closest() to walk up the DOM tree until it finds a matching nodeName
      *
      * @param {Node} el Element to start walking the DOM from
      * @param {string|function} validateWith If a string is passed, it will be evaluated against

src/core/util/util.spec.js

@@ -672,6 +672,31 @@ describe('util', function() {
     });
   });
 
+  describe('getSiblings', function() {
+    var $mdUtil;
+
+    beforeEach(inject(function(_$mdUtil_) {
+      $mdUtil = _$mdUtil_;
+    }));
+
+    it('should be able to get the siblings (wihout source element) of a particular node type', function() {
+      var parent = angular.element('<h1>');
+      var element = angular.element('<h2>');
+      var sibling = angular.element('<h2>');
+
+      parent.append(element);
+      parent.append(sibling);
+
+      var result = $mdUtil.getSiblings(element, 'h2');
+
+      expect(result).toBeTruthy();
+      expect(result.length).toBe(1);
+      expect(result[0]).toBe(sibling[0]);
+
+      parent.remove();
+    });
+  });
+
   describe('getClosest', function() {
     var $mdUtil;