Commit b85c5b5b authored by JC Brand's avatar JC Brand

Remove backbone.noconflict wrapper

parent 1d371ebf
/*global define */
define(['backbone'], function (Backbone) {
return Backbone.noConflict();
});
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
"use strict"; "use strict";
import { $build, $iq, $msg, $pres, SHA1, Strophe } from "strophe.js"; 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 Promise from "es6-promise/dist/es6-promise.auto";
import _ from "./lodash.noconflict"; import _ from "./lodash.noconflict";
import browserStorage from "backbone.browserStorage"; import browserStorage from "backbone.browserStorage";
...@@ -19,6 +20,7 @@ import polyfill from "./polyfill"; ...@@ -19,6 +20,7 @@ import polyfill from "./polyfill";
import sizzle from "sizzle"; import sizzle from "sizzle";
import u from "./utils/core"; import u from "./utils/core";
Backbone = Backbone.noConflict();
// Strophe globals // Strophe globals
const b64_sha1 = SHA1.b64_sha1; const b64_sha1 = SHA1.b64_sha1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment