Bläddra i källkod

Remove backbone.noconflict wrapper

JC Brand 6 år sedan
förälder
incheckning
b85c5b5b0e
2 ändrade filer med 3 tillägg och 5 borttagningar
  1. 0 4
      src/headless/backbone.noconflict.js
  2. 3 1
      src/headless/converse-core.js

+ 0 - 4
src/headless/backbone.noconflict.js

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

+ 3 - 1
src/headless/converse-core.js

@@ -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";
 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;