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
50559b64
Commit
50559b64
authored
Nov 15, 2016
by
Toby Lawrence
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PERF-321] Move heavy JS files for WordCloud out of lms-modules.js
parent
246bd19e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
6 deletions
+17
-6
common/lib/xmodule/xmodule/assets/word_cloud/public/js/d3.layout.cloud.js
+0
-0
common/lib/xmodule/xmodule/assets/word_cloud/public/js/d3.min.js
+0
-0
common/lib/xmodule/xmodule/assets/word_cloud/public/js/word_cloud.js
+0
-0
common/lib/xmodule/xmodule/assets/word_cloud/public/js/word_cloud_main.js
+0
-0
common/lib/xmodule/xmodule/word_cloud_module.py
+13
-6
lms/templates/word_cloud.html
+4
-0
No files found.
common/lib/xmodule/xmodule/
js/src/word_cloud
/d3.layout.cloud.js
→
common/lib/xmodule/xmodule/
assets/word_cloud/public/js
/d3.layout.cloud.js
View file @
50559b64
File moved
common/lib/xmodule/xmodule/
js/src/word_cloud
/d3.min.js
→
common/lib/xmodule/xmodule/
assets/word_cloud/public/js
/d3.min.js
View file @
50559b64
File moved
common/lib/xmodule/xmodule/
js/src/word_cloud
/word_cloud.js
→
common/lib/xmodule/xmodule/
assets/word_cloud/public/js
/word_cloud.js
View file @
50559b64
File moved
common/lib/xmodule/xmodule/
js/src/word_cloud
/word_cloud_main.js
→
common/lib/xmodule/xmodule/
assets/word_cloud/public/js
/word_cloud_main.js
View file @
50559b64
File moved
common/lib/xmodule/xmodule/word_cloud_module.py
View file @
50559b64
...
...
@@ -93,10 +93,6 @@ class WordCloudModule(WordCloudFields, XModule):
js
=
{
'js'
:
[
resource_string
(
__name__
,
'js/src/javascript_loader.js'
),
resource_string
(
__name__
,
'js/src/word_cloud/d3.min.js'
),
resource_string
(
__name__
,
'js/src/word_cloud/d3.layout.cloud.js'
),
resource_string
(
__name__
,
'js/src/word_cloud/word_cloud.js'
),
resource_string
(
__name__
,
'js/src/word_cloud/word_cloud_main.js'
),
],
}
css
=
{
'scss'
:
[
resource_string
(
__name__
,
'css/word_cloud/display.scss'
)]}
...
...
@@ -238,7 +234,17 @@ class WordCloudModule(WordCloudFields, XModule):
})
def
get_html
(
self
):
"""Template rendering."""
"""
Template rendering.
"""
js_includes
=
[
self
.
runtime
.
local_resource_url
(
self
,
'public/js/d3.min.js'
),
self
.
runtime
.
local_resource_url
(
self
,
'public/js/d3.layout.cloud.js'
),
self
.
runtime
.
local_resource_url
(
self
,
'public/js/word_cloud.js'
),
self
.
runtime
.
local_resource_url
(
self
,
'public/js/word_cloud_main.js'
),
]
context
=
{
'ajax_url'
:
self
.
system
.
ajax_url
,
'display_name'
:
self
.
display_name
,
...
...
@@ -247,6 +253,7 @@ class WordCloudModule(WordCloudFields, XModule):
'element_id'
:
self
.
location
.
html_id
(),
'num_inputs'
:
self
.
num_inputs
,
'submitted'
:
self
.
submitted
,
'js_includes'
:
js_includes
,
}
self
.
content
=
self
.
system
.
render_template
(
'word_cloud.html'
,
context
)
return
self
.
content
...
...
@@ -255,5 +262,5 @@ class WordCloudModule(WordCloudFields, XModule):
class
WordCloudDescriptor
(
WordCloudFields
,
MetadataOnlyEditingDescriptor
,
EmptyDataRawDescriptor
):
"""Descriptor for WordCloud Xmodule."""
module_class
=
WordCloudModule
resources_dir
=
None
resources_dir
=
'assets/word_cloud'
template_dir_name
=
'word_cloud'
lms/templates/word_cloud.html
View file @
50559b64
...
...
@@ -7,6 +7,10 @@
data-ajax-url=
"${ajax_url}"
>
% for js_include in js_includes:
<script
src=
"${js_include}"
></script>
% endfor
% if display_name:
<h3
class=
"hd hd-3"
id=
"word_cloud_${element_id}_heading"
>
${display_name}
</h3>
% endif
...
...
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