Merge branch 'd' into staging

2017-03-15 16:01:29 +01:00
parent 306f6ce806 a286599f93
commit 13d7b3cadc
7 changed files with 79 additions and 41 deletions
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -407,8 +407,11 @@ define([
            window.location = "/";
        };

-        $aTagBig.click(onClick);
-        $aTagSmall.click(onClick);
+        var onContext = function (e) { e.stopPropagation(); };
+
+        $aTagBig.click(onClick).contextmenu(onContext);
+        $aTagSmall.click(onClick).contextmenu(onContext);
+
        $linkContainer.append($aTagSmall).append($aTagBig);
    };