Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
b85c5b5b
Commit
b85c5b5b
authored
Nov 05, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove backbone.noconflict wrapper
parent
1d371ebf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
src/headless/backbone.noconflict.js
src/headless/backbone.noconflict.js
+0
-4
src/headless/converse-core.js
src/headless/converse-core.js
+3
-1
No files found.
src/headless/backbone.noconflict.js
deleted
100644 → 0
View file @
1d371ebf
/*global define */
define
([
'
backbone
'
],
function
(
Backbone
)
{
return
Backbone
.
noConflict
();
});
src/headless/converse-core.js
View file @
b85c5b5b
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment