diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 09:06:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 09:06:43 +0000 |
commit | 0dea53d5e575c6c15ce7384da73b8d4a95b1c8cf (patch) | |
tree | 43eb08e897fbac74f151eb650bde6029b6280a6e /app/assets/javascripts/notebook | |
parent | b4e072cbaf808793bafff148b0ec9d47819f479e (diff) | |
download | gitlab-ce-0dea53d5e575c6c15ce7384da73b8d4a95b1c8cf.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notebook')
-rw-r--r-- | app/assets/javascripts/notebook/cells/code.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/notebook/cells/code/index.vue | 12 | ||||
-rw-r--r-- | app/assets/javascripts/notebook/cells/output/index.vue | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/app/assets/javascripts/notebook/cells/code.vue b/app/assets/javascripts/notebook/cells/code.vue index eefc801ed7a..1782e5bfe5a 100644 --- a/app/assets/javascripts/notebook/cells/code.vue +++ b/app/assets/javascripts/notebook/cells/code.vue @@ -49,6 +49,7 @@ export default { v-if="hasOutput" :count="cell.execution_count" :outputs="outputs" + :metadata="cell.metadata" :code-css-class="codeCssClass" /> </div> diff --git a/app/assets/javascripts/notebook/cells/code/index.vue b/app/assets/javascripts/notebook/cells/code/index.vue index 98b6cdd0944..470d8c87d59 100644 --- a/app/assets/javascripts/notebook/cells/code/index.vue +++ b/app/assets/javascripts/notebook/cells/code/index.vue @@ -26,6 +26,10 @@ export default { type: String, required: true, }, + metadata: { + type: Object, + default: () => ({}), + }, }, computed: { code() { @@ -36,6 +40,12 @@ export default { return type.charAt(0).toUpperCase() + type.slice(1); }, + cellCssClass() { + return { + [this.codeCssClass]: true, + 'jupyter-notebook-scrolled': this.metadata.scrolled, + }; + }, }, mounted() { Prism.highlightElement(this.$refs.code); @@ -46,6 +56,6 @@ export default { <template> <div :class="type"> <prompt :type="promptType" :count="count" /> - <pre ref="code" :class="codeCssClass" class="language-python" v-text="code"></pre> + <pre ref="code" :class="cellCssClass" class="language-python" v-text="code"></pre> </div> </template> diff --git a/app/assets/javascripts/notebook/cells/output/index.vue b/app/assets/javascripts/notebook/cells/output/index.vue index b59ddd0d57a..d8b0e099bc4 100644 --- a/app/assets/javascripts/notebook/cells/output/index.vue +++ b/app/assets/javascripts/notebook/cells/output/index.vue @@ -19,6 +19,10 @@ export default { type: Array, required: true, }, + metadata: { + type: Object, + default: () => ({}), + }, }, methods: { outputType(output) { @@ -78,6 +82,7 @@ export default { :count="count" :index="index" :raw-code="rawCode(output)" + :metadata="metadata" :code-css-class="codeCssClass" /> </div> |