]> BookStack Code Mirror - bookstack/commitdiff
Fixed include syntax erroring within vue
authorDan Brown <redacted>
Sun, 15 Oct 2017 17:10:34 +0000 (18:10 +0100)
committerDan Brown <redacted>
Sun, 15 Oct 2017 17:20:13 +0000 (18:20 +0100)
Fixes #553

resources/views/books/show.blade.php
resources/views/chapters/show.blade.php
resources/views/pages/form.blade.php
resources/views/partials/activity-item.blade.php
resources/views/partials/book-tree.blade.php

index 956dbaf164fffba4b171a5cc25933ccaf4c4ee0a..ea4a079e819b133dadf3963fb1fcf37b770f8360 100644 (file)
@@ -91,7 +91,7 @@
 
 @section('body')
 
-    <div ng-non-bindable class="container small">
+    <div class="container small">
         <h1>{{$book->name}}</h1>
         <div class="book-content" v-show="!searching">
             <p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>
index e5a044aa7cafacc0e7481cba202aa6a65834d1ae..8f3b9143542c8413a37200f0123ca06a495e126e 100644 (file)
@@ -1,19 +1,19 @@
 @extends('sidebar-layout')
 
 @section('toolbar')
-    <div class="col-sm-6 col-xs-3 faded" ng-non-bindable>
+    <div class="col-sm-6 col-xs-3 faded" v-pre>
         @include('chapters._breadcrumbs', ['chapter' => $chapter])
     </div>
     <div class="col-sm-6 col-xs-9 faded">
         <div class="action-buttons">
-                        <span dropdown class="dropdown-container">
-                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
-                            <ul class="wide">
-                                <li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
-                                <li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
-                                <li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
-                            </ul>
-                        </span>
+            <span dropdown class="dropdown-container">
+                <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
+                <ul class="wide">
+                    <li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
+                    <li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
+                    <li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
+                </ul>
+            </span>
             @if(userCan('page-create', $chapter))
                 <a href="{{ $chapter->getUrl('/create-page') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a>
             @endif
 
 @section('body')
 
-    <div class="container small"  ng-non-bindable >
-        <h1>{{ $chapter->name }}</h1>
+    <div class="container small">
+        <h1 v-pre>{{ $chapter->name }}</h1>
         <div class="chapter-content" v-show="!searching">
-            <p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
+            <p v-pre class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
 
             @if(count($pages) > 0)
-                <div class="page-list">
+                <div v-pre class="page-list">
                     <hr>
                     @foreach($pages as $page)
                         @include('pages/list-item', ['page' => $page])
                     @endforeach
                 </div>
             @else
-                <div class="well">
+                <div v-pre class="well">
                     <p class="text-muted italic">{{ trans('entities.chapters_empty') }}</p>
                     <p>
                         @if(userCan('page-create', $chapter))
index c4a63989855fb16f004e19f417467687fa7aa1b2..12f2f3e97c1680732ec9fefd06d99715a9024c28 100644 (file)
@@ -51,7 +51,7 @@
     </div>
 
     {{--Title input--}}
-    <div class="title-input page-title clearfix" ng-non-bindable>
+    <div class="title-input page-title clearfix" v-pre>
         <div class="input">
             @include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])
         </div>
@@ -63,7 +63,7 @@
         {{--WYSIWYG Editor--}}
         @if(setting('app-editor') === 'wysiwyg')
             <div wysiwyg-editor class="flex-fill flex">
-                <textarea id="html-editor"   name="html" rows="5" ng-non-bindable
+                <textarea id="html-editor"  name="html" rows="5" v-pre
                     @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
             </div>
 
@@ -74,7 +74,7 @@
 
         {{--Markdown Editor--}}
         @if(setting('app-editor') === 'markdown')
-            <div ng-non-bindable id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
+            <div v-pre id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
 
                 <div class="markdown-editor-wrap">
                     <div class="editor-toolbar">
index 3f162e0bd87f283029bc603f1bb1788b8e2ba1bb..185e6803807370e519d425f22bc9302af2ef3ece 100644 (file)
@@ -7,7 +7,7 @@
     </div>
 @endif
 
-<div class="right" ng-non-bindable>
+<div class="right" v-pre>
     @if($activity->user)
         <a href="{{ $activity->user->getProfileUrl() }}">{{ $activity->user->name }}</a>
     @else
index 867d9779cd8d5993636682dbbe0905f95baef4fb..b954a4952e43991900c5aecfb67cf6bbaeaab1d0 100644 (file)
@@ -1,4 +1,4 @@
-<div class="card book-tree" ng-non-bindable>
+<div class="card book-tree" v-pre>
     <h3><i class="zmdi zmdi-book"></i> {{ trans('entities.books_navigation') }}</h3>
     <div class="body">
         <ul class="sidebar-page-list menu">