diff --git a/bin/installDeps.sh b/bin/installDeps.sh
index 088260853..a49c46b13 100755
--- a/bin/installDeps.sh
+++ b/bin/installDeps.sh
@@ -28,8 +28,8 @@ hash npm > /dev/null 2>&1 || {
#check npm version
NPM_VERSION=$(npm --version)
-if [ ! $(echo $NPM_VERSION | cut -d "." -f 1-2) = "1.0" ]; then
- echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.0.x" >&2
+if [ ! $(echo $NPM_VERSION | cut -d "." -f 1) = "1" ]; then
+ echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x" >&2
exit 1
fi
diff --git a/static/js/pad2.js b/static/js/pad2.js
index 6f398bade..debd25512 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -21,6 +21,7 @@ var LineNumbersDisabled = false;
var noColors = false;
var useMonospaceFontGlobal = false;
var globalUserName = false;
+var hideQRCode = false;
$(document).ready(function()
{
@@ -86,12 +87,14 @@ function getParams()
var showLineNumbers = params["showLineNumbers"];
var useMonospaceFont = params["useMonospaceFont"];
var IsnoColors = params["noColors"];
+ var hideQRCode = params["hideQRCode"];
if(IsnoColors)
{
if(IsnoColors == "true")
{
noColors = true;
+ $('#clearAuthorship').hide();
}
}
if(showControls)
@@ -102,7 +105,6 @@ function getParams()
$('#editorcontainer').css({"top":"0px"});
}
}
-
if(showChat)
{
if(showChat == "false")
@@ -110,7 +112,6 @@ function getParams()
$('#chaticon').hide();
}
}
-
if(showLineNumbers)
{
if(showLineNumbers == "false")
@@ -118,7 +119,6 @@ function getParams()
LineNumbersDisabled = true;
}
}
-
if(useMonospaceFont)
{
if(useMonospaceFont == "true")
@@ -126,13 +126,15 @@ function getParams()
useMonospaceFontGlobal = true;
}
}
-
-
if(userName)
{
// If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
globalUserName = unescape(userName);
}
+ if(hideQRCode)
+ {
+ $('#qrcode').hide();
+ }
}
function getUrlVars()
diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js
index 8680fc2e6..9bb5f95db 100644
--- a/static/js/pad_userlist.js
+++ b/static/js/pad_userlist.js
@@ -711,7 +711,7 @@ var paduserlist = (function()
}
$("#myswatch").css({'background-color': myUserInfo.colorId});
- $("#usericon").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId});
+ $("#usericon").css({'box-shadow': 'inset 0 0 30px ' + myUserInfo.colorId,'background-color': myUserInfo.colorId});
}
};
return self;
diff --git a/static/pad.html b/static/pad.html
index 851d5761d..7ab260764 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -3,7 +3,7 @@
- Etherpad Lite
+ Etherpad Lite -- Test
@@ -71,7 +71,7 @@
-
+