Move the patched Backbone to its own module again Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>tags/v16.0.0alpha1
@@ -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); | |||
@@ -0,0 +1,33 @@ | |||
/* | |||
* @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at> | |||
* | |||
* @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at> | |||
* | |||
* @license GNU AGPL version 3 or any later version | |||
* | |||
* This program is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License as | |||
* published by the Free Software Foundation, either version 3 of the | |||
* License, or (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
*/ | |||
import VendorBackbone from 'backbone'; | |||
import {davCall, davSync} from './backbone-webdav'; | |||
const Backbone = VendorBackbone.noConflict(); | |||
// Patch Backbone for DAV | |||
Object.assign(Backbone, { | |||
davCall, | |||
davSync: davSync(Backbone), | |||
}); | |||
export default Backbone; |
@@ -19,20 +19,12 @@ | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
*/ | |||
import Backbone from 'backbone'; | |||
import Apps from './apps' | |||
import AppConfig from './appconfig' | |||
import ContactsMenu from './contactsmenu'; | |||
import Backbone from './backbone' | |||
import ContactsMenu from './contactsmenu' | |||
import EventSource from './eventsource' | |||
import L10N from './l10n' | |||
import {davCall, davSync} from './backbone-webdav'; | |||
// Patch Backbone for DAV | |||
Object.assign(Backbone, { | |||
davCall, | |||
davSync, | |||
}); | |||
/** @namespace OC */ | |||
export default { | |||
@@ -42,4 +34,4 @@ export default { | |||
ContactsMenu, | |||
EventSource, | |||
L10N, | |||
}; | |||
} |