提交 21b2a40f 编写于 作者: J Johannes Rieken

move marked.js to common

上级 016f521f
......@@ -56,7 +56,7 @@ function editorLoaderConfig(removeAllOSS) {
var result = common.loaderConfig();
// never ship marked in editor
result.paths['vs/languages/markdown/common/marked'] = 'out-build/vs/languages/markdown/common/marked.mock';
result.paths['vs/base/common/marked/marked'] = 'out-build/vs/base/common/marked/marked.mock';
if (removeAllOSS) {
result.paths['vs/languages/lib/common/beautify-html'] = 'out-build/vs/languages/lib/common/beautify-html.mock';
......
......@@ -43,7 +43,7 @@ var indentationFilter = [
'!**/vs/languages/sass/test/common/example.scss',
'!**/vs/languages/less/common/parser/less.grammar.txt',
'!**/vs/languages/css/common/buildscripts/css-schema.xml',
'!**/vs/languages/markdown/common/raw.marked.js',
'!**/vs/base/common/marked/raw.marked.js',
'!**/vs/base/common/winjs.base.raw.js',
'!**/vs/base/node/terminateProcess.sh',
'!**/vs/base/node/terminateProcess.sh',
......
......@@ -5,7 +5,7 @@
require.config({
shim: {
'vs/languages/markdown/common/raw.marked': {
'vs/base/common/marked/raw.marked': {
exports: function () {
return this.marked;
}
......
......@@ -12,7 +12,7 @@ import EditorCommon = require('vs/editor/common/editorCommon');
import Modes = require('vs/editor/common/modes');
import Strings = require('vs/base/common/strings');
import Paths = require('vs/base/common/paths');
import Marked = require('vs/languages/markdown/common/marked');
import Marked = require('vs/base/common/marked/marked');
import ModesExtensions = require('vs/editor/common/modes/modesRegistry');
import {tokenizeToString} from 'vs/editor/common/modes/textToHtmlTokenizer';
import Platform = require('vs/platform/platform');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册