[MediaWiki-commits] [Gerrit] Moved edit feature from sitelinkview to sitelinkgroupview - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Moved edit feature from sitelinkview to sitelinkgroupview
..
Moved edit feature from sitelinkview to sitelinkgroupview
Requires adjustments to browsertests in
https://github.com/wmde/WikidataBrowserTests/pull/9
Bug: 68908
Change-Id: Icda4a7b522677501c3676b255aed3bee5a6b8731
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
M lib/resources/jquery.wikibase/resources.php
A
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
M lib/resources/templates.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkview.tests.js
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/View/SiteLinksView.php
M repo/resources/wikibase.ui.entityViewInit.js
15 files changed, 1,191 insertions(+), 418 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 9a429cd..167da20 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -289,7 +289,7 @@
'claimviewafterstartediting.' + this.widgetName,
'statementviewafterstartediting.' + this.widgetName,
'referenceviewafterstartediting.' + this.widgetName,
- 'sitelinkviewafterstartediting.' + this.widgetName
+ 'sitelinkgroupviewafterstartediting.' + this.widgetName
].join( ' ' ),
function( event ) {
var widgetName = event.type.replace(
/afterstartediting/, '' );
@@ -310,7 +310,7 @@
'statementviewafterstopediting.' + this.widgetName,
'statementviewafterremove.' + this.widgetName,
'referenceviewafterstopediting.' + this.widgetName,
- 'sitelinkviewafterstopediting.' + this.widgetName
+ 'sitelinkgroupviewafterstopediting.' + this.widgetName
].join( ' ' ),
function( event, dropValue ) {
self.enable();
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
index bce5254..53120a5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
@@ -2,13 +2,13 @@
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
*/
-( function( $ ) {
+( function( $, mw ) {
'use strict';
var PARENT = $.ui.TemplatedWidget;
/**
- * Encapsulates multiple sitelinkgroupview widget.
+ * Encapsulates multiple sitelinkgroupview widgets.
* @since 0.5
* @extends jQuery.TemplatedWidget
*
@@ -91,7 +91,8 @@
value: value,
entityId: self.options.entityId,
api: self.options.api,
- entityStore:
self.options.entityStore
+ entityStore:
self.options.entityStore,
+ helpMessage: mw.msg(
'wikibase-sitelinkgroupview-input-help-message' )
};
}
} ),
@@ -113,4 +114,4 @@
}
} );
-}( jQuery ) );
+}( jQuery, mediaWiki ) );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index afd47aa..46115b2 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -21,6 +21,28 @@
* @option {wikibase.RepoApi} api
*
* @option {wikibase.store.EntityStore} entityStore
+ *
+ * @option {string} [helpMessage]
+ * Default: 'Add a site link by specifying a site and a page
of that site, edit or
+ * remove existing site links.'
+ *
+ * @event change
+ *- {jQuery.Event}
+ *
+ * @event afterstartediting
+ * - {jQuery.Event}
+ *
+ * @event stopediting
+ *-
[MediaWiki-commits] [Gerrit] Moved edit feature from sitelinkview to sitelinkgroupview - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159989
Change subject: Moved edit feature from sitelinkview to sitelinkgroupview
..
Moved edit feature from sitelinkview to sitelinkgroupview
Change-Id: Icda4a7b522677501c3676b255aed3bee5a6b8731
---
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
M lib/resources/jquery.wikibase/resources.php
A
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
M lib/resources/templates.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinklistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.sitelinkview.tests.js
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/View/SiteLinksView.php
M repo/resources/wikibase.ui.entityViewInit.js
14 files changed, 1,130 insertions(+), 390 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/159989/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
index bce5254..53120a5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
@@ -2,13 +2,13 @@
* @licence GNU GPL v2+
* @author H. Snater mediaw...@snater.com
*/
-( function( $ ) {
+( function( $, mw ) {
'use strict';
var PARENT = $.ui.TemplatedWidget;
/**
- * Encapsulates multiple sitelinkgroupview widget.
+ * Encapsulates multiple sitelinkgroupview widgets.
* @since 0.5
* @extends jQuery.TemplatedWidget
*
@@ -91,7 +91,8 @@
value: value,
entityId: self.options.entityId,
api: self.options.api,
- entityStore:
self.options.entityStore
+ entityStore:
self.options.entityStore,
+ helpMessage: mw.msg(
'wikibase-sitelinkgroupview-input-help-message' )
};
}
} ),
@@ -113,4 +114,4 @@
}
} );
-}( jQuery ) );
+}( jQuery, mediaWiki ) );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index afd47aa..56a6711 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -21,6 +21,28 @@
* @option {wikibase.RepoApi} api
*
* @option {wikibase.store.EntityStore} entityStore
+ *
+ * @option {string} [helpMessage]
+ * Default: 'Add a site link by specifying a site and a page
of that site, edit or
+ * remove existing site links.'
+ *
+ * @event change
+ *- {jQuery.Event}
+ *
+ * @event afterstartediting
+ * - {jQuery.Event}
+ *
+ * @event stopediting
+ *- {jQuery.Event}
+ *- {boolean} Whether to drop the value.
+ *
+ * @event afterstopediting
+ *- {jQuery.Event}
+ *- {boolean} Whether to drop the value.
+ *
+ * @event toggleerror
+ *- {jQuery.Event}
+ *- {Error|null}
*/
$.widget( 'wikibase.sitelinkgroupview', PARENT, {
/**
@@ -42,8 +64,15 @@
value: null,
entityId: null,
api: null,
- entityStore: null
+ entityStore: null,
+ helpMessage: 'Add a site link by specifying a site and a page
of that site, edit or remove '
+ + 'existing site links.'
},
+
+ /**
+* @type {boolean}
+*/
+ _isInEditMode: false,
/**
* @type {jQuery}
@@ -73,7 +102,50 @@
this.$sitelinklistview = $( 'table/' ).appendTo(
this.element );
}
- this.$sitelinklistview.sitelinklistview( {
+ this._createSitelinklistview();
+
+ this._update();
+ },
+
+ /**
+* @see jQuery.ui.TemplatedWidget.destroy
+*/
+ destroy: function() {
+ if( this.$sitelinklistview ) {
+ this.$sitelinklistview.data( 'sitelinklistview'
).destroy();
+ }
+ PARENT.prototype.destroy.call( this );
+ },
+
+ /**
+* Creates and initializes the sitelinklistview widget.
+*/
+
