Stops errors in the rendering breaking the page

Fixed some output types

[ci skip]
This commit is contained in:
Phil Hughes 2017-03-20 14:44:07 +00:00
parent 33f26de56b
commit 313258fa42
2 changed files with 49 additions and 10 deletions

View file

@ -5,6 +5,10 @@ import NotebookLab from 'vendor/notebooklab';
Vue.use(VueResource);
Vue.use(NotebookLab);
Vue.config.errorHandler = (err) => {
console.log(err);
}
$(() => {
const el = document.getElementById('js-notebook-viewer');
@ -12,6 +16,7 @@ $(() => {
el,
data() {
return {
error: false,
loading: true,
json: {},
};
@ -28,14 +33,11 @@ $(() => {
</div>
`,
mounted() {
$.get(gon.katex_css_url, () => {
const css = $('<link>', {
rel: 'stylesheet',
type: 'text/css',
href: gon.katex_css_url,
});
css.appendTo('head');
});
$('<link>', {
rel: 'stylesheet',
type: 'text/css',
href: gon.katex_css_url,
}).appendTo('head');
$.getScript(gon.katex_js_url, () => {
this.$http.get(el.dataset.endpoint)

View file

@ -235,11 +235,24 @@ exports.default = {
output: function output() {
return this.cell.outputs[0];
},
outputType: function outputType() {
if (!this.output.text) {
return Object.keys(this.output.data)[0];
}
},
outputText: function outputText() {
if (this.output.text) {
return this.output.text.join('');
} else {
return this.output.data[Object.keys(this.output.data)[0]].join('');
var output = this.output.data[this.outputType];
if (typeof output === 'array') {
return output.join('');
} else if (typeof output === 'string') {
return output;
} else {
return '';
}
}
}
}
@ -257,6 +270,7 @@ exports.default = {
//
//
//
//
/***/ }),
/* 4 */
@ -284,6 +298,11 @@ exports.default = {
type: Number,
required: false
},
outputType: {
type: String,
required: false,
default: ''
},
type: {
type: String,
required: true
@ -305,6 +324,13 @@ exports.default = {
var type = this.type.split('put')[0];
return type.charAt(0).toUpperCase() + type.slice(1);;
},
isImage: function isImage() {
if (this.outputType) {
return this.outputType.indexOf('image/') === 0;
} else {
return false;
}
}
}
}; //
@ -316,6 +342,12 @@ exports.default = {
//
//
//
//
//
//
//
//
//
/***/ }),
/* 5 */
@ -1896,6 +1928,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
attrs: {
"type": "output",
"raw-code": _vm.outputText,
"output-type": _vm.outputType,
"count": _vm.output.execution_count
}
}) : _vm._e()], 1)
@ -1982,10 +2015,14 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
"type": _vm.promptType,
"count": _vm.count
}
}), _vm._v(" "), _c('pre', {
}), _vm._v(" "), (!_vm.isImage) ? _c('pre', {
domProps: {
"innerHTML": _vm._s(_vm.code)
}
}, [_vm._v("\n ")]) : _c('img', {
attrs: {
"src": 'data:' + _vm.outputType + ';base64,' + _vm.rawCode
}
})], 1)
},staticRenderFns: []}
module.exports.render._withStripped = true