From 7e216391b72c10749cb79a11b2f78826b5768101 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Sat, 12 Mar 2016 10:55:17 +0000 Subject: [PATCH] wip --- services/web/app/views/layout.jade | 12 ++---------- services/web/app/views/layout/navbar.jade | 2 +- services/web/public/coffee/base.coffee | 9 +++++++++ services/web/public/coffee/libs.coffee | 1 + services/web/public/coffee/main.coffee | 3 +++ 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade index a8cc76ee90..2d3d13c227 100644 --- a/services/web/app/views/layout.jade +++ b/services/web/app/views/layout.jade @@ -65,8 +65,8 @@ html(itemscope, itemtype='http://schema.org/Product') window.ab = {}; window.user_id = '#{getLoggedInUserId()}'; - script. - (function() {var s=document.createElement('script'); s.type='text/javascript';s.async=true; s.src=('https:'==document.location.protocol?'https':'http') + '://sharelatex-accounts.groovehq.com/widgets/f5ad3b09-7d99-431b-8af5-c5725e3760ce/ticket.js'; var q = document.getElementsByTagName('script')[0];q.parentNode.insertBefore(s, q);})(); + //- script. + //- (function() {var s=document.createElement('script'); s.type='text/javascript';s.async=true; s.src=('https:'==document.location.protocol?'https':'http') + '://sharelatex-accounts.groovehq.com/widgets/f5ad3b09-7d99-431b-8af5-c5725e3760ce/ticket.js'; var q = document.getElementsByTagName('script')[0];q.parentNode.insertBefore(s, q);})(); - if (typeof(settings.algolia) != "undefined") @@ -132,12 +132,4 @@ html(itemscope, itemtype='http://schema.org/Product') ) - script. - var toggleGroove = function(){ - var e = arguments[0]||window.event; - e.stopPropagation(); - GrooveWidget.toggle() - } - - diff --git a/services/web/app/views/layout/navbar.jade b/services/web/app/views/layout/navbar.jade index 89ff4e1dc2..5f8538cb31 100644 --- a/services/web/app/views/layout/navbar.jade +++ b/services/web/app/views/layout/navbar.jade @@ -27,7 +27,7 @@ nav.navbar.navbar-default a.dropdown-toggle(href, dropdown-toggle) | !{translate(item.text)} b.caret - ul.dropdown-menu + ul.dropdown-menu(ng-controller="NavController") each child in item.dropdown if child.divider li.divider diff --git a/services/web/public/coffee/base.coffee b/services/web/public/coffee/base.coffee index 98cdb3a871..bc040a16cc 100644 --- a/services/web/public/coffee/base.coffee +++ b/services/web/public/coffee/base.coffee @@ -24,4 +24,13 @@ define [ client_id: window.user_id }) + App.controller "NavController", ($scope) -> + + $scope.toggleGroove = -> + $scope['is-open'] = false + $scope['isOpen'] = false + GrooveWidget.toggle() + + + return App diff --git a/services/web/public/coffee/libs.coffee b/services/web/public/coffee/libs.coffee index 3c30dd63f3..fd1b5d0c91 100644 --- a/services/web/public/coffee/libs.coffee +++ b/services/web/public/coffee/libs.coffee @@ -12,6 +12,7 @@ define [ "libs/angular-cookies" "libs/passfield" "libs/sixpack" + "libs/groove" "libs/angular-sixpack" "libs/ng-tags-input-3.0.0" ], () -> diff --git a/services/web/public/coffee/main.coffee b/services/web/public/coffee/main.coffee index ad3e8d8a36..1d59eb19c8 100644 --- a/services/web/public/coffee/main.coffee +++ b/services/web/public/coffee/main.coffee @@ -30,3 +30,6 @@ define [ "__MAIN_CLIENTSIDE_INCLUDES__" ], () -> angular.bootstrap(document.body, ["SharelatexApp"]) + + +