jenkins-bot has submitted this change and it was merged.
Change subject: Combine var statements
......................................................................
Combine var statements
Change-Id: If005690ab8ecf21e64399781acbecd1ec3b02172
---
M modules/ext.codeEditor.geshi.js
M modules/jquery.codeEditor.js
2 files changed, 89 insertions(+), 53 deletions(-)
Approvals:
TheDJ: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.codeEditor.geshi.js b/modules/ext.codeEditor.geshi.js
index 6a6e6bd..771f80a 100644
--- a/modules/ext.codeEditor.geshi.js
+++ b/modules/ext.codeEditor.geshi.js
@@ -5,10 +5,15 @@
*/
$( function () {
- var $sources = $( '.mw-geshi' );
+ var $sources, setupEditor, openEditor;
+
+ $sources = $( '.mw-geshi' );
+
if ( $sources.length > 0 ) {
- var setupEditor = function ( $div ) {
- var $link = $( '<a>' )
+ setupEditor = function ( $div ) {
+ var $link, $edit;
+
+ $link = $( '<a>' )
.text( mediaWiki.msg( 'editsection' ) )
.attr( 'href', '#' )
.attr( 'title', 'Edit this code section' )
@@ -16,23 +21,29 @@
openEditor( $div );
event.preventDefault();
} );
- var $edit = $( '<span>' )
+ $edit = $( '<span>' )
.addClass( 'mw-editsection' )
.append( '<span
class="mw-editsection-bracket">[</span>' )
.append( $link )
.append( '<span
class="mw-editsection-bracket">]</span>' );
$div.prepend( $edit );
};
- var openEditor = function ( $div ) {
- var $main = $div.find( 'div' ),
- geshiLang = null,
- matches = /(?:^| )source-([a-z0-9_-]+)/.exec(
$main.attr( 'class' ) );
+
+ openEditor = function ( $div ) {
+ var $main, geshiLang, matches, $label, $langDropDown,
$xcontainer, codeEditor;
+
+ $main = $div.find( 'div' );
+ geshiLang = null;
+ matches = /(?:^| )source-([a-z0-9_-]+)/.exec(
$main.attr( 'class' ) );
+
if ( matches ) {
geshiLang = matches[1];
}
mediaWiki.loader.using( 'ext.codeEditor.ace.modes',
function () {
+ var map, canon, $container, $save, $cancel,
$controls, setLanguage, closeEditor;
+
// @fixme de-duplicate
- var map = {
+ map = {
c: 'c_cpp',
cpp: 'c_cpp',
clojure: 'clojure',
@@ -57,17 +68,17 @@
};
// Disable some annoying commands
- var canon = require( 'pilot/canon' );
+ canon = require( 'pilot/canon' );
canon.removeCommand( 'replace' ); //
ctrl+R
canon.removeCommand( 'transposeletters' ); //
ctrl+T
canon.removeCommand( 'gotoline' ); //
ctrl+L
- var $container = $( '<div>' )
+ $container = $( '<div>' )
.attr( 'style', 'top: 32px; left: 0px;
right: 0px; bottom: 0px; border: 1px solid gray' )
.text( $main.text() ); // quick hack :D
- var $label = $( '<label>' ).text( 'Source
language: ' );
- var $langDropDown = $( '<select>' );
+ $label = $( '<label>' ).text( 'Source language:
' );
+ $langDropDown = $( '<select>' );
$.each( map, function ( geshiLang, aceLang ) {
var $opt = $( '<option>' )
.text( geshiLang )
@@ -80,12 +91,14 @@
.change( function ( event ) {
setLanguage( $( this ).val() );
} );
- var $save = $( '<button>' )
+ $save = $( '<button>' )
.text( mediaWiki.msg( 'savearticle' ) )
.click( function ( event ) {
// horrible hack ;)
- var src =
codeEditor.getSession().getValue();
- var tag = '<source lang="' +
geshiLang + '">' + src + '</source>';
+ var src, tag;
+
+ src =
codeEditor.getSession().getValue();
+ tag = '<source lang="' +
geshiLang + '">' + src + '</source>';
$.ajax( wgScriptPath + '/api' +
wgScriptExtension, {
data: {
@@ -104,17 +117,17 @@
}
} );
} );
- var $cancel = $( '<button>' )
+ $cancel = $( '<button>' )
.text( 'Close' ).click( function (
event ) {
$xcontainer.remove();
$div.css( 'display', 'block' );
event.preventDefault();
} );
- var $controls = $( '<div>' )
+ $controls = $( '<div>' )
.append( $label )
.append( $save )
.append( $cancel );
- var $xcontainer = $( '<div style="position:
relative"></div>' )
+ $xcontainer = $( '<div style="position:
relative"></div>' )
.append( $controls )
.append( $container );
$xcontainer.width( $main.width() )
@@ -123,16 +136,16 @@
$div.css( 'display', 'none' );
$xcontainer.insertAfter( $div );
- var codeEditor = ace.edit( $container[0] );
+ codeEditor = ace.edit( $container[0] );
- var setLanguage = function ( lang ) {
+ setLanguage = function ( lang ) {
geshiLang = lang;
var aceLang = map[geshiLang];
codeEditor.getSession().setMode( new
(require( "ace/mode/" + aceLang ).Mode) );
};
setLanguage( geshiLang );
- var closeEditor = function () {
+ closeEditor = function () {
$xcontainer.remove();
$div.css( 'display', 'block' );
};
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index 3c8fce9..756e539 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -33,6 +33,8 @@
};
$.wikiEditor.extensions.codeEditor = function ( context ) {
+ var cookieEnabled, saveAndExtend;
+
/*
* Event Handlers
*
@@ -62,7 +64,7 @@
}
} );
- var cookieEnabled = $.cookie( 'wikiEditor-' + context.instance
+ '-codeEditor-enabled' );
+ cookieEnabled = $.cookie( 'wikiEditor-' + context.instance +
'-codeEditor-enabled' );
context.codeEditorActive = (cookieEnabled !== '0');
/**
@@ -119,23 +121,27 @@
} );
},
'toggleCodeEditorToolbar': function () {
- var target = 'img.tool[rel=codeEditor]';
- var $img =
context.modules.toolbar.$toolbar.find( target );
+ var target, $img;
+
+ target = 'img.tool[rel=codeEditor]';
+ $img = context.modules.toolbar.$toolbar.find(
target );
$img.attr( 'src',
context.fn.codeEditorToolbarIcon() );
},
/**
* Sets up the iframe in place of the textarea to allow
more advanced operations
*/
'setupCodeEditor': function () {
- var box = context.$textarea;
+ var box, lang, container, editdiv, session,
resize, summary;
- var lang = mw.config.get(
"wgCodeEditorCurrentLanguage" );
+ box = context.$textarea;
+ lang = mw.config.get(
"wgCodeEditorCurrentLanguage" );
+
if ( lang ) {
// Ace doesn't like replacing a
textarea directly.
// We'll stub this out to sit on top of
it...
// line-height is needed to compensate
for oddity in WikiEditor extension, which zeroes the line-height on a parent
container
- var container =
context.$codeEditorContainer = $( '<div style="position: relative"><div
class="editor" style="line-height: 1.5em; top: 0px; left: 0px; right: 0px;
bottom: 0px; border: 1px solid gray"></div></div>' ).insertAfter( box );
- var editdiv = container.find( '.editor'
);
+ container =
context.$codeEditorContainer = $( '<div style="position: relative"><div
class="editor" style="line-height: 1.5em; top: 0; left: 0; right: 0; bottom: 0;
border: 1px solid gray"></div></div>' ).insertAfter( box );
+ editdiv = container.find( '.editor' );
box.css( 'display', 'none' );
container.width( box.width() )
@@ -160,7 +166,7 @@
}
];
box.closest( 'form' ).submit(
context.evt.codeEditorSubmit );
- var session =
context.codeEditor.getSession();
+ session =
context.codeEditor.getSession();
// Use proper tabs
session.setUseSoftTabs( false );
@@ -183,7 +189,7 @@
session.setMode( new (require(
"ace/mode/" + lang ).Mode) );
// Force the box to resize horizontally
to match in future :D
- var resize = function () {
+ resize = function () {
container.width( box.width() );
};
$( window ).resize( resize );
@@ -196,7 +202,7 @@
}
} );
- var summary = $( '#wpSummary' );
+ summary = $( '#wpSummary' );
// Let modules know we're ready to
start working with the content
context.fn.trigger( 'ready' );
}
@@ -237,14 +243,17 @@
*/
'codeEditorMonitorFragment': function () {
function onHashChange() {
- var regexp = /#mw-ce-l(\d+)/;
- var result = regexp.exec(
window.location.hash );
+ var regexp, result, line;
+
+ regexp = /#mw-ce-l(\d+)/;
+ result = regexp.exec(
window.location.hash );
+
if ( result === null ) {
return;
}
// Line numbers in CodeEditor are
zero-based
- var line = parseInt( result[1] );
+ line = parseInt( result[1] );
context.codeEditor.navigateTo( line -
1, 0 );
// Scroll up a bit to give some context
context.codeEditor.scrollToRow( line -
4 );
@@ -260,11 +269,15 @@
* Override the base functions in a way that lets
* us fall back to the originals when we turn off.
*/
- var saveAndExtend = function ( base, extended ) {
- var saved = {};
+ saveAndExtend = function ( base, extended ) {
+ var saved, map;
+
+ saved = {};
// $.map doesn't handle objects in jQuery < 1.6; need
this for compat with MW 1.17
- var map = function ( obj, callback ) {
- for ( var key in extended ) {
+ map = function ( obj, callback ) {
+ var key;
+
+ for ( key in extended ) {
if ( obj.hasOwnProperty( key ) ) {
callback( obj[key], key );
}
@@ -331,18 +344,22 @@
* DO NOT CALL THIS DIRECTLY, use $.textSelection(
'functionname', options ) instead
*/
'encapsulateSelection': function ( options ) {
+ var sel, range, selText, isSample, text;
+
// Does not yet handle 'ownline', 'splitlines'
option
- var sel = context.codeEditor.getSelection();
- var range = sel.getRange();
- var selText = context.fn.getSelection();
- var isSample = false;
+ sel = context.codeEditor.getSelection();
+ range = sel.getRange();
+ selText = context.fn.getSelection();
+ isSample = false;
+
if ( !selText ) {
selText = options.peri;
isSample = true;
} else if ( options.replace ) {
selText = options.peri;
}
- var text = options.pre;
+
+ text = options.pre;
text += selText;
text += options.post;
context.codeEditor.insert( text );
@@ -371,14 +388,20 @@
* @param endContainer Element in iframe to end
selection in. If not set, end is a character offset
*/
'setSelection': function ( options ) {
+ var doc, lines, offsetToPos, start, end, sel,
range;
+
// Ace stores positions for ranges as
row/column pairs.
// To convert from character offsets, we'll
need to iterate through the document
- var doc =
context.codeEditor.getSession().getDocument();
- var lines = doc.getAllLines();
+ doc =
context.codeEditor.getSession().getDocument();
+ lines = doc.getAllLines();
- var offsetToPos = function ( offset ) {
- var row = 0, col = 0;
- var pos = 0;
+ offsetToPos = function ( offset ) {
+ var row, col, pos;
+
+ row = 0;
+ col = 0;
+ pos = 0;
+
while ( row < lines.length && pos +
lines[row].length < offset ) {
pos += lines[row].length;
pos++; // for the newline
@@ -387,11 +410,11 @@
col = offset - pos;
return {row: row, column: col};
};
- var start = offsetToPos( options.start ),
- end = offsetToPos( options.end );
+ start = offsetToPos( options.start );
+ end = offsetToPos( options.end );
- var sel = context.codeEditor.getSelection();
- var range = sel.getRange();
+ sel = context.codeEditor.getSelection();
+ range = sel.getRange();
range.setStart( start.row, start.column );
range.setEnd( end.row, end.column );
sel.setSelectionRange( range );
--
To view, visit https://gerrit.wikimedia.org/r/104734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If005690ab8ecf21e64399781acbecd1ec3b02172
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
