diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-12 00:32:38 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-12 00:32:38 +0100 |
commit | 76b31f870cf78aa8882761d954554fecb92e6211 (patch) | |
tree | 9c89430fe00983e94cc8864a12cd05242741d4c3 /core/js/js.js | |
parent | 0c31c3cc3a928e8ca9272d32d68163c0700697ea (diff) | |
parent | fb23ac3ce2e0b3f002f036e55e516b672f088dc0 (diff) | |
download | nextcloud-server-76b31f870cf78aa8882761d954554fecb92e6211.tar.gz nextcloud-server-76b31f870cf78aa8882761d954554fecb92e6211.zip |
Merge branch 'master' into master-sqlserver
Diffstat (limited to 'core/js/js.js')
-rw-r--r-- | core/js/js.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index 6b0c289850c..ae23c955c38 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -5,6 +5,12 @@ * To the end of config/config.php to enable debug mode. * The undefined checks fix the broken ie8 console */ +var oc_debug; +var oc_webroot; +var oc_requesttoken; +if (typeof oc_webroot === "undefined") { + oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/')); +} if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { if (!window.console) { window.console = {}; @@ -622,7 +628,8 @@ $(document).ready(function(){ }); // 'show password' checkbox - $('#password').showPassword(); + $('#password').showPassword(); + $('#adminpass').showPassword(); $('#pass2').showPassword(); //use infield labels |