web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'newpoll' into fileManagerMerge

Browse Source
This commit is contained in:
yflory
2016-12-07 16:59:43 +01:00
parent 9b3719e0ae b7b4a034a3
commit cb43eb9ca1
13 changed files with 1501 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/cryptpad-common.js
View File

@@ -798,7 +798,6 @@ define([
case 'editshare':
button = $('<button>', {
title: Messages.editShareTitle,
'class': "button action"
}).text(Messages.editShare);
if (data && data.editHash) {
var editHash = data.editHash;
@@ -817,7 +816,6 @@ define([
case 'viewshare':
button = $('<button>', {
title: Messages.viewShareTitle,
'class': "button action"
}).text(Messages.viewShare);
if (data && data.viewHash) {
button.click(function () {
@@ -835,7 +833,6 @@ define([
case 'viewopen':
button = $('<button>', {
title: Messages.viewOpenTitle,
'class': "button action"
}).text(Messages.viewOpen);
if (data && data.viewHash) {
button.click(function () {