Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
2cd70031
Commit
2cd70031
authored
7 years ago
by
XhmikosR
Browse files
Options
Download
Email Patches
Plain Diff
Remove the local jquery-1.9.1.min.js.
parent
f5e16cec
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
js/tests/index.html
+2
-2
js/tests/index.html
js/tests/karma.conf.js
+1
-1
js/tests/karma.conf.js
js/tests/vendor/jquery-1.9.1.min.js
+0
-5
js/tests/vendor/jquery-1.9.1.min.js
with
3 additions
and
8 deletions
+3
-8
js/tests/index.html
+
2
-
2
View file @
2cd70031
...
...
@@ -12,9 +12,9 @@
// get jquery param from the query string.
var
jQueryVersion
=
location
.
search
.
match
(
/
[
?&
]
jquery=
(
.*
?)(?=
&|$
)
/
)
// If a version was specified, use that version from
our vendor folder
// If a version was specified, use that version from
jQuery CDN
if
(
jQueryVersion
)
{
path
=
'
vendor
/jquery-
'
+
jQueryVersion
[
1
]
+
'
.min.js
'
path
=
'
https://code.jquery.com
/jquery-
'
+
jQueryVersion
[
1
]
+
'
.min.js
'
}
document
.
write
(
'
<script src="
'
+
path
+
'
"><
\
/script>
'
)
}())
...
...
This diff is collapsed.
Click to expand it.
js/tests/karma.conf.js
+
1
-
1
View file @
2cd70031
...
...
@@ -4,7 +4,7 @@ const path = require('path')
const
jsCoveragePath
=
path
.
resolve
(
__dirname
,
'
../coverage
'
)
module
.
exports
=
(
config
)
=>
{
const
jqueryFile
=
process
.
env
.
USE_OLD_JQUERY
?
'
js/tests/vendor
/jquery-1.9.1.min.js
'
:
'
assets/js/vendor/jquery-slim.min.js
'
const
jqueryFile
=
process
.
env
.
USE_OLD_JQUERY
?
'
https://code.jquery.com
/jquery-1.9.1.min.js
'
:
'
assets/js/vendor/jquery-slim.min.js
'
config
.
set
({
basePath
:
'
../..
'
,
...
...
This diff is collapsed.
Click to expand it.
js/tests/vendor/jquery-1.9.1.min.js
deleted
100644 → 0
+
0
-
5
View file @
f5e16cec
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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