github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
James Allen 2014-07-18 12:09:04 +01:00
commit 42578e328b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/public/coffee/main/templates.coffee
View file

@ -2,7 +2,7 @@ define [
"base"
], (App) ->
app.controller "openInSlController", ($scope) ->
App.controller "openInSlController", ($scope) ->
$scope.openInSlText = "Open in ShareLaTeX"
$scope.isDisabled = false
@ -16,13 +16,13 @@ define [
ga('send', 'event', 'template-site', 'download-zip', $('.page-header h1').text())
app.factory "algolia", ->
App.factory "algolia", ->
if window?.sharelatex?.algolia?.app_id?
client = new AlgoliaSearch(window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key)
index = client.initIndex(window.sharelatex.algolia?.indexes?.templates)
return index
app.controller "SearchController", ($scope, algolia, _) ->
App.controller "SearchController", ($scope, algolia, _) ->
$scope.hits = []
$scope.safeApply = (fn)->

2
services/web/public/coffee/main/user-details.coffee
View file

@ -2,7 +2,7 @@ define [
"base"
"libs/algolia-2.5.2"
], (App, algolia)->
app.factory "Institutions", ->
App.factory "Institutions", ->
new AlgoliaSearch(window.algolia.institutions.app_id, window.algolia.institutions.api_key).initIndex("institutions")
App.controller "UserProfileController", ($scope, $modal, $http)->