From 896933a3c4cae51492f92fd49a12c42f9ffa6040 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Thu, 24 Jan 2013 17:02:18 -0500 Subject: [PATCH] Fix broken IE --- .../js/src/graphical_slider_tool/el_output.js | 12 +++++------ .../g_label_el_output.js | 12 +++++------ .../js/src/graphical_slider_tool/graph.js | 20 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js index 3175aae3f0..d713c6f2ac 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/el_output.js @@ -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; diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js index 13c9dd3389..3e9e12b62e 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/g_label_el_output.js @@ -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; diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js index 5b6223df43..9f0d5046ca 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/graph.js @@ -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]); } }