Permalink
Browse files

Merge branch 'bugfix-issue-184' into develop

  • Loading branch information...
2 parents 5868e7a + aada08a commit 2a2e6e86b43215e3c7620ec89682916256cf7393 Carlos Scheidegger committed Nov 15, 2013
Showing with 3 additions and 5 deletions.
  1. +1 −1 htdocs/js/rcloud.js
  2. +1 −3 htdocs/js/rcloud_bundle.js
  3. +1 −1 htdocs/js/rcloud_bundle.min.js
View
@@ -296,7 +296,7 @@ RCloud.create = function(rcloud_ocaps) {
return;
curtains_on = true;
if (_.isUndefined(progress_dialog)) {
- progress_dialog = $('<div id="progress-dialog" class="modal fade"><div class="modal-dialog"><div class="modal-content"><div class="modal-header">Please wait...</div></div></div>');
+ progress_dialog = $('<div id="progress-dialog" class="modal fade"><div class="modal-dialog"><div class="modal-content"><div class="modal-body">Please wait...</div></div></div>');
$("body").append(progress_dialog);
}
progress_dialog.modal({keyboard: true});
@@ -412,7 +412,7 @@ RCloud.create = function(rcloud_ocaps) {
return;
curtains_on = true;
if (_.isUndefined(progress_dialog)) {
- progress_dialog = $('<div id="progress-dialog" class="modal fade"><div class="modal-dialog"><div class="modal-content"><div class="modal-header">Please wait...</div></div></div>');
+ progress_dialog = $('<div id="progress-dialog" class="modal fade"><div class="modal-dialog"><div class="modal-content"><div class="modal-body">Please wait...</div></div></div>');
$("body").append(progress_dialog);
}
progress_dialog.modal({keyboard: true});
@@ -808,8 +808,6 @@ function create_markdown_cell_html_view(language) { return function(cell_model)
// There's a list of things that we need to do to the output:
var uuid = rcloud.deferred_knitr_uuid;
- debugger;
-
if (inner_div.find("pre code").length === 0) {
r_result_div.prepend("<pre><code>" + cell_model.content() + "</code></pre>");
}
Oops, something went wrong.

0 comments on commit 2a2e6e8

Please sign in to comment.