github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-06 00:11:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse source
This commit is contained in:
Shane Kilkelly 2016-05-12 11:02:54 +01:00
commit 60cc1bfbff
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/contact-us-modal.jade
View file

@ -23,7 +23,7 @@ script(type='text/ng-template', id='supportModalTemplate')
label.desc
| #{translate("suggestion")}
.form-group
textarea.field.text.medium.span8.form-control(ng-model="form.message",type='text', value='', maxlength='255', tabindex='4', onkeyup='')
textarea.field.text.medium.span8.form-control(ng-model="form.message",type='text', value='', tabindex='4', onkeyup='')
.form-group.text-center
input.btn-success.btn.btn-lg(type='submit', ng-disabled="sending", ng-click="contactUs()" value='#{translate("contact_us")}')
span(ng-show="sent")

3
services/web/app/views/layout.jade
View file

@ -23,7 +23,8 @@ html(itemscope, itemtype='http://schema.org/Product')
if settings.i18n.subdomainLang
each subdomainDetails in settings.i18n.subdomainLang
link(rel="alternate", href=subdomainDetails.url+currentUrl, hreflang=subdomainDetails.lngCode)
if !subdomainDetails.hide
link(rel="alternate", href=subdomainDetails.url+currentUrl, hreflang=subdomainDetails.lngCode)
meta(itemprop="name", content="ShareLaTeX, the Online LaTeX Editor")

2
services/web/public/coffee/ide/pdfng/directives/pdfRenderer.coffee
View file

@ -16,7 +16,7 @@ define [
# PDFJS.disableStream
# PDFJS.disableRange
@scale = @options.scale || 1
@pdfjs = PDFJS.getDocument @url
@pdfjs = PDFJS.getDocument {url: @url, rangeChunkSize: 2*65536}
@pdfjs.onProgress = @options.progressCallback
@document = $q.when(@pdfjs)
@navigateFn = @options.navigateFn