ndla-article-scripts - npm Package Compare versions

Comparing version 0.1.10 to 0.2.0

es/figureScripts.js

@@ -23,2 +23,15 @@ /**
 
+export var toggleLicenseInfoBox = function toggleLicenseInfoBox() {
+  forEachElement('.c-dialog', function (el) {
+    var target = el;
+    var toggleButton = target.querySelector('.c-figure__captionbtn');
+    if (toggleButton) {
+      toggleButton.onclick = function () {
+        target.querySelector('.c-figure-license__hidden-content').classList.add('c-figure-license__hidden-content--active');
+        target.querySelector('.c-dialog__content--fullscreen').scrollTop = 350;
+      };
+    }
+  });
+};
+
 export var addCloseDialogClickListeners = function addCloseDialogClickListeners() {
@@ -40,6 +53,6 @@ forEachElement('.c-dialog', function (el) {
 export var addShowDialogClickListeners = function addShowDialogClickListeners() {
-  forEachElement('.c-figure .c-figure__captionbtn', function (el) {
+  forEachElement('.c-figure [data-dialog-trigger-id]', function (el) {
     var target = el;
     var figure = findAncestorByClass(target, 'c-figure');
-    var id = figure.getAttribute('id');
+    var id = target.getAttribute('data-dialog-trigger-id');
 
@@ -81,2 +94,9 @@ var dialog = document.querySelector('[data-dialog-id=\'' + id + '\']');
 
+export var removeShowDialogClickListeners = function removeShowDialogClickListeners() {
+  forEachElement('.c-figure [data-dialog-trigger-id]', function (el) {
+    var target = el;
+    target.onclick = undefined;
+  });
+};
+
 export var addCopyToClipboardListeners = function addCopyToClipboardListeners() {
@@ -152,22 +172,2 @@ forEachElement('button[data-copy-string]', function (el) {
   window.removeEventListener('resize', handler);
-};
-
-export var addEventListenersForZoom = function addEventListenersForZoom() {
-  forEachElement('.c-figure > .c-button', function (el) {
-    var parentNode = el.parentNode;
-
-    var target = el;
-
-    target.onclick = function () {
-      var toggleClass = parentNode.getAttribute('data-toggleclass');
-      parentNode.classList.toggle(toggleClass);
-    };
-  });
-};
-
-export var removeEventListenersForZoom = function removeEventListenersForZoom() {
-  forEachElement('.c-figure > .c-button', function (el) {
-    var target = el;
-    target.onclick = undefined;
-  });
 };

es/index.js

@@ -9,11 +9,13 @@ /**
 
-import { addAsideClickListener, removeAsideClickListener } from './asideScripts';
+import { addFactBoxClickListener, removeFactBoxClickListener } from './factBoxScripts';
 
-import { addShowDialogClickListeners, addCloseDialogClickListeners, addCopyToClipboardListeners, updateIFrameDimensions, addEventListenerForResize, removeEventListenerForResize, addEventListenersForZoom, removeEventListenersForZoom } from './figureScripts';
+import { addShowDialogClickListeners, removeShowDialogClickListeners, addCloseDialogClickListeners, addCopyToClipboardListeners, updateIFrameDimensions, addEventListenerForResize, removeEventListenerForResize, toggleLicenseInfoBox } from './figureScripts';
 
 import { addDetailsEventListeners, removeDetailsEventListeners } from './detailsScript';
 
+import { addFootnoteClickListeners } from './footnoteScripts';
+
 import { initAudioPlayers } from './audioPlayerScript';
 
-import { addShowGlossaryDefinitionClickListeners } from './glossaryScripts';
+import { addShowConceptDefinitionClickListeners } from './conceptScripts';
 
@@ -23,12 +25,12 @@ export var initArticleScripts = function initArticleScripts() {
   updateIFrameDimensions();
-  addAsideClickListener();
+  addFactBoxClickListener();
   addCopyToClipboardListeners();
   addShowDialogClickListeners();
   addCloseDialogClickListeners();
-  addShowGlossaryDefinitionClickListeners();
+  addShowConceptDefinitionClickListeners();
   addDetailsEventListeners();
-  addEventListenersForZoom();
   initAudioPlayers();
+  addFootnoteClickListeners();
 };
 
-export { updateIFrameDimensions, addAsideClickListener, removeAsideClickListener, addEventListenerForResize, removeEventListenerForResize, addCloseDialogClickListeners, addCopyToClipboardListeners, addShowDialogClickListeners, addShowGlossaryDefinitionClickListeners, addDetailsEventListeners, removeDetailsEventListeners, addEventListenersForZoom, removeEventListenersForZoom, initAudioPlayers };
+export { updateIFrameDimensions, addFactBoxClickListener, removeFactBoxClickListener, addEventListenerForResize, removeEventListenerForResize, addCloseDialogClickListeners, addCopyToClipboardListeners, addShowConceptDefinitionClickListeners, addShowDialogClickListeners, removeShowDialogClickListeners, addDetailsEventListeners, removeDetailsEventListeners, initAudioPlayers, addFootnoteClickListeners, toggleLicenseInfoBox };

lib/figureScripts.js

@@ -6,3 +6,3 @@ 'use strict';
 });
-exports.removeEventListenersForZoom = exports.addEventListenersForZoom = exports.removeEventListenerForResize = exports.addEventListenerForResize = exports.updateIFrameDimensions = exports.addCopyToClipboardListeners = exports.addShowDialogClickListeners = exports.addCloseDialogClickListeners = undefined;
+exports.removeEventListenerForResize = exports.addEventListenerForResize = exports.updateIFrameDimensions = exports.addCopyToClipboardListeners = exports.removeShowDialogClickListeners = exports.addShowDialogClickListeners = exports.addCloseDialogClickListeners = exports.toggleLicenseInfoBox = undefined;
 
@@ -39,2 +39,15 @@ var _ndlaUtil = require('ndla-util');
 
+var toggleLicenseInfoBox = exports.toggleLicenseInfoBox = function toggleLicenseInfoBox() {
+  (0, _domHelpers.forEachElement)('.c-dialog', function (el) {
+    var target = el;
+    var toggleButton = target.querySelector('.c-figure__captionbtn');
+    if (toggleButton) {
+      toggleButton.onclick = function () {
+        target.querySelector('.c-figure-license__hidden-content').classList.add('c-figure-license__hidden-content--active');
+        target.querySelector('.c-dialog__content--fullscreen').scrollTop = 350;
+      };
+    }
+  });
+};
+
 var addCloseDialogClickListeners = exports.addCloseDialogClickListeners = function addCloseDialogClickListeners() {
@@ -56,6 +69,6 @@ (0, _domHelpers.forEachElement)('.c-dialog', function (el) {
 var addShowDialogClickListeners = exports.addShowDialogClickListeners = function addShowDialogClickListeners() {
-  (0, _domHelpers.forEachElement)('.c-figure .c-figure__captionbtn', function (el) {
+  (0, _domHelpers.forEachElement)('.c-figure [data-dialog-trigger-id]', function (el) {
     var target = el;
     var figure = (0, _domHelpers.findAncestorByClass)(target, 'c-figure');
-    var id = figure.getAttribute('id');
+    var id = target.getAttribute('data-dialog-trigger-id');
 
@@ -97,2 +110,9 @@ var dialog = document.querySelector('[data-dialog-id=\'' + id + '\']');
 
+var removeShowDialogClickListeners = exports.removeShowDialogClickListeners = function removeShowDialogClickListeners() {
+  (0, _domHelpers.forEachElement)('.c-figure [data-dialog-trigger-id]', function (el) {
+    var target = el;
+    target.onclick = undefined;
+  });
+};
+
 var addCopyToClipboardListeners = exports.addCopyToClipboardListeners = function addCopyToClipboardListeners() {
@@ -168,22 +188,2 @@ (0, _domHelpers.forEachElement)('button[data-copy-string]', function (el) {
   window.removeEventListener('resize', handler);
-};
-
-var addEventListenersForZoom = exports.addEventListenersForZoom = function addEventListenersForZoom() {
-  (0, _domHelpers.forEachElement)('.c-figure > .c-button', function (el) {
-    var parentNode = el.parentNode;
-
-    var target = el;
-
-    target.onclick = function () {
-      var toggleClass = parentNode.getAttribute('data-toggleclass');
-      parentNode.classList.toggle(toggleClass);
-    };
-  });
-};
-
-var removeEventListenersForZoom = exports.removeEventListenersForZoom = function removeEventListenersForZoom() {
-  (0, _domHelpers.forEachElement)('.c-figure > .c-button', function (el) {
-    var target = el;
-    target.onclick = undefined;
-  });
 };

lib/index.js

@@ -6,5 +6,5 @@ 'use strict';
 });
-exports.initAudioPlayers = exports.removeEventListenersForZoom = exports.addEventListenersForZoom = exports.removeDetailsEventListeners = exports.addDetailsEventListeners = exports.addShowGlossaryDefinitionClickListeners = exports.addShowDialogClickListeners = exports.addCopyToClipboardListeners = exports.addCloseDialogClickListeners = exports.removeEventListenerForResize = exports.addEventListenerForResize = exports.removeAsideClickListener = exports.addAsideClickListener = exports.updateIFrameDimensions = exports.initArticleScripts = undefined;
+exports.toggleLicenseInfoBox = exports.addFootnoteClickListeners = exports.initAudioPlayers = exports.removeDetailsEventListeners = exports.addDetailsEventListeners = exports.removeShowDialogClickListeners = exports.addShowDialogClickListeners = exports.addShowConceptDefinitionClickListeners = exports.addCopyToClipboardListeners = exports.addCloseDialogClickListeners = exports.removeEventListenerForResize = exports.addEventListenerForResize = exports.removeFactBoxClickListener = exports.addFactBoxClickListener = exports.updateIFrameDimensions = exports.initArticleScripts = undefined;
 
-var _asideScripts = require('./asideScripts');
+var _factBoxScripts = require('./factBoxScripts');
 
@@ -15,28 +15,32 @@ var _figureScripts = require('./figureScripts');
 
+var _footnoteScripts = require('./footnoteScripts');
+
 var _audioPlayerScript = require('./audioPlayerScript');
 
-var _glossaryScripts = require('./glossaryScripts');
+var _conceptScripts = require('./conceptScripts');
 
+/**
+ * Copyright (c) 2016-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
 var initArticleScripts = exports.initArticleScripts = function initArticleScripts() {
   (0, _figureScripts.addEventListenerForResize)();
   (0, _figureScripts.updateIFrameDimensions)();
-  (0, _asideScripts.addAsideClickListener)();
+  (0, _factBoxScripts.addFactBoxClickListener)();
   (0, _figureScripts.addCopyToClipboardListeners)();
   (0, _figureScripts.addShowDialogClickListeners)();
   (0, _figureScripts.addCloseDialogClickListeners)();
-  (0, _glossaryScripts.addShowGlossaryDefinitionClickListeners)();
+  (0, _conceptScripts.addShowConceptDefinitionClickListeners)();
   (0, _detailsScript.addDetailsEventListeners)();
-  (0, _figureScripts.addEventListenersForZoom)();
   (0, _audioPlayerScript.initAudioPlayers)();
-}; /**
-    * Copyright (c) 2016-present, NDLA.
-    *
-    * This source code is licensed under the GPLv3 license found in the
-    * LICENSE file in the root directory of this source tree.
-    *
-    */
+  (0, _footnoteScripts.addFootnoteClickListeners)();
+};
 
 exports.updateIFrameDimensions = _figureScripts.updateIFrameDimensions;
-exports.addAsideClickListener = _asideScripts.addAsideClickListener;
-exports.removeAsideClickListener = _asideScripts.removeAsideClickListener;
+exports.addFactBoxClickListener = _factBoxScripts.addFactBoxClickListener;
+exports.removeFactBoxClickListener = _factBoxScripts.removeFactBoxClickListener;
 exports.addEventListenerForResize = _figureScripts.addEventListenerForResize;
@@ -46,8 +50,9 @@ exports.removeEventListenerForResize = _figureScripts.removeEventListenerForResize;
 exports.addCopyToClipboardListeners = _figureScripts.addCopyToClipboardListeners;
+exports.addShowConceptDefinitionClickListeners = _conceptScripts.addShowConceptDefinitionClickListeners;
 exports.addShowDialogClickListeners = _figureScripts.addShowDialogClickListeners;
-exports.addShowGlossaryDefinitionClickListeners = _glossaryScripts.addShowGlossaryDefinitionClickListeners;
+exports.removeShowDialogClickListeners = _figureScripts.removeShowDialogClickListeners;
 exports.addDetailsEventListeners = _detailsScript.addDetailsEventListeners;
 exports.removeDetailsEventListeners = _detailsScript.removeDetailsEventListeners;
-exports.addEventListenersForZoom = _figureScripts.addEventListenersForZoom;
-exports.removeEventListenersForZoom = _figureScripts.removeEventListenersForZoom;
-exports.initAudioPlayers = _audioPlayerScript.initAudioPlayers;
+exports.initAudioPlayers = _audioPlayerScript.initAudioPlayers;
+exports.addFootnoteClickListeners = _footnoteScripts.addFootnoteClickListeners;
+exports.toggleLicenseInfoBox = _figureScripts.toggleLicenseInfoBox;

package.json

 {
   "name": "ndla-article-scripts",
-  "version": "0.1.10",
+  "version": "0.2.0",
   "description": "A collection of functions for making article content responsive (and interactive)",
@@ -33,5 +33,5 @@ "license": "GPL-3.0",
   "dependencies": {
-    "focus-trap": "^2.3.1",
+    "focus-trap": "^2.4.2",
     "jump.js": "^1.0.2"
   }
 }

README.md

@@ -22,7 +22,3 @@ # ndla-article-scripts
 ```javascript
-import {
-  addEventListenerForResize,
-  updateIFrameDimensions,
-  addAsideClickListener,
-} from 'ndla-article-scripts';
+import { addEventListenerForResize, updateIFrameDimensions, addFactBoxClickListener } from 'ndla-article-scripts';
 
@@ -33,3 +29,3 @@ window.onload = () => {
   addEventListenerForResize();
-  addAsideClickListener();
+  addFactBoxClickListener();
 };
@@ -44,5 +40,5 @@ ```
   updateIFrameDimensions,
-  addAsideClickListener,
+  addFactBoxClickListener,
   removeEventListenerForResize,
-  removeAsideClickListener,
+  removeFactBoxClickListener,
 } from 'ndla-article-scripts';
@@ -54,3 +50,3 @@
     updateIFrameDimensions();
-    addAsideClickListener();
+    addFactBoxClickListener();
   }
@@ -60,3 +56,3 @@
     removeEventListenerForResize();
-    removeAsideClickListener();
+    removeFactBoxClickListener();
   }
@@ -95,9 +91,9 @@
 
-### `articleScripts.addAsideClickListener()`
+### `articleScripts.addFactBoxClickListener()`
 
-Adds an click listener on aside buttons for expanding the content on small screens.
+Adds an click listener on fact box buttons for expanding the content on small screens.
 
-### `articleScripts.removeAsideClickListener()`
+### `articleScripts.removeFactBoxClickListener()`
 
-Removes click listeners added by `removeAsideClickListener`.
+Removes click listeners added by `addFactBoxClickListener`.
 
@@ -104,0 +100,0 @@ ### `articleScripts.addShowDialogClickListeners()`

No alert changes

Improved metrics

Total package byte prevSize

40646

increased by6.52%

Number of package files

18

increased by12.5%

Lines of code

871

increased by6.74%

Worsened metrics

Number of lines in readme file

117

decreased by-3.31%

Dependency changes

• Updatedfocus-trap@^2.4.2