WMDE-leszek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365229 )
Change subject: Automatically check indentation of JS files
......................................................................
Automatically check indentation of JS files
Change-Id: I1d67f1ad833bcb11f030cdcfa0c87120073a1d17
---
M .eslintrc.json
M resources/datamodel/Lexeme.js
M resources/jquery.wikibase.lexemeview.js
M resources/jquery.wikibase.senselistview.js
M resources/view/ControllerViewFactory.js
5 files changed, 75 insertions(+), 66 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/29/365229/1
diff --git a/.eslintrc.json b/.eslintrc.json
index 7fad51f..52b1755 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -17,7 +17,7 @@
},
"rules": {
"dot-notation": "off",
- "indent": "off",
+ "indent": [ "error", "tab", { "CallExpression": { "arguments":
"first" } } ],
"new-cap": "off",
"no-unused-vars": "off",
"no-underscore-dangle": "off",
diff --git a/resources/datamodel/Lexeme.js b/resources/datamodel/Lexeme.js
index d58fd2d..ad24da4 100644
--- a/resources/datamodel/Lexeme.js
+++ b/resources/datamodel/Lexeme.js
@@ -37,41 +37,42 @@
this._statementGroupSet = statementGroupSet;
this._fingerprint = new wb.datamodel.Fingerprint(
labels, new wb.datamodel.TermMap() );
},
- {
+ {
- /**
- * @property {wikibase.datamodel.StatementGroupSet}
- * @private
- */
- _statementGroupSet: null,
+ /**
+ * @property {wikibase.datamodel.StatementGroupSet}
+ * @private
+ */
+ _statementGroupSet: null,
- /**
- * @return {wikibase.datamodel.StatementGroupSet}
- */
- getStatements: function () {
- return this._statementGroupSet;
- },
+ /**
+ * @return {wikibase.datamodel.StatementGroupSet}
+ */
+ getStatements: function () {
+ return this._statementGroupSet;
+ },
- /**
- * @return {boolean}
- */
- isEmpty: function () {
- return this._statementGroupSet.isEmpty() &&
this._fingerprint.isEmpty();
- },
+ /**
+ * @return {boolean}
+ */
+ isEmpty: function () {
+ return this._statementGroupSet.isEmpty() &&
this._fingerprint.isEmpty();
+ },
- /**
- * @param {*} lexeme
- * @return {boolean}
- */
- equals: function ( lexeme ) {
- return lexeme === this ||
- ( lexeme instanceof SELF &&
- this._id === lexeme.getId() &&
- this._statementGroupSet.equals(
lexeme.getStatements() ) &&
- this._fingerprint.equals(
lexeme.getFingerprint() )
- );
+ /**
+ * @param {*} lexeme
+ * @return {boolean}
+ */
+ equals: function ( lexeme ) {
+ return lexeme === this ||
+ ( lexeme instanceof SELF &&
+ this._id === lexeme.getId() &&
+ this._statementGroupSet.equals(
lexeme.getStatements() ) &&
+ this._fingerprint.equals(
lexeme.getFingerprint() )
+ );
+ }
}
- } );
+ );
/**
* @inheritdoc
diff --git a/resources/jquery.wikibase.lexemeview.js
b/resources/jquery.wikibase.lexemeview.js
index b40e918..42a3bbb 100644
--- a/resources/jquery.wikibase.lexemeview.js
+++ b/resources/jquery.wikibase.lexemeview.js
@@ -92,25 +92,33 @@
var self = this;
- this.element
- .on( [
+ var startEditingEvents = [
'statementviewafterstartediting.' +
this.widgetName,
'referenceviewafterstartediting.' +
this.widgetName
- ].join( ' ' ),
- function () {
- self._trigger( 'afterstartediting' );
- } );
+ ];
this.element
- .on( [
+ .on(
+ startEditingEvents.join( ' ' ),
+ function () {
+ self._trigger( 'afterstartediting' );
+ }
+ );
+
+ var stopEditingEvents = [
'statementlistviewafterremove.' +
this.widgetName,
'statementviewafterstopediting.' +
this.widgetName,
'statementviewafterremove.' + this.widgetName,
'referenceviewafterstopediting.' +
this.widgetName
- ].join( ' ' ),
- function ( event, dropValue ) {
- self._trigger( 'afterstopediting', null, [
dropValue ] );
- } );
+ ];
+
+ this.element
+ .on(
+ stopEditingEvents.join( ' ' ),
+ function ( event, dropValue ) {
+ self._trigger( 'afterstopediting',
null, [ dropValue ] );
+ }
+ );
},
/**
diff --git a/resources/jquery.wikibase.senselistview.js
b/resources/jquery.wikibase.senselistview.js
index a80f8a7..9be2315 100644
--- a/resources/jquery.wikibase.senselistview.js
+++ b/resources/jquery.wikibase.senselistview.js
@@ -41,8 +41,8 @@
this._listview = this._createListView();
this.options.getAdder(
this._listview.enterNewItem.bind(
this._listview ),
- this.element,
- this.options.message( 'wikibase-lexeme-add-sense' )
+ this.element,
+ this.options.message(
'wikibase-lexeme-add-sense' )
);
},
diff --git a/resources/view/ControllerViewFactory.js
b/resources/view/ControllerViewFactory.js
index 5874411..519e19b 100644
--- a/resources/view/ControllerViewFactory.js
+++ b/resources/view/ControllerViewFactory.js
@@ -123,18 +123,18 @@
removeCallback
) {
var lexemeFormView = this._getView(
- 'lexemeformview',
- $dom,
- {
- value: form || new
wb.lexeme.datamodel.LexemeForm(),
- labelFormattingService:
labelFormattingService,
- api: this._api,
- buildStatementGroupListView:
this.getStatementGroupListView.bind(
- this,
- startEditingCallback
- )
- }
- ),
+ 'lexemeformview',
+ $dom,
+ {
+ value: form || new
wb.lexeme.datamodel.LexemeForm(),
+ labelFormattingService: labelFormattingService,
+ api: this._api,
+ buildStatementGroupListView:
this.getStatementGroupListView.bind(
+ this,
+ startEditingCallback
+ )
+ }
+ ),
controller = this._getController(
this._toolbarFactory.getToolbarContainer(
lexemeFormView.element ),
lexemeFormView,
@@ -173,16 +173,16 @@
removeCallback
) {
var senseView = this._getView(
- 'senseview',
- $dom,
- {
- value: sense || new
wb.lexeme.datamodel.Sense(),
- buildStatementGroupListView:
this.getStatementGroupListView.bind(
- this,
- startEditingCallback
- )
- }
- );
+ 'senseview',
+ $dom,
+ {
+ value: sense || new wb.lexeme.datamodel.Sense(),
+ buildStatementGroupListView:
this.getStatementGroupListView.bind(
+ this,
+ startEditingCallback
+ )
+ }
+ );
var controller = this._getController(
this._toolbarFactory.getToolbarContainer(
senseView.element ),
senseView,
--
To view, visit https://gerrit.wikimedia.org/r/365229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d67f1ad833bcb11f030cdcfa0c87120073a1d17
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <leszek.mani...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
