Merge branch 'recompile_tooltip'

This commit is contained in:
Paulo Reis 2016-06-15 13:42:51 +01:00
commit 73d16b5c9c
3 changed files with 18 additions and 1 deletions

View file

@ -1,6 +1,13 @@
div.full-size.pdf(ng-controller="PdfController") div.full-size.pdf(ng-controller="PdfController")
.toolbar.toolbar-tall .toolbar.toolbar-tall
.btn-group(dropdown) .btn-group(
dropdown,
tooltip="#{translate('recompile_pdf')} ({{modifierKey}} + Enter)"
tooltip-class="keyboard-tooltip"
tooltip-popup-delay="500"
tooltip-append-to-body="true"
tooltip-placement="bottom"
)
a.btn.btn-info( a.btn.btn-info(
href, href,
ng-disabled="pdf.compiling", ng-disabled="pdf.compiling",

View file

@ -1,5 +1,6 @@
define [ define [
"base" "base"
"ace/ace"
"libs/latex-log-parser" "libs/latex-log-parser"
"libs/bib-log-parser" "libs/bib-log-parser"
], (App, LogParser, BibLogParser) -> ], (App, LogParser, BibLogParser) ->
@ -13,6 +14,11 @@ define [
$scope.pdf.view = if $scope?.pdf?.url then 'pdf' else 'uncompiled' $scope.pdf.view = if $scope?.pdf?.url then 'pdf' else 'uncompiled'
$scope.shouldShowLogs = false $scope.shouldShowLogs = false
if ace.require("ace/lib/useragent").isMac
$scope.modifierKey = "Cmd"
else
$scope.modifierKey = "Ctrl"
$scope.$on "project:joined", () -> $scope.$on "project:joined", () ->
return if !autoCompile return if !autoCompile
autoCompile = false autoCompile = false

View file

@ -168,3 +168,7 @@
} }
} }
} }
.keyboard-tooltip {
white-space: nowrap;
}