diff options
author | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
---|---|---|
committer | kondou <kondou@ts.unde.re> | 2013-08-18 00:38:52 +0200 |
commit | edd92e4c09151238a89816186914f9382293ab9b (patch) | |
tree | e25d87cecf45ff2c2189198e5369f7754e01873a /settings/js | |
parent | 1348330c7d75d2b60d845a43be57dedc6199ea1a (diff) | |
parent | 12f4494de02457d51004ca6a82c1b2160189819f (diff) | |
download | nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.tar.gz nextcloud-server-edd92e4c09151238a89816186914f9382293ab9b.zip |
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'settings/js')
-rw-r--r-- | settings/js/apps.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index 94300074652..cf8cd91bd40 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -152,7 +152,13 @@ OC.Settings.Apps = OC.Settings.Apps || { a.prepend(filename); a.prepend(img); li.append(a); - container.append(li); + // prepend the new app before the 'More apps' function + $('#apps-management').before(li); + // scroll the app navigation down so the newly added app is seen + $('#navigation').animate({ scrollTop: $('#apps').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}); + if (!SVGSupport() && entry.icon.match(/\.svg$/i)) { $(img).addClass('svg'); replaceSVG(); |