Merge pull request #497 from jmcarp/feature/excise-glossary

Use glossary from fec-style.

static/js/init.js

@@ -7,6 +7,8 @@ var _ = require('underscore');
 var keyboard = require('keyboardjs');
 var perfectScrollbar = require('perfect-scrollbar/jquery') ($);
 
+var glossary = require('fec-style/js/glossary');
+
 require('jquery.inputmask');
 require('jquery.inputmask/dist/inputmask/jquery.inputmask.date.extensions.js');
 require('jquery.inputmask/dist/inputmask/jquery.inputmask.numeric.extensions.js');
@@ -21,12 +23,10 @@ var accordion = require('./modules/accordion');
 var filters = require('./modules/filters.js');
 var typeahead = require('./modules/typeahead.js');
 var charts = require('./modules/charts.js');
-var glossary = require('./modules/glossary.js');
 var Search = require('./modules/search');
 var toggle = require('./modules/toggle');
 
 typeahead.init();
-glossary.init();
 charts.init();
 
 var SLT_ACCORDION = '.js-accordion';
@@ -57,6 +57,9 @@ $(document).ready(function() {
         });
     }
 
+    // Initialize glossary
+    new glossary.Glossary('#glossary', '#glossary-toggle');
+
     // Inialize input masks
     $('[data-inputmask]').inputmask();
 

static/js/modules/typeahead.js

@@ -9,9 +9,9 @@ var URI = require('URIjs');
 var Handlebars = require('handlebars');
 var keyboard = require('keyboardjs');
 
+var terms = require('fec-style/js/terms');
+
 var events = require('./events.js');
-var terms = require('./terms');
-var glossary = require('./glossary.js');
 
 var SUGGESTION_LIMIT = 10;
 

templates/partials/glossary.html

@@ -1,12 +1,14 @@
 <div id="glossary" class="glossary"
     aria-describedby="glossary-result" aria-hidden="true">
-  <button title="Close glossary" class="button button--close"
-      id="hide-glossary"><span class="u-visually-hidden">Hide glossary</span></button>
+  <button
+      title="Close glossary"
+      class="button button--close toggle"
+    ><span class="u-visually-hidden">Hide glossary</span>
+  </button>
   <h2>FEC Glossary</h2>
   <label for="glossary-search" class="label">Filter glossary terms</label>
   <input id="glossary-search" class="glossary__search" type="search" placeholder="e.g. Committee">
   <div class="glossary__content" id="glossary-result">
-    <ul class="glossary__list js-accordion">
-    </ul>
+    <ul class="glossary__list js-accordion"></ul>
   </div>
 </div>

tests/selenium/base_test_class.py

@@ -79,7 +79,7 @@ def getMain(self):
 
     def getGlossary(self):
         return self.driver.find_element_by_id('glossary')
-        
+
     def elementExistsByClassName(self, name):
         try:
             self.driver.find_element_by_class_name(name)

tests/selenium/landing_page_test.py

@@ -26,7 +26,7 @@ def testGlossaryToggle(self):
         self.driver.find_element_by_id('glossary-toggle').click()
         glossary = self.getGlossary()
         self.assertIn('is-open', glossary.get_attribute('class'))
-        hide = glossary.find_element_by_id('hide-glossary')
+        hide = glossary.find_element_by_css_selector('.toggle')
         WebDriverWait(self.driver, 1).until(lambda driver: hide.is_displayed())
         hide.click()
         self.assertNotIn('is-open', glossary.get_attribute('class'))