Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70216
Change subject: Code style fix: (X) -> ( X )
......................................................................
Code style fix: (X) -> ( X )
Change-Id: I7f3ac95621f70d9a89e70e9a51905673240cb51f
---
M modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js
M modules/ve/ce/ve.ce.RelocatableNode.js
M modules/ve/ce/ve.ce.ResizableNode.js
M modules/ve/ce/ve.ce.Surface.js
M modules/ve/ce/ve.ce.js
M modules/ve/dm/ve.dm.Converter.js
M modules/ve/dm/ve.dm.Surface.js
M modules/ve/dm/ve.dm.SurfaceFragment.js
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
M modules/ve/init/mw/ve.init.mw.Target.js
M modules/ve/test/ce/ve.ce.Document.test.js
M modules/ve/test/dm/lineardata/ve.dm.ElementLinearData.test.js
M modules/ve/test/dm/ve.dm.AnnotationSet.test.js
M modules/ve/test/dm/ve.dm.LinearData.test.js
M modules/ve/test/dm/ve.dm.SurfaceFragment.test.js
M modules/ve/test/dm/ve.dm.Transaction.test.js
M modules/ve/test/ve.test.js
M modules/ve/ui/ve.ui.Toolbar.js
M modules/ve/ve.Element.js
19 files changed, 48 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/16/70216/1
diff --git a/modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js
b/modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js
index 252fc92..bb0a897 100644
--- a/modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js
+++ b/modules/ve/ce/nodes/ve.ce.MWImageCaptionNode.js
@@ -65,7 +65,7 @@
this.$a = $( '<a>' )
.addClass( 'internal' )
// It's inside a protected node, so user can't see href/title
anyways.
- //.attr( 'href', '/wiki/File:Wiki.png')
+ //.attr( 'href', '/wiki/File:Wiki.png' )
//.attr( 'title', 'Enlarge' )
.appendTo( this.$magnify );
this.$img = $( '<img>' )
diff --git a/modules/ve/ce/ve.ce.RelocatableNode.js
b/modules/ve/ce/ve.ce.RelocatableNode.js
index ee3f1b4..7e924f4 100644
--- a/modules/ve/ce/ve.ce.RelocatableNode.js
+++ b/modules/ve/ce/ve.ce.RelocatableNode.js
@@ -18,7 +18,7 @@
ve.ce.RelocatableNode = function VeCeRelocatableNode() {
// Properties
this.relocatingSurface = null;
- this.$relocatableMarker = $('<img>');
+ this.$relocatableMarker = $( '<img>' );
// Events
this.connect( this, {
diff --git a/modules/ve/ce/ve.ce.ResizableNode.js
b/modules/ve/ce/ve.ce.ResizableNode.js
index f1e722c..3d0c91a 100644
--- a/modules/ve/ce/ve.ce.ResizableNode.js
+++ b/modules/ve/ce/ve.ce.ResizableNode.js
@@ -71,13 +71,13 @@
.appendTo( this.root.getSurface().getSurface().$localOverlay );
this.$resizeHandles
- .find('.ve-ce-resizableNode-neHandle')
+ .find( '.ve-ce-resizableNode-neHandle' )
.css( { 'margin-right': -this.$resizable.width() } )
.end()
- .find('.ve-ce-resizableNode-swHandle')
+ .find( '.ve-ce-resizableNode-swHandle' )
.css( { 'margin-bottom': -this.$resizable.height() } )
.end()
- .find('.ve-ce-resizableNode-seHandle')
+ .find( '.ve-ce-resizableNode-seHandle' )
.css( {
'margin-right': -this.$resizable.width(),
'margin-bottom': -this.$resizable.height()
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index f126a7d..ec63004 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -637,7 +637,7 @@
if ( view.clipboard[key] ) {
pasteData = view.clipboard[key];
} else {
- pasteText = view.$pasteTarget.text().replace( /\n/gm,
'');
+ pasteText = view.$pasteTarget.text().replace( /\n/gm,
'' );
pasteData = new ve.dm.DocumentSlice( ve.splitClusters(
pasteText ) );
}
@@ -802,7 +802,7 @@
lengthDiff < 0 &&
previous.text.substring( 0, nextStart ) ===
next.text.substring( 0, nextStart ) &&
- previous.text.substring( previousStart -
lengthDiff + offsetDiff) ===
+ previous.text.substring( previousStart -
lengthDiff + offsetDiff ) ===
next.text.substring( nextStart )
)
);
diff --git a/modules/ve/ce/ve.ce.js b/modules/ve/ce/ve.ce.js
index cb0b88b..8ab47d4 100644
--- a/modules/ve/ce/ve.ce.js
+++ b/modules/ve/ce/ve.ce.js
@@ -95,7 +95,7 @@
} else if ( nodeType === 1 || nodeType === 9 ) {
hash += '<' + nodeName + '>';
// Traverse its children
- for ( element = element.firstChild; element; element =
element.nextSibling) {
+ for ( element = element.firstChild; element; element =
element.nextSibling ) {
hash += ve.ce.getDomHash( element );
}
hash += '</' + nodeName + '>';
@@ -223,7 +223,7 @@
if ( addOuterLength === true ) {
return nodeModel.getOffset() +
nodeModel.getOuterLength();
} else {
- return nodeModel.getOffset() +
(nodeModel.isWrapped() ? 1 : 0);
+ return nodeModel.getOffset() + (
nodeModel.isWrapped() ? 1 : 0 );
}
} else {
node = $domNode.contents().last()[0];
diff --git a/modules/ve/dm/ve.dm.Converter.js b/modules/ve/dm/ve.dm.Converter.js
index d09537b..d3deab1 100644
--- a/modules/ve/dm/ve.dm.Converter.js
+++ b/modules/ve/dm/ve.dm.Converter.js
@@ -1195,7 +1195,7 @@
// then
check that we are the last child
//
before unwrapping (and therefore destroying)
i ===
data.length - 1 ||
- data[i
+ 1].type.charAt(0) === '/'
+ data[i
+ 1].type.charAt( 0 ) === '/'
)
) {
doUnwrap = true;
diff --git a/modules/ve/dm/ve.dm.Surface.js b/modules/ve/dm/ve.dm.Surface.js
index 44c7cba..7a5462e 100644
--- a/modules/ve/dm/ve.dm.Surface.js
+++ b/modules/ve/dm/ve.dm.Surface.js
@@ -139,7 +139,7 @@
*/
ve.dm.Surface.prototype.getHistory = function () {
if ( this.smallStack.length > 0 ) {
- return this.bigStack.slice( 0 ).concat( [{ 'stack':
this.smallStack.slice(0) }] );
+ return this.bigStack.slice( 0 ).concat( [{ 'stack':
this.smallStack.slice( 0 ) }] );
} else {
return this.bigStack.slice( 0 );
}
diff --git a/modules/ve/dm/ve.dm.SurfaceFragment.js
b/modules/ve/dm/ve.dm.SurfaceFragment.js
index f38fdec..f6c612e 100644
--- a/modules/ve/dm/ve.dm.SurfaceFragment.js
+++ b/modules/ve/dm/ve.dm.SurfaceFragment.js
@@ -877,7 +877,7 @@
}
startSplitNode = startSplitNode.getParent();
if ( startSplitRequired ) {
- startSplitNodes.unshift(startSplitNode);
+ startSplitNodes.unshift( startSplitNode );
} else {
startOffset = startSplitNode.getOuterRange().start;
}
@@ -893,7 +893,7 @@
}
endSplitNode = endSplitNode.getParent();
if ( endSplitRequired ) {
- endSplitNodes.unshift(endSplitNode);
+ endSplitNodes.unshift( endSplitNode );
} else {
endOffset = endSplitNode.getOuterRange().end;
}
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 43f4d04..43d9862 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -1061,9 +1061,9 @@
} else {
$links.each( function () {
var veSectionEditUri = new mw.Uri( veEditUri.toString()
),
- sectionEditUri = new mw.Uri( $(this).attr(
'href' ) );
+ sectionEditUri = new mw.Uri( $( this ).attr(
'href' ) );
veSectionEditUri.extend( { 'vesection':
sectionEditUri.query.section } );
- $(this).attr( 'href', veSectionEditUri );
+ $( this ).attr( 'href', veSectionEditUri );
} );
}
};
@@ -1295,17 +1295,17 @@
.byteLimit( viewPage.editSummaryByteLimit )
.on( {
'focus': function () {
- $(this).parent().addClass(
+ $( this ).parent().addClass(
've-init-mw-viewPageTarget-saveDialog-summary-focused'
);
},
'blur': function () {
- $(this).parent().removeClass(
+ $( this ).parent().removeClass(
've-init-mw-viewPageTarget-saveDialog-summary-focused'
);
},
'keyup keydown mouseup cut paste change
focus blur': function () {
- var $textarea = $(this),
+ var $textarea = $( this ),
$editSummaryCount =
$textarea
.closest(
'.ve-init-mw-viewPageTarget-saveDialog-slide-save' )
.find(
'.ve-init-mw-viewPageTarget-saveDialog-editSummaryCount' );
@@ -1379,14 +1379,14 @@
viewPage.$saveDialog.fadeIn( 'fast', function () {
// Initial size
viewPage.onResizeSaveDialog();
- });
+ } );
$( document ).on( 'keydown.ve-savedialog', function ( e ) {
// Escape
if ( e.which === 27 ) {
viewPage.onSaveDialogCloseButtonClick();
}
- });
+ } );
$( window ).on( 'resize.ve-savedialog', ve.bind(
viewPage.onResizeSaveDialog, viewPage ) );
};
@@ -1635,9 +1635,9 @@
var $toc = $( '#toc' ),
$wrap = $toc.parent();
if ( $wrap.data( 've.hideTableOfContents' ) ) {
- $wrap.slideDown(function () {
+ $wrap.slideDown( function () {
$toc.unwrap();
- });
+ } );
}
};
@@ -1793,7 +1793,7 @@
// Make site notice visible again (if present)
- $(' #siteNotice.ve-hide' )
+ $( '#siteNotice.ve-hide' )
.slideDown( 'fast' );
// Push non-veaction=edit url in history
@@ -1880,7 +1880,7 @@
surfaceView = this.surface.getView(),
surfaceModel = surfaceView.getModel();
this.$document.find( 'h1, h2, h3, h4, h5, h6' ).eq(
this.section - 1 ).each( function () {
- var headingNode = $(this).data( 'view' );
+ var headingNode = $( this ).data( 'view' );
if ( headingNode ) {
offset =
surfaceModel.getDocument().data.getNearestContentOffset(
headingNode.getModel().getOffset()
diff --git a/modules/ve/init/mw/ve.init.mw.Target.js
b/modules/ve/init/mw/ve.init.mw.Target.js
index e6ad49e..b7dc694 100644
--- a/modules/ve/init/mw/ve.init.mw.Target.js
+++ b/modules/ve/init/mw/ve.init.mw.Target.js
@@ -315,7 +315,7 @@
if ( !data && !response.error ) {
ve.init.mw.Target.onSaveError.call( this, null, 'Invalid
response from server', null );
} else if ( response.error ) {
- if (response.error.code === 'editconflict' ) {
+ if ( response.error.code === 'editconflict' ) {
this.emit( 'editConflict' );
} else {
ve.init.mw.Target.onSaveError.call(
diff --git a/modules/ve/test/ce/ve.ce.Document.test.js
b/modules/ve/test/ce/ve.ce.Document.test.js
index 7828858..bf480f5 100644
--- a/modules/ve/test/ce/ve.ce.Document.test.js
+++ b/modules/ve/test/ce/ve.ce.Document.test.js
@@ -401,4 +401,4 @@
}
}
QUnit.expect( expectCount );
-});
+} );
diff --git a/modules/ve/test/dm/lineardata/ve.dm.ElementLinearData.test.js
b/modules/ve/test/dm/lineardata/ve.dm.ElementLinearData.test.js
index c90f0bb..b82808f 100644
--- a/modules/ve/test/dm/lineardata/ve.dm.ElementLinearData.test.js
+++ b/modules/ve/test/dm/lineardata/ve.dm.ElementLinearData.test.js
@@ -1335,7 +1335,7 @@
];
QUnit.expect( cases.length );
for ( i = 0; i < cases.length; i++ ) {
- data = new ve.dm.ElementLinearData( store,
cases[i].phrase.split('') );
+ data = new ve.dm.ElementLinearData( store,
cases[i].phrase.split( '' ) );
range = data.getNearestWordRange( cases[i].offset );
word = cases[i].phrase.substring( range.start, range.end );
assert.strictEqual( word, cases[i].expected,
diff --git a/modules/ve/test/dm/ve.dm.AnnotationSet.test.js
b/modules/ve/test/dm/ve.dm.AnnotationSet.test.js
index 7bc1684..5da9d29 100644
--- a/modules/ve/test/dm/ve.dm.AnnotationSet.test.js
+++ b/modules/ve/test/dm/ve.dm.AnnotationSet.test.js
@@ -67,13 +67,13 @@
assert.equal( annotationSet.contains( italic ) &&
!annotationSet.contains( underline ), true, 'contains italic not underline
after removeNotInSet' );
annotationSet2.add( underline, 1 );
annotationSet3 = annotationSet2.reversed();
- assert.equal( annotationSet3.indexOf( underline ), 0, 'underline has
indexOf 0 after reverse');
+ assert.equal( annotationSet3.indexOf( underline ), 0, 'underline has
indexOf 0 after reverse' );
annotationSet3 = annotationSet.mergeWith( annotationSet2 );
- assert.equal( annotationSet3.getLength(), 3, 'set merged with set2 has
length 3');
+ assert.equal( annotationSet3.getLength(), 3, 'set merged with set2 has
length 3' );
annotationSet3 = annotationSet.diffWith( annotationSet2 );
- assert.equal( annotationSet3.getLength(), 1, 'set diffed with set2 has
length 1');
- assert.equal( annotationSet3.contains( bold ), true, 'set diffed with
set2 contains bold');
+ assert.equal( annotationSet3.getLength(), 1, 'set diffed with set2 has
length 1' );
+ assert.equal( annotationSet3.contains( bold ), true, 'set diffed with
set2 contains bold' );
annotationSet3 = annotationSet.intersectWith( annotationSet2 );
- assert.equal( annotationSet3.getLength(), 1, 'set intersected with set2
has length 1');
- assert.equal( annotationSet3.contains( italic ), true, 'set intersected
with set2 contains italic');
+ assert.equal( annotationSet3.getLength(), 1, 'set intersected with set2
has length 1' );
+ assert.equal( annotationSet3.contains( italic ), true, 'set intersected
with set2 contains italic' );
} );
diff --git a/modules/ve/test/dm/ve.dm.LinearData.test.js
b/modules/ve/test/dm/ve.dm.LinearData.test.js
index dcfa9af..7c2fe62 100644
--- a/modules/ve/test/dm/ve.dm.LinearData.test.js
+++ b/modules/ve/test/dm/ve.dm.LinearData.test.js
@@ -39,7 +39,7 @@
);
dataSlice = data.sliceObject( 10, 12 );
expectedDataSlice = new ve.dm.LinearData( store,
- expectedData.slice( 10, 12)
+ expectedData.slice( 10, 12 )
);
assert.deepEqual( dataSlice.getData(), expectedDataSlice.getData(),
'slice: matches data built with Array.slice'
diff --git a/modules/ve/test/dm/ve.dm.SurfaceFragment.test.js
b/modules/ve/test/dm/ve.dm.SurfaceFragment.test.js
index d4e575f..3132a27 100644
--- a/modules/ve/test/dm/ve.dm.SurfaceFragment.test.js
+++ b/modules/ve/test/dm/ve.dm.SurfaceFragment.test.js
@@ -130,7 +130,7 @@
];
QUnit.expect( cases.length*2 );
for ( i = 0; i < cases.length; i++ ) {
- doc = new ve.dm.Document( cases[i].phrase.split('') );
+ doc = new ve.dm.Document( cases[i].phrase.split( '' ) );
surface = new ve.dm.Surface( doc );
fragment = new ve.dm.SurfaceFragment( surface, cases[i].range );
newFragment = fragment.expandRange( 'word' );
@@ -519,14 +519,14 @@
runIsolateTest( assert, 'mwHeading', new ve.Range( 12, 20 ), function (
data ) {
data.splice( 11, 0, { 'type': '/list' } );
data.splice( 12, 1 );
- data.splice( 20, 1, { 'type': 'list', 'attributes': { 'style':
'bullet' } });
- }, 'isolating paragraph in list item "Item 2" for MWheading');
+ data.splice( 20, 1, { 'type': 'list', 'attributes': { 'style':
'bullet' } } );
+ }, 'isolating paragraph in list item "Item 2" for MWheading' );
runIsolateTest( assert, 'heading', new ve.Range( 12, 20 ), function (
data ) {
data.splice( 11, 0, { 'type': 'listItem' } );
data.splice( 12, 1 );
- data.splice( 20, 1, { 'type': '/listItem' });
- }, 'isolating paragraph in list item "Item 2" for heading');
+ data.splice( 20, 1, { 'type': '/listItem' } );
+ }, 'isolating paragraph in list item "Item 2" for heading' );
runIsolateTest( assert, 'mwHeading', new ve.Range( 89, 97 ), function (
data ) {
data.splice( 88, 1,
@@ -539,7 +539,7 @@
{ 'type': 'tableSection', 'attributes': { 'style':
'body' } },
{ 'type': 'tableRow' }
);
- }, 'isolating "Cell 2" for MWheading');
+ }, 'isolating "Cell 2" for MWheading' );
runIsolateTest( assert, 'mwHeading', new ve.Range( 202, 212 ), function
( data ) {
data.splice( 201, 1,
@@ -550,5 +550,5 @@
{ 'type': 'listItem' },
{ 'type': 'list', 'attributes': { 'style': 'number' } }
);
- }, 'isolating paragraph in list item "Nested 2" for MWheading');
+ }, 'isolating paragraph in list item "Nested 2" for MWheading' );
} );
diff --git a/modules/ve/test/dm/ve.dm.Transaction.test.js
b/modules/ve/test/dm/ve.dm.Transaction.test.js
index 91d07c8..ee53018 100644
--- a/modules/ve/test/dm/ve.dm.Transaction.test.js
+++ b/modules/ve/test/dm/ve.dm.Transaction.test.js
@@ -1353,7 +1353,7 @@
QUnit.test( 'translateOffset', function ( assert ) {
var mapping, offset, expected,
- doc = new ve.dm.Document( '-----defg---h--'.split('') ),
+ doc = new ve.dm.Document( '-----defg---h--'.split( '' ) ),
tx = new ve.dm.Transaction();
tx.pushReplace( doc, 0, 0, ['a','b','c'] );
@@ -1385,7 +1385,7 @@
15: [18, 21],
16: 22
};
- QUnit.expect( 2*ve.getObjectKeys(mapping).length );
+ QUnit.expect( 2*ve.getObjectKeys( mapping ).length );
for ( offset in mapping ) {
expected = ve.isArray( mapping[offset] ) ? mapping[offset] : [
mapping[offset], mapping[offset] ];
assert.strictEqual( tx.translateOffset( Number( offset ) ),
expected[1], offset );
@@ -1395,7 +1395,7 @@
QUnit.test( 'translateOffsetReversed', function ( assert ) {
var mapping, offset, expected,
- doc = new ve.dm.Document( '-----defg---h--'.split('') ),
+ doc = new ve.dm.Document( '-----defg---h--'.split( '' ) ),
tx = new ve.dm.Transaction();
tx.pushReplace( doc, 0, 0, ['a','b','c'] );
@@ -1433,7 +1433,7 @@
21: 15,
22: 16
};
- QUnit.expect( 2*ve.getObjectKeys(mapping).length );
+ QUnit.expect( 2*ve.getObjectKeys( mapping ).length );
for ( offset in mapping ) {
expected = ve.isArray( mapping[offset] ) ? mapping[offset] : [
mapping[offset], mapping[offset] ];
assert.strictEqual( tx.translateOffset( Number( offset ), true
), expected[1], offset );
diff --git a/modules/ve/test/ve.test.js b/modules/ve/test/ve.test.js
index 4bdfe72..131aba2 100644
--- a/modules/ve/test/ve.test.js
+++ b/modules/ve/test/ve.test.js
@@ -220,7 +220,7 @@
QUnit.test( 'getDomAttributes', 1, function ( assert ) {
assert.deepEqual(
- ve.getDomAttributes( $( '<div foo="bar" baz
quux=3></div>').get( 0 ) ),
+ ve.getDomAttributes( $( '<div foo="bar" baz quux=3></div>'
).get( 0 ) ),
{ 'foo': 'bar', 'baz': '', 'quux': '3' },
'getDomAttributes() returns object with correct attributes'
);
diff --git a/modules/ve/ui/ve.ui.Toolbar.js b/modules/ve/ui/ve.ui.Toolbar.js
index 25ab7d3..c5ce98b 100644
--- a/modules/ve/ui/ve.ui.Toolbar.js
+++ b/modules/ve/ui/ve.ui.Toolbar.js
@@ -174,7 +174,7 @@
tool = false;
try {
tool = ve.ui.toolFactory.create(
group.items[j], this );
- } catch(e) {}
+ } catch( e ) {}
if ( tool ) {
$group.append( tool.$ );
}
diff --git a/modules/ve/ve.Element.js b/modules/ve/ve.Element.js
index a2c38a4..72d8d34 100644
--- a/modules/ve/ve.Element.js
+++ b/modules/ve/ve.Element.js
@@ -134,7 +134,7 @@
// Get iframe element
frames = from.parent.document.getElementsByTagName( 'iframe' );
- for ( i = 0, len = frames.length; i < len; i++) {
+ for ( i = 0, len = frames.length; i < len; i++ ) {
if ( frames[i].contentWindow === from ) {
frame = frames[i];
break;
--
To view, visit https://gerrit.wikimedia.org/r/70216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f3ac95621f70d9a89e70e9a51905673240cb51f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
