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

Fix broken IE due to using the word function

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;

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;

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]);
 
                     }
                 }