Merge pull request #209 from angular-ui/dev

deeg · deeg · commit 34dac1c6333a · 2016-01-10T15:39:01.000-08:00
Update master branch with dev. Closes #209
diff --git a/src/tinymce.js b/src/tinymce.js
@@ -28,7 +28,7 @@ angular.module('ui.tinymce', [])
 
             ngModel.$setViewValue(content);
             if (!$rootScope.$$phase) {
-              scope.$apply();
+              scope.$digest();
             }
           };
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ angular.module('ui.tinymce', [])`
`28`	`28`
`29`	`29`	`ngModel.$setViewValue(content);`
`30`	`30`	`if (!$rootScope.$$phase) {`
`31`		`- scope.$apply();`
	`31`	`+ scope.$digest();`
`32`	`32`	`}`
`33`	`33`	`};`
`34`	`34`