summaryrefslogtreecommitdiffstats
path: root/core/src/OC/backbone-webdav.js
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2019-01-30 08:39:35 +0100
committerChristoph Wurst <christoph@winzerhof-wurst.at>2019-01-31 08:47:30 +0100
commit72c88c767c433bb66ca2632fcc012568282eafaf (patch)
tree540b7cb7b2793e254e1bc327a09e55a44b4083aa /core/src/OC/backbone-webdav.js
parent85d6d7b87c82bfed9f1a494d55074daff0e2e3ee (diff)
downloadnextcloud-server-72c88c767c433bb66ca2632fcc012568282eafaf.tar.gz
nextcloud-server-72c88c767c433bb66ca2632fcc012568282eafaf.zip
Use Backbone.noConflict in the bundle as well
Move the patched Backbone to its own module again Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'core/src/OC/backbone-webdav.js')
-rw-r--r--core/src/OC/backbone-webdav.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/OC/backbone-webdav.js b/core/src/OC/backbone-webdav.js
index f658532fa18..d007054630f 100644
--- a/core/src/OC/backbone-webdav.js
+++ b/core/src/OC/backbone-webdav.js
@@ -255,7 +255,7 @@ function callMethod (client, options, model, headers) {
});
}
-export function davCall (options, model) {
+export const davCall = (options, model) => {
var client = new dav.Client({
baseUrl: options.url,
xmlNamespaces: _.extend({
@@ -284,7 +284,7 @@ export function davCall (options, model) {
/**
* DAV transport
*/
-export function davSync (method, model, options) {
+export const davSync = Backbone => (method, model, options) => {
var params = {type: methodMap[method] || method};
var isCollection = (model instanceof Backbone.Collection);