Skip to content

fix capa textline to properly use inline if specified when using math preprocessor #2869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ichuang merged 3 commits into from
Mar 10, 2014
Merged

fix capa textline to properly use inline if specified when using math preprocessor #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d0db64
fix capa textline to properly use inline if specified when using js p…
ichuang Mar 8, 2014
a35d524
fix text-input-dynamath_data test in test_input_templates.py
ichuang Mar 8, 2014
cac6693
more robust capa math preprocessor test, and new test for inline
ichuang Mar 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/lib/capa/capa/templates/textline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<section id="inputtype_${id}" class="${'text-input-dynamath' if do_math else ''} capa_inputtype ${doinline} textline" >

% if preprocessor is not None:
<div class="text-input-dynamath_data" data-preprocessor="${preprocessor['class_name']}"/>
<div class="text-input-dynamath_data ${doinline}" data-preprocessor="${preprocessor['class_name']}"/>
<div class="script_placeholder" data-src="${preprocessor['script_src']}"/>
% endif

Expand Down
11 changes: 10 additions & 1 deletion common/lib/capa/capa/tests/test_input_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,12 +431,21 @@ def test_preprocessor(self):
'script_src': 'test_script'}
xml = self.render_to_xml(self.context)

xpath = "//div[@class='text-input-dynamath_data' and @data-preprocessor='test_class']"
xpath = "//div[contains(@class, 'text-input-dynamath_data') and @data-preprocessor='test_class']"
self.assert_has_xpath(xml, xpath, self.context)

xpath = "//div[@class='script_placeholder' and @data-src='test_script']"
self.assert_has_xpath(xml, xpath, self.context)

def test_do_inline_and_preprocessor(self):
self.context['preprocessor'] = {'class_name': 'test_class',
'script_src': 'test_script'}
self.context['inline'] = True
xml = self.render_to_xml(self.context)

xpath = "//div[contains(@class, 'text-input-dynamath_data inline') and @data-preprocessor='test_class']"
self.assert_has_xpath(xml, xpath, self.context)

def test_do_inline(self):
cases = [('correct', 'correct'),
('unsubmitted', 'unanswered'),
Expand Down