easy-navigation 2.1.5 → 2.1.9

package/src/item/accordion.js

@@ -14,18 +14,6 @@ export default class AccordionItem extends Element {
     return articles;
   }
 
-  getAccordionDiv() {
-    const { AccordionDiv } = this.constructor;
-
-    return AccordionDiv;
-  }
-
-  getAccordionButton() {
-    const { AccordionButton } = this.constructor;
-
-    return AccordionButton;
-  }
-
   getArticleIndex(uri) {
     const { Articles } = this.properties,
           articleIndex = Articles.findIndex((Article) => {
@@ -106,9 +94,12 @@ export default class AccordionItem extends Element {
     const articleIndex = this.getArticleIndex(uri),
           articleFirstArticle = (articleIndex === 0);
 
-    articleFirstArticle ?
-      this.disableButton():
-        this.enableButton();
+    if (articleFirstArticle) {
+      this.disableButton();
+      this.blurButton();
+    } else {
+      this.enableButton();
+    }
   }
 
   expand(initialHeight, instantly) {
@@ -120,10 +111,9 @@ export default class AccordionItem extends Element {
   }
 
   childElements() {
-    const { Articles, first, last, showArticle } = this.properties,
+    const { AccordionDiv, AccordionButton } = this.constructor,
+          { Articles, first, last, showArticle } = this.properties,
           [ Article ] = Articles,
-          AccordionDiv = this.getAccordionDiv(),
-          AccordionButton = this.getAccordionButton(),
           articles = Articles.map((Article, index) =>
 
             <Article index={index} />
@@ -147,6 +137,7 @@ export default class AccordionItem extends Element {
       "expandDiv",
       "isCollapsed",
       "collapseDiv",
+      "blurButton",
       "enableButton",
       "disableButton",
       "activateButton",

package/src/item/navigation/accordion.js

@@ -7,16 +7,10 @@ import { Element } from "easy";
 import AccordionNavigationButton from "../../button/navigation/accordion";
 
 class AccordionNavigationItem extends Element {
-  getAccordionNavigationButton() {
-    const { AccordionNavigationButton } = this.constructor;
-
-    return AccordionNavigationButton;
-  }
-
   childElements() {
     const { Articles, first, last, showArticle } = this.properties,
-          [ Article ] = Articles,
-          AccordionNavigationButton = this.getAccordionNavigationButton();
+          { AccordionNavigationButton } = this.constructor,
+          [ Article ] = Articles;
 
     return (
 

package/src/list/navigation/accordion.js

@@ -9,12 +9,6 @@ import AccordionNavigationItem from "../../item/navigation/accordion";
 import { guaranteeArray } from "../../utilities/array";
 
 class AccordionNavigationList extends Element {
-  getAccordionNavigationItem() {
-    const { AccordionNavigationItem } = this.constructor;
-
-    return AccordionNavigationItem;
-  }
-
   getButtons() {
     const maximumDepth = 2,
           buttonDescendantElements = this.getDescendantElements("button", maximumDepth),
@@ -29,16 +23,19 @@ class AccordionNavigationList extends Element {
     buttons.forEach((button) => {
       const uriArticleURI = button.isURIArticleURI(uri);
 
-      (uriArticleURI) ?
-        button.disable() :
-          button.enable();
+      if (uriArticleURI) {
+        button.disable();
+        button.blur();
+      } else {
+        button.enable();
+      }
     });
   }
 
   childElements() {
-    const { ArticlesArray, showArticle } = this.properties,
+    const { AccordionNavigationItem } = this.constructor,
+          { ArticlesArray, showArticle } = this.properties,
           ArticlesArrayLength = ArticlesArray.length,
-          AccordionNavigationItem = this.getAccordionNavigationItem(),
           firstIndex = 0,
           lastIndex = ArticlesArrayLength - 1,
           items = ArticlesArray.map((ArticleOrArticles, index) => {

package/src/navigation/accordion.js

@@ -5,15 +5,9 @@ import { Element } from "easy";
 import AccordionNavigationList from "../list/navigation/accordion";
 
 export default class AccordionNavigation extends Element {
-  getAccordionNavigationList() {
-    const { AccordionNavigationList } = this.constructor;
-
-    return AccordionNavigationList;
-  }
-
   childElements() {
-    const { ArticlesArray, showArticle } = this.properties,
-          AccordionNavigationList = this.getAccordionNavigationList();
+    const { AccordionNavigationList } = this.constructor,
+          { ArticlesArray, showArticle } = this.properties;
 
     return (