Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-03-02 18:16:20 +01:00
parent a852112808 2c9deed381
commit 6098f28260
6 changed files with 11 additions and 5 deletions
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1423,7 +1423,8 @@ define([
                    // Open the menu
                    $iframe.find('.contextMenu').css({
                        top: ($context.offset().top + 32) + 'px',
-                        right: '0px'
+                        right: '0px',
+                        left: ''
                    });
                    $li.contextmenu();
                });