mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-11-24 03:42:32 +01:00
Changed direct attributes to prevent conflicts
This commit is contained in:
parent
59ce228c2e
commit
93ebdf724b
@ -167,18 +167,19 @@ module.exports = function (ngApp, events) {
|
|||||||
restrict: 'A',
|
restrict: 'A',
|
||||||
scope: {
|
scope: {
|
||||||
tinymce: '=',
|
tinymce: '=',
|
||||||
ngModel: '=',
|
mceModel: '=',
|
||||||
ngChange: '='
|
mceChange: '='
|
||||||
},
|
},
|
||||||
link: function (scope, element, attrs) {
|
link: function (scope, element, attrs) {
|
||||||
|
|
||||||
function tinyMceSetup(editor) {
|
function tinyMceSetup(editor) {
|
||||||
editor.on('keyup', (e) => {
|
editor.on('keyup', (e) => {
|
||||||
var content = editor.getContent();
|
var content = editor.getContent();
|
||||||
|
console.log(content);
|
||||||
scope.$apply(() => {
|
scope.$apply(() => {
|
||||||
scope.ngModel = content;
|
scope.mceModel = content;
|
||||||
});
|
});
|
||||||
scope.ngChange(content);
|
scope.mceChange(content);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="edit-area flex-fill flex">
|
<div class="edit-area flex-fill flex">
|
||||||
<textarea id="html-editor" tinymce="editorOptions" ng-change="editorChange" ng-model="editorHtml" name="html" rows="5"
|
<textarea id="html-editor" tinymce="editorOptions" mce-change="editorChange" mce-model="editorHtml" name="html" rows="5"
|
||||||
@if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
|
@if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
|
||||||
@if($errors->has('html'))
|
@if($errors->has('html'))
|
||||||
<div class="text-neg text-small">{{ $errors->first('html') }}</div>
|
<div class="text-neg text-small">{{ $errors->first('html') }}</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user