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

2017-06-30 11:42:59 +02:00
parent b9320e6005 9e91739044
commit 26193aeaa7
5 changed files with 61 additions and 11 deletions
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -465,6 +465,7 @@ define([
                            window.frames["pad-iframe"].print();
                        }
                    }, {ok: Messages.printButton});
+                    Cryptpad.feedback('PRINT_SLIDES');
                    //$('body').append(createPrintDialog());
                }).append($('<span>', {'class': 'drawer'}).text(Messages.printText));
                $drawer.append($printButton);