summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2013-10-02 16:37:29 -0700
committerJohn McLear <john@mclear.co.uk>2013-10-02 16:37:29 -0700
commit6dc424098557157a13ab26fb40fca28e52d879e5 (patch)
tree332589dd8dba208a79f10acd7df7efb3f1d57cb9
parentba1ff4686701cbc0a8d63a9942ce166a0f5c54bb (diff)
parentd69df917095c49e9cc98e13e98e9af2b78cb59b7 (diff)
downloadetherpad-lite-6dc424098557157a13ab26fb40fca28e52d879e5.zip
Merge pull request #1919 from ether/make-username-show-properly
use val not value, broken with newer jq
-rw-r--r--src/static/js/pad.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 4d5df7eb..cca2f3eb 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -334,7 +334,7 @@ function handshake()
{
pad.notifyChangeName(settings.globalUserName); // Notifies the server
pad.myUserInfo.name = settings.globalUserName;
- $('#myusernameedit').attr({"value":settings.globalUserName}); // Updates the current users UI
+ $('#myusernameedit').val(settings.globalUserName); // Updates the current users UI
}
if (settings.globalUserColor !== false && colorutils.isCssHex(settings.globalUserColor))
{