Merge 45eb565 into 95a6480

mdn · Jun 19, 2014 · 17abf65 · 17abf65
2 parents 95a6480 + 45eb565
commit 17abf65
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/media/js/wiki-edit.js b/media/js/wiki-edit.js
@@ -140,8 +140,7 @@
               });
 
               var s = values.join(' ');
-
-              s = $.slugifyString(s);
+              s = $.slugifyString(s, false, true);
 
               // Trim to first num_chars chars
               s = s.substring(0, maxLength);

diff --git a/media/js/wiki-move.js b/media/js/wiki-move.js
@@ -62,6 +62,6 @@
 
      // Help on the client side for validating slugs to be moved
      $moveSlug.on('change keyup focus blur', function() {
-        this.value = $.slugifyString(this.value.replace(moveRegex, ''), true);
+        this.value = $.slugifyString(this.value.replace(moveRegex, ''), true, true);
      });
 })(jQuery);
diff --git a/media/redesign/js/wiki.js b/media/redesign/js/wiki.js
@@ -413,14 +413,20 @@
             return nvpair;
         },
         // Used within the wiki new/move pages
-        slugifyString: function(str, allowSlash) {
+        slugifyString: function(str, allowSlash, allowMultipleUnderscores) {
             var regex = new RegExp('[\?\&\"\'\#\*\$' + (allowSlash ? '' : '\/') + ' +?]', 'g');
+
             // Remove anything from the slug that could cause big problems
-            return str.replace(regex, '_')
-                // "$" is used for verb delimiter in URLs
-                .replace(/\$/g, '')
-                // Don't allow "_____" mess
-                .replace(/\_+/g, '_');
+            var result = str.replace(regex, '_')
+                                // "$" is used for verb delimiter in URLs
+                                .replace(/\$/g, '');
+
+            // Don't allow "_____" mess
+            if(!allowMultipleUnderscores) {
+                result = result.replace(/\_+/g, '_');
+            }
+
+            return result;
         }
     });