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

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

Browse Source
This commit is contained in:
Pierre Bondoerffer
2017-03-02 17:44:29 +01:00
parent e39fe1c0b7 52793385ea
commit 800db07077
49 changed files with 185 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/poll/index.html
View File

@@ -11,11 +11,7 @@
id="favicon" />
<link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/customize/main.css" />
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
<script> require.config({
waitSeconds: 60,
urlArgs: "bust=1.1.0",
}); </script>
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
<style>
html, body {
width: 100%;

4
www/poll/main.js
View File

@@ -440,7 +440,7 @@ define([
var setName = APP.setName = function (newName) {
if (typeof(newName) !== 'string') { return; }
var myUserNameTemp = Cryptpad.fixHTML(newName.trim());
var myUserNameTemp = newName.trim();
if(myUserNameTemp.length > 32) {
myUserNameTemp = myUserNameTemp.substr(0, 32);
}
@@ -662,7 +662,7 @@ define([
var disconnect = function (info) {
//setEditable(false); // TODO
Cryptpad.alert(Messages.common_connectionLost);
Cryptpad.alert(Messages.common_connectionLost, undefined, true);
};
var create = function (info) {