Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Pushing v10 to master for new release #185

Merged
merged 11 commits into from
Oct 20, 2015
Merged

Pushing v10 to master for new release #185

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6359985
Do not set contenteditable to true when in readonly mode
deeg Oct 13, 2015
3c581ee
Merge pull request #177 from deeg/fix-readonly-mode
deeg Oct 16, 2015
28f9368
Merge pull request #178 from angular-ui/dev
deeg Oct 16, 2015
ec56a5f
Updating git ignore file to include Intellij created files. Updating …
deeg Oct 16, 2015
f56bced
#172 - Update to latest version of TinyMCE
deeg Oct 16, 2015
27959bd
#143 - Fix passing in setup function breaking model.
deeg Oct 16, 2015
b6294f7
Closes #169, closes #150, closes #163 - Default to getting content i…
deeg Oct 16, 2015
d38ab68
Merge pull request #182 from angular-ui/dev
deeg Oct 17, 2015
2f1beb1
Closes #179. - Add contributing and update ng-model block in readme.
deeg Oct 19, 2015
3466d0a
Updating CONTRIBUTING.md
deeg Oct 19, 2015
285a5fb
Merge pull request #184 from angular-ui/dev
deeg Oct 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tinymce.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ angular.module('ui.tinymce', [])
} else {
ensureInstance();

if (tinyInstance) {
if (tinyInstance && !tinyInstance.settings.readonly) {
tinyInstance.getBody().setAttribute('contenteditable', true);
}
}
Expand Down