improved support for Unicode anchors in Mojolicious::Plugin::PODRenderer

mojolicious · Jul 26, 2014 · 3ae054c · 3ae054c
1 parent a5e62ba
commit 3ae054c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
 5.19  2014-07-26
+  - Improved support for Unicode anchors in Mojolicious::Plugin::PODRenderer.
 
 5.18  2014-07-25
   - Improved is_readable performance in Mojo::Reactor.

diff --git a/lib/Mojolicious/templates/mojobar.html.ep b/lib/Mojolicious/templates/mojobar.html.ep
@@ -68,10 +68,15 @@
   </div>
 </div>
 <script>
+  function escapeAnchor(hash) {
+    var anchor = hash.split("#")[1]
+    anchor = anchor.replace(/[!"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~]/g, "\\$&");
+    return "#" + anchor;
+  }
   var mojobar = $('#mojobar');
   var mojobarHeight = mojobar.outerHeight();
   function fixOffset() {
-    var offset = $(window.location.hash).offset();
+    var offset = $(escapeAnchor(window.location.hash)).offset();
     if (offset) {
       $('html, body').animate({scrollTop: offset.top - mojobarHeight}, 1);
     }
@@ -111,10 +116,8 @@
     $(".mojoscroll").click(function(e) {
       e.preventDefault();
       e.stopPropagation();
-      var hash = this.href.split("#")[1];
-      hash     = hash.replace(/[!"#$%&'()*+,.\/:;<=>?@[\\\]^`{|}~]/g, "\\$&");
-      hash       = "#" + hash;
-      var target = $(hash);
+      var hash   = "#" + this.href.split("#")[1];
+      var target = $(escapeAnchor(hash));
       var old    = target.attr('id');
       target.attr('id', '');
       location.hash = hash;