diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py index 3b8d96ee81..ef1be96c84 100644 --- a/common/lib/xmodule/xmodule/gst_module.py +++ b/common/lib/xmodule/xmodule/gst_module.py @@ -24,11 +24,10 @@ class GraphicalSliderToolModule(XModule): ''' js = { + 'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee')], 'js': [ # 3rd party libraries used by graphic slider tool. # TODO - where to store them - outside xmodule? - resource_string(__name__, 'js/src/graphical_slider_tool/jstat-1.0.0.min.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/gst_main.js'), resource_string(__name__, 'js/src/graphical_slider_tool/state.js'), resource_string(__name__, 'js/src/graphical_slider_tool/logme.js'), @@ -38,8 +37,8 @@ class GraphicalSliderToolModule(XModule): resource_string(__name__, 'js/src/graphical_slider_tool/graph.js'), resource_string(__name__, 'js/src/graphical_slider_tool/el_output.js'), resource_string(__name__, 'js/src/graphical_slider_tool/g_label_el_output.js'), - resource_string(__name__, 'js/src/graphical_slider_tool/gst.js') + ] } js_module_name = "GraphicalSliderTool" 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 2520f0b12f..5b6223df43 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 @@ -401,7 +401,7 @@ define('Graph', ['logme'], function (logme) { return false; } } else { - logme('MESSAGE: "xticks" were not specified. Using defaults.'); + // logme('MESSAGE: "xticks" were not specified. Using defaults.'); return false; } @@ -416,7 +416,7 @@ define('Graph', ['logme'], function (logme) { return false; } } else { - logme('MESSAGE: "yticks" were not specified. Using defaults.'); + // logme('MESSAGE: "yticks" were not specified. Using defaults.'); return false; } diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js index 1434d05f70..73252455d0 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js @@ -14,7 +14,9 @@ window.GraphicalSliderTool = function (el) { // with a unique DOM ID), we will iterate over all children, and for // each match, we will call GstMain module. $(el).children('.graphical_slider_tool').each(function (index, value) { - GstMain($(value).attr('id')); + JavascriptLoader.executeModuleScripts($(value), function(){ + GstMain($(value).attr('id')); + }); }); }); }; diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js index 34b54b4216..3d9f511ca9 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js @@ -19,7 +19,7 @@ define( if ($('#' + gstId).attr('data-processed') !== 'processed') { $('#' + gstId).attr('data-processed', 'processed'); } else { - logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.'); + // logme('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.'); return; } diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js index 6201da8237..e73ca1c57e 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js @@ -20,9 +20,9 @@ define('Sliders', ['logme'], function (logme) { } else if (sliderDiv.length > 1) { logme('ERROR: Found more than one slider for the parameter "' + paramName + '".'); logme('sliderDiv.length = ', sliderDiv.length); - } else { - logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".'); - } + } // else { + // logme('MESSAGE: Did not find a slider for the parameter "' + paramName + '".'); + // } } function createSlider(sliderDiv, paramName) { diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js index 8b534fd19d..91a78f62ff 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js @@ -24,7 +24,7 @@ define('State', ['logme'], function (logme) { dynamicElByElId = {}; stateInst += 1; - logme('MESSAGE: Creating state instance # ' + stateInst + '.'); + // logme('MESSAGE: Creating state instance # ' + stateInst + '.'); // Initially, there are no parameters to track. So, we will instantiate // an empty object.