From 892460ed0b952f24d1b5f8e736e91818c3738741 Mon Sep 17 00:00:00 2001 From: Vitaly Puzrin Date: Wed, 8 Oct 2014 15:55:35 +0400 Subject: [PATCH] Options rename --- README.md | 2 +- benchmark/implementations/current/index.js | 2 +- benchmark/profile.js | 2 +- demo/assets/index.js | 2 +- demo/index.jade | 2 +- demo/sample.js | 2 +- lib/defaults.js | 4 ++-- lib/renderer.js | 2 +- lib/rules_block/blockquote.js | 2 +- lib/rules_block/list.js | 2 +- lib/rules_inline/emphasis.js | 2 +- lib/rules_inline/links.js | 2 +- support/specsplit.js | 2 +- test/remarkable.js | 2 +- test/remarked.js | 2 +- test/stmd.js | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ad514df..3ec4113 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ var md = new Remarkable({ html: false, // enable html tags in source xhtml: false, // use '/' to close single tags (
) breaks: true, // convert '\n' in paragraphs into
- langprefix: 'language-', // css language prefix for fenced blocks + langPrefix: 'language-', // css language prefix for fenced blocks // Should return HTML markup for highlighted text, // or empty string to escape source diff --git a/benchmark/implementations/current/index.js b/benchmark/implementations/current/index.js index 2bd8e87..e878d9e 100644 --- a/benchmark/implementations/current/index.js +++ b/benchmark/implementations/current/index.js @@ -5,7 +5,7 @@ var md = new Remarkable({ html: true, xhtml: true, breaks: false, - langprefix: 'language-' + langPrefix: 'language-' }); exports.run = function(data) { diff --git a/benchmark/profile.js b/benchmark/profile.js index 8d4245d..5c0db03 100755 --- a/benchmark/profile.js +++ b/benchmark/profile.js @@ -10,7 +10,7 @@ var md = new Remarkable({ html: true, xhtml: true, breaks: false, - langprefix: 'language-' + langPrefix: 'language-' }); var data = fs.readFileSync(path.join(__dirname, '/samples/cdata.md'), 'utf8'); diff --git a/demo/assets/index.js b/demo/assets/index.js index 22c4bd5..3f08035 100644 --- a/demo/assets/index.js +++ b/demo/assets/index.js @@ -7,7 +7,7 @@ html: true, xhtml: true, breaks: false, - langprefix: 'language-', + langPrefix: 'language-', // options below are for demo only _highlight: false, diff --git a/demo/index.jade b/demo/index.jade index 4b640cc..9b804ed 100644 --- a/demo/index.jade +++ b/demo/index.jade @@ -45,7 +45,7 @@ html input#_highlight(type='checkbox') | highlight .form-group - input#langprefix.form-control._tip( + input#langPrefix.form-control._tip( type='input' placeholder='language prefix' title='css class language prefix for fenced code blocks' diff --git a/demo/sample.js b/demo/sample.js index d7cb7c1..85651a4 100644 --- a/demo/sample.js +++ b/demo/sample.js @@ -3,7 +3,7 @@ var md = new Remarkable({ html: false, // enable html tags in source xhtml: false, // use '/' to close single tags (
) breaks: true, // convert '\n' in paragraphs into
- langprefix: 'language-', // css language prefix for fenced blocks + langPrefix: 'language-', // css language prefix for fenced blocks // Should return HTML markup for highlighted text, // or empty string to escape source diff --git a/lib/defaults.js b/lib/defaults.js index 71b4d11..db9f5dd 100644 --- a/lib/defaults.js +++ b/lib/defaults.js @@ -7,7 +7,7 @@ module.exports = { html: false, xhtml: false, breaks: false, - level: 10, - langprefix: 'language-', + maxLevel: 20, + langPrefix: 'language-', highlight: function (/*str*/) { return ''; } }; diff --git a/lib/renderer.js b/lib/renderer.js index dd91a85..ca38025 100644 --- a/lib/renderer.js +++ b/lib/renderer.js @@ -54,7 +54,7 @@ rules.code = function (tokens, idx /*, options*/) { rules.fence = function (tokens, idx, options) { var token = tokens[idx]; var langClass = ''; - var langPrefix = options.langprefix || ''; + var langPrefix = options.langPrefix || ''; var params, langName = ''; var highlighted; diff --git a/lib/rules_block/blockquote.js b/lib/rules_block/blockquote.js index d3e4728..44f487f 100644 --- a/lib/rules_block/blockquote.js +++ b/lib/rules_block/blockquote.js @@ -17,7 +17,7 @@ module.exports = function blockquote(state, startLine, endLine, silent) { // check the block quote marker if (state.src.charCodeAt(pos++) !== 0x3E/* > */) { return false; } - if (state.level >= state.options.level) { return false; } + if (state.level >= state.options.maxLevel) { return false; } // we know that it's going to be a valid blockquote, // so no point trying to find the end of it in silent mode diff --git a/lib/rules_block/list.js b/lib/rules_block/list.js index fac308f..b3e1252 100644 --- a/lib/rules_block/list.js +++ b/lib/rules_block/list.js @@ -101,7 +101,7 @@ module.exports = function list(state, startLine, endLine, silent) { return false; } - if (state.level >= state.options.level) { return false; } + if (state.level >= state.options.maxLevel) { return false; } // We should terminate list on style change. Remember first one to compare. markerCharCode = state.src.charCodeAt(posAfterMarker - 1); diff --git a/lib/rules_inline/emphasis.js b/lib/rules_inline/emphasis.js index 29cbcad..3dac210 100644 --- a/lib/rules_inline/emphasis.js +++ b/lib/rules_inline/emphasis.js @@ -124,7 +124,7 @@ module.exports = function emphasis(state/*, silent*/) { return true; } - if (state.level >= state.options.level) { return false; } + if (state.level >= state.options.maxLevel) { return false; } oldLength = state.tokens.length; oldPending = state.pending; diff --git a/lib/rules_inline/links.js b/lib/rules_inline/links.js index 6c5cdbb..79d068c 100644 --- a/lib/rules_inline/links.js +++ b/lib/rules_inline/links.js @@ -28,7 +28,7 @@ function links(state) { } if (marker !== 0x5B/* [ */) { return false; } - if (state.level >= state.options.level) { return false; } + if (state.level >= state.options.maxLevel) { return false; } labelStart = start + 1; labelEnd = parseLinkLabel(state, start); diff --git a/support/specsplit.js b/support/specsplit.js index 8a2642c..2ef0d70 100755 --- a/support/specsplit.js +++ b/support/specsplit.js @@ -61,7 +61,7 @@ readFile(options.spec, 'utf8', function (error, input) { html: true, breaks: false, xhtml: true, - langprefix: 'language-' + langPrefix: 'language-' }); if (error) { diff --git a/test/remarkable.js b/test/remarkable.js index 3f562ad..6cb3e6e 100644 --- a/test/remarkable.js +++ b/test/remarkable.js @@ -12,7 +12,7 @@ var Remarked = require('../'); describe('Default', function () { var md = new Remarked({ breaks: false, - langprefix: '' + langPrefix: '' }); utils.addTests(path.join(__dirname, 'fixtures/remarkable'), md); diff --git a/test/remarked.js b/test/remarked.js index d62f812..fe3b531 100644 --- a/test/remarked.js +++ b/test/remarked.js @@ -15,7 +15,7 @@ describe('remarked', function () { // Set options, to give output more close to remarked md.set({ breaks: false, - langprefix: 'lang-' + langPrefix: 'lang-' }); utils.addTests(path.join(__dirname, 'fixtures/remarked_ok'), md); diff --git a/test/stmd.js b/test/stmd.js index c4c759d..0427aef 100644 --- a/test/stmd.js +++ b/test/stmd.js @@ -14,7 +14,7 @@ describe('stmd', function () { html: true, xhtml: true, breaks: false, - langprefix: 'language-' + langPrefix: 'language-' }); utils.addSpecTests(path.join(__dirname, 'fixtures/stmd/good.txt'), md);