github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-23 01:05:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

split errors into normal error, and renderingError.

Browse source
This commit is contained in:
Shane Kilkelly 2016-03-21 13:20:03 +00:00
parent a704289099
commit 9b22efbd98
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/web/app/views/project/editor/pdf.jade
View file

@ -32,7 +32,7 @@ div.full-size.pdf(ng-controller="PdfController")
a.log-btn(
href
ng-click="toggleLogs()"
ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.timeout && !pdf.uncompiled }"
ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled }"
tooltip="#{translate('logs_and_output_files')}"
tooltip-placement="bottom"
)
@ -75,7 +75,7 @@ div.full-size.pdf(ng-controller="PdfController")
i.split-screen
i.split-screen
.pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error")
.pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError")
div(
pdfng
ng-if="settings.pdfViewer == 'pdfjs'"
@ -97,8 +97,8 @@ div.full-size.pdf(ng-controller="PdfController")
i.fa.fa-level-up.fa-flip-horizontal.fa-2x
|   #{translate('click_here_to_preview_pdf')}
.pdf-errors(ng-show="pdf.timedout || pdf.error")
.alert.alert-danger(ng-show="pdf.error")
.pdf-errors(ng-show="pdf.timedout || pdf.error || pdf.renderingError")
.alert.alert-danger(ng-show="pdf.error || pdf.renderingError")
strong #{translate("server_error")}
span #{translate("somthing_went_wrong_compiling")}
@ -162,7 +162,7 @@ div.full-size.pdf(ng-controller="PdfController")
.pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.timeout && !pdf.uncompiled")
.pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled")
.alert.alert-success(ng-show="pdf.logEntries.all.length == 0")
| #{translate("no_errors_good_job")}

2
services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
View file

@ -12,7 +12,7 @@ define [
$scope.hasPremiumCompile = $scope.project.features.compileGroup == "priority"
$scope.$on "pdf:error:display", () ->
$scope.pdf.error = true
$scope.pdf.renderingError = true
$scope.draft = localStorage("draft:#{$scope.project_id}") or false
$scope.$watch "draft", (new_value, old_value) ->