From 6a4563f203d8decb07bee3a82e111d876255e516 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 7 Oct 2013 11:07:33 +0200
Subject: [PATCH] Fix breadcrumb to reinit dnd after ajax nav #5064
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.
This also fixes dropping onto the "files" app icon.
---
apps/files/js/files.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 899bc6469e..53858d65c6 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -98,6 +98,8 @@ Files={
lastWidth: 0,
initBreadCrumbs: function () {
+ var $controls = $('#controls');
+
Files.lastWidth = 0;
Files.breadcrumbs = [];
@@ -118,7 +120,10 @@ Files={
});
// event handlers for breadcrumb items
- $('#controls .crumb a').on('click', onClickBreadcrumb);
+ $controls.find('.crumb a').on('click', onClickBreadcrumb);
+
+ // setup drag and drop
+ $controls.find('.crumb:not(.last)').droppable(crumbDropOptions);
},
resizeBreadcrumbs: function (width, firstRun) {
@@ -176,11 +181,8 @@ $(document).ready(function() {
$('#file_action_panel').attr('activeAction', false);
- $('div.crumb:not(.last)').droppable(crumbDropOptions);
- $('ul#apps>li:first-child').data('dir','');
- if($('div.crumb').length){
- $('ul#apps>li:first-child').droppable(crumbDropOptions);
- }
+ // allow dropping on the "files" app icon
+ $('ul#apps li:first-child').data('dir','').droppable(crumbDropOptions);
// Triggers invisible file input
$('#upload a').on('click', function() {
--
GitLab