From 9184a301c06c73c21ebe38a5abebd70100df068b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 24 Jun 2016 12:30:53 +0200 Subject: [PATCH] marked now needs to be shipped in monaco-editor-core due to 51f2d539a60cf22955ccc64db39e060d39b85782 --- build/gulpfile.editor.js | 2 -- build/monaco/ThirdPartyNotices.txt | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js index 82291913706..df483970b0b 100644 --- a/build/gulpfile.editor.js +++ b/build/gulpfile.editor.js @@ -57,8 +57,6 @@ var BUNDLED_FILE_HEADER = [ function editorLoaderConfig(removeAllOSS) { var result = common.loaderConfig(); - // never ship marked in editor - result.paths['vs/base/common/marked/marked'] = 'out-build/vs/base/common/marked/marked.mock'; // never ship octicons in editor result.paths['vs/base/browser/ui/octiconLabel/octiconLabel'] = 'out-build/vs/base/browser/ui/octiconLabel/octiconLabel.mock'; diff --git a/build/monaco/ThirdPartyNotices.txt b/build/monaco/ThirdPartyNotices.txt index 6cf532ef542..29b175e7597 100644 --- a/build/monaco/ThirdPartyNotices.txt +++ b/build/monaco/ThirdPartyNotices.txt @@ -70,3 +70,32 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ========================================= END OF string_scorer NOTICES AND INFORMATION + + + + +%% chjj-marked NOTICES AND INFORMATION BEGIN HERE +========================================= +The MIT License (MIT) + +Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +========================================= +END OF chjj-marked NOTICES AND INFORMATION