diff --git a/platform/commonUI/general/src/directives/MCTScroll.js b/platform/commonUI/general/src/directives/MCTScroll.js index 6436bd3dcc..c0f0dbfcc5 100644 --- a/platform/commonUI/general/src/directives/MCTScroll.js +++ b/platform/commonUI/general/src/directives/MCTScroll.js @@ -39,7 +39,7 @@ define( } // Initialize state in scope - updateScope(); + parsed.assign(scope, element[0][property]); // Update element state when value in scope changes scope.$watch(expr, updateElement); diff --git a/platform/commonUI/general/test/directives/MCTScrollSpec.js b/platform/commonUI/general/test/directives/MCTScrollSpec.js index 200c418798..bf55d90aca 100644 --- a/platform/commonUI/general/test/directives/MCTScrollSpec.js +++ b/platform/commonUI/general/test/directives/MCTScrollSpec.js @@ -86,6 +86,11 @@ define( expect(mockScope.$apply).toHaveBeenCalledWith(EXPRESSION); }); + // This would trigger an infinite digest exception + it("does not call $apply during construction", function () { + expect(mockScope.$apply).not.toHaveBeenCalled(); + }); + }); } ); \ No newline at end of file