jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367044 )
Change subject: Inline selectorBox as a replace for popover
......................................................................
Inline selectorBox as a replace for popover
Replaces links in Query Helper triples section with selectorBox from
popover.
Change-Id: I0bb08bcb3eb7f2adf8847fa02cbf3c7b2377bf62
---
M embed.html
M style.css
M wikibase/queryService/ui/queryHelper/SelectorBox.js
M wikibase/tests/QueryHelper.html
M wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
5 files changed, 39 insertions(+), 1 deletion(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, but someone else must approve
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/embed.html b/embed.html
index 76c00c3..0e8bb47 100644
--- a/embed.html
+++ b/embed.html
@@ -79,9 +79,19 @@
background-color: rgba(255,255,255,0.8);
}
.popover {
+ max-width: 80vw;
min-width: 300px;
white-space: nowrap;
}
+
+.select2-container {
+ z-index: 2000;
+ min-width: 200px;
+}
+
+.tooltip {
+ z-index: 2001;
+}
</style>
<body>
diff --git a/style.css b/style.css
index 3b0d111..4468ecd 100644
--- a/style.css
+++ b/style.css
@@ -518,9 +518,13 @@
}
.select2-container {
- z-index: 2000;
+ min-width: 150px;
+}
+
+.popover .select2-container {
min-width: 200px;
}
+
.query-helper .popover {
min-width: 250px;
white-space: nowrap;
diff --git a/wikibase/queryService/ui/queryHelper/SelectorBox.js
b/wikibase/queryService/ui/queryHelper/SelectorBox.js
index e66f3e6..d009bb3 100644
--- a/wikibase/queryService/ui/queryHelper/SelectorBox.js
+++ b/wikibase/queryService/ui/queryHelper/SelectorBox.js
@@ -346,6 +346,11 @@
$toolbar = this._getToolbar( toolbar, $element ),
$content = $( '<div>' ).append( $close, ' ', $select, '
', $toolbar );
+ if ( $element.children().length === 0 ) {
+ this._createSelectInline( $element, triple, listener );
+ return;
+ }
+
$element.clickover( {
placement: 'bottom',
'global_close': false,
@@ -380,6 +385,23 @@
/**
* @private
*/
+ SELF.prototype._createSelectInline = function( $element, triple,
listener ) {
+ var $select = this._getSelectBox( $element );
+
+ $element.replaceWith( $select );
+ this._renderSelect2( $select, $element, triple );
+
+ $select.change( function( e ) {
+ if ( listener ) {
+ listener( $select.val(), $select.find(
'option:selected' ).text(), $( e.target ).data( 'options' ) );
+ }
+ } );
+
+ };
+
+ /**
+ * @private
+ */
SELF.prototype._getSelectBox = function( $element ) {
var id = $element.data( 'id' );
var label = $element.text();
diff --git a/wikibase/tests/QueryHelper.html b/wikibase/tests/QueryHelper.html
index c7e08a9..f0879e4 100644
--- a/wikibase/tests/QueryHelper.html
+++ b/wikibase/tests/QueryHelper.html
@@ -19,6 +19,7 @@
<script src="../../node_modules/sinon/pkg/sinon.js"></script>
<script
src="../../node_modules/bootstrap-table/dist/bootstrap-table.js"></script>
+ <script src="../../node_modules/select2/dist/js/select2.js"></script>
<script
src="../../vendor/sparqljs/dist/sparqljs-browser-min.js"></script>
<script
src="../../vendor/bootstrapx-clickover/bootstrapx-clickover.js"></script>
<!-- wikibase -->
diff --git a/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
b/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
index facc092..b3908de 100644
--- a/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
+++ b/wikibase/tests/queryService/ui/queryHelper/QueryHelper.test.js
@@ -104,6 +104,7 @@
var $html = $( '<div>' );
qh.draw( $html );
$html.find( '.btn' ).remove();
+ $html.find( '.select2' ).remove();
assert.equal( qh.getQuery().trim(), testCase.sparqlOut
);
assert.equal( $html.text().trim(), testCase.text );
--
To view, visit https://gerrit.wikimedia.org/r/367044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bb08bcb3eb7f2adf8847fa02cbf3c7b2377bf62
Gerrit-PatchSet: 7
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
Gerrit-Reviewer: Lucas Werkmeister (WMDE) <lucas.werkmeis...@wikimedia.de>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
