Removed Pen.js. It was nice, but too buggy. Using normal textarea instead.

poll/poll.py

@@ -142,15 +142,6 @@ class PollBlock(XBlock):
         frag.add_javascript_url(
             self.runtime.local_resource_url(
                 self, 'public/js/vendor/handlebars.js'))
-        frag.add_javascript_url(
-            self.runtime.local_resource_url(
-                self, 'public/js/vendor/pen.js'))
-        frag.add_javascript_url(
-            self.runtime.local_resource_url(
-                self, 'public/js/vendor/markdown.js'))
-        frag.add_css_url(
-            self.runtime.local_resource_url(
-                self, 'public/css/vendor/pen.css'))
         frag.add_css(self.resource_string('/public/css/poll_edit.css'))
         frag.add_javascript(self.resource_string("public/js/poll_edit.js"))
         frag.initialize_js('PollEditBlock')

poll/public/html/poll_edit.html

@@ -2,11 +2,11 @@
 <div class="wrapper-comp-settings is-active editor-with-buttons" id="settings-tab">
     <form id="poll-form">
     <ul class="list-input settings-list" id="poll-line-items">
-        <h2><label for="question-editor">Question/Prompt</label></h2>
-        Select text to bring up formatting options.
         <li class="field comp-setting-entry is-set">
+          <h2><label for="question-editor">Question/Prompt</label></h2>
+          <a href="//daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Syntax</a> is supported.
           <div id="question-editor-container">
-            <div class="input setting-input" name="question" id="question-editor">{{question|safe}}</div>
+            <textarea class="input setting-input" name="question" id="question-editor">{{question|safe}}</textarea>
           </div>
         </li>
         <li class="field comp-setting-entry is-set">

poll/public/js/poll_edit.js

@@ -39,13 +39,14 @@ function PollEditBlock(runtime, element) {
     $(element).find('.save-button').bind('click', function() {
         var handlerUrl = runtime.handlerUrl(element, 'studio_submit');
         var data = {};
-        var poll_order = []
+        var poll_order = [];
         $('#poll-form input', element).each(function(i) {
             data[this.name] = this.value;
             if (this.name.indexOf('answer-') >= 0){
                 poll_order.push(this.name);
             }
         });
+        data['question'] = $('#question-editor').val();
         data['poll_order'] = poll_order;
         function check_return(data) {
             if (data['success']) {
@@ -69,7 +70,5 @@ function PollEditBlock(runtime, element) {
             data: JSON.stringify({}),
             success: displayAnswers
         });
-        var pen = new Pen("#question-editor");
-        $.focus(pen)
     });
 }
\ No newline at end of file

poll/public/js/vendor/markdown.js

-/*! Licensed under MIT, https://github.com/sofish/pen */
-(function(root) {
-
-  // only works with Pen
-  if(!root.Pen) return;
-
-  // markdown covertor obj
-  var covertor = {
-    keymap: { '96': '`', '62': '>', '49': '1', '46': '.', '45': '-', '42': '*', '35': '#'},
-    stack : []
-  };
-
-  // return valid markdown syntax
-  covertor.valid = function(str) {
-    var len = str.length;
-
-    if(str.match(/[#]{1,6}/)) {
-      return ['h' + len, len];
-    } else if(str === '```') {
-      return ['pre', len];
-    } else if(str === '>') {
-      return ['blockquote', len];
-    } else if(str === '1.') {
-      return ['insertorderedlist', len];
-    } else if(str === '-' || str === '*') {
-      return ['insertunorderedlist', len];
-    } else if(str.match(/(?:\.|\*|\-){3,}/)) {
-      return ['inserthorizontalrule', len];
-    }
-  };
-
-  // parse command
-  covertor.parse = function(e) {
-    var code = e.keyCode || e.which;
-
-    // when `space` is pressed
-    if(code === 32) {
-      var cmd = this.stack.join('');
-      this.stack.length = 0;
-      return this.valid(cmd);
-    }
-
-    // make cmd
-    if(this.keymap[code]) this.stack.push(this.keymap[code]);
-
-    return false;
-  };
-
-  // exec command
-  covertor.action = function(pen, cmd) {
-
-    // only apply effect at line start
-    if(pen.selection.focusOffset > cmd[1]) return;
-
-    var node = pen.selection.focusNode;
-    node.textContent = node.textContent.slice(cmd[1]);
-    pen.execCommand(cmd[0]);
-  };
-
-  // init covertor
-  covertor.init = function(pen) {
-    pen.on('keypress', function(e) {
-      var cmd = covertor.parse(e);
-      if(cmd) return covertor.action(pen, cmd);
-    });
-  };
-
-  // append to Pen
-  root.Pen.prototype.markdown = covertor;
-
-}(window));