Benutzer:Schnark/js/syntaxhighlight.js - Versionsgeschichte

Krinkle: Maintenance: mw:RL/MGU - Updated deprecated module name

2019-01-20T02:38:51Z

Maintenance: mw:RL/MGU - Updated deprecated module name

← Nächstältere Version		Version vom 20. Januar 2019, 04:38 Uhr
Zeile 229:		Zeile 229:
	t = t.slice(parens[j] - oldLen);		t = t.slice(parens[j] - oldLen);
	}		}
	newOutput.push([t~~.charAt(~~0), 'matching-paren']);		newOutput.push([t[0], 'matching-paren']);
	t = t.slice(1);		t = t.slice(1);
	oldLen = parens[j] + 1;		oldLen = parens[j] + 1;
Zeile 319:		Zeile 319:
	this.close('externalLink');		this.close('externalLink');
	this.open('externalLink');		this.open('externalLink');
	this.write('[' + text~~.charAt(~~0)); //write first char to make sure we don't trigger a bare external link		this.write('[' + text[0]); //write first char to make sure we don't trigger a bare external link
	return;		return;
	}		}
Zeile 329:		Zeile 329:
	this.write(']');		this.write(']');
	this.close('externalLink');		this.close('externalLink');
	} else if (text~~.charAt(~~0) === ']') {		} else if (text[0] === ']') {
	this.closeUntil('wikilink');		this.closeUntil('wikilink');
	this.write(']]');		this.write(']]');
Zeile 365:		Zeile 365:
	//if the following text starts with # or !}}, the last pair of braces		//if the following text starts with # or !}}, the last pair of braces
	//is start of a "template" (well, of a parser function)		//is start of a "template" (well, of a parser function)
	var isTemplate = (text~~.charAt(~~0) === '#' \|\| (text~~.charAt(~~0) === '!' && text.indexOf('!}}') === 0)),		var isTemplate = (text[0] === '#' \|\| (text[0] === '!' && text.indexOf('!}}') === 0)),
	count = braces.length - (isTemplate ? 2 : 0), i;		count = braces.length - (isTemplate ? 2 : 0), i;
	if (count === 1) {		if (count === 1) {
Zeile 397:		Zeile 397:
	'\\}': function (x, text, before) {		'\\}': function (x, text, before) {
	var closeTable = (/^ *\\|$/.test(before)), count = 1, i;		var closeTable = (/^ *\\|$/.test(before)), count = 1, i;
	if (text~~.charAt(~~0) === '}') {		if (text[0] === '}') {
	count = 2;		count = 2;
	if (text.charAt(1) === '}') {		if (text.charAt(1) === '}') {
Zeile 442:		Zeile 442:
	},		},
	'^\\\|-+\|^\\\|\\+\|^[\|!]\|\\\|\\\|\|!!': function (s, next) {		'^\\\|-+\|^\\\|\\+\|^[\|!]\|\\\|\\\|\|!!': function (s, next) {
	if (this.current() === 'table' && !(s === '\|' && next~~.charAt(~~0) === '}')) {		if (this.current() === 'table' && !(s === '\|' && next[0] === '}')) {
	this.open('table-syntax');		this.open('table-syntax');
	this.write(s);		this.write(s);
Zeile 760:		Zeile 760:
	return this.colors[type];		return this.colors[type];
	}		}
	if (type~~.charAt(~~0) === '<') {		if (type[0] === '<') {
	return this.colors.tag;		return this.colors.tag;
	}		}
Zeile 1.344:		Zeile 1.344:
	for (i = 0; i < lines.length; i++) {		for (i = 0; i < lines.length; i++) {
	if (e.shiftKey) {		if (e.shiftKey) {
	if (lines[i]~~.charAt(~~0) === '\t') {		if (lines[i][0] === '\t') {
	lines[i] = lines[i].slice(1);		lines[i] = lines[i].slice(1);
	len--;		len--;
Zeile 1.445:		Zeile 1.445:
	}, ext, deps = [], hasCodeEditor = 0; //0 - no, 1 - yes, disabled, 2 - yes, enabled		}, ext, deps = [], hasCodeEditor = 0; //0 - no, 1 - yes, disabled, 2 - yes, enabled
	if (!ve && mw.config.get('wgCanonicalSpecialPageName') !== 'Upload' && mw.user.options.get('usebetatoolbar')) {		if (!ve && mw.config.get('wgCanonicalSpecialPageName') !== 'Upload' && mw.user.options.get('usebetatoolbar')) {
	deps.push('ext.wikiEditor~~.toolbar~~');		deps.push('ext.wikiEditor');
	mw.util.addCSS('.tool-select .options {z-index: 5;}');		mw.util.addCSS('.tool-select .options {z-index: 5;}');
	}		}

Schnark: alten Checkboxcode entfernt

2017-08-29T07:46:37Z

alten Checkboxcode entfernt

@@ Zeile 1.080: / Zeile 1.080: @@
 };
-function makeCheckboxCommon (label, highlighter) {
+function makeCheckboxVE (label, highlighter) {
 	$label = $('<label>', {
 		'for': 'syntaxhighlight'
@@ Zeile 1.096: / Zeile 1.101: @@
+		}
 	});
 	$('#syntaxhighlight, label[for="syntaxhighlight"]').remove();
-	$span = $('<span>').append(elements.$checkbox).append('\n').append(elements.$label);
+	$span = $('<span>').append($checkbox).append('\n').append($label);
 	$('#footer').prepend($span);
 	mw.hook('ve.deactivate').add(function () {
@@ Zeile 1.122: / Zeile 1.109: @@
+}
-function makeCheckboxOoui (label, highlighter) {
+function makeCheckboxEdit (label, highlighter) {
 	mw.loader.using('oojs-ui-core').done(function () {
 		var checkbox = new OO.ui.CheckboxInputWidget({
@@ Zeile 1.155: / Zeile 1.142: @@
 	if (label) {
 		if (id) {
 		} else {
 			makeCheckboxVE(label, highlighter);

Schnark: an OOjs-UI-Stil anpassen

2017-05-19T07:21:38Z

an OOjs-UI-Stil anpassen

Änderungen zeigen

Schnark: bind

2017-05-04T08:07:47Z

bind

← Nächstältere Version		Version vom 4. Mai 2017, 10:07 Uhr
Zeile 802:		Zeile 802:

	highlight: function (text, pos) {		highlight: function (text, pos) {
	var css~~, that = this~~;		var css;
	if (!this.hasChanged(text, pos)) {		if (!this.hasChanged(text, pos)) {
	return;		return;
Zeile 816:		Zeile 816:
	this.lastCSS = css;		this.lastCSS = css;
	requestAnimationFrame(function () {		requestAnimationFrame(function () {
	~~that~~.stylesheet.textContent = css;		this.stylesheet.textContent = css;
	});		}.bind(this));
	}		}
	};		};
Zeile 849:		Zeile 849:

	function Highlighter (syntax, colors, textarea, paren) {		function Highlighter (syntax, colors, textarea, paren) {
	var that = this;
	if (!syntax) {		if (!syntax) {
	this.debug = true;		this.debug = true;
Zeile 863:		Zeile 862:
	if (paren) {		if (paren) {
	if (this.isDiv) {		if (this.isDiv) {
	~~that~~.getPos = function () {		this.getPos = function () {
	var sel = window.getSelection(), par, i, c, l, pos = 0;		var sel = window.getSelection(), par, i, c, l, pos = 0;
	if (!sel.isCollapsed \|\| !sel.anchorNode) {		if (!sel.isCollapsed \|\| !sel.anchorNode) {
Zeile 869:		Zeile 868:
	}		}
	par = sel.anchorNode.parentNode;		par = sel.anchorNode.parentNode;
	if (!par \|\| par.parentNode !== ~~that~~.textarea) {		if (!par \|\| par.parentNode !== this.textarea) {
	return false;		return false;
	}		}
	c = ~~that~~.textarea.children;		c = this.textarea.children;
	l = c.length;		l = c.length;
	for (i = 0; i < l; i++) {		for (i = 0; i < l; i++) {
Zeile 881:		Zeile 880:
	}		}
	return pos + sel.anchorOffset;		return pos + sel.anchorOffset;
	};		}.bind(this);
	} else {		} else {
	this.$textarea = $(this.textarea);		this.$textarea = $(this.textarea);
	mw.loader.using('jquery.textSelection').done(function () {		mw.loader.using('jquery.textSelection').done(function () {
	~~that~~.getPos = function () {		this.getPos = function () {
	return ~~that~~.$textarea.textSelection('getCaretPosition');		return this.$textarea.textSelection('getCaretPosition');
	};		}.bind(this);
	});		}.bind(this));
	}		}
	}		}
Zeile 1.026:		Zeile 1.025:

	proxy: function (f) {		proxy: function (f) {
	var that = this;
	if (!this.proxyCache) {		if (!this.proxyCache) {
	this.proxyCache = {};		this.proxyCache = {};
Zeile 1.032:		Zeile 1.030:
	if (!hasOwn.call(this.proxyCache, f)) {		if (!hasOwn.call(this.proxyCache, f)) {
	this.proxyCache[f] = function () {		this.proxyCache[f] = function () {
	~~that~~[f].apply(~~that~~);		this[f].apply(this);
	};		}.bind(this);
	}		}
	return this.proxyCache[f];		return this.proxyCache[f];

Schnark: jQuery-Hilfsfunktionen durch gewöhnliches JS ersetzt

2017-04-06T07:08:36Z

jQuery-Hilfsfunktionen durch gewöhnliches JS ersetzt

← Nächstältere Version		Version vom 6. April 2017, 09:08 Uhr
Zeile 348:		Zeile 348:
	this.write(tag);		this.write(tag);
	this.close('<' + tagname + '>');		this.close('<' + tagname + '>');
	} else if ((selfclosing && $.~~inArray~~(tagname~~, singleTag~~) > -1) \|\| $.~~inArray~~(tagname~~, selfclosingTag~~) > -1) {		} else if ((selfclosing && singleTag.indexOf(tagname) > -1) \|\| selfclosingTag.indexOf(tagname) > -1) {
	this.open('<' + tagname + '>');		this.open('<' + tagname + '>');
	this.write(tag);		this.write(tag);
Zeile 452:		Zeile 452:
	'~{3,5}': makeParserFunctionType('signature'),		'~{3,5}': makeParserFunctionType('signature'),
	'https?://': parsePlainLink, //TODO? Should we use mw.config.get('wgUrlProtocols') instead?		'https?://': parsePlainLink, //TODO? Should we use mw.config.get('wgUrlProtocols') instead?
	'\'\'+': function (apos, next) { //~~FIXME~~ this is a ~~bit~~ ~~too~~ ~~simple~~		'\'\'+': function (apos, next) { //this isn't perfect, but good enough on actual pages
	var b = this.isOpen('bold'), i = this.isOpen('italic');		var b = this.isOpen('bold'), i = this.isOpen('italic');
	if (apos.length === 4) {		if (apos.length === 4) {
Zeile 532:		Zeile 532:
	var i;		var i;
	for (i = 0; i < open.length; i++) {		for (i = 0; i < open.length; i++) {
	if (~~$.inArray(open[i],~~ ['externalLink', 'bold', 'italic', 'heading', 'pre']) !== -1) {		if (['externalLink', 'bold', 'italic', 'heading', 'pre'].indexOf(open[i]) !== -1) {
	open.length = i;		open.length = i;
	break;		break;
Zeile 884:		Zeile 884:
	} else {		} else {
	this.$textarea = $(this.textarea);		this.$textarea = $(this.textarea);
	mw.loader.using('jquery.textSelection', function () {		mw.loader.using('jquery.textSelection').done(function () {
	that.getPos = function () {		that.getPos = function () {
	return that.$textarea.textSelection('getCaretPosition');		return that.$textarea.textSelection('getCaretPosition');
Zeile 984:		Zeile 984:
	bugfixStyle.paddingRight = addPx(style.paddingRight, 1);		bugfixStyle.paddingRight = addPx(style.paddingRight, 1);
	} else if (this.isDiv) {		} else if (this.isDiv) {
	bugfixStyle.lineHeight = this.textarea.firstChild ~~? //FIXME can~~ this ~~happen?~~		bugfixStyle.lineHeight = getStyles(this.textarea.firstChild \|\| this.textarea, ['lineHeight']).lineHeight;
	getStyles(this.textarea.firstChild, ['lineHeight']).lineHeight : '18.45px';
	}		}

Zeile 1.114:		Zeile 1.113:
	enabling/disabling syntaxhighlight would waste space, and other small things.		enabling/disabling syntaxhighlight would waste space, and other small things.
	So let's do it quick and dirty and hope for native highlighting in NWE soon. */		So let's do it quick and dirty and hope for native highlighting in NWE soon. */
			$('#syntaxhighlight, label[for="syntaxhighlight"]').remove();
	$span = $('<span>').append($checkbox).append('\n').append($label);		$span = $('<span>').append($checkbox).append('\n').append($label);
	$('#footer').prepend($span);		$('#footer').prepend($span);
Zeile 1.221:		Zeile 1.221:
	return 'wpUploadDescription';		return 'wpUploadDescription';
	}		}
	if ($('html.ve-active').length) {		if ($('html.ve-activating, html.ve-active').length) { //class can still be ve-activating when toolbar isn't ready yet
	return '';		return '';
	}
	if (!$('#wpTextbox1').length) {
	console.log($('html')[0].className);
	}		}
	return 'wpTextbox1';		return 'wpTextbox1';
Zeile 1.343:		Zeile 1.340:
	//only call this when CodeEditor is disabled!		//only call this when CodeEditor is disabled!
	function createHighlighter (deps, ext) {		function createHighlighter (deps, ext) {
	mw.loader.using(deps, function () {		mw.loader.using(deps).done(function () {
	$(function () {		$(function () {
	window.setTimeout(function () { //make sure we initialize after WikiEditor		window.setTimeout(function () { //make sure we initialize after WikiEditor
Zeile 1.433:		Zeile 1.430:

	if (ext) {		if (ext) {
	mw.loader.using('jquery.textSelection', allowTabs);		mw.loader.using('jquery.textSelection').done(allowTabs);
	}		}

Zeile 1.453:		Zeile 1.450:

	if (hasCodeEditor) {		if (hasCodeEditor) {
	mw.loader.using('ext.codeEditor', function () {		mw.loader.using('ext.codeEditor').done(function () {
	$(function () {		$(function () {
	handleCodeEditor(deps, ext, hasCodeEditor === 2);		handleCodeEditor(deps, ext, hasCodeEditor === 2);
Zeile 1.465:		Zeile 1.462:

	if (		if (
	$.~~inArray~~(mw.config.get('wgAction')~~, ['edit', 'submit']~~) !== -1 \|\|		['edit', 'submit'].indexOf(mw.config.get('wgAction')) !== -1 \|\|
	mw.config.get('wgCanonicalSpecialPageName') === 'Upload'		mw.config.get('wgCanonicalSpecialPageName') === 'Upload'
	) {		) {
	mw.loader.using(['jquery.client', 'mediawiki.util', 'mediawiki.language', 'user.options'], function () {		mw.loader.using(['jquery.client', 'mediawiki.util', 'mediawiki.language', 'user.options']).done(function () {
	init(); //make sure no parameters are used		init(); //make sure no parameters are used
	});		});
Zeile 1.474:		Zeile 1.471:

	mw.hook('ve.activationComplete').add(function () {		mw.hook('ve.activationComplete').add(function () {
	mw.loader.using(['jquery.client', 'mediawiki.util', 'mediawiki.language', 'user.options'], function () {		mw.loader.using(['jquery.client', 'mediawiki.util', 'mediawiki.language', 'user.options']).done(function () {
	init(true);		init(true);
	});		});

Schnark: +Debug

2017-04-05T08:05:18Z

+Debug

← Nächstältere Version		Version vom 5. April 2017, 10:05 Uhr
Zeile 1.223:		Zeile 1.223:
	if ($('html.ve-active').length) {		if ($('html.ve-active').length) {
	return '';		return '';
			}
			if (!$('#wpTextbox1').length) {
			console.log($('html')[0].className);
	}		}
	return 'wpTextbox1';		return 'wpTextbox1';

Schnark: Versuch die Zeilenhöhe korrekt auszulesen

2017-04-03T09:50:25Z

Versuch die Zeilenhöhe korrekt auszulesen

← Nächstältere Version		Version vom 3. April 2017, 11:50 Uhr
Zeile 984:		Zeile 984:
	bugfixStyle.paddingRight = addPx(style.paddingRight, 1);		bugfixStyle.paddingRight = addPx(style.paddingRight, 1);
	} else if (this.isDiv) {		} else if (this.isDiv) {
	bugfixStyle.lineHeight = ~~'18~~.~~45px';~~ //~~ve.ui.MWDesktopWikitextSurface.css~~ FIXME do ~~not~~ ~~hardcode!~~		bugfixStyle.lineHeight = this.textarea.firstChild ? //FIXME can this happen?
			getStyles(this.textarea.firstChild, ['lineHeight']).lineHeight : '18.45px';
	}		}

Schnark: $.now -> mw.now

2017-04-03T07:43:57Z

$.now -> mw.now

← Nächstältere Version		Version vom 3. April 2017, 09:43 Uhr
Zeile 842:		Zeile 842:
	}		}
	return String(l) + 'px';		return String(l) + 'px';
			}

			function randomId () {
			return 'id' + String(mw.now()).replace(/\D/g, '');
	}		}

Zeile 852:		Zeile 856:
	this.isDiv = (textarea.tagName.toLowerCase() !== 'textarea');		this.isDiv = (textarea.tagName.toLowerCase() !== 'textarea');
	this.initBoxes();		this.initBoxes();
	this.basicHighlighter = new BasicHighlighter(syntax, colors, this.highlightbox, (textarea.id \|\| (~~'id' + $.now()~~)) + '-');		this.basicHighlighter = new BasicHighlighter(syntax, colors, this.highlightbox, (textarea.id \|\| randomId()) + '-');
	this.onoff = $.noop;		this.onoff = $.noop;
	this.reportTime = $.noop;		this.reportTime = $.noop;
Zeile 1.072:		Zeile 1.076:
	},		},
	highlight: function () {		highlight: function () {
	var time = $.now();		var time = mw.now();
	this.basicHighlighter.highlight(this.getContent(), this.getPos());		this.basicHighlighter.highlight(this.getContent(), this.getPos());
	this.reportTime($.now() - time);		this.reportTime(mw.now() - time);
	}		}
	};		};
Zeile 1.354:		Zeile 1.358:
	$('.tool[rel="codeEditor"]').remove();		$('.tool[rel="codeEditor"]').remove();
	context.fn.disableCodeEditor();		context.fn.disableCodeEditor();
	if (mw.user.options.get('usecodeeditor') !== '0') {		if (String(mw.user.options.get('usecodeeditor')) !== '0') {
	context.fn.setCodeEditorPreference(false);		context.fn.setCodeEditorPreference(false);
	}		}
Zeile 1.430:		Zeile 1.434:
	if (ext && mw.user.options.get('usebetatoolbar')) {		if (ext && mw.user.options.get('usebetatoolbar')) {
	if (mw.user.options.exists('usecodeeditor')) {		if (mw.user.options.exists('usecodeeditor')) {
	if (mw.user.options.get('usecodeeditor') !== '0') {		if (String(mw.user.options.get('usecodeeditor')) !== '0') {
	hasCodeEditor = 2;		hasCodeEditor = 2;
	} else {		} else {

Schnark: 2 kleine Fehler behoben

2017-03-10T10:23:25Z

2 kleine Fehler behoben

← Nächstältere Version		Version vom 10. März 2017, 12:23 Uhr
Zeile 769:		Zeile 769:
	for (i = 0; i < syntax.length; i++) {		for (i = 0; i < syntax.length; i++) {
	color = this.getColor(syntax[i][1]);		color = this.getColor(syntax[i][1]);
	text = syntax[i][0].replace(/(\\\|")/g, '\\$1')~~.replace(/\n/g, '\\A ');~~		text = syntax[i][0].replace(/(\\\|")/g, '\\$1')
			.replace(/\n/g, '\\A '); //append space to make sure no longer hex number is created
	if (color !== lastColor) {		if (color !== lastColor) {
	if (lastColor !== false) {		if (lastColor !== false) {
Zeile 788:		Zeile 789:
	css.push('"}');		css.push('"}');
	this.makeSpans(Math.floor(spans / 2) + 1);		this.makeSpans(Math.floor(spans / 2) + 1);
	return css.join('');		return css.join('').replace(/\\A "/g, '\\A"'); //in this case the space is wrong
	},		},

Zeile 979:		Zeile 980:
	bugfixStyle.paddingRight = addPx(style.paddingRight, 1);		bugfixStyle.paddingRight = addPx(style.paddingRight, 1);
	} else if (this.isDiv) {		} else if (this.isDiv) {
	bugfixStyle.lineHeight = '~~20px~~'; //ve.ui.MWDesktopWikitextSurface.css		bugfixStyle.lineHeight = '18.45px'; //ve.ui.MWDesktopWikitextSurface.css FIXME do not hardcode!
	}		}

Schnark: in NWE standardmäßig deaktiviert, im Moment zu viele Probleme

2017-03-10T08:36:53Z

in NWE standardmäßig deaktiviert, im Moment zu viele Probleme

← Nächstältere Version		Version vom 10. März 2017, 10:36 Uhr
Zeile 1.399:		Zeile 1.399:

	if (!$.client.test(map) && !mw.util.getParamValue('ignoreBlacklist')) {		if (!$.client.test(map) && !mw.util.getParamValue('ignoreBlacklist')) {
			return;
			}

			if (ve && !mw.user.options.get('userjs-schnark-syntaxhighlight-nwe')) {
	return;		return;
	}		}