Merge pull request #178 from angular-ui/dev

deeg · deeg · commit 28f936857d0e · 2015-10-16T07:33:43.000-07:00
Updating v10 candidate to include latest dev changes.
diff --git a/src/tinymce.js b/src/tinymce.js
@@ -42,7 +42,7 @@ angular.module('ui.tinymce', [])
           } else {
             ensureInstance();
 
-            if (tinyInstance) {
+            if (tinyInstance && !tinyInstance.settings.readonly) {
               tinyInstance.getBody().setAttribute('contenteditable', true);
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ angular.module('ui.tinymce', [])`
`42`	`42`	`} else {`
`43`	`43`	`ensureInstance();`
`44`	`44`
`45`		`- if (tinyInstance) {`
	`45`	`+ if (tinyInstance && !tinyInstance.settings.readonly) {`
`46`	`46`	`tinyInstance.getBody().setAttribute('contenteditable', true);`
`47`	`47`	`}`
`48`	`48`	`}`