updated activecode.py to bring back support for the textfield directive

Author: riknos314

runestone/activecode/activecode.py

@@ -14,239 +14,87 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-__author__ = 'bmiller'
+__author__ = 'isaiahmayerchak'
 
 from docutils import nodes
 from docutils.parsers.rst import directives
 from docutils.parsers.rst import Directive
+from .textfield import *
 
 
 def setup(app):
     app.add_directive('activecode', ActiveCode)
-    app.add_directive('actex', ActiveExercise)
-    app.add_stylesheet('codemirror.css')
     app.add_stylesheet('activecode.css')
 
-    app.add_javascript('jquery.highlight.js')
-    app.add_javascript('bookfuncs.js')
+    app.add_javascript('skulpt.min.js')
+    app.add_javascript('skulpt-stdlib.js')
     app.add_javascript('codemirror.js')
-    app.add_javascript('xml.js')
-    app.add_javascript('css.js')
-    app.add_javascript('htmlmixed.js')
     app.add_javascript('python.js')
-    app.add_javascript('javascript.js')
     app.add_javascript('activecode.js')
-    app.add_javascript('skulpt.min.js')
-    app.add_javascript('skulpt-stdlib.js')
+
+    app.add_role('textfield', textfield_role)
 
     app.add_node(ActivcodeNode, html=(visit_ac_node, depart_ac_node))
 
     app.connect('doctree-resolved', process_activcode_nodes)
     app.connect('env-purge-doc', purge_activecodes)
 
 
-START = '''
-<div id="cont"></div>
-<div id="%(divid)s" lang="%(language)s" time="%(timelimit)s" class="ac_section alert alert-warning" >
-'''
-
-EDIT1 = '''
-</div>
-<br/>
-<div id="%(divid)s_code_div" style="display: %(hidecode)s" class="ac_code_div">
-<textarea cols="50" rows="12" id="%(divid)s_code" class="active_code" prefixcode="%(include)s" lang="%(language)s">
-%(initialcode)s
-</textarea>
-</div>
-'''
-
-CAPTION = ''' 
-<div class="clearfix"></div>
-<p class="ac_caption"><span class="ac_caption_text">%(caption)s (%(divid)s)</span> </p>
-'''
-
-UNHIDE = '''
-<span class="ac_sep"></span>
-<button class='btn btn-default' id="%(divid)s_showb" onclick="$('#%(divid)s_code_div').toggle();cm_editors['%(divid)s_code'].refresh();$('#%(divid)s_saveb').toggle();$('#%(divid)s_loadb').toggle()">Show/Hide Code</button>
-'''
-
-GRADES = '''
-<span class="ac_sep"></span>
-<input type="button" class='btn btn-default ' id="gradeb" name="Show Feedback" value="Show Feedback" onclick="createGradeSummary('%(divid)s')"/>
-'''
-
-AUDIO = '''
-<span class="ac_sep"></span>
-<input type="button" class='btn btn-default ' id="audiob" name="Play Audio" value="Start Audio Tour" onclick="createAudioTourHTML('%(divid)s','%(argu)s','%(no_of_buttons)s','%(ctext)s')"/>
-'''
-
-EDIT2 = '''
-<div class="ac_actions">
-<button class='btn btn-success' id="%(divid)s_runb">Run</button>
-<button class="ac_opt btn btn-default" style="display: inline-block" id="%(divid)s_saveb" onclick="saveEditor('%(divid)s');">Save</button>
-<button class="ac_opt btn btn-default" style="display: inline-block" id="%(divid)s_loadb" onclick="requestCode('%(divid)s');">Load</button>
-'''
-
-VIZB = '''<button class='btn btn-default' id="%(divid)s_vizb" onclick="injectCodelens(this,'%(divid)s');">Show in Codelens</button>
-'''
-
-COACHB = '''<button class='ac_opt btn btn-default' id="%(divid)s_coach_b" onclick="injectCodeCoach('%(divid)s');">Code Coach</button>
-'''
-
-SCRIPT = '''
-<script>
-if ('%(hidecode)s' == 'none') {
-    // a hack to preserve the inline-block display style. Toggle() will use display: block
-    // (instead of inline-block) if the previous display style was 'none'
-    $('#%(divid)s_saveb').toggle();
-    $('#%(divid)s_loadb').toggle();
-}
-if ($("#%(divid)s").attr("lang") !== "html" && $("#%(divid)s_code_div").parents(".admonition").length == 0 && $("#%(divid)s_code_div").parents("#exercises").length == 0){
-    if ($(window).width() > 975){
-        $("#%(divid)s_code_div").offset({
-            left: $("#%(divid)s .clearfix").offset().left
-        });
-    }
-    $("#%(divid)s_runb").one("click", function(){
-        $({})
-        .queue(function (next) {
-            if ($(window).width() > 975){
-                $("#%(divid)s_code_div").animate({
-                    left: 40
-                }, 500, next);
-                if (! Sk.TurtleGraphics ) {
-                    Sk.TurtleGraphics = {};
-                }
-                Sk.TurtleGraphics.height = 320;
-                Sk.TurtleGraphics.width = 320;
-            }
-            else{
-                next();
-            }
-        })
-        .queue(function (next) {
-            $("#%(divid)s_runb").parent().siblings(".ac_output").show();
-            runit('%(divid)s',this, %(include)s);
-            $("#%(divid)s_runb").on("click", function(){
-                runit('%(divid)s',this, %(include)s);
-            });
-        })
-
-    });
-}
-else{
-    $("#%(divid)s_code_div").css({float : "none", marginLeft : "auto", marginRight : "auto"});
-    $("#%(divid)s_runb").parent().siblings(".ac_output").show().css({float : "none", right : "0px"});
-    $("#%(divid)s_runb").on("click", function(){
-        runit('%(divid)s',this, %(include)s);
-    });
-}
-</script>
-'''
-OUTPUT_START = '''
-<div class="ac_output">'''
-
-CANVAS = '''
-<div style="text-align: center">
-<div id="%(divid)s_canvas" class="ac-canvas" style="border-style: solid; text-align: center"></div>
-</div>
-'''
-
-SUFF = '''<pre id="%(divid)s_suffix" style="display:none">%(suffix)s</pre>'''
-
-PRE = '''<pre id="%(divid)s_pre" class="active_out"></pre>
-'''
-OUTPUT_END = '''
-</div> <!-- end output -->'''
-
-VIZ = '''<div id="%(divid)s_codelens_div" style="display:none"></div>'''
-
-# <iframe id="%(divid)s_codelens" width="800" height="500" style="display:block"src="#">
-# </iframe>
-
-COACH = '''<div id="%(divid)s_coach_div" style="display:none;"></div>'''
-
-HTMLOUT = '''<div id="%(divid)s_htmlout" style="display:none;" class="ac_htmlout"></div>'''
-
-END = '''
-</div>
-
-'''
-
-AUTO = '''
-<script type="text/javascript">
-$(document).ready(function() {
-    $(window).load(function() {
-        var runb = document.getElementById("%(divid)s_runb");
-        runit('%(divid)s',runb, %(include)s);
-    });
-});
-</script>
-'''
-
+TEMPLATE = """
+    <pre data-component="activecode" id=%(divid)s data-lang="%(language)s" %(autorun)s %(hidecode)s %(include)s %(timelimit)s %(coach)s %(codelens)s>
+    %(initialcode)s
+    </pre>
+    """
 
 class ActivcodeNode(nodes.General, nodes.Element):
     def __init__(self, content):
         """
-
         Arguments:
         - `self`:
         - `content`:
         """
         super(ActivcodeNode, self).__init__()
-        self.ac_components = content
+        self.ac_options = content
 
-
-# self for these functions is an instance of the writer class.  For example
-# in html, self is sphinx.writers.html.SmartyPantsHTMLTranslator
-# The node that is passed as a parameter is an instance of our node class.
 def visit_ac_node(self, node):
     # print self.settings.env.activecodecounter
-    res = START
-    if 'above' in node.ac_components:
-        res += CANVAS
-    if 'tour_1' not in node.ac_components:
-        res += EDIT2
+    res = ""
+
+    if 'language' not in node.ac_options:
+        node.ac_options['language'] = 'python'
+
+    if 'autorun' in node.ac_options:
+        node.ac_options['autorun'] = 'data-autorun'
+    else:
+        node.ac_options['autorun'] = ''
+
+    if 'hidecode' in node.ac_options:
+        node.ac_options['hidecode'] = 'data-hidecode'
+    else:
+        node.ac_options['hidecode'] = ''
+
+    if 'include' in node.ac_options:
+        node.ac_options['include'] = 'data-include=' + str(node.ac_options['include'])
     else:
-        res += EDIT2 + AUDIO
-    if node.ac_components['codelens']:
-        res += VIZB
-
-    if 'coach' in node.ac_components:
-        res += COACHB
-
-    if 'hidecode' not in node.ac_components:
-        node.ac_components['hidecode'] = 'block'
-    if node.ac_components['hidecode'] == 'none':
-        res += UNHIDE
-    if 'gradebutton' in node.ac_components:
-        res += GRADES
-    res += EDIT1
-    res += OUTPUT_START
-    if 'above' not in node.ac_components:
-        if 'nocanvas' not in node.ac_components:
-            res += CANVAS
-    if 'suffix' in node.ac_components:
-        res += SUFF
-    if 'nopre' not in node.ac_components:
-        res += PRE
-    if 'autorun' in node.ac_components:
-        res += AUTO
-    res += OUTPUT_END
-    res += CAPTION
-
-    if node.ac_components['codelens']:
-        res += VIZ
-
-    if 'coach' in node.ac_components:
-        res += COACH
-
-    if node.ac_components['language'] == 'html':
-        res += HTMLOUT
-
-    res += SCRIPT
-    res += END
-    res = res % node.ac_components
+        node.ac_options['include'] = ''
+
+    if 'timelimit' in node.ac_options:
+        node.ac_options['timelimit'] = 'data-timelimit=' + str(node.ac_options['timelimit'])
+    else:
+        node.ac_options['timelimit'] = ''
+
+    if 'coach' in node.ac_options:
+        node.ac_options['coach'] = 'data-coach'
+    else:
+        node.ac_options['coach'] = ''
+
+    if 'codelens' in node.ac_options:
+        node.ac_options['codelens'] = 'data-codelens'
+    else:
+        node.ac_options['codelens'] = ''
+
+    res += TEMPLATE % node.ac_options
+
     res = res.replace("u'", "'")  # hack:  there must be a better way to include the list and avoid unicode strings
 
     self.body.append(res)
@@ -300,80 +148,11 @@ def run(self):
 
         self.options['divid'] = self.arguments[0]
 
-        if self.content:
-            if '====' in self.content:
-                idx = self.content.index('====')
-                source = "\n".join(self.content[:idx])
-                suffix = "\n".join(self.content[idx + 1:])
-            else:
-                source = "\n".join(self.content)
-                suffix = "\n"
-        else:
-            source = '\n'
-            suffix = '\n'
-
+        source = "\n".join(self.content)
         self.options['initialcode'] = source
-        self.options['suffix'] = suffix
-        str = source.replace("\n", "*nline*")
-        str0 = str.replace("\"", "*doubleq*")
-        str1 = str0.replace("(", "*open*")
-        str2 = str1.replace(")", "*close*")
-        str3 = str2.replace("'", "*singleq*")
-        self.options['argu'] = str3
-
-        complete = ""
-        no_of_buttons = 0
-        okeys = list(self.options.keys())
-        for k in okeys:
-            if '_' in k:
-                x, label = k.split('_')
-                no_of_buttons = no_of_buttons + 1
-                complete = complete + self.options[k] + "*atype*"
-
-        newcomplete = complete.replace("\"", "*doubleq*")
-        self.options['ctext'] = newcomplete
-        self.options['no_of_buttons'] = no_of_buttons
-
-        if 'caption' not in self.options:
-            self.options['caption'] = ''
-
-        if 'include' not in self.options:
-            self.options['include'] = 'undefined'
-        else:
-            lst = self.options['include'].split(',')
-            lst = [x.strip() for x in lst]
-            self.options['include'] = lst
-
-        if 'hidecode' in self.options:
-            self.options['hidecode'] = 'none'
-        else:
-            self.options['hidecode'] = 'block'
-
-        if 'language' not in self.options:
-            self.options['language'] = 'python'
-
-        if 'nocodelens' in self.options or self.options['language'] != 'python':
-            self.options['codelens'] = False
-        else:
-            self.options['codelens'] = True
-
-        if 'timelimit' not in self.options:
-            self.options['timelimit'] = ''
 
         return [ActivcodeNode(self.options)]
 
 
-class ActiveExercise(ActiveCode):
-    required_arguments = 1
-    optional_arguments = 0
-    has_content = True
-
-    def run(self):
-        self.options['hidecode'] = True
-        self.options['gradebutton'] = True
-        self.options['coach'] = True
-        return super(ActiveExercise, self).run()
-
-
 if __name__ == '__main__':
     a = ActiveCode()