Merge branch 'master' of github.com:nicothin/NTH-start-project

src/blocks/field-num/field-num.js

@@ -5,23 +5,25 @@ const ready = require('../../js/utils/documentReady.js');
 ready(function(){
 
   var fields = document.querySelectorAll( '.field-num' );
-  Array.prototype.forEach.call( fields, function( field ) {
-    const input = field.querySelector('.field-num__input');
-    const valueMin = input.getAttribute('min') ? +input.getAttribute('min') : -Infinity;
-    const valueMax = input.getAttribute('max') ? +input.getAttribute('max') : Infinity;
-    const valueStep = input.getAttribute('step') ? +input.getAttribute('step') : 1;
-    field.addEventListener('click', function(event){
-      if(event.target.classList.contains('field-num__btn') && !input.getAttribute('disabled')) {
-        let num = parseInt(input.value);
-        if(isNaN(num)) num = 0;
-        if(event.target.classList.contains('field-num__btn--plus')) {
-          if (num < valueMax) input.value = num + valueStep;
+  if(fields.length) {
+    Array.prototype.forEach.call( fields, function( field ) {
+      const input = field.querySelector('.field-num__input');
+      const valueMin = input.getAttribute('min') ? +input.getAttribute('min') : -Infinity;
+      const valueMax = input.getAttribute('max') ? +input.getAttribute('max') : Infinity;
+      const valueStep = input.getAttribute('step') ? +input.getAttribute('step') : 1;
+      field.addEventListener('click', function(event){
+        if(event.target.classList.contains('field-num__btn') && !input.getAttribute('disabled')) {
+          let num = parseInt(input.value);
+          if(isNaN(num)) num = 0;
+          if(event.target.classList.contains('field-num__btn--plus')) {
+            if (num < valueMax) input.value = num + valueStep;
+          }
+          if(event.target.classList.contains('field-num__btn--minus')) {
+            if (num > valueMin) input.value = num - valueStep;
+          }
         }
-        if(event.target.classList.contains('field-num__btn--minus')) {
-          if (num > valueMin) input.value = num - valueStep;
-        }
-      }
+      });
     });
-  });
+  }
 
 });

src/pages/404.pug

+extends ../pug/layout.pug
+
+block meta
+  title Error 404
+  meta(name='description', content='')
+
+//- block append head
+//-   link(rel='stylesheet', href='css/some.css')
+
+block nav
+  +main-nav('-1')
+
+block content
+  h1 Error 404
+  p Page not found.
+
+//- block footer
+//-   p footer
+
+//- block append page-bottom
+//-   script(src='js/some.js')

src/pages/index.pug

@@ -7,20 +7,15 @@ block meta
 //- block append head
 //-   link(rel='stylesheet', href='css/some.css')
 
-block header
-  +page-header()
-    +logo('/')
-      img(src='img/demo-logo.svg', alt='Logo', width='64', height='15')
-    +main-nav('10')
+block nav
+  +main-nav('10')
 
 block content
   h1 Заголовок
   p Содержимое. #[a(href='blocks-demo.html') Библиотека блоков].
 
-block footer
-  +page-footer()
-    p «Подвал»
-    p Контактный телефон: #[a(href='tel:+70000000000') +7 000 000 00 00]
+//- block footer
+//-   p footer
 
 //- block append page-bottom
 //-   script(src='js/some.js')

src/pug/layout.pug

@@ -38,13 +38,18 @@ html(class='page  no-js', lang='ru')
 
     .page__inner
       .page__content
-        block header
-          p шапка
+        +page-header()
+          +logo('/')
+            img(src='img/demo-logo.svg', alt='Logo', width='64', height='15')
+          block nav
+
         block content
           p содержимое
       .page__footer-wrapper
-        block footer
-          p подвал
+        +page-footer()
+          block footer
+            p «Подвал»
+            p Контактный телефон: #[a(href='tel:+70000000000') +7 000 000 00 00]
 
     block page-bottom
       script(src='js/bundle.js')