mod-build 3.5.6 → 3.6.0-beta.1

package/gulp-tasks/grab-cdn.js

@@ -3,11 +3,13 @@ var source = require('vinyl-source-stream');
 
 // helper to allow us to define an "end" event to multiple streams
 function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName) {
+	var url = `https://${siteSettings.nodeEnv}/quote/resources/mod-site${inputPath}`;
+
 	return new Promise(resolve => { // eslint-disable-line no-undef
-		request(`https://${siteSettings.nodeEnv}/quote/resources/mod-site${inputPath}`)
+		request(url)
 			.on('response', resp => {
 				if (resp.statusCode !== 200) {
-					throw new Error('Error fetching about/privacy/terms modals');
+					throw new Error(`Error fetching ${url}`);
 				}
 			})
 			.pipe(source(fileName))
@@ -28,17 +30,9 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 		// key: inputPath, value: destPath
 
 		externalResources = {
-			'/templates/modals/about/': ['/templates/modals/about/', 'index.html'],
-			'/templates/modals/privacy/': ['/templates/modals/privacy/', 'index.html'],
-			'/templates/modals/terms/': ['/templates/modals/terms/', 'index.html'],
-			'/templates/qs-modals/contact-us/': ['/templates/modals/contact-us/', 'index.html'],
 			'/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html']
 		};
 
-		if (includeFaqLink) {
-			Object.assign(externalResources, {'/templates/modals/faq/': ['/templates/modals/faq/', 'index.html']});
-		}
-
 		Object.assign(externalResources, {'/templates/scripts/jornaya.html': ['/templates/scripts/', 'jornaya.html']});
 
 		if (isModWhiteLabel || domainHasModernize) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.5.6",
+  "version": "3.6.0-beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/scripts/components/modal-pages.js

@@ -1,77 +0,0 @@
-/**
- * This file runs modals for links such as About us, Privacy,
- * and Terms (usually in the footer of a form page). It loads
- * respective page into a modal window.
- *
- * Requires:
- * - jQuery
- * - Twitter Bootstrap 3
- *
- * Links mark up example:
- * <a href="#privacy" data-bind="modal-link">Privacy Policy</a>
- *
- * It will load a '/templates/modals/privacy.html' via AJAX into a modal window
- */
-
-/* eslint brace-style: 0 */
-(function($) {
-	var modalTplsUrl = '/modals',
-		modalId = 'info-modal',
-		modalTpl = [
-		/* eslint-disable indent */
-			'<div class="modal" id="' + modalId + '" tabindex="-1" role="dialog" aria-labelledby="infoModal" aria-hidden="true">',
-				'<div class="modal-dialog">',
-					'<div class="modal-content">',
-						'<div class="modal-header">',
-							'<h4 class="modal-title"></h4>',
-						'</div>',
-						'<div class="modal-body">Loading...</div>',
-						'<div class="modal-footer">',
-							'<button type="button" class="btn btn-primary close" data-dismiss="modal">Close</button>',
-						'</div>',
-					'</div>',
-				'</div>',
-			'</div>'
-		/* eslint-enable indent */
-		].join('');
-
-	$(document).ready(function() {
-		$('body').on('click', 'a[data-bind="modal-link"]', function(e) {
-			e.preventDefault();
-
-			var $link = $(this),
-				loadUrl;
-
-			if ($link.attr('data-load')) {
-				loadUrl = $link.attr('data-load');
-			}
-			else if ($link.attr('href') !== '') {
-				loadUrl = modalTplsUrl + $link.attr('href');
-			}
-			else {
-				return;
-			}
-
-			$('#' + modalId).remove();
-			$('body').append($(modalTpl));
-
-			var $modal = $('#' + modalId);
-
-			$modal.find('.modal-title').text($link.text());
-			$modal.find('.modal-body').load(loadUrl, function() {
-				// Anchors inside of modal
-				$modal.find('a[href*=\\#]').on('click', function(e) {
-					e.preventDefault();
-					$(this.hash)[0].scrollIntoView({behavior: 'smooth'});
-				});
-
-				var $anchor = $($link.data('anchor'));
-
-				if ($anchor.length > 0) {
-					$anchor[0].scrollIntoView();
-				}
-			});
-			$modal.modal('show');
-		});
-	});
-})(jQuery);