From 27e19e5f54269b6a492554271d596aa24e2d8e49 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 30 Aug 2016 11:20:50 +0200 Subject: [PATCH 1/7] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index df140562..6fe91641 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ Please mention the version of the editor when creating issues and the browser yo This repository contains only the scripts to glue things together, please create issues against the actual repositories where the source code lives: * [monaco-editor-core](https://github.com/Microsoft/vscode) -- (the editor itself) - * [monaco-typescript](https://github.com/Microsoft/monaco-typescript) -- (JavaScript or TypeScript language support) * [monaco-css](https://github.com/Microsoft/monaco-css) -- (CSS, LESS or SCSS advanced language support) * [monaco-json](https://github.com/Microsoft/monaco-json) -- (JSON advanced language support) * [monaco-languages](https://github.com/Microsoft/monaco-languages) -- (bat, coffee script, cpp, csharp, fsharp, go, ini, jade, lua, objective-c, powershell, python, r, ruby, sql, swift, vb or xml colorizers) From 20e9e10736ea20c22e952c7c747a7a50cc178c3b Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 30 Aug 2016 11:57:26 +0200 Subject: [PATCH 2/7] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6fe91641..f2a384d7 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,11 @@ Browse the latest editor API at [`monaco.d.ts`](https://github.com/Microsoft/mon ## Issues -Please mention the version of the editor when creating issues and the browser you're having trouble in. +Please mention the version of the editor when creating issues and the browser you're having trouble in. Use the following two repositories when filing issues: -This repository contains only the scripts to glue things together, please create issues against the actual repositories where the source code lives: + * [monaco-editor](https://github.com/Microsoft/monaco-editor) -- (TypeScript, JavaScript, JSON, CSS, LESS or SCSS advanced language support, and all color-only languages like bat, coffee script, cpp, csharp, fsharp, go, ini, jade, lua, objective-c, powershell, python, r, ruby, sql, swift, vb or xml colorizers) * [monaco-editor-core](https://github.com/Microsoft/vscode) -- (the editor itself) - * [monaco-css](https://github.com/Microsoft/monaco-css) -- (CSS, LESS or SCSS advanced language support) - * [monaco-json](https://github.com/Microsoft/monaco-json) -- (JSON advanced language support) - * [monaco-languages](https://github.com/Microsoft/monaco-languages) -- (bat, coffee script, cpp, csharp, fsharp, go, ini, jade, lua, objective-c, powershell, python, r, ruby, sql, swift, vb or xml colorizers) + ## Known issues In IE, the editor must be completely surrounded in the body element, otherwise the hit testing we do for mouse operations does not work. You can inspect this using F12 and clicking on the body element and confirm that visually it surrounds the editor. From 7829739f7746274f8ecc14aa6e9e8fe3b1ca8e46 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 30 Aug 2016 12:00:24 +0200 Subject: [PATCH 3/7] update metadata --- metadata.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.js b/metadata.js index f1c44ed0..7a5b8544 100644 --- a/metadata.js +++ b/metadata.js @@ -32,7 +32,7 @@ modulePrefix: 'vs/language/json', paths: { npm: 'node_modules/monaco-json/release/min', - dev: '/monaco-css/release/dev' + dev: '/monaco-json/release/dev' } },{ name: 'monaco-languages', From 741a1e5438f649d0d0ee125ad22c92e1e76268b3 Mon Sep 17 00:00:00 2001 From: Chris Dias Date: Tue, 30 Aug 2016 10:42:20 -0700 Subject: [PATCH 4/7] clarify mobile support --- website/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/index.html b/website/index.html index 87627ebd..09be6c8b 100644 --- a/website/index.html +++ b/website/index.html @@ -55,6 +55,8 @@

It is licensed under the MIT License and supports IE 9/10/11, Edge, Chrome, Firefox, Safari and Opera.

+

The Monaco editor is not supported in mobile browsers or mobile web frameworks.

+

Find more information at the Monaco Editor repo.

From 841b1ed9e5ba5bbca9aec2f460773ded757990b1 Mon Sep 17 00:00:00 2001 From: Chris Dias Date: Tue, 30 Aug 2016 10:45:18 -0700 Subject: [PATCH 5/7] clarify mobile support --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index f2a384d7..03835131 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,11 @@ Create a Monarch tokenizer [here](https://microsoft.github.io/monaco-editor/mona > Q: I see the warning "Could not create web worker". What should I do?
> A: HTML5 does not allow pages loaded on `file://` to create web workers. Please load the editor with a web server on `http://` or `https://` schemes. Please also see the cross domain case above. + +> Q: Is the editor supported in mobile browsers or mobile web app frameworks?
+> A: No. + + ## Dev ### Cheat Sheet From b48fd28aa5155cc99d43aae924f58ba2cdc7ae6b Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Wed, 31 Aug 2016 11:38:15 +0200 Subject: [PATCH 6/7] Update README.md --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 03835131..fc0d35bc 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,7 @@ Browse the latest editor API at [`monaco.d.ts`](https://github.com/Microsoft/mon ## Issues -Please mention the version of the editor when creating issues and the browser you're having trouble in. Use the following two repositories when filing issues: - - * [monaco-editor](https://github.com/Microsoft/monaco-editor) -- (TypeScript, JavaScript, JSON, CSS, LESS or SCSS advanced language support, and all color-only languages like bat, coffee script, cpp, csharp, fsharp, go, ini, jade, lua, objective-c, powershell, python, r, ruby, sql, swift, vb or xml colorizers) - * [monaco-editor-core](https://github.com/Microsoft/vscode) -- (the editor itself) - +Please mention the version of the editor when creating issues and the browser you're having trouble in. Create issues in this repository. ## Known issues In IE, the editor must be completely surrounded in the body element, otherwise the hit testing we do for mouse operations does not work. You can inspect this using F12 and clicking on the body element and confirm that visually it surrounds the editor. From 31dddee3269c469c537caad0793a101a7423ab05 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 31 Aug 2016 17:31:21 +0200 Subject: [PATCH 7/7] Add colorize test page (#151) --- test/colorize.html | 55 ++++++++++++++++++++++++++++++++++++++++++++++ test/index.html | 2 ++ 2 files changed, 57 insertions(+) create mode 100644 test/colorize.html diff --git a/test/colorize.html b/test/colorize.html new file mode 100644 index 00000000..1ee4bb31 --- /dev/null +++ b/test/colorize.html @@ -0,0 +1,55 @@ + + + + + + + + +

Colorize example

+ +
+/* Some example CSS */
+
+@import url("something.css");
+
+body {
+  margin: 0;
+  padding: 3em 6em;
+  font-family: tahoma, arial, sans-serif;
+  color: #000;
+}
+
+#navigation a {
+  font-weight: bold;
+  text-decoration: none !important;
+}
+
+h1 {
+  font-size: 2.5em;
+}
+
+h2 {
+  font-size: 1.7em;
+}
+
+h1:before, h2:before {
+  content: "some contents";
+}
+
+code {
+  font-family: courier, monospace;
+  font-size: 80%;
+  color: #418A8A;
+}
+
+ + + + + + \ No newline at end of file diff --git a/test/index.html b/test/index.html index 0ef435df..3308e1fa 100644 --- a/test/index.html +++ b/test/index.html @@ -18,6 +18,8 @@ Jump to:  |  [scrollable element]  |  +[colorize element] + |  [cross origin broken]  |  [cross origin good]