Changeset 3880:e6d1f6d9d7df for themes

Timestamp:

09/18/18 20:22:10 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use let and const rather than var (ES2015/ES6), use template string where is more efficient

Location:

themes

Files:

• berlin/js/berlin.js (modified) (2 diffs)
• default/js/post.js (modified) (3 diffs)
• ductile/ductile.js (modified) (1 diff)

themes/berlin/js/berlin.js

@@ -5 +5 @@
 // Show/Hide main menu
 $('.header__nav').
-before('<button id="hamburger" type="button"><span class="visually-hidden">' + dotclear_berlin_navigation + '</span></button>').
+before(`<button id="hamburger" type="button"><span class="visually-hidden">${dotclear_berlin_navigation}</span></button>`).
 toggle();
 $('#hamburger').click(function() {
@@ -12 +12 @@
 });
 // Show/Hide sidebar on small screens
-$('#main').prepend('<button id="offcanvas-on" type="button"><span class="visually-hidden">' + dotclear_berlin_show_menu + '</span></button>');
+$('#main').prepend(`<button id="offcanvas-on" type="button"><span class="visually-hidden">${dotclear_berlin_show_menu}</span></button>`);
 $('#offcanvas-on').click(function() {
-  var btn = $('<button id="offcanvas-off" type="button"><span class="visually-hidden">' + dotclear_berlin_hide_menu + '</span></button>');
+  const btn = $(`<button id="offcanvas-off" type="button"><span class="visually-hidden">${dotclear_berlin_hide_menu}</span></button>`);
   $('#wrapper').addClass('off-canvas');
   $('#footer').addClass('off-canvas');

themes/default/js/post.js

@@ -5 +5 @@
   $('#comment-form p:has(input[type=submit][name=preview],button[type=submit][name=preview])').
   before(
-    '<p class="remember"><input type="checkbox" id="c_remember" name="c_remember" /> ' +
-    '<label for="c_remember">' + post_remember_str + '</label>' +
-    '</p>'
+`<p class="remember"><input type="checkbox" id="c_remember" name="c_remember" />
+<label for="c_remember">${post_remember_str}</label>
+</p>`
   );
 
@@ -46 +46 @@
 
   function setCookie() {
-    var name = $('#c_name').val();
-    var mail = $('#c_mail').val();
-    var site = $('#c_site').val();
-    var cpath = $('link[rel=top]').attr('href');
+    const name = $('#c_name').val();
+    const mail = $('#c_mail').val();
+    const site = $('#c_site').val();
+    let cpath = $('link[rel=top]').attr('href');
     if (!cpath) {
       cpath = '/';
@@ -73 +73 @@
       return false;
     }
-
-    var s = c.split('\n');
-
+    const s = c.split('\n');
     if (s.length != 3) {
       dropCookie();
       return false;
     }
-
     return s;
   }

themes/ductile/ductile.js

@@ -2 +2 @@
 'use strict';
 
-$(function() {
-  var create_name = function(text) {
+$(document).ready(function() {
+  if ($(window).width() < 1024) {
 
-    // Convert text to lower case.
-    var name = text.toLowerCase();
+    const create_name = function(text) {
 
-    // Remove leading and trailing spaces, and any non-alphanumeric
-    // characters except for ampersands, spaces and dashes.
-    name = name.replace(/^\s+|\s+$|[^a-z0-9&\s-]/g, '');
+      // Convert text to lower case.
+      let name = text.toLowerCase();
 
-    // Replace '&' with 'and'.
-    name = name.replace(/&/g, 'and');
+      // Remove leading and trailing spaces, and any non-alphanumeric
+      // characters except for ampersands, spaces and dashes.
+      name = name.replace(/^\s+|\s+$|[^a-z0-9&\s-]/g, '');
 
-    // Replaces spaces with dashes.
-    name = name.replace(/\s/g, '-');
+      // Replace '&' with 'and'.
+      name = name.replace(/&/g, 'and');
 
-    // Squash any duplicate dashes.
-    name = name.replace(/(-)+\1/g, '$1');
+      // Replaces spaces with dashes.
+      name = name.replace(/\s/g, '-');
 
-    return name;
-  };
+      // Squash any duplicate dashes.
+      name = name.replace(/(-)+\1/g, '$1');
 
-  var add_link = function() {
+      return name;
+    };
 
-    // Convert the h2 element text into a value that
-    // is safe to use in a name attribute.
-    var name = create_name($(this).text());
+    // Set toggle class to each #sidebar h2
+    $('#sidebar div div h2').addClass('toggle');
 
-    // Create a name attribute in the following sibling
-    // to act as a fragment anchor.
-    $(this).next().attr('name', name);
+    // Hide all h2.toggle siblings
+    $('#sidebar div div h2').nextAll().hide();
 
-    // Replace the h2.toggle element with a link to the
-    // fragment anchor.  Use the h2 text to create the
-    // link title attribute.
-    $(this).html(
-      '<a href="#' + name + '" title="Reveal ' +
-      $(this).text() + ' content">' +
-      $(this).html() + '</a>');
-  };
+    // Add a link to each h2.toggle element.
+    $('h2.toggle').each(function() {
 
-  var toggle = function(event) {
-    event.preventDefault();
+      // Convert the h2 element text into a value that
+      // is safe to use in a name attribute.
+      const name = create_name($(this).text());
 
-    // Toggle the 'expanded' class of the h2.toggle
-    // element, then apply the slideToggle effect
-    // to all siblings.
-    $(this).toggleClass('expanded').
-    nextAll().slideToggle('fast');
-  };
+      // Create a name attribute in the following sibling
+      // to act as a fragment anchor.
+      $(this).next().attr('name', name);
 
-  var remove_focus = function() {
-    // Use the blur() method to remove focus.
-    $(this).blur();
-  };
+      // Replace the h2.toggle element with a link to the
+      // fragment anchor.  Use the h2 text to create the
+      // link title attribute.
+      $(this).html(
+        '<a href="#' + name + '" title="Reveal ' +
+        $(this).text() + ' content">' +
+        $(this).html() + '</a>');
+    });
 
-  $(document).ready(function() {
-    if ($(window).width() < 1024) {
+    // Add a click event handler to all h2.toggle elements.
+    $('h2.toggle').click(function(event) {
+      event.preventDefault();
+      // Toggle the 'expanded' class of the h2.toggle
+      // element, then apply the slideToggle effect
+      // to all siblings.
+      $(this).toggleClass('expanded').
+      nextAll().slideToggle('fast');
+    });
 
-      // Set toggle class to each #sidebar h2
-      $('#sidebar div div h2').addClass('toggle');
-
-      // Hide all h2.toggle siblings
-      $('#sidebar div div h2').nextAll().hide();
-
-      // Add a link to each h2.toggle element.
-      $('h2.toggle').each(add_link);
-
-      // Add a click event handler to all h2.toggle elements.
-      $('h2.toggle').click(toggle);
-
-      // Remove the focus from the link tag when accessed with a mouse.
-      $('h2.toggle a').mouseup(remove_focus);
-    }
-  });
-
+    // Remove the focus from the link tag when accessed with a mouse.
+    $('h2.toggle a').mouseup(function() {
+      // Use the blur() method to remove focus.
+      $(this).blur();
+    });
+  }
 });