mirror of
https://github.com/marktext/marktext.git
synced 2025-05-02 20:49:15 +08:00
* Temporary disable numbered code block lines due to #1648 * Set default value to false
This commit is contained in:
parent
ad69d6e22e
commit
c7ae487e6e
@ -255,7 +255,7 @@ export const MUYA_DEFAULT_OPTION = {
|
||||
bulletListMarker: '-',
|
||||
orderListDelimiter: '.',
|
||||
tabSize: 4,
|
||||
codeBlockLineNumbers: true,
|
||||
codeBlockLineNumbers: false,
|
||||
// bullet/list marker width + listIndentation, tab or Daring Fireball Markdown (4 spaces) --> list indentation
|
||||
listIndentation: 1,
|
||||
frontmatterType: '-',
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { loadLanguage } from '../prism/index'
|
||||
import resizeCodeBlockLineNumber from '../utils/resizeCodeLineNumber'
|
||||
// import resizeCodeBlockLineNumber from '../utils/resizeCodeLineNumber'
|
||||
import selection from '../selection'
|
||||
|
||||
const CODE_UPDATE_REP = /^`{3,}(.*)/
|
||||
@ -143,17 +143,18 @@ const codeBlockCtrl = ContentState => {
|
||||
}
|
||||
|
||||
ContentState.prototype.resizeLineNumber = function () {
|
||||
const { codeBlockLineNumbers } = this.muya.options
|
||||
if (!codeBlockLineNumbers) {
|
||||
return
|
||||
}
|
||||
// FIXME: Disabled due to #1648.
|
||||
// const { codeBlockLineNumbers } = this.muya.options
|
||||
// if (!codeBlockLineNumbers) {
|
||||
// return
|
||||
// }
|
||||
|
||||
const codeBlocks = document.querySelectorAll('pre.line-numbers')
|
||||
if (codeBlocks.length) {
|
||||
for (const ele of codeBlocks) {
|
||||
resizeCodeBlockLineNumber(ele)
|
||||
}
|
||||
}
|
||||
// const codeBlocks = document.querySelectorAll('pre.line-numbers')
|
||||
// if (codeBlocks.length) {
|
||||
// for (const ele of codeBlocks) {
|
||||
// resizeCodeBlockLineNumber(ele)
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import resizeCodeBlockLineNumber from '../utils/resizeCodeLineNumber'
|
||||
import { throttle } from '../utils'
|
||||
// import resizeCodeBlockLineNumber from '../utils/resizeCodeLineNumber'
|
||||
// import { throttle } from '../utils'
|
||||
|
||||
class Resize {
|
||||
constructor (muya) {
|
||||
@ -8,14 +8,20 @@ class Resize {
|
||||
}
|
||||
|
||||
listen () {
|
||||
window.addEventListener('resize', throttle(() => {
|
||||
const codeBlocks = document.querySelectorAll('pre.line-numbers')
|
||||
if (codeBlocks.length) {
|
||||
for (const ele of codeBlocks) {
|
||||
resizeCodeBlockLineNumber(ele)
|
||||
}
|
||||
}
|
||||
}, 300))
|
||||
// FIXME: Disabled due to #1648.
|
||||
// const { codeBlockLineNumbers } = this.muya.options
|
||||
// if (!codeBlockLineNumbers) {
|
||||
// return
|
||||
// }
|
||||
//
|
||||
// window.addEventListener('resize', throttle(() => {
|
||||
// const codeBlocks = document.querySelectorAll('pre.line-numbers')
|
||||
// if (codeBlocks.length) {
|
||||
// for (const ele of codeBlocks) {
|
||||
// resizeCodeBlockLineNumber(ele)
|
||||
// }
|
||||
// }
|
||||
// }, 300))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -370,6 +370,11 @@ class Muya {
|
||||
}
|
||||
|
||||
setOptions (options, needRender = false) {
|
||||
// FIXME: Just to be sure, disabled due to #1648.
|
||||
if (options.codeBlockLineNumbers) {
|
||||
options.codeBlockLineNumbers = false
|
||||
}
|
||||
|
||||
Object.assign(this.options, options)
|
||||
if (needRender) {
|
||||
this.contentState.render(false, true)
|
||||
|
@ -2,7 +2,7 @@ import { CLASS_OR_ID } from '../../../config'
|
||||
import { renderTableTools } from './renderToolBar'
|
||||
import { footnoteJumpIcon } from './renderFootnoteJump'
|
||||
import { renderEditIcon } from './renderContainerEditIcon'
|
||||
import renderLineNumberRows from './renderLineNumber'
|
||||
// import renderLineNumberRows from './renderLineNumber'
|
||||
import renderCopyButton from './renderCopyButton'
|
||||
import { renderLeftBar, renderBottomBar } from './renderTableDargBar'
|
||||
import { h } from '../snabbdom'
|
||||
@ -62,13 +62,14 @@ export default function renderContainerBlock (parent, block, activeBlocks, match
|
||||
if (type === 'pre') {
|
||||
children.unshift(renderCopyButton())
|
||||
}
|
||||
if (this.muya.options.codeBlockLineNumbers) {
|
||||
if (type === 'pre') {
|
||||
selector += '.line-numbers'
|
||||
} else {
|
||||
children.unshift(renderLineNumberRows(block.children[0]))
|
||||
}
|
||||
}
|
||||
// FIXME: Disabled due to #1648 - be consistent.
|
||||
// if (this.muya.options.codeBlockLineNumbers) {
|
||||
// if (type === 'pre') {
|
||||
// selector += '.line-numbers'
|
||||
// } else {
|
||||
// children.unshift(renderLineNumberRows(block.children[0]))
|
||||
// }
|
||||
// }
|
||||
Object.assign(data.attrs, { spellcheck: 'false' })
|
||||
}
|
||||
|
||||
|
@ -25,6 +25,8 @@ const getStyles = function (element) {
|
||||
* @param {Element} element <pre> element
|
||||
*/
|
||||
const resizeCodeBlockLineNumber = function (element) {
|
||||
// FIXME: Heavy performance issues with this function, please see #1648.
|
||||
|
||||
const codeStyles = getStyles(element)
|
||||
const whiteSpace = codeStyles['white-space']
|
||||
|
||||
|
@ -39,7 +39,9 @@
|
||||
:value="codeFontFamily"
|
||||
:onChange="value => onSelectChange('codeFontFamily', value)"
|
||||
></font-text-box>
|
||||
<!-- FIXME: Disabled due to #1648. -->
|
||||
<bool
|
||||
v-show="false"
|
||||
description="Whether to show the code block line numbers."
|
||||
:bool="codeBlockLineNumbers"
|
||||
:onChange="value => onSelectChange('codeBlockLineNumbers', value)"
|
||||
|
Loading…
Reference in New Issue
Block a user