Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 493848 | Differences between
and this patch

Collapse All | Expand All

(-)a/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/styles.txt (-1 / +1 lines)
Lines 1156-1162 Link Here
1156
{"start":12259,"end":12261,"style":{"styleClass":"string quoted double"}}
1156
{"start":12259,"end":12261,"style":{"styleClass":"string quoted double"}}
1157
{"start":12263,"end":12276,"style":{"styleClass":"comment line double-slash"}}
1157
{"start":12263,"end":12276,"style":{"styleClass":"comment line double-slash"}}
1158
{"start":12303,"end":12304,"style":{"styleClass":"punctuation operator"}}
1158
{"start":12303,"end":12304,"style":{"styleClass":"punctuation operator"}}
1159
{"start":12305,"end":12307,"style":{"styleClass":"string quoted double"}}
1159
{"start":12305,"end":12307,"style":{"styleClass":"string quoted backtick js"}}
1160
{"start":12309,"end":12322,"style":{"styleClass":"comment line double-slash"}}
1160
{"start":12309,"end":12322,"style":{"styleClass":"comment line double-slash"}}
1161
{"start":12327,"end":12328,"style":{"styleClass":"punctuation section block end"}}
1161
{"start":12327,"end":12328,"style":{"styleClass":"punctuation section block end"}}
1162
{"start":12332,"end":12333,"style":{"styleClass":"punctuation section block end"}}
1162
{"start":12332,"end":12333,"style":{"styleClass":"punctuation section block end"}}
(-)a/bundles/org.eclipse.orion.client.editor/web/js-tests/editor/textStyler/js/text.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * @license
2
 * @license
3
 * Copyright (c) 2010, 2015 IBM Corporation and others.
3
 * Copyright (c) 2010, 2016 IBM Corporation and others.
4
 * All rights reserved. This program and the accompanying materials are made 
4
 * All rights reserved. This program and the accompanying materials are made 
5
 * available under the terms of the Eclipse Public License v1.0 
5
 * available under the terms of the Eclipse Public License v1.0 
6
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
6
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
Lines 383-389 define("orion/editor/textView", [ //$NON-NLS-0$ Link Here
383
					viewDiv.style.zIndex = "2"; //$NON-NLS-0$
383
					viewDiv.style.zIndex = "2"; //$NON-NLS-0$
384
				} else {
384
				} else {
385
					viewDiv.style.pointerEvents = ""; //$NON-NLS-0$
385
					viewDiv.style.pointerEvents = ""; //$NON-NLS-0$
386
					viewDiv.style.zIndex = ""; //$NON-NLS-0$
386
					viewDiv.style.zIndex = ``; //$NON-NLS-0$
387
				}
387
				}
388
			}
388
			}
389
			if (!init) {
389
			if (!init) {
(-)a/bundles/org.eclipse.orion.client.editor/web/orion/editor/stylers/application_javascript/syntax.js (-1 / +5 lines)
Lines 1-6 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * @license
2
 * @license
3
 * Copyright (c) 2014 IBM Corporation and others.
3
 * Copyright (c) 2014, 2016 IBM Corporation and others.
4
 * All rights reserved. This program and the accompanying materials are made 
4
 * All rights reserved. This program and the accompanying materials are made 
5
 * available under the terms of the Eclipse Public License v1.0 
5
 * available under the terms of the Eclipse Public License v1.0 
6
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
6
 * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution 
Lines 59-64 define("orion/editor/stylers/application_javascript/syntax", ["orion/editor/styl Link Here
59
				end: '^(?:$|(?:\\\\.|[^\\\\"])*("|[^\\\\]$))',
59
				end: '^(?:$|(?:\\\\.|[^\\\\"])*("|[^\\\\]$))',
60
				name: "string.quoted.double.js"
60
				name: "string.quoted.double.js"
61
			},
61
			},
62
			{
63
				match: '`(?:\\\\.|[^`])*`?',
64
				name: "string.quoted.backtick.js"
65
			},
62
			{include: "orion.lib#string_doubleQuote"},
66
			{include: "orion.lib#string_doubleQuote"},
63
			{include: "orion.lib#string_singleQuote"},
67
			{include: "orion.lib#string_singleQuote"},
64
			{include: "orion.c-like#comment_singleLine"},
68
			{include: "orion.c-like#comment_singleLine"},

Return to bug 493848