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
1c18ad96
Commit
1c18ad96
authored
Oct 12, 2012
by
Victor Shnayder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make loader only load scripts once per run, midway through fixing multiple chem equations per page
parent
b2afa82c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
15 deletions
+31
-15
common/lib/xmodule/xmodule/js/src/javascript_loader.coffee
+17
-11
common/static/js/capa/chemical_equation_preview.js
+14
-4
No files found.
common/lib/xmodule/xmodule/js/src/javascript_loader.coffee
View file @
1c18ad96
...
@@ -41,20 +41,26 @@ class @JavascriptLoader
...
@@ -41,20 +41,26 @@ class @JavascriptLoader
callbackCalled
=
true
callbackCalled
=
true
callback
()
if
callback
?
callback
()
if
callback
?
# Keep a map of what sources we're loaded from, and don't do it twice.
loaded
=
{}
placeholders
.
each
(
index
,
placeholder
)
->
placeholders
.
each
(
index
,
placeholder
)
->
# TODO: Check if the script already exists in DOM. If so, (1) copy it
# TODO: Check if the script already exists in DOM. If so, (1) copy it
# into memory; (2) delete the DOM script element; (3) reappend it.
# into memory; (2) delete the DOM script element; (3) reappend it.
# This would prevent memory bloat and save a network request.
# This would prevent memory bloat and save a network request.
s
=
document
.
createElement
(
'script'
)
src
=
$
(
placeholder
).
attr
(
"data-src"
)
s
.
setAttribute
(
'src'
,
$
(
placeholder
).
attr
(
"data-src"
))
if
src
not
of
loaded
s
.
setAttribute
(
'type'
,
"text/javascript"
)
loaded
[
src
]
=
true
s
=
document
.
createElement
(
'script'
)
s
.
setAttribute
(
'src'
,
src
)
s
.
setAttribute
(
'type'
,
"text/javascript"
)
s
.
onload
=
completionHandlerGenerator
(
index
)
s
.
onload
=
completionHandlerGenerator
(
index
)
# s.onload does not fire in IE8; this does.
s
.
onreadystatechange
=
completionHandlerGeneratorIE
(
index
)
# s.onload does not fire in IE8; this does.
# Need to use the DOM elements directly or the scripts won't execute
s
.
onreadystatechange
=
completionHandlerGeneratorIE
(
index
)
# properly.
$
(
'head'
)[
0
].
appendChild
(
s
)
# Need to use the DOM elements directly or the scripts won't execute
$
(
placeholder
).
remove
()
# properly.
$
(
'head'
)[
0
].
appendChild
(
s
)
$
(
placeholder
).
remove
()
common/static/js/capa/chemical_equation_preview.js
View file @
1c18ad96
(
function
()
{
(
function
()
{
var
preview_div
=
$
(
'.chemicalequationinput .equation'
);
update
=
function
(
index
,
input
)
{
$
(
'.chemicalequationinput input'
).
bind
(
"input"
,
function
(
eventObject
)
{
preview_div
=
$
(
input
).
siblings
(
'div.equation'
);
$
.
get
(
"/preview/chemcalc/"
,
{
"formula"
:
this
.
value
},
function
(
response
)
{
$
.
get
(
"/preview/chemcalc/"
,
{
"formula"
:
input
.
value
},
function
(
response
)
{
if
(
response
.
error
)
{
if
(
response
.
error
)
{
preview_div
.
html
(
"<span class='error'>"
+
response
.
error
+
"</span>"
);
preview_div
.
html
(
"<span class='error'>"
+
response
.
error
+
"</span>"
);
}
else
{
}
else
{
preview_div
.
html
(
response
.
preview
);
preview_div
.
html
(
response
.
preview
);
}
}
});
});
}
inputs
=
$
(
'.chemicalequationinput input'
);
// update on load
inputs
.
each
(
update
);
// and on every change
inputs
.
bind
(
"input"
,
function
(
event
)
{
// pass a dummy index
update
(
0
,
event
.
target
);
});
});
}).
call
(
this
);
}).
call
(
this
);
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