diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-02-21 15:51:41 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-02-21 15:51:41 +0100 |
| commit | f1475671aba59e33442ca5f4121e49782eabe974 (patch) | |
| tree | 33b049bac3cb2fcf86f7acfcc728e5fb6e2322e1 /core/js/js.js | |
| parent | b060a17b59f7117a670f09550215cb005dd822bc (diff) | |
| parent | aa0bcf7ba45d004b0c0226fd07696f9f224f9c1c (diff) | |
| download | nextcloud-server-f1475671aba59e33442ca5f4121e49782eabe974.tar.gz nextcloud-server-f1475671aba59e33442ca5f4121e49782eabe974.zip | |
Merge branch 'master' into extstorage-configclass
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index d4d2583f1e5..ec890be4541 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -860,6 +860,7 @@ function initCore() { // checkShowCredentials(); // $('input#user, input#password').keyup(checkShowCredentials); + // user menu $('#settings #expand').keydown(function(event) { if (event.which === 13 || event.which === 32) { $('#expand').click() @@ -872,7 +873,8 @@ function initCore() { $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $(document).click(function(){//hide the settings menu when clicking outside it + //hide the user menu when clicking outside it + $(document).click(function(){ $('#settings #expanddiv').slideUp(200); }); @@ -987,6 +989,17 @@ OC.set=function(name, value) { context[tail]=value; }; +// fix device width on windows phone +(function() { + if ("-ms-user-select" in document.documentElement.style && navigator.userAgent.match(/IEMobile\/10\.0/)) { + var msViewportStyle = document.createElement("style"); + msViewportStyle.appendChild( + document.createTextNode("@-ms-viewport{width:auto!important}") + ); + document.getElementsByTagName("head")[0].appendChild(msViewportStyle); + } +})(); + /** * select a range in an input field * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area |