Merge pull request angular-ui#47 from ohana54/fix-phase-check

solidspark · solidspark · commit 2ebfd03c482d · 2013-10-14T08:06:58.000-07:00
Check $$phase on the root scope
diff --git a/src/tinymce.js b/src/tinymce.js
@@ -12,7 +12,7 @@ angular.module('ui.tinymce', [])
         var expression, options, tinyInstance,
           updateView = function () {
             ngModel.$setViewValue(elm.val());
-            if (!scope.$$phase) {
+            if (!scope.$root.$$phase) {
               scope.$apply();
             }
           };

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ angular.module('ui.tinymce', [])`
`12`	`12`	`var expression, options, tinyInstance,`
`13`	`13`	`updateView = function () {`
`14`	`14`	`ngModel.$setViewValue(elm.val());`
`15`		`- if (!scope.$$phase) {`
	`15`	`+ if (!scope.$root.$$phase) {`
`16`	`16`	`scope.$apply();`
`17`	`17`	`}`
`18`	`18`	`};`