diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-28 08:12:08 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-29 20:16:39 +0200 |
| commit | cbaf858dea0f2094805edb6aa223bdd6877fff5b (patch) | |
| tree | 9da83c325bb6ab94160bec964b8ef64aeda745ae /core/js/js.js | |
| parent | 3b9fac8f81b76af988ea620a207e6c65fa665589 (diff) | |
| parent | 80374c7cb2f3c98e350c95f92a9785aacef5d2c4 (diff) | |
| download | nextcloud-server-cbaf858dea0f2094805edb6aa223bdd6877fff5b.tar.gz nextcloud-server-cbaf858dea0f2094805edb6aa223bdd6877fff5b.zip | |
Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
apps/files/js/fileactions.js
apps/files_archive/js/archive.js
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/js/js.js b/core/js/js.js index 7a50b2e7b9d..e50b407bacf 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -475,8 +475,9 @@ $(document).ready(function(){ } } // hide log in button etc. when form fields not filled - checkShowCredentials(); - $('input#user, input#password').keyup(checkShowCredentials); + // commented out due to some browsers having issues with it + // checkShowCredentials(); + // $('input#user, input#password').keyup(checkShowCredentials); $('#settings #expand').keydown(function(event) { if (event.which == 13 || event.which == 32) { @@ -534,7 +535,7 @@ if (!Array.prototype.map){ } } - return res; + return res; }; } @@ -542,7 +543,7 @@ if (!Array.prototype.map){ * Filter Jquery selector by attribute value **/ $.fn.filterAttr = function(attr_name, attr_value) { - return this.filter(function() { return $(this).attr(attr_name) === attr_value; }); + return this.filter(function() { return $(this).attr(attr_name) === attr_value; }); }; function humanFileSize(size) { |