Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1348 from MITx/fix/zoldak/ie-keyword

Browse Source 
Fix broken IE due to using the word function
This commit is contained in:
David Ormsbee
2013-01-24 14:07:59 -08:00
parent acfafa6516 896933a3c4
commit d31229360f
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js
View File

@@ -8,13 +8,13 @@ define('ElOutput', ['logme'], function (logme) {
function ElOutput(config, state) {
if ($.isPlainObject(config.functions.function)) {
processFuncObj(config.functions.function);
} else if ($.isArray(config.functions.function)) {
if ($.isPlainObject(config.functions["function"])) {
processFuncObj(config.functions["function"]);
} else if ($.isArray(config.functions["function"])) {
(function (c1) {
while (c1 < config.functions.function.length) {
if ($.isPlainObject(config.functions.function[c1])) {
processFuncObj(config.functions.function[c1]);
while (c1 < config.functions["function"].length) {
if ($.isPlainObject(config.functions["function"][c1])) {
processFuncObj(config.functions["function"][c1]);
}
c1 += 1;

12
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js
View File

@@ -6,13 +6,13 @@ define('GLabelElOutput', ['logme'], function (logme) {
return GLabelElOutput;
function GLabelElOutput(config, state) {
if ($.isPlainObject(config.functions.function)) {
processFuncObj(config.functions.function);
} else if ($.isArray(config.functions.function)) {
if ($.isPlainObject(config.functions["function"])) {
processFuncObj(config.functions["function"]);
} else if ($.isArray(config.functions["function"])) {
(function (c1) {
while (c1 < config.functions.function.length) {
if ($.isPlainObject(config.functions.function[c1])) {
processFuncObj(config.functions.function[c1]);
while (c1 < config.functions["function"].length) {
if ($.isPlainObject(config.functions["function"][c1])) {
processFuncObj(config.functions["function"][c1]);
}
c1 += 1;

20
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js
View File

@@ -838,33 +838,33 @@ define('Graph', ['logme'], function (logme) {
return;
}
if (typeof config.functions.function === 'string') {
if (typeof config.functions["function"] === 'string') {
// If just one function string is present.
addFunction(config.functions.function);
addFunction(config.functions["function"]);
} else if ($.isPlainObject(config.functions.function) === true) {
} else if ($.isPlainObject(config.functions["function"]) === true) {
// If a function is present, but it also has properties
// defined.
callAddFunction(config.functions.function);
callAddFunction(config.functions["function"]);
} else if ($.isArray(config.functions.function)) {
} else if ($.isArray(config.functions["function"])) {
// If more than one function is defined.
for (c1 = 0; c1 < config.functions.function.length; c1 += 1) {
for (c1 = 0; c1 < config.functions["function"].length; c1 += 1) {
// For each definition, we must check if it is a simple
// string definition, or a complex one with properties.
if (typeof config.functions.function[c1] === 'string') {
if (typeof config.functions["function"][c1] === 'string') {
// Simple string.
addFunction(config.functions.function[c1]);
addFunction(config.functions["function"][c1]);
} else if ($.isPlainObject(config.functions.function[c1])) {
} else if ($.isPlainObject(config.functions["function"][c1])) {
// Properties are present.
callAddFunction(config.functions.function[c1]);
callAddFunction(config.functions["function"][c1]);
}
}