Merge 0c2a44d into 54cb131

CHANGELOG.md

@@ -20,6 +20,13 @@ Always reference the ticket number at the end of the issue description.
 [310]: //github.com/sanoma/django-arctic/issues/310
 
 
+## 1.3.3.1
+
+### Changed
+- Changed slugify function, allow dashes (matches Django slugify)
+- Added a few more characters with accents
+
+
 ## 1.3.3
 
 ### Changed

arctic/static/arctic/src/assets/js/utils/helpers.js

@@ -37,16 +37,19 @@ window.arctic.utils = {
     },
 
     slugify: function ( text ) {
+        text = text.replace(/^\s+|\s+$/g, ''); // trim
         text = text.toLowerCase();
 
         // remove accents, swap ñ for n, etc
-        let from = 'àáäâèéëêìíïîòóöôùúüûñç';
-        let to   = 'aaaaeeeeiiiioooouuuunc';
+        let from = "åàáäâãèéëêìíïîòóöôùúüûñç";
+        let to   = "aaaaaaeeeeiiiioooouuuunc";
         for (let i=0, l=from.length ; i<l ; i++) {
             text = text.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i));
         }
-        return text
-            .replace( /[^\w ]+/g, '' )
-            .replace( / +/g, '-' );
+        text = text.replace(/[^a-z0-9 -]/g, '') // remove invalid chars
+               .replace(/\s+/g, '-') // collapse whitespace and replace by -
+               .replace(/-+/g, '-'); // collapse dashes
+
+       return text;
     }
 };