summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-06-04 13:18:05 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-06-04 14:38:25 +0200
commite291a04dee352fc9e3d7c7189e802d7867d1048d (patch)
tree341aee0c38dacc50cf3ad3a483eef9095d3747bb /core/js
parent7cdd4fee9a84a093f73ee046df81c1c5a630f09c (diff)
downloadnextcloud-server-e291a04dee352fc9e3d7c7189e802d7867d1048d.tar.gz
nextcloud-server-e291a04dee352fc9e3d7c7189e802d7867d1048d.zip
show loading feedback
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 0d255b55e57..795ba788274 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -533,7 +533,6 @@ var OC={
*/
registerMenu: function($toggle, $menuEl) {
$menuEl.addClass('menu');
- $toggle.addClass('menutoggle');
$toggle.on('click.menu', function(event) {
if ($menuEl.is(OC._currentMenu)) {
$menuEl.slideUp(OC.menuSpeed);
@@ -1112,7 +1111,7 @@ function initCore() {
*/
function setupMainMenu() {
// toggle the navigation
- var $toggle = $('#header #owncloud');
+ var $toggle = $('#header .menutoggle');
var $navigation = $('#navigation');
// init the menu
@@ -1120,6 +1119,15 @@ function initCore() {
$toggle.data('oldhref', $toggle.attr('href'));
$toggle.attr('href', '#');
$navigation.hide();
+
+ // show loading feedback
+ $navigation.delegate('a', 'click', function(event) {
+ var $app = $(event.target);
+ if(!$app.is('a')) {
+ $app = $app.closest('a');
+ }
+ $app.find('img').attr('src', OC.imagePath('core','loading-dark.gif'));
+ });
}
setupMainMenu();