Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
90499e77
Commit
90499e77
authored
Apr 26, 2016
by
Brian Jacobel
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12250 from edx/bjacobel/underscore.string-removal-v2
remove usage of minifed Underscore.string
parents
badb2ec3
217ea5d0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
5 deletions
+3
-5
common/static/karma_common.conf.js
+1
-1
common/static/karma_common_requirejs.conf.js
+1
-1
lms/envs/common.py
+0
-1
lms/static/karma_lms.conf.js
+1
-2
No files found.
common/static/karma_common.conf.js
View file @
90499e77
...
@@ -38,7 +38,7 @@ var libraryFiles = [
...
@@ -38,7 +38,7 @@ var libraryFiles = [
{
pattern
:
'js/vendor/jquery.truncate.js'
,
included
:
true
},
{
pattern
:
'js/vendor/jquery.truncate.js'
,
included
:
true
},
{
pattern
:
'js/vendor/mustache.js'
,
included
:
true
},
{
pattern
:
'js/vendor/mustache.js'
,
included
:
true
},
{
pattern
:
'common/js/vendor/underscore.js'
,
included
:
true
},
{
pattern
:
'common/js/vendor/underscore.js'
,
included
:
true
},
{
pattern
:
'
js/vendor/underscore.string.min
.js'
,
included
:
true
},
{
pattern
:
'
common/js/vendor/underscore.string
.js'
,
included
:
true
},
{
pattern
:
'js/vendor/backbone-min.js'
,
included
:
true
},
{
pattern
:
'js/vendor/backbone-min.js'
,
included
:
true
},
{
pattern
:
'js/vendor/jquery.timeago.js'
,
included
:
true
},
{
pattern
:
'js/vendor/jquery.timeago.js'
,
included
:
true
},
{
pattern
:
'js/vendor/URI.min.js'
,
included
:
true
},
{
pattern
:
'js/vendor/URI.min.js'
,
included
:
true
},
...
...
common/static/karma_common_requirejs.conf.js
View file @
90499e77
...
@@ -36,7 +36,7 @@ var libraryFiles = [
...
@@ -36,7 +36,7 @@ var libraryFiles = [
{
pattern
:
'js/vendor/jquery.simulate.js'
,
included
:
false
},
{
pattern
:
'js/vendor/jquery.simulate.js'
,
included
:
false
},
{
pattern
:
'js/vendor/jquery.truncate.js'
,
included
:
false
},
{
pattern
:
'js/vendor/jquery.truncate.js'
,
included
:
false
},
{
pattern
:
'common/js/vendor/underscore.js'
,
included
:
false
},
{
pattern
:
'common/js/vendor/underscore.js'
,
included
:
false
},
{
pattern
:
'
js/vendor/underscore.string.min
.js'
,
included
:
false
},
{
pattern
:
'
common/js/vendor/underscore.string
.js'
,
included
:
false
},
{
pattern
:
'js/vendor/backbone-min.js'
,
included
:
false
},
{
pattern
:
'js/vendor/backbone-min.js'
,
included
:
false
},
{
pattern
:
'js/vendor/backbone.paginator.min.js'
,
included
:
false
},
{
pattern
:
'js/vendor/backbone.paginator.min.js'
,
included
:
false
},
{
pattern
:
'js/vendor/jquery.timeago.js'
,
included
:
false
},
{
pattern
:
'js/vendor/jquery.timeago.js'
,
included
:
false
},
...
...
lms/envs/common.py
View file @
90499e77
...
@@ -1257,7 +1257,6 @@ base_vendor_js = [
...
@@ -1257,7 +1257,6 @@ base_vendor_js = [
'js/vendor/url.min.js'
,
'js/vendor/url.min.js'
,
'common/js/vendor/underscore.js'
,
'common/js/vendor/underscore.js'
,
'common/js/vendor/underscore.string.js'
,
'common/js/vendor/underscore.string.js'
,
'js/vendor/underscore.string.min.js'
,
'common/js/vendor/picturefill.min.js'
,
'common/js/vendor/picturefill.min.js'
,
# Make some edX UI Toolkit utilities available in the global "edx" namespace
# Make some edX UI Toolkit utilities available in the global "edx" namespace
...
...
lms/static/karma_lms.conf.js
View file @
90499e77
...
@@ -60,7 +60,7 @@ var libraryFiles = [
...
@@ -60,7 +60,7 @@ var libraryFiles = [
{
pattern
:
'xmodule_js/src/xmodule.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/src/xmodule.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/src/**/*.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/src/**/*.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/common/js/vendor/underscore.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/common/js/vendor/underscore.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/
js/vendor/underscore.string.min
.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/
common/js/vendor/underscore.string
.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/vendor/backbone-min.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/vendor/backbone-min.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/vendor/backbone.paginator.min.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js'
,
included
:
false
},
{
pattern
:
'xmodule_js/common_static/js/vendor/edxnotes/annotator-full.min.js'
,
included
:
false
},
...
@@ -151,4 +151,3 @@ module.exports = function (config) {
...
@@ -151,4 +151,3 @@ module.exports = function (config) {
config
.
set
(
_
.
extend
(
commonConfig
,
localConfig
));
config
.
set
(
_
.
extend
(
commonConfig
,
localConfig
));
};
};
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