Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Remove backbone.noconflict wrapper

Browse Source
This commit is contained in:
JC Brand 2018-11-05 17:58:27 +01:00
parent 1d371ebfd8
commit b85c5b5b0e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/headless/backbone.noconflict.js
View File

@ -1,4 +0,0 @@
/*global define */
define(['backbone'], function (Backbone) {
return Backbone.noConflict();
});

4
src/headless/converse-core.js
View File

@ -7,7 +7,8 @@
"use strict";
import { $build, $iq, $msg, $pres, SHA1, Strophe } from "strophe.js";
import Backbone from "./backbone.noconflict";
import Backbone from "backbone";
import BrowserStorage from "backbone.browserStorage";
import Promise from "es6-promise/dist/es6-promise.auto";
import _ from "./lodash.noconflict";
import browserStorage from "backbone.browserStorage";
@ -19,6 +20,7 @@ import polyfill from "./polyfill";
import sizzle from "sizzle";
import u from "./utils/core";
Backbone = Backbone.noConflict();
// Strophe globals
const b64_sha1 = SHA1.b64_sha1;