').html(funcString).text();
-
- if (disableAutoReturn === false) {
- if (funcString.search(/return/i) === -1) {
- funcString = 'return ' + funcString;
- }
- } else {
- if (funcString.search(/return/i) === -1) {
- console.log(
- 'ERROR: You have specified a JavaScript ' +
- 'function without a "return" statemnt. Your ' +
- 'function will return "undefined" by default.'
- );
- }
- }
-
- allParamNames.push(funcString);
- try {
- xrange.max = Function.apply(null, allParamNames);
- } catch (err) {
- console.log(
- 'ERROR: could not create a function from the string "' +
- funcString + '" for xrange.max.'
- );
- console.log('Error message: "' + err.message + '"');
-
- if (state.showDebugInfo) {
- $('#' + gstId).html(
- '
' + 'ERROR IN ' +
- 'XML: Could not create a function from the string "' +
- funcString + '" for xrange.max.' + '
'
- );
- $('#' + gstId).append(
- '
'
- );
- }
-
- return false;
- }
- allParamNames.pop();
-
- tempNum = parseInt(config.plot.num_points, 10);
- if (isFinite(tempNum) === false) {
- tempNum = plotDiv.width() / 5.0;
- }
-
- if (
- (tempNum < 2) &&
- (tempNum > 1000)
- ) {
- console.log(
- 'ERROR: Number of points is outside the allowed range ' +
- '[2, 1000]'
- );
- console.log('config.plot.num_points = ' + tempNum);
-
- return false;
- }
-
- numPoints = tempNum;
-
- return true;
- }
-
- function createFunctions() {
- var c1;
-
- functions = [];
-
- if (typeof config.functions === 'undefined') {
- console.log('ERROR: config.functions is undefined.');
-
- return;
- }
-
- if (typeof config.functions["function"] === 'string') {
-
- // If just one function string is present.
- addFunction(config.functions["function"]);
-
- } else if ($.isPlainObject(config.functions["function"]) === true) {
-
- // If a function is present, but it also has properties
- // defined.
- callAddFunction(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 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') {
-
- // Simple string.
- addFunction(config.functions["function"][c1]);
-
- } else if ($.isPlainObject(config.functions["function"][c1])) {
-
- // Properties are present.
- callAddFunction(config.functions["function"][c1]);
-
- }
- }
- } else {
- console.log('ERROR: config.functions.function is of an unsupported type.');
-
- return;
- }
-
- return;
-
- // This function will reduce code duplication. We have to call
- // the function addFunction() several times passing object
- // properties as parameters. Rather than writing them out every
- // time, we will have a single place where it is done.
- function callAddFunction(obj) {
- if (
- (obj.hasOwnProperty('@output')) &&
- (typeof obj['@output'] === 'string')
- ) {
-
- // If this function is meant to be calculated for an
- // element then skip it.
- if ((obj['@output'].toLowerCase() === 'element') ||
- (obj['@output'].toLowerCase() === 'none')) {
- return;
- }
-
- // If this function is meant to be calculated for a
- // dynamic element in a label then skip it.
- else if (obj['@output'].toLowerCase() === 'plot_label') {
- return;
- }
-
- // It is an error if '@output' is not 'element',
- // 'plot_label', or 'graph'. However, if the '@output'
- // attribute is omitted, we will not have reached this.
- else if (obj['@output'].toLowerCase() !== 'graph') {
- console.log(
- 'ERROR: Function "output" attribute can be ' +
- 'either "element", "plot_label", "none" or "graph".'
- );
-
- return;
- }
-
- }
-
- // The user did not specify an "output" attribute, or it is
- // "graph".
- addFunction(
- obj['#text'],
- obj['@color'],
- obj['@line'],
- obj['@dot'],
- obj['@label'],
- obj['@point_size'],
- obj['@fill_area'],
- obj['@bar'],
- obj['@disable_auto_return']
- );
- }
-
- function addFunction(funcString, color, line, dot, label,
- pointSize, fillArea, bar, disableAutoReturn) {
-
- var newFunctionObject, func, paramNames, c1, rgxp;
-
- // The main requirement is function string. Without it we can't
- // create a function, and the series cannot be calculated.
- if (typeof funcString !== 'string') {
- return;
- }
-
- // Make sure that any HTML entities that were escaped will be
- // unescaped. This is done because if a string with escaped
- // HTML entities is passed to the Function() constructor, it
- // will break.
- funcString = $('
').html(funcString).text();
-
- // If the user did not specifically turn off this feature,
- // check if the function string contains a 'return', and
- // prepend a 'return ' to the string if one, or more, is not
- // found.
- if (
- (disableAutoReturn === undefined) ||
- (
- (typeof disableAutoReturn === 'string') &&
- (disableAutoReturn.toLowerCase() !== 'true')
- )
- ) {
- if (funcString.search(/return/i) === -1) {
- funcString = 'return ' + funcString;
- }
- } else {
- if (funcString.search(/return/i) === -1) {
- console.log(
- 'ERROR: You have specified a JavaScript ' +
- 'function without a "return" statemnt. Your ' +
- 'function will return "undefined" by default.'
- );
- }
- }
-
- // Some defaults. If no options are set for the graph, we will
- // make sure that at least a line is drawn for a function.
- newFunctionObject = {
- 'line': true,
- 'dot': false,
- 'bars': false
- };
-
- // Get all of the parameter names defined by the user in the
- // XML.
- paramNames = state.getAllParameterNames();
-
- // The 'x' is always one of the function parameters.
- paramNames.push('x');
-
- // Must make sure that the function body also gets passed to
- // the Function constructor.
- paramNames.push(funcString);
-
- // Create the function from the function string, and all of the
- // available parameters AND the 'x' variable as it's parameters.
- // For this we will use the built-in Function object
- // constructor.
- //
- // If something goes wrong during this step, most
- // likely the user supplied an invalid JavaScript function body
- // string. In this case we will not proceed.
- try {
- func = Function.apply(null, paramNames);
- } catch (err) {
- console.log(
- 'ERROR: The function body "' +
- funcString +
- '" was not converted by the Function constructor.'
- );
- console.log('Error message: "' + err.message + '"');
-
- if (state.showDebugInfo) {
- $('#' + gstId).html('
' + 'ERROR IN XML: Could not create a function from the string "' + funcString + '".' + '
');
- $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
- }
-
- paramNames.pop();
- paramNames.pop();
-
- return;
- }
-
- // Return the array back to original state. Remember that it is
- // a pointer to original array which is stored in state object.
- paramNames.pop();
- paramNames.pop();
-
- newFunctionObject['func'] = func;
-
- if (typeof color === 'string') {
- newFunctionObject['color'] = color;
- }
-
- if (typeof line === 'string') {
- if (line.toLowerCase() === 'true') {
- newFunctionObject['line'] = true;
- } else if (line.toLowerCase() === 'false') {
- newFunctionObject['line'] = false;
- }
- }
-
- if (typeof dot === 'string') {
- if (dot.toLowerCase() === 'true') {
- newFunctionObject['dot'] = true;
- } else if (dot.toLowerCase() === 'false') {
- newFunctionObject['dot'] = false;
- }
- }
-
- if (typeof pointSize === 'string') {
- newFunctionObject['pointSize'] = pointSize;
- }
-
- if (typeof bar === 'string') {
- if (bar.toLowerCase() === 'true') {
- newFunctionObject['bars'] = true;
- } else if (bar.toLowerCase() === 'false') {
- newFunctionObject['bars'] = false;
- }
- }
-
- if (newFunctionObject['bars'] === true) {
- newFunctionObject['line'] = false;
- newFunctionObject['dot'] = false;
- // To do: See if need to do anything here.
- } else if (
- (newFunctionObject['dot'] === false) &&
- (newFunctionObject['line'] === false)
- ) {
- newFunctionObject['line'] = true;
- }
-
- if (newFunctionObject['line'] === true) {
- if (typeof fillArea === 'string') {
- if (fillArea.toLowerCase() === 'true') {
- newFunctionObject['fillArea'] = true;
- } else if (fillArea.toLowerCase() === 'false') {
- newFunctionObject['fillArea'] = false;
- } else {
- console.log('ERROR: The attribute fill_area should be either "true" or "false".');
- console.log('fill_area = "' + fillArea + '".');
-
- return;
- }
- }
- }
-
- if (typeof label === 'string') {
-
- newFunctionObject.specialLabel = false;
- newFunctionObject.pldeHash = [];
-
- // Let's check the label against all of the plde objects.
- // plde is an abbreviation for Plot Label Dynamic Elements.
- for (c1 = 0; c1 < state.plde.length; c1 += 1) {
- rgxp = new RegExp(state.plde[c1].elId, 'g');
-
- // If we find a dynamic element in the label, we will
- // hash the current plde object, and indicate that this
- // is a special label.
- if (rgxp.test(label) === true) {
- newFunctionObject.specialLabel = true;
- newFunctionObject.pldeHash.push(state.plde[c1]);
- }
- }
-
- newFunctionObject.label = label;
- } else {
- newFunctionObject.label = false;
- }
-
- functions.push(newFunctionObject);
- }
- }
-
- // The callback that will be called whenever a constant changes (gets
- // updated via a slider or a text input).
- function onUpdatePlot(event) {
- if (generateData() === true) {
- updatePlot();
- }
- }
-
- function generateData() {
- var c0, c1, c3, functionObj, seriesObj, dataPoints, paramValues, x, y,
- start, end, step, numNotUndefined;
-
- paramValues = state.getAllParameterValues();
-
- dataSeries = [];
-
- for (c0 = 0; c0 < functions.length; c0 += 1) {
- functionObj = functions[c0];
-
- try {
- start = xrange.min.apply(window, paramValues);
- } catch (err) {
- console.log('ERROR: Could not determine xrange start.');
- console.log('Error message: "' + err.message + '".');
-
- if (state.showDebugInfo) {
- $('#' + gstId).html('
' + 'ERROR IN XML: Could not determine xrange start from defined function.' + '
');
- $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
- }
-
- return false;
- }
- try {
- end = xrange.max.apply(window, paramValues);
- } catch (err) {
- console.log('ERROR: Could not determine xrange end.');
- console.log('Error message: "' + err.message + '".');
-
- if (state.showDebugInfo) {
- $('#' + gstId).html('
' + 'ERROR IN XML: Could not determine xrange end from defined function.' + '
');
- $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
- }
-
- return false;
- }
-
- seriesObj = {};
- dataPoints = [];
-
- // For counting number of points added. In the end we will
- // compare this number to 'numPoints' specified in the config
- // JSON.
- c1 = 0;
-
- step = (end - start) / (numPoints - 1);
-
- // Generate the data points.
- for (x = start; x <= end; x += step) {
-
- // Push the 'x' variable to the end of the parameter array.
- paramValues.push(x);
-
- // We call the user defined function, passing all of the
- // available parameter values. Inside this function they
- // will be accessible by their names.
- try {
- y = functionObj.func.apply(window, paramValues);
- } catch (err) {
- console.log('ERROR: Could not generate data.');
- console.log('Error message: "' + err.message + '".');
-
- if (state.showDebugInfo) {
- $('#' + gstId).html('
' + 'ERROR IN XML: Could not generate data from defined function.' + '
');
- $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
- }
-
- return false;
- }
-
- // Return the paramValues array to how it was before we
- // added 'x' variable to the end of it.
- paramValues.pop();
-
- // Add the generated point to the data points set.
- dataPoints.push([x, y]);
-
- c1 += 1;
-
- }
-
- // If the last point did not get included because of rounding
- // of floating-point number addition, then we will include it
- // manually.
- if (c1 != numPoints) {
- x = end;
- paramValues.push(x);
- try {
- y = functionObj.func.apply(window, paramValues);
- } catch (err) {
- console.log('ERROR: Could not generate data.');
- console.log('Error message: "' + err.message + '".');
-
- if (state.showDebugInfo) {
- $('#' + gstId).html('
' + 'ERROR IN XML: Could not generate data from function.' + '
');
- $('#' + gstId).append('
' + 'Error message: "' + err.message + '".' + '
');
- }
-
- return false;
- }
- paramValues.pop();
- dataPoints.push([x, y]);
- }
-
- // Put the entire data points set into the series object.
- seriesObj.data = dataPoints;
-
- // See if user defined a specific color for this function.
- if (functionObj.hasOwnProperty('color') === true) {
- seriesObj.color = functionObj.color;
- }
-
- // See if a user defined a label for this function.
- if (functionObj.label !== false) {
- if (functionObj.specialLabel === true) {
- (function (c1) {
- var tempLabel;
-
- tempLabel = functionObj.label;
-
- while (c1 < functionObj.pldeHash.length) {
- tempLabel = tempLabel.replace(
- functionObj.pldeHash[c1].elId,
- functionObj.pldeHash[c1].func.apply(
- window,
- state.getAllParameterValues()
- )
- );
-
- c1 += 1;
- }
-
- seriesObj.label = tempLabel;
- }(0));
- } else {
- seriesObj.label = functionObj.label;
- }
- }
-
- // Should the data points be connected by a line?
- seriesObj.lines = {
- 'show': functionObj.line
- };
-
- if (functionObj.hasOwnProperty('fillArea') === true) {
- seriesObj.lines.fill = functionObj.fillArea;
- }
-
- // Should each data point be represented by a point on the
- // graph?
- seriesObj.points = {
- 'show': functionObj.dot
- };
-
- seriesObj.bars = {
- 'show': functionObj.bars,
- 'barWidth': graphBarWidth
- };
-
- if (graphBarAlign !== null) {
- seriesObj.bars.align = graphBarAlign;
- }
-
- if (functionObj.hasOwnProperty('pointSize')) {
- seriesObj.points.radius = functionObj.pointSize;
- }
-
- // Add the newly created series object to the series set which
- // will be plotted by Flot.
- dataSeries.push(seriesObj);
- }
-
- if (graphBarAlign === null) {
- for (c0 = 0; c0 < numPoints; c0 += 1) {
- // Number of points that have a value other than 'undefined' (undefined).
- numNotUndefined = 0;
-
- for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
- if (dataSeries[c1].bars.show === false) {
- continue;
- }
-
- if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
- numNotUndefined += 1;
- }
- }
-
- c3 = 0;
- for (c1 = 0; c1 < dataSeries.length; c1 += 1) {
- if (dataSeries[c1].bars.show === false) {
- continue;
- }
-
- dataSeries[c1].data[c0][0] -= graphBarWidth * (0.5 * numNotUndefined - c3);
-
- if (isFinite(parseInt(dataSeries[c1].data[c0][1])) === true) {
- c3 += 1;
- }
- }
- }
- }
-
- for (c0 = 0; c0 < asymptotes.length; c0 += 1) {
-
- // If the user defined a label for this asympote, then the
- // property 'label' will be a string (in the other case it is
- // a boolean value 'false'). We will create an empty data set,
- // and add to it a label. This solution is a bit _wrong_ , but
- // it will have to do for now. Flot JS does not provide a way
- // to add labels to markings, and we use markings to generate
- // asymptotes.
- if (asymptotes[c0].label !== false) {
- dataSeries.push({
- 'data': [],
- 'label': asymptotes[c0].label,
- 'color': asymptotes[c0].color
- });
- }
-
- }
-
- return true;
- } // End-of: function generateData
-
- function updatePlot() {
- var paramValues, plotObj;
-
- paramValues = state.getAllParameterValues();
-
- if (xaxis.tickFormatter !== null) {
- xaxis.ticks = null;
- }
-
- if (yaxis.tickFormatter !== null) {
- yaxis.ticks = null;
- }
-
- // Tell Flot to draw the graph to our specification.
- plotObj = $.plot(
- plotDiv,
- dataSeries,
- {
- 'xaxis': xaxis,
- 'yaxis': yaxis,
- 'legend': {
-
- // To show the legend or not. Note, even if 'show' is
- // 'true', the legend will only show if labels are
- // provided for at least one of the series that are
- // going to be plotted.
- 'show': true,
-
- // A floating point number in the range [0, 1]. The
- // smaller the number, the more transparent will the
- // legend background become.
- 'backgroundOpacity': 0
-
- },
- 'grid': {
- 'markings': generateMarkings()
- }
- }
- );
-
- updateMovingLabels();
-
- // The first time that the graph gets added to the page, the legend
- // is created from scratch. When it appears, MathJax works some
- // magic, and all of the specially marked TeX gets rendered nicely.
- // The next time when we update the graph, no such thing happens.
- // We must ask MathJax to typeset the legend again (well, we will
- // ask it to look at our entire graph DIV), the next time it's
- // worker queue is available.
- MathJax.Hub.Queue([
- 'Typeset',
- MathJax.Hub,
- plotDiv.attr('id')
- ]);
-
- return;
-
- function updateMovingLabels() {
- var c1, labelCoord, pointOffset;
-
- for (c1 = 0; c1 < movingLabels.length; c1 += 1) {
- if (movingLabels[c1].el === null) {
- movingLabels[c1].el = $(
- '
' +
- movingLabels[c1].labelText +
- '
'
- );
- movingLabels[c1].el.css('position', 'absolute');
- movingLabels[c1].el.css('color', movingLabels[c1].fontColor);
- movingLabels[c1].el.css('font-weight', movingLabels[c1].fontWeight);
- movingLabels[c1].el.appendTo(plotDiv);
-
- movingLabels[c1].elWidth = movingLabels[c1].el.width();
- movingLabels[c1].elHeight = movingLabels[c1].el.height();
- } else {
- movingLabels[c1].el.detach();
- movingLabels[c1].el.appendTo(plotDiv);
- }
-
- labelCoord = movingLabels[c1].func.apply(window, paramValues);
-
- pointOffset = plotObj.pointOffset({'x': labelCoord.x, 'y': labelCoord.y});
-
- movingLabels[c1].el.css('left', pointOffset.left - 0.5 * movingLabels[c1].elWidth);
- movingLabels[c1].el.css('top', pointOffset.top - 0.5 * movingLabels[c1].elHeight);
- }
- }
-
- // Generate markings to represent asymptotes defined by the user.
- // See the following function for more details:
- //
- // function processAsymptote()
- //
- function generateMarkings() {
- var c1, asymptote, markings, val;
-
- markings = [];
-
- for (c1 = 0; c1 < asymptotes.length; c1 += 1) {
- asymptote = asymptotes[c1];
-
- try {
- val = asymptote.func.apply(window, paramValues);
- } catch (err) {
- console.log('ERROR: Could not generate value from asymptote function.');
- console.log('Error message: ', err.message);
-
- continue;
- }
-
- if (asymptote.type === 'x') {
- markings.push({
- 'color': asymptote.color,
- 'lineWidth': 2,
- 'xaxis': {
- 'from': val,
- 'to': val
- }
- });
- } else {
- markings.push({
- 'color': asymptote.color,
- 'lineWidth': 2,
- 'yaxis': {
- 'from': val,
- 'to': val
- }
- });
-
- }
- }
-
- return markings;
- }
- }
-
- function xAxisTickFormatter(val, axis) {
- if (xTicksNames.hasOwnProperty(val.toFixed(axis.tickDecimals)) === true) {
- return xTicksNames[val.toFixed(axis.tickDecimals)];
- }
-
- return '';
- }
-
- function yAxisTickFormatter(val, axis) {
- if (yTicksNames.hasOwnProperty(val.toFixed(axis.tickDecimals)) === true) {
- return yTicksNames[val.toFixed(axis.tickDecimals)];
- }
-
- return '';
- }
- }
-
-
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
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
deleted file mode 100644
index 73252455d0..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * We will add a function that will be called for all GraphicalSliderTool
- * xmodule module instances. It must be available globally by design of
- * xmodule.
- */
-window.GraphicalSliderTool = function (el) {
- // All the work will be performed by the GstMain module. We will get access
- // to it, and all it's dependencies, via Require JS. Currently Require JS
- // is namespaced and is available via a global object RequireJS.
- RequireJS.require(['GstMain'], function (GstMain) {
- // The GstMain module expects the DOM ID of a Graphical Slider Tool
- // element. Since we are given a
element which might in
- // theory contain multiple graphical_slider_tool elements (each
- // 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) {
- 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
deleted file mode 100644
index 733e570333..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/gst_main.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define(
- 'GstMain',
-
- // Even though it is not explicitly in this module, we have to specify
- // 'GeneralMethods' as a dependency. It expands some of the core JS objects
- // with additional useful methods that are used in other modules.
- ['State', 'GeneralMethods', 'Sliders', 'Inputs', 'Graph', 'ElOutput', 'GLabelElOutput'],
- function (State, GeneralMethods, Sliders, Inputs, Graph, ElOutput, GLabelElOutput) {
-
- return GstMain;
-
- function GstMain(gstId) {
- var config, gstClass, state;
-
- if ($('#' + gstId).attr('data-processed') !== 'processed') {
- $('#' + gstId).attr('data-processed', 'processed');
- } else {
- // console.log('MESSAGE: Already processed GST with ID ' + gstId + '. Skipping.');
-
- return;
- }
-
- // Get the JSON configuration, parse it, and store as an object.
- try {
- config = JSON.parse($('#' + gstId + '_json').html()).root;
- } catch (err) {
- console.log('ERROR: could not parse config JSON.');
- console.log('$("#" + gstId + "_json").html() = ', $('#' + gstId + '_json').html());
- console.log('JSON.parse(...) = ', JSON.parse($('#' + gstId + '_json').html()));
- console.log('config = ', config);
-
- return;
- }
-
- // Get the class name of the GST. All elements are assigned a class
- // name that is based on the class name of the GST. For example, inputs
- // are assigned a class name '{GST class name}_input'.
- if (typeof config['@class'] !== 'string') {
- console.log('ERROR: Could not get the class name of GST.');
- console.log('config["@class"] = ', config['@class']);
-
- return;
- }
- gstClass = config['@class'];
-
- // Parse the configuration settings for parameters, and store them in a
- // state object.
- state = State(gstId, config);
-
- state.showDebugInfo = false;
-
- // It is possible that something goes wrong while extracting parameters
- // from the JSON config object. In this case, we will not continue.
- if (state === undefined) {
- console.log('ERROR: The state object was not initialized properly.');
-
- return;
- }
-
- // Create the sliders and the text inputs, attaching them to
- // appropriate parameters.
- Sliders(gstId, state);
- Inputs(gstId, gstClass, state);
-
- // Configure functions that output to an element instead of the graph.
- ElOutput(config, state);
-
- // Configure functions that output to an element instead of the graph
- // label.
- GLabelElOutput(config, state);
-
- // Configure and display the graph. Attach event for the graph to be
- // updated on any change of a slider or a text input.
- Graph(gstId, config, state);
- }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
deleted file mode 100644
index 531a939aec..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define('Inputs', [], function () {
- return Inputs;
-
- function Inputs(gstId, gstClass, state) {
- var c1, paramName, allParamNames;
-
- allParamNames = state.getAllParameterNames();
-
- for (c1 = 0; c1 < allParamNames.length; c1 += 1) {
- $('#' + gstId).find('.' + gstClass + '_input').each(function (index, value) {
- var inputDiv, paramName;
-
- paramName = allParamNames[c1];
- inputDiv = $(value);
-
- if (paramName === inputDiv.data('var')) {
- createInput(inputDiv, paramName);
- }
- });
- }
-
- return;
-
- function createInput(inputDiv, paramName) {
- var paramObj;
-
- paramObj = state.getParamObj(paramName);
-
- // Check that the retrieval went OK.
- if (paramObj === undefined) {
- console.log('ERROR: Could not get a paramObj for parameter "' + paramName + '".');
-
- return;
- }
-
- // Bind a function to the 'change' event. Whenever the user changes
- // the value of this text input, and presses 'enter' (or clicks
- // somewhere else on the page), this event will be triggered, and
- // our callback will be called.
- inputDiv.bind('change', inputOnChange);
-
- inputDiv.val(paramObj.value);
-
- // Lets style the input element nicely. We will use the button()
- // widget for this since there is no native widget for the text
- // input.
- inputDiv.button().css({
- 'font': 'inherit',
- 'color': 'inherit',
- 'text-align': 'left',
- 'outline': 'none',
- 'cursor': 'text',
- 'height': '15px'
- });
-
- // Tell the parameter object from state that we are attaching a
- // text input to it. Next time the parameter will be updated with
- // a new value, tis input will also be updated.
- paramObj.inputDivs.push(inputDiv);
-
- return;
-
- // Update the 'state' - i.e. set the value of the parameter this
- // input is attached to to a new value.
- //
- // This will cause the plot to be redrawn each time after the user
- // changes the value in the input. Note that he has to either press
- // 'Enter', or click somewhere else on the page in order for the
- // 'change' event to be tiggered.
- function inputOnChange(event) {
- var inputDiv;
-
- inputDiv = $(this);
- state.setParameterValue(paramName, inputDiv.val(), inputDiv);
- }
- }
- }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js
deleted file mode 100644
index 7f9cd4a124..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/jstat-1.0.0.min.js
+++ /dev/null
@@ -1,236 +0,0 @@
-function jstat(){}
-j=jstat;(function(){var initializing=false,fnTest=/xyz/.test(function(){xyz;})?/\b_super\b/:/.*/;this.Class=function(){};Class.extend=function(prop){var _super=this.prototype;initializing=true;var prototype=new this();initializing=false;for(var name in prop){prototype[name]=typeof prop[name]=="function"&&typeof _super[name]=="function"&&fnTest.test(prop[name])?(function(name,fn){return function(){var tmp=this._super;this._super=_super[name];var ret=fn.apply(this,arguments);this._super=tmp;return ret;};})(name,prop[name]):prop[name];}
-function Class(){if(!initializing&&this.init)
-this.init.apply(this,arguments);}
-Class.prototype=prototype;Class.constructor=Class;Class.extend=arguments.callee;return Class;};})();jstat.ONE_SQRT_2PI=0.3989422804014327;jstat.LN_SQRT_2PI=0.9189385332046727417803297;jstat.LN_SQRT_PId2=0.225791352644727432363097614947;jstat.DBL_MIN=2.22507e-308;jstat.DBL_EPSILON=2.220446049250313e-16;jstat.SQRT_32=5.656854249492380195206754896838;jstat.TWO_PI=6.283185307179586;jstat.DBL_MIN_EXP=-999;jstat.SQRT_2dPI=0.79788456080287;jstat.LN_SQRT_PI=0.5723649429247;jstat.seq=function(min,max,length){var r=new Range(min,max,length);return r.getPoints();}
-jstat.dnorm=function(x,mean,sd,log){if(mean==null)mean=0;if(sd==null)sd=1;if(log==null)log=false;var n=new NormalDistribution(mean,sd);if(!isNaN(x)){return n._pdf(x,log);}else if(x.length){var res=[];for(var i=0;i
'+contents+'
').css({position:'absolute',display:'none',top:y+15,'font-size':'small',left:x+5,border:'1px solid '+color[1],color:color[2],padding:'5px','background-color':color[0],opacity:0.80}).appendTo("body").show();}
-var previousPoint=null;$(this._container).bind("plothover",function(event,pos,item){$("#x").text(pos.x.toFixed(2));$("#y").text(pos.y.toFixed(2));if(item){if(previousPoint!=item.datapoint){previousPoint=item.datapoint;$("#jstat_tooltip").remove();var x=jstat.toSigFig(item.datapoint[0],2),y=jstat.toSigFig(item.datapoint[1],2);var text=null;var color=item.series.color;if(item.series.label=='PDF'){text="P("+x+") = "+y;color=["#fee","#fdd","#C05F5F"];}else{text="F("+x+") = "+y;color=["#eef","#ddf","#4A4AC0"];}
-showTooltip(item.pageX,item.pageY,text,color);}}
-else{$("#jstat_tooltip").remove();previousPoint=null;}});$(this._container).bind("mouseleave",function(){if($('#jstat_tooltip').is(':visible')){$('#jstat_tooltip').remove();previousPoint=null;}});}else{if(this._options.grid==null){this._options.grid={hoverable:false}}else{this._options.grid.hoverable=false}
-$(this._container).unbind("plothover");}
-this.render();},setType:function(type){this._plotType=type;var lines={};var points={};if(this._plotType=='line'){lines.show=true;points.show=false;}else if(this._plotType=='points'){lines.show=false;points.show=true;}else if(this._plotType=='both'){lines.show=true;points.show=true;}
-if(this._options.series==null){this._options.series={lines:lines,points:points}}else{if(this._options.series.lines==null){this._options.series.lines=lines;}else{this._options.series.lines.show=lines.show;}
-if(this._options.series.points==null){this._options.series.points=points;}else{this._options.series.points.show=points.show;}}
-this.render();},setFill:function(bool){this._fill=bool;if(this._options.series==null){this._options.series={lines:{fill:bool}}}else{if(this._options.series.lines==null){this._options.series.lines={fill:bool}}else{this._options.series.lines.fill=bool;}}
-this.render();},clear:function(){this._super();this._distribution=null;this._pdfValues=[];this._cdfValues=[];this.render();},_generateValues:function(){this._cdfValues=[];this._pdfValues=[];var xs=this._range.getPoints();this._options.xaxis={min:xs[0],max:xs[xs.length-1]}
-var pdfs=this._distribution.density(this._range);var cdfs=this._distribution.cumulativeDensity(this._range);for(var i=0;i 1) {
- console.log('ERROR: Found more than one slider for the parameter "' + paramName + '".');
- console.log('sliderDiv.length = ', sliderDiv.length);
- } // else {
- // console.log('MESSAGE: Did not find a slider for the parameter "' + paramName + '".');
- // }
- }
-
- function createSlider(sliderDiv, paramName) {
- var paramObj;
-
- paramObj = state.getParamObj(paramName);
-
- // Check that the retrieval went OK.
- if (paramObj === undefined) {
- console.log('ERROR: Could not get a paramObj for parameter "' + paramName + '".');
-
- return;
- }
-
- // Create a jQuery UI slider from the slider DIV. We will set
- // starting parameters, and will also attach a handler to update
- // the 'state' on the 'slide' event.
- sliderDiv.slider({
- 'min': paramObj.min,
- 'max': paramObj.max,
- 'value': paramObj.value,
- 'step': paramObj.step
- });
-
- // Tell the parameter object stored in state that we have a slider
- // that is attached to it. Next time when the parameter changes, it
- // will also update the value of this slider.
- paramObj.sliderDiv = sliderDiv;
-
- // Atach callbacks to update the slider's parameter.
- paramObj.sliderDiv.on('slide', sliderOnSlide);
- paramObj.sliderDiv.on('slidechange', sliderOnChange);
-
- return;
-
- // Update the 'state' - i.e. set the value of the parameter this
- // slider is attached to to a new value.
- //
- // This will cause the plot to be redrawn each time after the user
- // drags the slider handle and releases it.
- function sliderOnSlide(event, ui) {
- // Last parameter passed to setParameterValue() will be 'true'
- // so that the function knows we are a slider, and it can
- // change the our value back in the case when the new value is
- // invalid for some reason.
- if (state.setParameterValue(paramName, ui.value, sliderDiv, true, 'slide') === undefined) {
- console.log('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
- }
- }
-
- function sliderOnChange(event, ui) {
- if (state.setParameterValue(paramName, ui.value, sliderDiv, true, 'change') === undefined) {
- console.log('ERROR: Could not update the parameter named "' + paramName + '" with the value "' + ui.value + '".');
- }
- }
- }
- }
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
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
deleted file mode 100644
index 2a4536a8f9..0000000000
--- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/state.js
+++ /dev/null
@@ -1,395 +0,0 @@
-// Wrapper for RequireJS. It will make the standard requirejs(), require(), and
-// define() functions from Require JS available inside the anonymous function.
-(function (requirejs, require, define) {
-
-define('State', [], function () {
- var stateInst;
-
- // Since there will be (can be) multiple GST on a page, and each will have
- // a separate state, we will create a factory constructor function. The
- // constructor will expect the ID of the DIV with the GST contents, and the
- // configuration object (parsed from a JSON string). It will return an
- // object containing methods to set and get the private state properties.
-
- stateInst = 0;
-
- // This module defines and returns a factory constructor.
- return State;
-
- function State(gstId, config) {
- var parameters, allParameterNames, allParameterValues,
- plotDiv, dynamicEl, dynamicElByElId;
-
- dynamicEl = [];
- dynamicElByElId = {};
-
- stateInst += 1;
- // console.log('MESSAGE: Creating state instance # ' + stateInst + '.');
-
- // Initially, there are no parameters to track. So, we will instantiate
- // an empty object.
- //
- // As we parse the JSON config object, we will add parameters as
- // named properties. For example
- //
- // parameters.a = {...};
- //
- // will be created for the parameter 'a'.
- parameters = {};
-
- // Check that the required parameters config object is available.
- if ($.isPlainObject(config.parameters) === false) {
- console.log('ERROR: Expected config.parameters to be an object. It is not.');
- console.log('config.parameters = ', config.parameters);
-
- return;
- }
-
- // If config.parameters.param is an array, pass it to the processor
- // element by element.
- if ($.isArray(config.parameters.param) === true) {
- (function (c1) {
- while (c1 < config.parameters.param.length) {
- processParameter(config.parameters.param[c1]);
- c1 += 1;
- }
- }(0));
- }
-
- // If config.parameters.param is an object, pass this object to the
- // processor directly.
- else if ($.isPlainObject(config.parameters.param) === true) {
- processParameter(config.parameters.param);
- }
-
- // If config.parameters.param is some other type, report an error and
- // do not continue.
- else {
- console.log('ERROR: config.parameters.param is of an unsupported type.');
- console.log('config.parameters.param = ', config.parameters.param);
-
- return;
- }
-
- // Instead of building these arrays every time when some component
- // requests them, we will create them in the beginning, and then update
- // each element individually when some parameter's value changes.
- //
- // Then we can just return the required array, instead of iterating
- // over all of the properties of the 'parameters' object, and
- // extracting their names/values one by one.
- allParameterNames = [];
- allParameterValues = [];
-
- // Populate 'allParameterNames', and 'allParameterValues' with data.
- generateHelperArrays();
-
- // The constructor will return an object with methods to operate on
- // it's private properties.
- return {
- 'getParameterValue': getParameterValue,
- 'setParameterValue': setParameterValue,
-
- 'getParamObj': getParamObj,
-
- 'getAllParameterNames': getAllParameterNames,
- 'getAllParameterValues': getAllParameterValues,
-
- 'bindUpdatePlotEvent': bindUpdatePlotEvent,
- 'addDynamicEl': addDynamicEl,
-
- // plde is an abbreviation for Plot Label Dynamic Elements.
- plde: []
- };
-
- function getAllParameterNames() {
- return allParameterNames;
- }
-
- function getAllParameterValues() {
- return allParameterValues;
- }
-
- function getParamObj(paramName) {
- if (parameters.hasOwnProperty(paramName) === false) {
- console.log('ERROR: Object parameters does not have a property named "' + paramName + '".');
-
- return;
- }
-
- return parameters[paramName];
- }
-
- function bindUpdatePlotEvent(newPlotDiv, callback) {
- plotDiv = newPlotDiv;
-
- plotDiv.bind('update_plot', callback);
- }
-
- function addDynamicEl(el, func, elId, updateOnEvent) {
- var newLength;
-
- newLength = dynamicEl.push({
- 'el': el,
- 'func': func,
- 'elId': elId,
- 'updateOnEvent': updateOnEvent
- });
-
- if (typeof dynamicElByElId[elId] !== 'undefined') {
- console.log(
- 'ERROR: Duplicate dynamic element ID "' + elId + '" found.'
- );
- } else {
- dynamicElByElId[elId] = dynamicEl[newLength - 1];
- }
- }
-
- function getParameterValue(paramName) {
-
- // If the name of the constant is not tracked by state, return an
- // 'undefined' value.
- if (parameters.hasOwnProperty(paramName) === false) {
- console.log('ERROR: Object parameters does not have a property named "' + paramName + '".');
-
- return;
- }
-
- return parameters[paramname].value;
- }
-
- // ####################################################################
- //
- // Function: setParameterValue(paramName, paramValue, element)
- // --------------------------------------------------
- //
- //
- // This function can be called from a callback, registered by a slider
- // or a text input, when specific events ('slide' or 'change') are
- // triggered.
- //
- // The 'paramName' is the name of the parameter in 'parameters' object
- // whose value must be updated to the new value of 'paramValue'.
- //
- // Before we update the value, we must check that:
- //
- // 1.) the parameter named as 'paramName' actually exists in the
- // 'parameters' object;
- // 2.) the value 'paramValue' is a valid floating-point number, and
- // it lies within the range specified by the 'min' and 'max'
- // properties of the stored parameter object.
- //
- // If 'paramName' and 'paramValue' turn out to be valid, we will update
- // the stored value in the parameter with the new value, and also
- // update all of the text inputs and the slider that correspond to this
- // parameter (if any), so that they reflect the new parameter's value.
- // Finally, the helper array 'allParameterValues' will also be updated
- // to reflect the change.
- //
- // If something went wrong (for example the new value is outside the
- // allowed range), then we will reset the 'element' to display the
- // original value.
- //
- // ####################################################################
- function setParameterValue(paramName, paramValue, element, slider, updateOnEvent) {
- var paramValueNum, c1;
-
- // If a parameter with the name specified by the 'paramName'
- // parameter is not tracked by state, do not do anything.
- if (parameters.hasOwnProperty(paramName) === false) {
- console.log('ERROR: Object parameters does not have a property named "' + paramName + '".');
-
- return;
- }
-
- // Try to convert the passed value to a valid floating-point
- // number.
- paramValueNum = parseFloat(paramValue);
-
- // We are interested only in valid float values. NaN, -INF,
- // +INF we will disregard.
- if (isFinite(paramValueNum) === false) {
- console.log('ERROR: New parameter value is not a floating-point number.');
- console.log('paramValue = ', paramValue);
-
- return;
- }
-
- if (paramValueNum < parameters[paramName].min) {
- paramValueNum = parameters[paramName].min;
- } else if (paramValueNum > parameters[paramName].max) {
- paramValueNum = parameters[paramName].max;
- }
-
- parameters[paramName].value = paramValueNum;
-
- // Update all text inputs with the new parameter's value.
- for (c1 = 0; c1 < parameters[paramName].inputDivs.length; c1 += 1) {
- parameters[paramName].inputDivs[c1].val(paramValueNum);
- }
-
- // Update the single slider with the new parameter's value.
- if ((slider === false) && (parameters[paramName].sliderDiv !== null)) {
- parameters[paramName].sliderDiv.slider('value', paramValueNum);
- }
-
- // Update the helper array with the new parameter's value.
- allParameterValues[parameters[paramName].helperArrayIndex] = paramValueNum;
-
- for (c1 = 0; c1 < dynamicEl.length; c1++) {
- if (
- ((updateOnEvent !== undefined) && (dynamicEl[c1].updateOnEvent === updateOnEvent)) ||
- (updateOnEvent === undefined)
- ) {
- // If we have a DOM element, call the function "paste" the answer into the DIV.
- if (dynamicEl[c1].el !== null) {
- dynamicEl[c1].el.html(dynamicEl[c1].func.apply(window, allParameterValues));
- }
- // If we DO NOT have an element, simply call the function. The function can then
- // manipulate all the DOM elements it wants, without the fear of them being overwritten
- // by us afterwards.
- else {
- dynamicEl[c1].func.apply(window, allParameterValues);
- }
- }
- }
-
- // If we have a plot DIV to work with, tell to update.
- if (plotDiv !== undefined) {
- plotDiv.trigger('update_plot');
- }
-
- return true;
- } // End-of: function setParameterValue
-
- // ####################################################################
- //
- // Function: processParameter(obj)
- // -------------------------------
- //
- //
- // This function will be run once for each instance of a GST when
- // parsing the JSON config object.
- //
- // 'newParamObj' must be empty from the start for each invocation of
- // this function, that's why we will declare it locally.
- //
- // We will parse the passed object 'obj' and populate the 'newParamObj'
- // object with required properties.
- //
- // Since there will be many properties that are of type floating-point
- // number, we will have a separate function for parsing them.
- //
- // processParameter() will fail right away if 'obj' does not have a
- // '@var' property which represents the name of the parameter we want
- // to process.
- //
- // If, after all of the properties have been processed, we reached the
- // end of the function successfully, the 'newParamObj' will be added to
- // the 'parameters' object (that is defined in the scope of State()
- // function) as a property named as the name of the parameter.
- //
- // If at least one of the properties from 'obj' does not get correctly
- // parsed, then the parameter represented by 'obj' will be disregarded.
- // It will not be available to user-defined plotting functions, and
- // things will most likely break. We will notify the user about this.
- //
- // ####################################################################
- function processParameter(obj) {
- var paramName, newParamObj;
-
- if (typeof obj['@var'] !== 'string') {
- console.log('ERROR: Expected obj["@var"] to be a string. It is not.');
- console.log('obj["@var"] = ', obj['@var']);
-
- return;
- }
-
- paramName = obj['@var'];
- newParamObj = {};
-
- if (
- (processFloat('@min', 'min') === false) ||
- (processFloat('@max', 'max') === false) ||
- (processFloat('@step', 'step') === false) ||
- (processFloat('@initial', 'value') === false)
- ) {
- console.log('ERROR: A required property is missing. Not creating parameter "' + paramName + '"');
-
- return;
- }
-
- // Pointers to text input and slider DIV elements that this
- // parameter will be attached to. Initially there are none. When we
- // will create text inputs and sliders, we will update these
- // properties.
- newParamObj.inputDivs = [];
- newParamObj.sliderDiv = null;
-
- // Everything went well, so save the new parameter object.
- parameters[paramName] = newParamObj;
-
- return;
-
- function processFloat(attrName, newAttrName) {
- var attrValue;
-
- if (typeof obj[attrName] !== 'string') {
- console.log('ERROR: Expected obj["' + attrName + '"] to be a string. It is not.');
- console.log('obj["' + attrName + '"] = ', obj[attrName]);
-
- return false;
- } else {
- attrValue = parseFloat(obj[attrName]);
-
- if (isFinite(attrValue) === false) {
- console.log('ERROR: Expected obj["' + attrName + '"] to be a valid floating-point number. It is not.');
- console.log('obj["' + attrName + '"] = ', obj[attrName]);
-
- return false;
- }
- }
-
- newParamObj[newAttrName] = attrValue;
-
- return true;
- } // End-of: function processFloat
- } // End-of: function processParameter
-
- // ####################################################################
- //
- // Function: generateHelperArrays()
- // -------------------------------
- //
- //
- // Populate 'allParameterNames' and 'allParameterValues' with data.
- // Link each parameter object with the corresponding helper array via
- // an index 'helperArrayIndex'. It will be the same for both of the
- // arrays.
- //
- // NOTE: It is important to remember to update these helper arrays
- // whenever a new parameter is added (or one is removed), or when a
- // parameter's value changes.
- //
- // ####################################################################
- function generateHelperArrays() {
- var paramName, c1;
-
- c1 = 0;
- for (paramName in parameters) {
- allParameterNames.push(paramName);
- allParameterValues.push(parameters[paramName].value);
-
- parameters[paramName].helperArrayIndex = c1;
-
- c1 += 1;
- }
- }
- } // End-of: function State
-});
-
-// End of wrapper for RequireJS. As you can see, we are passing
-// namespaced Require JS variables to an anonymous function. Within
-// it, you can use the standard requirejs(), require(), and define()
-// functions as if they were in the global namespace.
-}(RequireJS.requirejs, RequireJS.require, RequireJS.define)); // End-of: (function (requirejs, require, define)
diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/common/lib/xmodule/xmodule/tests/test_export.py
index b9f361d4b0..b4da1df061 100644
--- a/common/lib/xmodule/xmodule/tests/test_export.py
+++ b/common/lib/xmodule/xmodule/tests/test_export.py
@@ -82,7 +82,6 @@ class RoundTripTestCase(unittest.TestCase):
"conditional_and_poll",
"conditional",
"self_assessment",
- "graphic_slider_tool",
"test_exam_registration",
"word_cloud",
"pure_xblock",
diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/common/lib/xmodule/xmodule/tests/test_import.py
index a061780477..54a7a662c1 100644
--- a/common/lib/xmodule/xmodule/tests/test_import.py
+++ b/common/lib/xmodule/xmodule/tests/test_import.py
@@ -614,22 +614,6 @@ class ImportTestCase(BaseCourseTestCase):
self.assertRaises(etree.XMLSyntaxError, system.process_xml, bad_xml)
- def test_graphicslidertool_import(self):
- '''
- Check to see if definition_from_xml in gst_module.py
- works properly. Pulls data from the graphic_slider_tool directory
- in the test data directory.
- '''
- modulestore = XMLModuleStore(DATA_DIR, source_dirs=['graphic_slider_tool'])
-
- sa_id = SlashSeparatedCourseKey("edX", "gst_test", "2012_Fall")
- location = sa_id.make_usage_key("graphical_slider_tool", "sample_gst")
- gst_sample = modulestore.get_item(location)
- render_string_from_sample_gst_xml = """
- \
-""".strip()
- self.assertIn(render_string_from_sample_gst_xml, gst_sample.data)
-
def test_word_cloud_import(self):
modulestore = XMLModuleStore(DATA_DIR, source_dirs=['word_cloud'])
diff --git a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
index 214ce621db..e66b6ae5a2 100644
--- a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
+++ b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
@@ -32,7 +32,6 @@ from xmodule.annotatable_module import AnnotatableDescriptor
from xmodule.capa_module import CapaDescriptor
from xmodule.course_module import CourseDescriptor
from xmodule.discussion_module import DiscussionDescriptor
-from xmodule.gst_module import GraphicalSliderToolDescriptor
from xmodule.html_module import HtmlDescriptor
from xmodule.poll_module import PollDescriptor
from xmodule.word_cloud_module import WordCloudDescriptor
@@ -53,7 +52,6 @@ LEAF_XMODULES = {
AnnotatableDescriptor: [{}],
CapaDescriptor: [{}],
DiscussionDescriptor: [{}],
- GraphicalSliderToolDescriptor: [{}],
HtmlDescriptor: [{}],
PollDescriptor: [{'display_name': 'Poll Display Name'}],
WordCloudDescriptor: [{}],
@@ -75,10 +73,9 @@ CONTAINER_XMODULES = {
WrapperBlock: [{}],
}
-# These modules are editable in studio yet
+# These modules are not editable in studio yet
NOT_STUDIO_EDITABLE = (
CrowdsourceHinterDescriptor,
- GraphicalSliderToolDescriptor,
PollDescriptor
)
diff --git a/common/test/data/graphic_slider_tool/README.md b/common/test/data/graphic_slider_tool/README.md
deleted file mode 100644
index ec4f121ad8..0000000000
--- a/common/test/data/graphic_slider_tool/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a very very simple course, useful for debugging graphical slider tool
-code.
diff --git a/common/test/data/graphic_slider_tool/course.xml b/common/test/data/graphic_slider_tool/course.xml
deleted file mode 120000
index 49041310f6..0000000000
--- a/common/test/data/graphic_slider_tool/course.xml
+++ /dev/null
@@ -1 +0,0 @@
-roots/2012_Fall.xml
\ No newline at end of file
diff --git a/common/test/data/graphic_slider_tool/course/2012_Fall.xml b/common/test/data/graphic_slider_tool/course/2012_Fall.xml
deleted file mode 100644
index 2983c85dd5..0000000000
--- a/common/test/data/graphic_slider_tool/course/2012_Fall.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml b/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
deleted file mode 100644
index bd0360fde8..0000000000
--- a/common/test/data/graphic_slider_tool/graphical_slider_tool/sample_gst.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- return Math.sqrt(a * a - x * x);
- return -Math.sqrt(a * a - x * x);
-
-
-
-
-
- return -a;
-
-
- return a;
-
-
- 1000
- -30, 6, 30
- -30, 6, 30
-
-
-
-
diff --git a/common/test/data/graphic_slider_tool/policies/2012_Fall.json b/common/test/data/graphic_slider_tool/policies/2012_Fall.json
deleted file mode 100644
index 9058481dc8..0000000000
--- a/common/test/data/graphic_slider_tool/policies/2012_Fall.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "course/2012_Fall": {
- "graceperiod": "2 days 5 hours 59 minutes 59 seconds",
- "start": "2015-07-17T12:00",
- "display_name": "GST Test",
- "graded": "false"
- },
- "chapter/Overview": {
- "display_name": "Overview"
- },
- "graphical_slider_tool/sample_gst": {
- "display_name": "Sample GST"
- }
-}
diff --git a/common/test/data/graphic_slider_tool/roots/2012_Fall.xml b/common/test/data/graphic_slider_tool/roots/2012_Fall.xml
deleted file mode 100644
index 1dc86c4afc..0000000000
--- a/common/test/data/graphic_slider_tool/roots/2012_Fall.xml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lms/djangoapps/courseware/features/gst.feature b/lms/djangoapps/courseware/features/gst.feature
deleted file mode 100644
index f397c54bbc..0000000000
--- a/lms/djangoapps/courseware/features/gst.feature
+++ /dev/null
@@ -1,10 +0,0 @@
-@shard_2
-Feature: LMS.Graphical Slider Tool Module
- As a student, I want to view a Graphical Slider Tool Component
-
- Scenario: The slider changes values on the page
- Given that I have a course with a Graphical Slider Tool
- When I view the Graphical Slider Tool
- Then the displayed value should be 0
- And I move the slider to the right
- Then the displayed value should be 10
\ No newline at end of file
diff --git a/lms/djangoapps/courseware/features/gst.py b/lms/djangoapps/courseware/features/gst.py
deleted file mode 100644
index f232f9dfad..0000000000
--- a/lms/djangoapps/courseware/features/gst.py
+++ /dev/null
@@ -1,76 +0,0 @@
-
-from lettuce import world, steps
-from nose.tools import assert_equals
-
-from common import i_am_registered_for_the_course, visit_scenario_item
-
-
-DEFAULT_DATA = """\
-
- Test of the graphical slider tool
-
-
-
-
-
-
-
-
-
-
-
-
- a
-
-
-"""
-
-
-@steps
-class GraphicalSliderToolSteps(object):
- COURSE_NUM = 'test_course'
-
- def setup_gst(self, step):
- r'that I have a course with a Graphical Slider Tool$'
-
- i_am_registered_for_the_course(step, self.COURSE_NUM)
-
- world.scenario_dict['GST'] = world.ItemFactory(
- parent_location=world.scenario_dict['SECTION'].location,
- category='graphical_slider_tool',
- display_name="Test GST",
- data=DEFAULT_DATA
- )
-
- def view_gst(self, step):
- r'I view the Graphical Slider Tool$'
- visit_scenario_item('GST')
- world.wait_for_js_variable_truthy('$(".xblock-student_view[data-type=GraphicalSliderTool]").data("initialized")')
- world.wait_for_ajax_complete()
-
- def check_value(self, step, value):
- r'the displayed value should be (?P\d+)$'
-
- assert_equals(world.css_text('.gst-value'), value)
-
- def move_slider(self, step):
- r'I move the slider to the right$'
-
- handle_selector = '.gst-input .ui-slider-handle'
- world.wait_for_visible(handle_selector)
- world.wait_for_visible('.gst-value #value-display')
-
- def try_move():
- handle = world.css_find(handle_selector).first
- slider = world.css_find('.gst-input .ui-slider').first
- (handle.action_chains
- .click_and_hold(handle._element)
- .move_by_offset(
- int(handle._element.location['x'] + 400),
- 0
- ).release().perform())
-
- world.retry_on_exception(try_move)
-
-
-GraphicalSliderToolSteps()
diff --git a/lms/templates/graphical_slider_tool.html b/lms/templates/graphical_slider_tool.html
deleted file mode 100644
index 93a6761784..0000000000
--- a/lms/templates/graphical_slider_tool.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- ${configuration_json}
-
-
-
- ${gst_html}
-