Merge branch 'staging' into newCk

2017-06-20 10:57:40 +02:00
parent f13d23241c 728272d936
commit 5a248db267
59 changed files with 1651 additions and 671 deletions
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -96,6 +96,10 @@ define([
        } else {
            styleToolbar($container);
        }
+        $container.on('drop dragover', function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+        });
        return $toolbar;
    };