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
4652385b
Commit
4652385b
authored
Jan 04, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove jQuery from non-tests config
parent
7cf9c9ef
Changes
18
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
25 additions
and
29 deletions
+25
-29
spec/chatbox.js
spec/chatbox.js
+1
-1
spec/chatroom.js
spec/chatroom.js
+1
-1
spec/controlbox.js
spec/controlbox.js
+1
-1
spec/converse.js
spec/converse.js
+1
-1
spec/mam.js
spec/mam.js
+1
-1
spec/minchats.js
spec/minchats.js
+1
-1
spec/notification.js
spec/notification.js
+1
-1
spec/otr.js
spec/otr.js
+1
-1
spec/register.js
spec/register.js
+1
-1
spec/roster.js
spec/roster.js
+1
-1
spec/transcripts.js
spec/transcripts.js
+1
-1
spec/xmppstatus.js
spec/xmppstatus.js
+1
-1
src/build-no-dependencies.js
src/build-no-dependencies.js
+0
-2
src/config.js
src/config.js
+0
-4
src/jquery-stub.js
src/jquery-stub.js
+4
-0
tests/mock.js
tests/mock.js
+2
-3
tests/runner.js
tests/runner.js
+2
-1
tests/utils.js
tests/utils.js
+5
-7
No files found.
spec/chatbox.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jquery
"
,
"
jasmine
"
,
"
utils
"
,
"
converse-core
"
,
...
...
spec/chatroom.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
,
"
utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
,
"
utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
,
utils
)
{
var
_
=
converse
.
env
.
_
;
var
$pres
=
converse
.
env
.
$pres
;
...
...
spec/controlbox.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
var
_
=
converse
.
env
.
_
;
var
$pres
=
converse
.
env
.
$pres
;
...
...
spec/converse.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jquery
"
,
"
jasmine
"
,
"
converse-core
"
,
"
mock
"
,
...
...
spec/mam.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
"
use strict
"
;
var
_
=
converse
.
env
.
_
;
...
...
spec/minchats.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
var
_
=
converse
.
env
.
_
;
var
$msg
=
converse
.
env
.
$msg
;
...
...
spec/notification.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
,
"
utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
,
"
utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
,
utils
)
{
"
use strict
"
;
var
_
=
converse
.
env
.
_
;
...
...
spec/otr.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
var
Strophe
=
converse
.
env
.
Strophe
;
var
b64_sha1
=
converse
.
env
.
b64_sha1
;
...
...
spec/register.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
var
Strophe
=
converse
.
env
.
Strophe
;
var
$iq
=
converse
.
env
.
$iq
;
...
...
spec/roster.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
var
_
=
converse
.
env
.
_
;
var
$pres
=
converse
.
env
.
$pres
;
...
...
spec/transcripts.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jquery
"
,
"
converse-core
"
,
"
mock
"
,
"
test_utils
"
,
...
...
spec/xmppstatus.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
"
jquery
.noconflict
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
define
([
"
jquery
"
,
"
jasmine
"
,
"
mock
"
,
"
converse-core
"
,
"
test-utils
"
],
factory
);
}
(
this
,
function
(
$
,
jasmine
,
mock
,
converse
,
test_utils
)
{
return
describe
(
"
The XMPPStatus model
"
,
function
()
{
...
...
src/build-no-dependencies.js
View file @
4652385b
...
...
@@ -5,8 +5,6 @@
include
:
[
"
converse
"
],
exclude
:
[
"
awesomplete
"
,
"
jquery
"
,
"
jquery.noconflict
"
,
"
backbone.browserStorage
"
,
"
backbone.overview
"
,
"
moment
"
,
...
...
src/config.js
View file @
4652385b
...
...
@@ -31,9 +31,7 @@ require.config({
"
form-utils
"
:
"
src/form-utils
"
,
"
i18n
"
:
"
src/i18n
"
,
"
jed
"
:
"
node_modules/jed/jed
"
,
"
jquery
"
:
"
node_modules/jquery/dist/jquery
"
,
"
jquery.browser
"
:
"
node_modules/jquery.browser/dist/jquery.browser
"
,
"
jquery.noconflict
"
:
"
src/jquery.noconflict
"
,
"
lodash
"
:
"
node_modules/lodash/lodash
"
,
"
lodash.converter
"
:
"
3rdparty/lodash.fp
"
,
"
lodash.fp
"
:
"
src/lodash.fp
"
,
...
...
@@ -106,7 +104,6 @@ require.config({
// '*' means all modules will get the '*.noconflict' version
// as their dependency.
'
*
'
:
{
'
jquery
'
:
'
jquery.noconflict
'
,
'
backbone
'
:
'
backbone.noconflict
'
,
'
lodash
'
:
'
lodash.noconflict
'
},
...
...
@@ -114,7 +111,6 @@ require.config({
// If this line was not here, there would
// be an unresolvable cyclic dependency.
'
backbone.noconflict
'
:
{
'
backbone
'
:
'
backbone
'
},
'
jquery.noconflict
'
:
{
'
jquery
'
:
'
jquery
'
},
'
lodash.noconflict
'
:
{
'
lodash
'
:
'
lodash
'
}
},
...
...
src/jquery-stub.js
0 → 100644
View file @
4652385b
/*global define */
define
([],
function
()
{
return
Object
;
});
tests/mock.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
(
"
mock
"
,
[
'
jquery.noconflict
'
,
'
converse
'
],
factory
);
}(
this
,
function
(
$
,
converse
)
{
define
(
"
mock
"
,
[
'
converse
'
],
factory
);
}(
this
,
function
(
converse
)
{
var
_
=
converse
.
env
.
_
;
var
Promise
=
converse
.
env
.
Promise
;
var
Strophe
=
converse
.
env
.
Strophe
;
...
...
@@ -115,7 +115,6 @@
},
settings
||
{}));
_converse
.
ChatBoxViews
.
prototype
.
trimChat
=
function
()
{};
window
.
converse_disable_effects
=
true
;
$
.
fx
.
off
=
true
;
return
_converse
;
}
...
...
tests/runner.js
View file @
4652385b
/*global config */
// Extra test dependencies
config
.
paths
.
jquery
=
"
node_modules/jquery/dist/jquery
"
;
config
.
paths
.
mock
=
"
tests/mock
"
;
config
.
paths
[
'
wait-until-promise
'
]
=
"
node_modules/wait-until-promise/index
"
;
config
.
paths
[
'
test-utils
'
]
=
"
tests/utils
"
;
...
...
@@ -57,7 +58,7 @@ var specs = [
require
([
'
console-reporter
'
,
'
mock
'
,
'
sinon
'
,
'
wait-until-promise
'
,
'
pluggable
'
],
function
(
ConsoleReporter
,
mock
,
sinon
,
waitUntilPromise
,
pluggable
)
{
window
.
sinon
=
sinon
;
window
.
waitUntilPromise
=
waitUntilPromise
[
'
default
'
]
;
window
.
waitUntilPromise
=
waitUntilPromise
.
default
;
window
.
localStorage
.
clear
();
window
.
sessionStorage
.
clear
();
// Load the specs
...
...
tests/utils.js
View file @
4652385b
(
function
(
root
,
factory
)
{
define
([
'
jquery.noconflict
'
,
'
converse
'
,
'
es6-promise
'
,
'
mock
'
,
'
wait-until-promise
'
],
factory
);
}(
this
,
function
(
$
,
converse_api
,
Promise
,
mock
,
waitUntilPromise
)
{
define
([
'
converse
'
,
'
es6-promise
'
,
'
mock
'
,
'
wait-until-promise
'
],
factory
);
}(
this
,
function
(
converse_api
,
Promise
,
mock
,
waitUntilPromise
)
{
var
_
=
converse_api
.
env
.
_
;
var
$msg
=
converse_api
.
env
.
$msg
;
var
$pres
=
converse_api
.
env
.
$pres
;
...
...
@@ -76,15 +76,13 @@
utils
.
openContactsPanel
=
function
(
converse
)
{
this
.
openControlBox
(
converse
);
var
cbview
=
converse
.
chatboxviews
.
get
(
'
controlbox
'
);
var
$tabs
=
$
(
cbview
.
el
).
find
(
'
#controlbox-tabs
'
);
$tabs
.
find
(
'
li
'
).
first
().
find
(
'
a
'
)[
0
].
click
();
cbview
.
el
.
querySelector
(
'
#controlbox-tabs li:first-child a
'
).
click
();
};
utils
.
openRoomsPanel
=
function
(
converse
)
{
utils
.
openControlBox
();
var
cbview
=
converse
.
chatboxviews
.
get
(
'
controlbox
'
);
var
$tabs
=
$
(
cbview
.
el
).
find
(
'
#controlbox-tabs
'
);
$tabs
.
find
(
'
li
'
).
last
().
find
(
'
a
'
)[
0
].
click
();
cbview
.
el
.
querySelector
(
'
#controlbox-tabs li:last-child a
'
).
click
();
};
utils
.
openChatBoxes
=
function
(
converse
,
amount
)
{
...
...
@@ -170,7 +168,7 @@
utils
.
clearChatBoxMessages
=
function
(
converse
,
jid
)
{
var
view
=
converse
.
chatboxviews
.
get
(
jid
);
$
(
view
.
el
).
find
(
'
.chat-content
'
).
empty
()
;
view
.
el
.
querySelector
(
'
.chat-content
'
).
innerHTML
=
''
;
view
.
model
.
messages
.
reset
();
view
.
model
.
messages
.
browserStorage
.
_clear
();
};
...
...
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