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
e95e23fa
Commit
e95e23fa
authored
Aug 06, 2015
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow discussion vendor files to be bundled.
Improve client-side performance.
parent
68645db3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
8 deletions
+18
-8
lms/envs/common.py
+16
-0
lms/templates/discussion/_js_head_dependencies.html
+2
-8
No files found.
lms/envs/common.py
View file @
e95e23fa
...
...
@@ -1259,6 +1259,18 @@ dashboard_js = (
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'js/dashboard/**/*.js'
))
)
discussion_js
=
sorted
(
rooted_glob
(
COMMON_ROOT
/
'static'
,
'coffee/src/discussion/**/*.js'
))
discussion_vendor_js
=
[
'js/Markdown.Converter.js'
,
'js/Markdown.Sanitizer.js'
,
'js/Markdown.Editor.js'
,
'js/vendor/jquery.timeago.js'
,
'js/src/jquery.timeago.locale.js'
,
'js/vendor/jquery.truncate.js'
,
'js/jquery.ajaxfileupload.js'
,
'js/split.js'
]
staff_grading_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/staff_grading/**/*.js'
))
open_ended_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/open_ended/**/*.js'
))
notes_js
=
sorted
(
rooted_glob
(
PROJECT_ROOT
/
'static'
,
'coffee/src/notes/**/*.js'
))
...
...
@@ -1512,6 +1524,10 @@ PIPELINE_JS = {
'source_filenames'
:
discussion_js
,
'output_filename'
:
'js/discussion.js'
,
},
'discussion_vendor'
:
{
'source_filenames'
:
discussion_vendor_js
,
'output_filename'
:
'js/discussion_vendor.js'
,
},
'staff_grading'
:
{
'source_filenames'
:
staff_grading_js
,
'output_filename'
:
'js/staff_grading.js'
,
...
...
lms/templates/discussion/_js_head_dependencies.html
View file @
e95e23fa
<
%
namespace
name=
'static'
file=
'../static_content.html'
/>
<script
type=
"text/javascript"
src=
"${static.url('js/split.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/jquery.truncate.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/jquery.ajaxfileupload.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/Markdown.Converter.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/Markdown.Sanitizer.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/Markdown.Editor.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/jquery.autocomplete.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/vendor/jquery.timeago.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/src/jquery.timeago.locale.js')}"
></script>
<script
type=
"text/javascript"
src=
"${static.url('js/src/tooltip_manager.js')}"
></script>
<
%
static:js
group=
'discussion_vendor'
/>
<link
href=
"${static.url('css/vendor/jquery.autocomplete.css')}"
rel=
"stylesheet"
type=
"text/css"
>
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