From 4e78e58902e9b2ea9c251534cdb52a348b7bd846 Mon Sep 17 00:00:00 2001 From: Valera Rozuvan Date: Fri, 14 Dec 2012 11:00:25 +0200 Subject: [PATCH] Mod to XML GST. --- common/lib/xmodule/xmodule/gst_module.py | 7 +++---- .../xmodule/js/src/graphical_slider_tool/inputs.js | 4 ++-- .../xmodule/js/src/graphical_slider_tool/sliders.js | 10 +++++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/common/lib/xmodule/xmodule/gst_module.py b/common/lib/xmodule/xmodule/gst_module.py index 74cc70e076..276762408f 100644 --- a/common/lib/xmodule/xmodule/gst_module.py +++ b/common/lib/xmodule/xmodule/gst_module.py @@ -69,8 +69,7 @@ class GraphicalSliderToolModule(XModule): Simple variant: slider and plot controls are not inside any tag. """ #substitute plot - plot_div = '
This is plot
' + plot_div = '
' html_string = html_string.replace('$plot$', plot_div) # substitute sliders if we have them @@ -81,7 +80,7 @@ class GraphicalSliderToolModule(XModule): vars = [x['@var'] for x in sliders] slider_div = '' + data-var="{var}" data-el_width="120">' for var in vars: html_string = re.sub(r'\$slider\s+' + var + r'\$', @@ -98,7 +97,7 @@ class GraphicalSliderToolModule(XModule): vars = [x['@var'] for x in inputs] input_div = '' + data-var="{var}" data-el_width="60">' for var in vars: html_string = re.sub(r'\$input\s+' + var + r'\$', 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 index 595021023f..b5d3217a85 100644 --- a/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js +++ b/common/lib/xmodule/xmodule/js/src/graphical_slider_tool/inputs.js @@ -124,8 +124,8 @@ define('Inputs', [], function () { 'text-align': 'left', 'outline': 'none', 'cursor': 'text', - 'height': '15px', - 'width': '50px' + 'height': '15px' + // 'width': '50px' }); // And finally, publish the text input element to the page. 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 ea6398caad..ef3d5bb6d3 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 @@ -164,7 +164,15 @@ define('Sliders', [], function () { } // Set the defined width to the slider. - sliderEl.width(sliderWidth); + // sliderEl.width(sliderWidth); + + console.log('[Before]'); + console.log('sliderEl.width: ' + sliderEl.width()); + + sliderEl.width(spanEl.data('el_width')); + + console.log('[After]'); + console.log('sliderEl.width: ' + sliderEl.width()); // And make sure that it gets added to the page as an // 'inline-block' element. This will allow for the insertion of the