mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 12:16:07 +00:00
Fixed double brace issues in both editors.
Double braces were being parsed by angular in both the WYSIWYG and markdown editor. Fixes #150 and fixes #155.
This commit is contained in:
parent
2d958e88bf
commit
b246a67e8a
@ -252,11 +252,14 @@ module.exports = function (ngApp, events) {
|
|||||||
link: function (scope, element, attrs) {
|
link: function (scope, element, attrs) {
|
||||||
|
|
||||||
// Set initial model content
|
// Set initial model content
|
||||||
var content = element.val();
|
element = element.find('textarea').first();
|
||||||
|
let content = element.val();
|
||||||
scope.mdModel = content;
|
scope.mdModel = content;
|
||||||
scope.mdChange(markdown(content));
|
scope.mdChange(markdown(content));
|
||||||
|
|
||||||
element.on('change input', (e) => {
|
console.log('test');
|
||||||
|
|
||||||
|
element.on('change input', (event) => {
|
||||||
content = element.val();
|
content = element.val();
|
||||||
$timeout(() => {
|
$timeout(() => {
|
||||||
scope.mdModel = content;
|
scope.mdModel = content;
|
||||||
@ -284,7 +287,7 @@ module.exports = function (ngApp, events) {
|
|||||||
link: function (scope, element, attrs) {
|
link: function (scope, element, attrs) {
|
||||||
|
|
||||||
// Elements
|
// Elements
|
||||||
const input = element.find('textarea[markdown-input]');
|
const input = element.find('[markdown-input] textarea').first();
|
||||||
const display = element.find('.markdown-display').first();
|
const display = element.find('.markdown-display').first();
|
||||||
const insertImage = element.find('button[data-action="insertImage"]');
|
const insertImage = element.find('button[data-action="insertImage"]');
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-area.flex > .mce-tinymce.mce-container.mce-panel {
|
.edit-area.flex > div > .mce-tinymce.mce-container.mce-panel {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
@ -44,8 +44,11 @@
|
|||||||
|
|
||||||
<div class="edit-area flex-fill flex">
|
<div class="edit-area flex-fill flex">
|
||||||
@if(setting('app-editor') === 'wysiwyg')
|
@if(setting('app-editor') === 'wysiwyg')
|
||||||
<textarea id="html-editor" tinymce="editorOptions" mce-change="editorChange" mce-model="editContent" name="html" rows="5"
|
<div tinymce="editorOptions" mce-change="editorChange" mce-model="editContent" class="flex-fill flex">
|
||||||
@if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
|
<textarea id="html-editor" name="html" rows="5" ng-non-bindable
|
||||||
|
@if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
@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>
|
||||||
@endif
|
@endif
|
||||||
@ -61,8 +64,12 @@
|
|||||||
<button class="text-button" type="button" data-action="insertImage"><i class="zmdi zmdi-image"></i>Insert Image</button>
|
<button class="text-button" type="button" data-action="insertImage"><i class="zmdi zmdi-image"></i>Insert Image</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<textarea markdown-input md-change="editorChange" id="markdown-editor-input" md-model="editContent" name="markdown" rows="5"
|
|
||||||
@if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea>
|
<div markdown-input md-change="editorChange" md-model="editContent" class="flex flex-fill">
|
||||||
|
<textarea ng-non-bindable id="markdown-editor-input" name="markdown" rows="5"
|
||||||
|
@if($errors->has('markdown')) class="neg" @endif>@if(isset($model) || old('markdown')){{htmlspecialchars( old('markdown') ? old('markdown') : ($model->markdown === '' ? $model->html : $model->markdown))}}@endif</textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="markdown-editor-wrap">
|
<div class="markdown-editor-wrap">
|
||||||
|
Loading…
Reference in New Issue
Block a user