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

Merge pull request #1296 from MITx/hotfix/alex/gst

Browse Source 
Hotfix/alex/gst
This commit is contained in:
David Ormsbee
2013-01-17 08:14:39 -08:00
parent fd20496a60 176be15998
commit 15249b03d6
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/lib/xmodule/xmodule/gst_module.py
View File

@@ -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"

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

@@ -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;
}

4
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
View File

@@ -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'));
});
});
});
};

2
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
View File

@@ -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;
}

6
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/sliders.js
View File

@@ -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) {

2
common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
View File

@@ -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.