From 0a71037095212cd69e1bf8e1ae2e11bdf1d1d991 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 4 Sep 2015 17:19:23 -0400 Subject: [PATCH] fix(accordion): Move jQuery to static.js --- website/public/js/static.js | 17 +++++++++++++++++ website/views/static/faq.jade | 20 ++------------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/website/public/js/static.js b/website/public/js/static.js index 7c2853a81a..e87368cdd8 100644 --- a/website/public/js/static.js +++ b/website/public/js/static.js @@ -40,3 +40,20 @@ window.habitrpg = angular.module('habitrpg', ['chieffancypants.loadingBar', 'ui. }); }); }]) + +.controller('AccordionCtrl', function() { + function openHashAccordion() { + if (window.location.hash) { + var $target = $(window.location.hash.replace('/','')); + if ($target.hasClass('collapse')) { + $target.collapse('show'); + $('html, body').animate({ + scrollTop: $($target).offset().top - 100 + }); + } + } + } + $(document).ready(function(){ + openHashAccordion(); + }); +}) diff --git a/website/views/static/faq.jade b/website/views/static/faq.jade index b60b344b4d..f5323b1580 100644 --- a/website/views/static/faq.jade +++ b/website/views/static/faq.jade @@ -8,23 +8,7 @@ block title =env.t('FAQ') block content - script(type='text/javascript'). - function openHashAccordion() { - if (window.location.hash) { - var $target = $(window.location.hash.replace('/','')); - if ($target.hasClass('collapse')) { - $target.collapse('show'); - $('html, body').animate({ - scrollTop: $($target).offset().top - 100 - }); - } - } - } - $(document).ready(function(){ - openHashAccordion(); - }); - - .row + .row(ng-controller='AccordionCtrl') .col-md-12 .page-header h1=env.t('frequentlyAskedQuestions') @@ -34,7 +18,7 @@ block content =env.t('September') | 4, 2015 a.h2.accordion.collapsed(href='#overview' data-toggle='collapse')=env.t('FAQheaderOverview') - .clearfix.collapse#overview + .clearfix.collapse#overview p!=env.t('FAQbodyOverview-1') a.h2.accordion.collapsed(href='#set-up-tasks' data-toggle='collapse')=env.t('FAQheaderSetUpTasks') .clearfix.collapse#set-up-tasks