Avoiding infinite loop for heightless parents

TimeoutZero · Jan 3, 2017 · 9fb8ab8 · 9fb8ab8
1 parent 4502cd6
commit 9fb8ab8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/app/components/directive.coffee b/src/app/components/directive.coffee
@@ -16,15 +16,16 @@ angular.module("ngFillHeight.directives")
 
       ngFillHeightOption.api = {
         recalcHeight : () ->
-          
+
           recurrFunc = (increment) ->
             currObject.height(currObject.height() + increment)
 
-          recurrFunc(10) while currObject.height() < ngFillHeightOption.minHeight or parentObject.height() >= parentObject.prop('scrollHeight')
+          if parentObject.prop('scrollHeight')
+            recurrFunc(10) while currObject.height() < ngFillHeightOption.minHeight or parentObject.height() >= parentObject.prop('scrollHeight')
 
-          recurrFunc(-1) while currObject.height() > ngFillHeightOption.minHeight and parentObject.height() < parentObject.prop('scrollHeight')
+            recurrFunc(-1) while currObject.height() > ngFillHeightOption.minHeight and parentObject.height() < parentObject.prop('scrollHeight')
 
-          return
+          return currObject.height()
       }
 
     return {