diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
| commit | c9d26631592ba58d8026a14e7f637cfe835fa15d (patch) | |
| tree | b6bc91006e0207a2e2b26ba5d1205853e0ca7fda /settings/js | |
| parent | b9167196fb331d7197210e4a130e03d32d839b8a (diff) | |
| parent | c7ca86799b2608609ead7ecd2d84d0bbd47c6548 (diff) | |
| download | nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.tar.gz nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.zip | |
Merge branch 'master' into fileapi-foreward
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/apps.js | 8 | ||||
| -rw-r--r-- | settings/js/personal.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 1ae45932172..54810776d2b 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -169,7 +169,7 @@ OC.Settings.Apps = OC.Settings.Apps || { var navEntries=response.nav_entries; for(var i=0; i< navEntries.length; i++){ var entry = navEntries[i]; - var container = $('#apps'); + var container = $('#apps .wrapper'); if(container.children('li[data-id="'+entry.id+'"]').length === 0){ var li=$('<li></li>'); @@ -181,10 +181,10 @@ OC.Settings.Apps = OC.Settings.Apps || { a.prepend(filename); a.prepend(img); li.append(a); - // prepend the new app before the 'More apps' function - $('#apps-management').before(li); + // append the new app as last item in the list (.push is from sticky footer) + $('#apps .wrapper .push').before(li); // scroll the app navigation down so the newly added app is seen - $('#navigation').animate({ scrollTop: $('#apps').height() }, 'slow'); + $('#navigation').animate({ scrollTop: $('#navigation').height() }, 'slow'); // draw attention to the newly added app entry by flashing it twice container.children('li[data-id="'+entry.id+'"]').animate({opacity:.3}).animate({opacity:1}).animate({opacity:.3}).animate({opacity:1}); diff --git a/settings/js/personal.js b/settings/js/personal.js index 8ad26c086b5..77826c82de1 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -94,7 +94,7 @@ $(document).ready(function(){ $("#languageinput").chosen(); // Show only the not selectable optgroup // Choosen only shows optgroup-labels if there are options in the optgroup - $(".languagedivider").remove(); + $(".languagedivider").hide(); $("#languageinput").change( function(){ // Serialize the data |