Merge branch 'master' into frontend-next

2017-01-21 12:08:52 +08:00
parent a9a38c3d75 1de4242473
commit 4bbe035beb
8 changed files with 95 additions and 59 deletions
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1761,6 +1761,10 @@ ui.toolbar.uploadImage.bind('change', function (e) {
 ui.toc.dropdown.click(function (e) {
    e.stopPropagation();
 });
+// prevent empty link change hash
+$('a[href="#"]').click(function (e) {
+    e.preventDefault();
+});

 //modal actions
 var revisions = [];