web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix namespace collision

Browse Source
This commit is contained in:
ansuz 2017-11-21 15:10:28 +01:00
parent c8a9afb6c8
commit d726c95f0b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/contacts/inner.js
View File

@ -9,6 +9,7 @@ define([
'/contacts/messenger-ui.js', '/contacts/messenger-ui.js',
'/common/sframe-messenger-inner.js', '/common/sframe-messenger-inner.js',
'/customize/messages.js', '/customize/messages.js',
'/common/common-interface.js',
'css!/bower_components/bootstrap/dist/css/bootstrap.min.css', 'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
'less!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
@ -21,9 +22,10 @@ define([
nThen, nThen,
SFCommon, SFCommon,
h, h,
UI, MessengerUI,
Messenger, Messenger,
Messages Messages,
UI
) )
{ {
var APP = {}; var APP = {};
@ -73,7 +75,7 @@ define([
var messenger = Messenger.create(sFrameChan); var messenger = Messenger.create(sFrameChan);
UI.create(messenger, $(friendList), $(messaging), common); MessengerUI.create(messenger, $(friendList), $(messaging), common);
UI.removeLoadingScreen(); UI.removeLoadingScreen();