[MediaWiki-commits] [Gerrit] Fixes:[Bug] suggestions show up twice in entity suggester - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232916
Change subject: Fixes:[Bug] suggestions show up twice in entity suggester
..
Fixes:[Bug] suggestions show up twice in entity suggester
Bug: T109697
Change-Id: I82b9217ed637cb155453a4f9ebb9ec57ec5f011b
---
M view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
1 file changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/16/232916/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
b/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
index 2511b23..13519d6 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
@@ -102,12 +102,6 @@
},
/**
-* @property {number}
-* @private
-*/
- _searchTimeoutHandle: null,
-
- /**
* Caching the most current entity returned from the API.
* @property {Object}
* @private
@@ -180,8 +174,8 @@
this._cache = {};
this._select( null );
- clearTimeout( this._searchTimeoutHandle );
- this._searchTimeoutHandle = setTimeout( function() {
+ clearTimeout( this._searching );
+ this._searching = setTimeout( function() {
self.search( event )
.done( function( suggestions, requestTerm ) {
if( !suggestions.length || self.element.val()
!== requestTerm ) {
--
To view, visit https://gerrit.wikimedia.org/r/232916
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82b9217ed637cb155453a4f9ebb9ec57ec5f011b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes: Using back button in browser loads old version - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226732
Change subject: Fixes: Using back button in browser loads old version
..
Fixes: Using back button in browser loads old version
Detects navigation through browser back/forward buttons and triggers a
page reload if necessary.
Bug: T55466
Change-Id: Ia20803db3463941d838714aa63bff9eafc0c172d
---
M repo/resources/wikibase.ui.entityViewInit.js
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/32/226732/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
old mode 100644
new mode 100755
index 4aeba0e..a16b5c0
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -8,6 +8,8 @@
( function( $, mw, wb, dataTypeStore, getExpertsStore, getFormatterStore,
getParserStore ) {
'use strict';
+ attachHistoryCacheCleaning();
+
mw.hook( 'wikipage.content' ).add( function() {
if( mw.config.get( 'wbEntity' ) === null ) {
@@ -271,7 +273,22 @@
}
} );
}
+
+ /**
+* This methods detects whether the site was loaded from "history
cache"
+* and triggers a reload to prevent the browser to display an old state
+*/
+ function attachHistoryCacheCleaning() {
+ if (window.name == "reload") {
+ window.name = "";
+ location.reload();
+ }
+ $( window ).on( "beforeunload", function() {
+ window.name = "reload";
+ });
+ }
+
/**
* @param {jQuery} $entityview
* @param {jQuery} $origin
--
To view, visit https://gerrit.wikimedia.org/r/226732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia20803db3463941d838714aa63bff9eafc0c172d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes counting of references - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227230
Change subject: Fixes counting of references
..
Fixes counting of references
Fixes counting of references by filtering on class 'wb-reference-new'
instead of items with value.
Bug: T98593
Change-Id: I7bbcd9142b4e6e64e112f8e9cd67dad0a8714b53
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/30/227230/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 30dfca0..ff7e451 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -626,8 +626,8 @@
numberOfPendingValues = 0;
if( this._referencesListview ) {
- numberOfValues =
this._referencesListview.nonEmptyItems().length;
- numberOfPendingValues =
this._referencesListview.items().length - numberOfValues;
+ numberOfPendingValues =
this._referencesListview.items().filter( '.wb-reference-new' ).length;
+ numberOfValues =
this._referencesListview.items().length - numberOfPendingValues;
}
// build a nice counter, displaying fixed and pending values:
--
To view, visit https://gerrit.wikimedia.org/r/227230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bbcd9142b4e6e64e112f8e9cd67dad0a8714b53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove set focus to page - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227666
Change subject: Remove set focus to page
..
Remove set focus to page
Removed set focus to page after selecting site, because if tab key is
used for selecting the focus is set wrong.
Bug: T107063
Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/66/227666/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index e7789e8..fd7d0fb 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -300,8 +300,7 @@
$pageNameInput
.attr( 'lang', site.getLanguageCode() )
.attr( 'dir', site.getLanguageDirection() )
- .show()
- .focus();
+ .show();
} else {
$pageNameInput.hide();
}
--
To view, visit https://gerrit.wikimedia.org/r/227666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eb4667fa1a5834259ee774e181e610b4439566a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes: Property Background remains blue after removing state... - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227702
Change subject: Fixes: Property Background remains blue after removing statement
..
Fixes: Property Background remains blue after removing statement
Removes wb-edit class in afterremove event
Change-Id: I6cb63ab566671ff738b21121137cb1ab8404012f
---
M view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/02/227702/1
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
index 39396ed..e1ab9d7 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementgroupview.js
@@ -166,6 +166,7 @@
self.$property.addClass( 'wb-edit' );
} )
.on( prefix + 'afterremove.' + this.widgetName, function( event
) {
+ self.$property.removeClass( 'wb-error' ).removeClass(
'wb-edit' );
self._trigger( 'afterremove' );
} )
.statementlistview( {
--
To view, visit https://gerrit.wikimedia.org/r/227702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cb63ab566671ff738b21121137cb1ab8404012f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed background on Entitytermsview input fields - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227715
Change subject: Changed background on Entitytermsview input fields
..
Changed background on Entitytermsview input fields
Changed background color of input fields when they are focused to blue
Bug: T92447
Change-Id: Ia441d0e481d8d5b26e698fab417d5387fd397715
---
M view/resources/jquery/ui/jquery.ui.tagadata.css
M
view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css
M view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css
3 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/227715/1
diff --git a/view/resources/jquery/ui/jquery.ui.tagadata.css
b/view/resources/jquery/ui/jquery.ui.tagadata.css
index 2ca4149..1019b1d 100644
--- a/view/resources/jquery/ui/jquery.ui.tagadata.css
+++ b/view/resources/jquery/ui/jquery.ui.tagadata.css
@@ -52,9 +52,7 @@
}
ul.tagadata li.tagadata-choice-empty,
-ul.tagadata li.tagadata-choice-active,
-ul.tagadata li.tagadata-choice .tagadata-label input:focus,
-ul.tagadata li.tagadata-choice-empty input {
+ul.tagadata li.tagadata-choice-active {
background: none white !important;
}
@@ -77,3 +75,7 @@
ul.tagadata {
background-color: #F0F0F0;
}
+
+ul.tagadata li.tagadata-choice .tagadata-label input:focus {
+ background-color: #D6F3FF;
+}
\ No newline at end of file
diff --git
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css
index dc03833..d9d3d07 100644
---
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css
+++
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.descriptionview.css
@@ -10,3 +10,7 @@
font-family: inherit;
font-size: inherit;
}
+
+.wikibase-descriptionview .wikibase-descriptionview-input:focus {
+ background-color: #D6F3FF;
+}
\ No newline at end of file
diff --git
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css
index 9d6b9d7..ca1fcc5 100644
---
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css
+++
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.labelview.css
@@ -10,3 +10,7 @@
font-family: inherit;
font-size: inherit;
}
+
+.wikibase-labelview .wikibase-labelview-input:focus {
+ background-color: #D6F3FF;
+}
--
To view, visit https://gerrit.wikimedia.org/r/227715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia441d0e481d8d5b26e698fab417d5387fd397715
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Making edit warning red and autohide:false - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227976
Change subject: Making edit warning red and autohide:false
..
Making edit warning red and autohide:false
Changed the edit warning notification being more present and not
vanishing itself.
Bug: T91955
Change-Id: If3755cb80e6ad29e8f28855c255ea335cbefedd9
---
M repo/resources/wikibase.ui.entityViewInit.js
M view/resources/wikibase/utilities/wikibase.utilities.ui.css
2 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/76/227976/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 4aeba0e..bcd0f53 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -263,11 +263,10 @@
$.find( '.mw-notification-content' ).length === 0
&& !$.cookie(
'wikibase-no-anonymouseditwarning' )
) {
- mw.notify(
- mw.msg( 'wikibase-anonymouseditwarning',
- mw.msg( 'wikibase-entity-' +
entityType )
- )
- );
+ var message = '' +
mw.msg( 'wikibase-anonymouseditwarning',
+ mw.msg(
'wikibase-entity-' + entityType ) );
+ message = $( '' +
message + '' );
+ mw.notify( message, { autoHide: false } );
}
} );
}
diff --git a/view/resources/wikibase/utilities/wikibase.utilities.ui.css
b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
index d1d963c..3abf894 100644
--- a/view/resources/wikibase/utilities/wikibase.utilities.ui.css
+++ b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
@@ -85,4 +85,8 @@
font-size: .9em;
}
+.wb-warning {
+ color: #BA;
+ font-weight: bold;
+}
/* /ERROR OUTPUT */
--
To view, visit https://gerrit.wikimedia.org/r/227976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3755cb80e6ad29e8f28855c255ea335cbefedd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reenable widget after save failed - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223791
Change subject: Reenable widget after save failed
..
Reenable widget after save failed
Fixes a bug where you can't edit a claim value once save ended up in an
error
Bug:T89784
Change-Id: I6458aa26ca7091b78e11f65870be04a2e74f39bf
---
M view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/91/223791/1
diff --git a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
index 1619e26..82daa94 100644
--- a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
+++ b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
@@ -145,6 +145,7 @@
.fail( function( error ) {
self.setError( error );
deferred.reject( error );
+ self.enable();
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/223791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6458aa26ca7091b78e11f65870be04a2e74f39bf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reposition snak type selector after resize - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223818
Change subject: Reposition snak type selector after resize
..
Reposition snak type selector after resize
Calling repositionMenu() after a window resize event
Bug: T97288
Change-Id: Ia9f4aa93ea06aaedb24fbcc56e159df47ef13617
---
M view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
M view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/18/223818/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
b/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
index f2bc1bd..ab1ffa1 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.badgeselector.js
@@ -150,7 +150,7 @@
};
$( document ).on( 'mouseup.' + this.widgetName, degrade );
- $( window ).on( 'resize.' + this.widgetName, degrade );
+ $( window ).on( 'resize.' + this.widgetName, function( event )
{ self.repositionMenu(); } );
$menu.on( 'click.' + this.widgetName, function( event ) {
var $li = $( event.target ).closest( 'li' ),
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
index 1f40751..90fd8ab 100644
---
a/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
+++
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js
@@ -120,7 +120,7 @@
};
$( document ).on( 'mouseup.' + self.widgetName,
degrade );
- $( window ).on( 'resize.' + self.widgetName,
degrade );
+ $( window ).on( 'resize.' + self.widgetName,
function( event ) { self.repositionMenu(); } );
} );
this._setRank( this.options.value );
diff --git
a/view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js
b/view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js
index 1330004..76e400f 100644
--- a/view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js
+++ b/view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js
@@ -95,7 +95,7 @@
self._unbindGlobalListenersFn = $.noop;
};
$( document ).on( 'mouseup.' + widgetName,
degrade );
- $( window ).on( 'resize.' + widgetName, degrade
);
+ $( window ).on( 'resize.' + widgetName,
function( event ) { self.repositionMenu(); } );
} );
this._$icon = $( '' )
--
To view, visit https://gerrit.wikimedia.org/r/223818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9f4aa93ea06aaedb24fbcc56e159df47ef13617
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sitelink boxes collapsible - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/224037 Change subject: Make sitelink boxes collapsible .. Make sitelink boxes collapsible Added mw-collapsible class to widget skeleton and a span with mw-collapsible-content around the actual site linklist view part. Bug: T87024 Change-Id: I683358e69d6315a60d9c69b51259d7ba1b7aa5d1 --- M view/resources/templates.php 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/37/224037/1 diff --git a/view/resources/templates.php b/view/resources/templates.php index efe31a9..1998842 100644 --- a/view/resources/templates.php +++ b/view/resources/templates.php @@ -224,14 +224,16 @@ $templates['wikibase-sitelinkgroupview'] = << + $2$3 $6 - $4 + + $4 + HTML; -- To view, visit https://gerrit.wikimedia.org/r/224037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I683358e69d6315a60d9c69b51259d7ba1b7aa5d1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set focus to page input field after selecting a site - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226276
Change subject: Set focus to page input field after selecting a site
..
Set focus to page input field after selecting a site
When adding site links set focus to page input field after selecting a
site
Bug: T105357
Change-Id: I90b0eab5fb50c1fde578079de1bbba9e4bf5c468
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/76/226276/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index fd7d0fb..e7789e8 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -300,7 +300,8 @@
$pageNameInput
.attr( 'lang', site.getLanguageCode() )
.attr( 'dir', site.getLanguageDirection() )
- .show();
+ .show()
+ .focus();
} else {
$pageNameInput.hide();
}
--
To view, visit https://gerrit.wikimedia.org/r/226276
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90b0eab5fb50c1fde578079de1bbba9e4bf5c468
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Entity selector display alias in brackets behind label - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226299
Change subject: Entity selector display alias in brackets behind label
..
Entity selector display alias in brackets behind label
Changed the alias span to be inside of the label span with style
display:inline.
Bug: T104553
Change-Id: Idd9e65a5537e3c75fddd20eefa7ec1cef183b043
---
M view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
M
view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
2 files changed, 12 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/99/226299/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
b/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
index f86a78c..3fab6eb 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entityselector.js
@@ -100,7 +100,6 @@
caseSensitive: false,
timeout: 8000,
messages: {
- 'aliases-label': mwMsgOrString(
'wikibase-aliases-label', 'also known as:' ),
more: mwMsgOrString( 'wikibase-entityselector-more',
'more' )
}
},
@@ -291,11 +290,17 @@
_createLabelFromSuggestion: function( entityStub ) {
var $suggestion = $( '' );
- $suggestion.append(
- $( '' )
- .text( entityStub.label || entityStub.id )
- );
+ var $label = $( '' )
+ .text( entityStub.label || entityStub.id)
+ if( entityStub.aliases ) {
+ $label.append(
+ $( '' ).text( " (" + entityStub.aliases.join( ',
' ) + ")" )
+ );
+ }
+
+ $suggestion.append($label);
+
if( entityStub.description ) {
$suggestion.append(
$( '' )
@@ -303,15 +308,6 @@
);
}
- if( entityStub.aliases ) {
- var aliasesText = this.options.messages['aliases-label']
- + ' '
- + entityStub.aliases.join( ', ' );
-
- $suggestion.append(
- $( ''
).text( aliasesText )
- );
- }
return $suggestion;
},
diff --git
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
index 2465ca2..d158a4e 100644
---
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
+++
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -41,8 +41,9 @@
font-weight: bold;
}
-.ui-entityselector-aliases {
+.ui-entityselector-list .ui-entityselector-aliases {
font-style: italic;
+ display: inline;
}
.ui-entityselector-list .ui-entityselector-more {
--
To view, visit https://gerrit.wikimedia.org/r/226299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd9e65a5537e3c75fddd20eefa7ec1cef183b043
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Workaround for composer merge plugin issue - change (mediawiki/vagrant)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222147
Change subject: Workaround for composer merge plugin issue
..
Workaround for composer merge plugin issue
Details https://github.com/wikimedia/composer-merge-plugin/issues/41
Change-Id: I234a651614d505931dca56f65ba2d8ec1b18a5d3
---
M puppet/modules/php/manifests/composer/install.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/47/222147/1
diff --git a/puppet/modules/php/manifests/composer/install.pp
b/puppet/modules/php/manifests/composer/install.pp
index 692926f..36314fb 100644
--- a/puppet/modules/php/manifests/composer/install.pp
+++ b/puppet/modules/php/manifests/composer/install.pp
@@ -39,7 +39,8 @@
}
exec { "composer-install-${safe_dir}":
-command => "composer install --optimize-autoloader
--prefer-${prefer}",
+# dump-autoload workaround
https://github.com/wikimedia/composer-merge-plugin/issues/41
+command => "composer install --optimize-autoloader
--prefer-${prefer} && composer dump-autoload -o",
cwd => $directory,
environment => [
"COMPOSER_HOME=${::php::composer::home}",
--
To view, visit https://gerrit.wikimedia.org/r/222147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I234a651614d505931dca56f65ba2d8ec1b18a5d3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Display label instead of Q id titles - change (mediawiki...MobileFrontend)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/244704
Change subject: [WIP] Display label instead of Q id titles
..
[WIP] Display label instead of Q id titles
Display label instead of Q id titles by using page terms module and
replace displayTitle
Bug: T115014
Change-Id: I005af60091907f428a86ed75f953b0fa306b40e4
---
M resources/mobile.nearby/Nearby.js
M resources/mobile.nearby/NearbyGateway.js
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/04/244704/1
diff --git a/resources/mobile.nearby/Nearby.js
b/resources/mobile.nearby/Nearby.js
index 5e5bbe2..9ae38e1 100644
--- a/resources/mobile.nearby/Nearby.js
+++ b/resources/mobile.nearby/Nearby.js
@@ -160,6 +160,13 @@
if ( pages && pages.length === 0 ) {
options.errorOptions =
self._errorOptions( 'empty' );
}
+
+ $.each( pages, function(key, page){
+ if(page.options.terms.label[0]){
+ page.displayTitle =
page.options.terms.label[0]
+ }
+ } );
+ //debugger;
self._isLoading = false;
result.resolve( options );
}
@@ -224,8 +231,8 @@
_postRenderLinks: function () {
var offset,
hash = window.location.hash;
-
this.$( 'a' ).each( function ( i ) {
+ debugger;
// FIXME: not unique if multiple Nearby objects
on same page
$( this ).attr( 'id', 'nearby-page-list-item-'
+ i );
} ).on( 'click', function () {
diff --git a/resources/mobile.nearby/NearbyGateway.js
b/resources/mobile.nearby/NearbyGateway.js
index 99c7431..8c61fe4 100644
--- a/resources/mobile.nearby/NearbyGateway.js
+++ b/resources/mobile.nearby/NearbyGateway.js
@@ -125,7 +125,7 @@
requestParams = {
action: 'query',
colimit: 'max',
- prop: 'pageimages|coordinates',
+ prop: 'pageimages|coordinates|pageterms',
pithumbsize: mw.config.get(
'wgMFThumbnailSizes' ).small,
pilimit: limit,
generator: 'geosearch',
--
To view, visit https://gerrit.wikimedia.org/r/244704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I005af60091907f428a86ed75f953b0fa306b40e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Insert extra prefixes from sample queries. - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249974
Change subject: Insert extra prefixes from sample queries.
..
Insert extra prefixes from sample queries.
Bug: T117175
Change-Id: I5adde9c48c8f8184eefdfdacc4747da523d3a778
---
M gui/gui.js
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/74/249974/1
diff --git a/gui/gui.js b/gui/gui.js
index 9a2716f..8d67194 100644
--- a/gui/gui.js
+++ b/gui/gui.js
@@ -394,6 +394,12 @@
var title = paragraphs[key-1] || "";
title = title.replace( '=', '' ).trim();
+ if(paragraph.match('extraprefix=')){
+ var prefix =
paragraph.substring( paragraph.indexOf( '|extraprefix=' )+13,
paragraph.indexOf( '|query=' ) ).trim();
+ debugger;
+ query = prefix + '\n\n' + query;
+ }
+
if( title ){
exampleQueries.add( new Option(
title, query ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/249974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5adde9c48c8f8184eefdfdacc4747da523d3a778
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show Wikidata ID hint in SPARQL query editor - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250670
Change subject: Show Wikidata ID hint in SPARQL query editor
..
Show Wikidata ID hint in SPARQL query editor
Shows tooltip when hovering over wikibase entity
Bug: T114740
Change-Id: Icfda334a52973921ddb093c57962703b88bcc569
---
A gui/addon/tooltip/WikibaseRDFTooltip.js
M gui/gui.js
M gui/index.html
3 files changed, 145 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/70/250670/1
diff --git a/gui/addon/tooltip/WikibaseRDFTooltip.js
b/gui/addon/tooltip/WikibaseRDFTooltip.js
new file mode 100644
index 000..f389808
--- /dev/null
+++ b/gui/addon/tooltip/WikibaseRDFTooltip.js
@@ -0,0 +1,140 @@
+var WikibaseRDFTooltip = ( function( CodeMirror, $ ) {
+ "use strict";
+
+
+ /**
+* Wikibase RDF tooltip for codemirror editor
+*
+* @class WikibaseRdfTooltip
+* @licence GNU GPL v2+
+* @author Jonas Kress
+* @constructor
+*/
+ function SELF( editor ) {
+
+ this.editor = editor;
+ this._registerHandler();
+ }
+
+ SELF.prototype.editor = null;
+ SELF.prototype.tooltipTimeoutHandler = null;
+
+
+ var ENTITY_TYPES = { "http://www.wikidata.org/prop/direct/": "property",
+ "http://www.wikidata.org/prop/": "property",
+ "http://www.wikidata.org/prop/novalue/": "property",
+ "http://www.wikidata.org/prop/statement/": "property",
+ "http://www.wikidata.org/prop/statement/value/":
"property",
+ "http://www.wikidata.org/prop/qualifier/": "property",
+ "http://www.wikidata.org/prop/qualifier/value/":
"property",
+ "http://www.wikidata.org/prop/reference/": "property",
+ "http://www.wikidata.org/prop/reference/value/":
"property",
+ "http://www.wikidata.org/wiki/Special:EntityData/":
"item",
+ "http://www.wikidata.org/entity/": "item" };
+
+ var ENTITY_SEARCH_API_ENDPOINT =
"https://www.wikidata.org/w/api.php?action=wbsearchentities&search={term}&format=json&language=en&uselang=en&type={entityType}&continue=0";;
+
+
+ SELF.prototype._registerHandler = function(){
+ CodeMirror.on(this.editor.getWrapperElement(), "mouseover",
$.proxy(this._triggerTooltip, this));
+ };
+
+ SELF.prototype._triggerTooltip = function( e ){
+
+ clearTimeout( this.tooltipTimeoutHandler );
+ this._removeToolTip();
+
+ var self = this;
+ this.tooltipTimeoutHandler = setTimeout(function(){
+ self._createTooltip( e );
+ }, 500);
+ };
+
+
+ SELF.prototype._createTooltip = function( e ){
+
+ var posX = e.clientX, posY = (e.clientY +
$(window).scrollTop());
+
+ var token =
this.editor.getTokenAt(this.editor.coordsChar({left: posX, top: posY})).string;
+ console.log(token);
+
+ if(!token.match(/.+\:(Q|P)[0-9]*/)){
+ return;
+ }
+
+ var prefixes = this._extractPrefixes(
this.editor.doc.getValue() );
+ var prefix = token.split( ":" ).shift();
+ var entityId = token.split( ":" ).pop();
+
+ if (! prefixes[ prefix ] ) {
+ return;
+ }
+
+ var self = this;
+ this._searchEntities( entityId, prefixes[ prefix ]
).done(function( list ){
+ self._showToolTip( list.shift(), {x:posX, y:posY} );
+ });
+ };
+
+ SELF.prototype._removeToolTip = function(){
+ $(".wikibaseRDFtoolTip").remove();
+ };
+
+ SELF.prototype._showToolTip = function( text, pos ){
+ if( !text || !pos ){
+ return;
+ }
+ $("")
+ .text(text)
+ .css( "position", "absolute" )
+ .css( "background-color", "white" )
+ .css( "z-index", "100" )
+ .css( "border", "1px solid grey" )
+ .css( "max-width", "200px" )
+ .css( "padding", "5px" )
+ .css( {top: pos.y + 2, left: pos.x + 2} )
+ .addClass( "wikibaseRDFtoolTip" )
+ .appendTo( "body" )
+ .fadeIn( "slow" );
+ };
+
+
+ SELF.prototype._extractPrefixes = function( text ) {
+ var prefixes = {},
+ lines = text.split( "\n" ),
+ matches;
+
+ $.each( lines, function ( index, line ) {
+ // PREFIX wd:
[MediaWiki-commits] [Gerrit] Create methods to toggle and get toggle status from toggler - change (data-values/value-view)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250703
Change subject: Create methods to toggle and get toggle status from toggler
..
Create methods to toggle and get toggle status from toggler
Bug: T117558
Change-Id: I18ad60e2a10e2f9128caf54ba972be5c2fe2643e
---
M lib/jquery.ui/jquery.ui.toggler.js
1 file changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/data-values/value-view
refs/changes/03/250703/1
diff --git a/lib/jquery.ui/jquery.ui.toggler.js
b/lib/jquery.ui/jquery.ui.toggler.js
index bc0bb90..6ee20f4 100644
--- a/lib/jquery.ui/jquery.ui.toggler.js
+++ b/lib/jquery.ui/jquery.ui.toggler.js
@@ -106,6 +106,7 @@
this.element
.on( 'click.' + this.widgetName, function( event ) {
event.preventDefault();
+<<< HEAD
if ( !self.element.hasClass( 'ui-state-disabled' ) ) {
// Change toggle icon to reflect current state
of toggle subject visibility:
@@ -122,6 +123,9 @@
}
);
}
+===
+ self.toggle();
+>>> Enable toggler to be toggled and get toggle status with actual methods.
} )
.on( 'mouseover.' + this.widgetName, function( event ) {
self.element.addClass( 'ui-state-hover' );
@@ -137,6 +141,39 @@
},
/**
+* Toggle status of toggler to expand/collapse
+*/
+ toggle: function (){
+
+ var self = this;
+ if( !this.element.hasClass( 'ui-state-disabled' ) ) {
+ // Change toggle icon to reflect current state of
toggle subject visibility:
+ var visible = this._reflectVisibilityOnToggleIcon( true
);
+
+ this.options.$subject.stop().animateWithEvent(
+ 'togglerstatetransition',
+ 'slideToggle',
+ this.options,
+ function( animationEvent ) {
+ self._trigger( 'animation',
animationEvent, {
+ visible: visible
+ } );
+ }
+ );
+ }
+ },
+
+
+ /**
+* Returns status of toggler.
+* Is true when toggler is collapes
+* @return {boolean}
+*/
+ isCollapsed: function(){
+ return this.element.hasClass( 'ui-toggler-toggle-collapsed' );
+ },
+
+ /**
* @see jQuery.Widget.destroy
*/
destroy: function() {
--
To view, visit https://gerrit.wikimedia.org/r/250703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18ad60e2a10e2f9128caf54ba972be5c2fe2643e
Gerrit-PatchSet: 1
Gerrit-Project: data-values/value-view
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reference section must switch to edit mode when statement sw... - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250704
Change subject: Reference section must switch to edit mode when statement
switches to edit mode and expanded if collapsed
..
Reference section must switch to edit mode when statement switches to
edit mode and expanded if collapsed
Needs ValueView release and merge of this change
https://gerrit.wikimedia.org/r/#/c/250703/
Bug:T117558
Change-Id: Ib6d3d97db9b5637b3f8cdf830c0cb44ec8b3f8f9
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 36 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/04/250704/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 06fcf86..77490df 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -131,6 +131,16 @@
*/
_qualifiers: null,
+
+
+ /**
+* Reference to the `toggler` widget managing expanding/collapsing
+* @property {jQuery.ui.toggler}
+* @private
+*/
+ _$toggler: null,
+
+
/**
* @inheritdoc
* @protected
@@ -348,13 +358,13 @@
);
// toggle for references section:
- var $toggler = $( '' ).toggler( { $subject:
this.$references } );
+ this._$toggler = $( '' ).toggler( { $subject:
this.$references } );
if ( this.$refsHeading.text() ) {
- $toggler.find( '.ui-toggler-label' ).text(
this.$refsHeading.text() );
- this.$refsHeading.html( $toggler );
+ this._$toggler.find( '.ui-toggler-label' ).text(
this.$refsHeading.text() );
+ this.$refsHeading.html( this._$toggler );
} else {
- this.$refsHeading.html( $toggler );
+ this.$refsHeading.html( this._$toggler );
this._drawReferencesCounter();
}
},
@@ -636,11 +646,33 @@
} );
this._mainSnakSnakView.startEditing();
+ this._startEditingOfReferences();
return deferred.promise();
},
/**
+* @protected
+*/
+ _startEditingOfReferences: function() {
+ $.each( this._referencesListview.value(), function ( key,
refernceView ) {
+ refernceView.startEditing();
+ });
+
+ this._expandReferencesToggler();
+ },
+
+ /**
+* @protected
+*/
+ _expandReferencesToggler: function(){
+ var toggler = this._$toggler.data( 'toggler' );
+ if(toggler.isCollapsed()){
+ toggler.toggle();
+ }
+ },
+
+ /**
* @inheritdoc
* @protected
*/
--
To view, visit https://gerrit.wikimedia.org/r/250704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6d3d97db9b5637b3f8cdf830c0cb44ec8b3f8f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Display newly added references when leaving edit mode - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250948
Change subject: Display newly added references when leaving edit mode
..
Display newly added references when leaving edit mode
Bug: T117675
Change-Id: Ibbb7e19774d74c266714873d8936215c0946eca7
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/48/250948/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index ecc28f1..087fc64 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -333,7 +333,7 @@
$newLi
.on( lia.prefixedEvent( 'afterstopediting' ),
function( event, dropValue ) {
if ( dropValue ) {
-
self._referencesListview.removeItem( $newLi );
+
//self._referencesListview.removeItem( $newLi );
} else {
var newReferenceWithHash =
liInstance.value();
@@ -688,11 +688,14 @@
/**
* @protected
*/
- _stopEditingReferences: function() {
+ _stopEditingReferences: function( dropValue ) {
+
$.each( this._referencesListview.value(), function ( key,
referenceView ) {
+ if( !dropValue ){
+ referenceView.value( referenceView.value() );
+ }
referenceView.stopEditing();
} );
-
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/250948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbb7e19774d74c266714873d8936215c0946eca7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enables codemirror editor to resize dynamically to its content - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250995
Change subject: Enables codemirror editor to resize dynamically to its content
..
Enables codemirror editor to resize dynamically to its content
Change-Id: Ia927a010e999f3e41d89e7633d388d12f0785f48
---
M gui/gui.js
M gui/style.css
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/95/250995/1
diff --git a/gui/gui.js b/gui/gui.js
index 6ba4f86..8421a84 100644
--- a/gui/gui.js
+++ b/gui/gui.js
@@ -55,7 +55,8 @@
lineNumbers: true,
matchBrackets: true,
mode: 'sparql',
- extraKeys: { 'Ctrl-Space': 'autocomplete' }
+ extraKeys: { 'Ctrl-Space': 'autocomplete' },
+ viewportMargin: Infinity
},
ERROR_LINE_MARKER = null,
ERROR_CHARACTER_MARKER = null,
@@ -322,6 +323,7 @@
}
} );
EDITOR.addKeyMap( { 'Ctrl-Enter': submitQuery } );
+ EDITOR.setValue('\n\n\n\n\n\n\n\n');
EDITOR.focus();
new WikibaseRDFTooltip(EDITOR);
diff --git a/gui/style.css b/gui/style.css
index 97669ff..43708ab 100644
--- a/gui/style.css
+++ b/gui/style.css
@@ -27,6 +27,10 @@
background-color: inherit;
}
+.CodeMirror {
+ border: 1px solid #eee;
+ height: auto!important;
+}
.exampleQueries{
width:160px;
--
To view, visit https://gerrit.wikimedia.org/r/250995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia927a010e999f3e41d89e7633d388d12f0785f48
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Put jquery and bootstrap to vendor directory - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/251003 Change subject: Put jquery and bootstrap to vendor directory .. Put jquery and bootstrap to vendor directory Change-Id: Id3a2db76fdf8683c13c389d93dd495a49395d3ad --- M gui/index.html R gui/vendor/bootstrap/bootstrap.min.css R gui/vendor/bootstrap/bootstrap.min.js R gui/vendor/jquery/jquery-1.11.3.js 4 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/03/251003/1 diff --git a/gui/index.html b/gui/index.html index ab59cc8..f853505 100644 --- a/gui/index.html +++ b/gui/index.html @@ -1,8 +1,8 @@ - - + + @@ -14,8 +14,8 @@ - + diff --git a/gui/bootstrap.min.css b/gui/vendor/bootstrap/bootstrap.min.css similarity index 100% rename from gui/bootstrap.min.css rename to gui/vendor/bootstrap/bootstrap.min.css diff --git a/gui/bootstrap.min.js b/gui/vendor/bootstrap/bootstrap.min.js similarity index 100% rename from gui/bootstrap.min.js rename to gui/vendor/bootstrap/bootstrap.min.js diff --git a/gui/jquery-1.11.3.js b/gui/vendor/jquery/jquery-1.11.3.js similarity index 100% rename from gui/jquery-1.11.3.js rename to gui/vendor/jquery/jquery-1.11.3.js -- To view, visit https://gerrit.wikimedia.org/r/251003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3a2db76fdf8683c13c389d93dd495a49395d3ad Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup folder structure of codemirror and enable placeholder - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251002
Change subject: Cleanup folder structure of codemirror and enable placeholder
..
Cleanup folder structure of codemirror and enable placeholder
Change-Id: I281ecef1f57d5542e0351b7de593c9b5e602f684
---
M gui/index.html
A gui/vendor/codemirror/addon/display/placeholder.js
R gui/vendor/codemirror/addon/hint/show-hint.css
R gui/vendor/codemirror/addon/hint/show-hint.js
R gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
R gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
R gui/vendor/codemirror/addon/tooltip/WikibaseRDFTooltip.js
R gui/vendor/codemirror/lib/codemirror.css
R gui/vendor/codemirror/lib/codemirror.js
R gui/vendor/codemirror/mode/sparql.js
10 files changed, 70 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/02/251002/1
diff --git a/gui/index.html b/gui/index.html
index 40df811..ab59cc8 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -3,20 +3,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
@@ -63,7 +64,7 @@
-
+
×
Press
[CTRL-SPACE] to activate auto completion. Data last updated: [connecting]
diff --git a/gui/vendor/codemirror/addon/display/placeholder.js
b/gui/vendor/codemirror/addon/display/placeholder.js
new file mode 100644
index 000..babddfb
--- /dev/null
+++ b/gui/vendor/codemirror/addon/display/placeholder.js
@@ -0,0 +1,60 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+mod(require("../../lib/codemirror"));
+ else if (typeof define == "function" && define.amd) // AMD
+define(["../../lib/codemirror"], mod);
+ else // Plain browser env
+mod(CodeMirror);
+})(function(CodeMirror) {
+ CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
+var prev = old && old != CodeMirror.Init;
+if (val && !prev) {
+ cm.on("blur", onBlur);
+ cm.on("change", onChange);
+ onChange(cm);
+} else if (!val && prev) {
+ cm.off("blur", onBlur);
+ cm.off("change", onChange);
+ clearPlaceholder(cm);
+ var wrapper = cm.getWrapperElement();
+ wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
+}
+
+if (val && !cm.hasFocus()) onBlur(cm);
+ });
+
+ function clearPlaceholder(cm) {
+if (cm.state.placeholder) {
+ cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
+ cm.state.placeholder = null;
+}
+ }
+ function setPlaceholder(cm) {
+clearPlaceholder(cm);
+var elt = cm.state.placeholder = document.createElement("pre");
+elt.style.cssText = "height: 0; overflow: visible";
+elt.className = "CodeMirror-placeholder";
+var placeHolder = cm.getOption("placeholder")
+if (typeof placeHolder == "string") placeHolder =
document.createTextNode(placeHolder)
+elt.appendChild(placeHolder)
+cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
+ }
+
+ function onBlur(cm) {
+if (isEmpty(cm)) setPlaceholder(cm);
+ }
+ function onChange(cm) {
+var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
+wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") +
(empty ? " CodeMirror-empty" : "");
+
+if (empty) setPlaceholder(cm);
+else clearPlaceholder(cm);
+ }
+
+ function isEmpty(cm) {
+return (cm.lineCount() === 1) && (cm.getLine(0) === "");
+ }
+});
diff --git a/gui/addon/hint/show-hint.css
b/gui/vendor/codemirror/addon/hint/show-hint.css
similarity index 100%
rename from gui/addon/hint/show-hint.css
rename to gui/vendor/codemirror/addon/hint/show-hint.css
diff --git a/gui/addon/hint/show-hint.js
b/gui/vendor/codemirror/addon/hint/show-hint.js
similarity index 100%
rename from gui/addon/hint/show-hint.js
rename to gui/vendor/codemirror/addon/hint/show-hint.js
diff --git a/gui/addon/hint/wikibase-rdf-hint.js
b/gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
similarity index 100%
rename from gui/addon/hint/wikibase-rdf-hint.js
rename to gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js
diff --git a/gui/addon/hint/wikibase-sparql-hint.js
b/gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
similarity index 100%
rename from gui/addon/hint/wikibase-sparql-hint.js
rename to gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js
diff --git a/gui/addon/tooltip/WikibaseRDFTooltip.js
b/gui/vendor/codemirror
[MediaWiki-commits] [Gerrit] Error message for Special:GoToLinkedPage - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228810
Change subject: Error message for Special:GoToLinkedPage
..
Error message for Special:GoToLinkedPage
Error message for Special:GoToLinkedPage
-The entered ID of the item is not valid
-Item was not found
-There was no page found for that combination of item and site
Bug: T72127
Change-Id: I185aacfe288e8e12b5202c59b366233c236263ac
---
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/specials/SpecialGoToLinkedPage.php
3 files changed, 77 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/10/228810/1
diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 401be0c..848d123 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -141,6 +141,9 @@
"wikibase-gotolinkedpage-lookup-item": "Item id:",
"wikibase-gotolinkedpage-submit": "Go",
"wikibase-gotolinkedpage-summary": "Special:GoToLinkedPage is used to
find the page for an item on a connected site. The left field, \"Site:\",
is where you enter the language and site code. For the right field,
\"Item id:\", you must put in the item id you are looking for.",
+ "wikibase-gotolinkedpage-error-page-not-found": "There was no page
found for that combination of item and site",
+ "wikibase-gotolinkedpage-error-item-id-invalid": "The entered ID of the
item is not valid",
+ "wikibase-gotolinkedpage-error-item-not-found": "Item was not found",
"special-itemdisambiguation": "Item disambiguation",
"wikibase-itemdisambiguation-lookup-fieldset": "Search for items by
language and label",
"wikibase-itemdisambiguation-lookup-language": "Language code:",
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index 7d0eb77..adfdd4d 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -170,6 +170,9 @@
"wikibase-gotolinkedpage-lookup-item": "Label for the textfield holding
the item ID. See also the Wikidata glossary for
[[d:Wikidata:Glossary#Items|items]].",
"wikibase-gotolinkedpage-submit": "Text for the submit button in the
search form which if successfully will go (redirect) to the specified linked
page (sitelink).\n{{Identical|Go}}",
"wikibase-gotolinkedpage-summary": "Summary and explanation of the
GoToLinkedPage.\n\nFor right-to-left languages swap \"right\" and
\"left\".\n\n\"Site\" is
{{msg-mw|wikibase-gotolinkedpage-lookup-site}}.\n\n\"item id\" is
{{msg-mw|wikibase-gotolinkedpage-lookup-item}}.",
+ "wikibase-gotolinkedpage-error-page-not-found": "Error message when no
page was found for the given input",
+ "wikibase-gotolinkedpage-error-item-id-invalid": "Error message when
the syntax of the ID is invalid",
+ "wikibase-gotolinkedpage-error-item-not-found": "Error message when
there is no item with the given ID",
"special-itemdisambiguation": "{{doc-special|ItemDisambiguation}}\nThis
special page returns all items with a given label. It provides an interface to
disambiguate them. See also the Wikidata glossary for
[[d:Wikidata:Glossary#languageattribute-label|label]] and
[[d:Wikidata:Glossary#Items|items]].",
"wikibase-itemdisambiguation-lookup-fieldset": "This is the title for
the fieldset on the special page for further refining the search. This is the
search by language and label.",
"wikibase-itemdisambiguation-lookup-language": "Label for the textfield
holding the language id.\n{{Identical|Language code}}",
diff --git a/repo/includes/specials/SpecialGoToLinkedPage.php
b/repo/includes/specials/SpecialGoToLinkedPage.php
index bba00d6..b7df32f 100644
--- a/repo/includes/specials/SpecialGoToLinkedPage.php
+++ b/repo/includes/specials/SpecialGoToLinkedPage.php
@@ -9,6 +9,8 @@
use Wikibase\Lib\Store\EntityRedirectLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
use Wikibase\Repo\WikibaseRepo;
+use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\Lib\Store\EntityLookup;
/**
* Enables accessing a linked page on a site by providing the item id and site
@@ -35,6 +37,22 @@
private $redirectLookup;
/**
+* @var EntityIdParser
+*/
+ private $idParser;
+
+ /**
+* @var EntityLookup
+*/
+ private $entityLookup;
+
+ /**
+* Error message key
+* @var string
+*/
+ private $errorMessageKey;
+
+ /**
* @see SpecialWikibasePage::__construct
*/
public function __construct() {
@@ -45,8 +63,12 @@
$this->initServices(
$wikibaseRepo->getSiteStore(),
$wikibaseRepo->getStore()->newSiteLinkStore(),
- $wikibaseRepo->getStore()->getEntityRedirectLookup()
+ $wikibaseRepo->getStore()->getEntityRedirectLookup(),
+ $wikibaseRepo-
[MediaWiki-commits] [Gerrit] Special:ItemByTitle error messages - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229129
Change subject: Special:ItemByTitle error messages
..
Special:ItemByTitle error messages
Created error messages for Special:ItemByTitle:
Item not found
Site not found
Change-Id: I1b2a436d76f71289bb8faf36af07888d4518d97f
---
M repo/i18n/en.json
M repo/i18n/qqq.json
M repo/includes/specials/SpecialItemByTitle.php
3 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/29/229129/1
diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index 401be0c..cd48e43 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -135,6 +135,8 @@
"wikibase-itembytitle-submit": "Search",
"wikibase-itembytitle-create": "You can also [$1 create an item].",
"wikibase-itembytitle-summary": "Special:ItemByTitle is used to find
the corresponding item for a given page on a connected site. The left
field, \"Site:\", is where you enter the language and site code. For the
right field, \"Page:\", you must put in the exact title of the page as it
appears on the connected site.",
+ "wikibase-itembytitle-lookup-error-site": "Please enter an existing
site.",
+ "wikibase-itembytitle-lookup-error-item_not_found": "No item was
found.",
"special-gotolinkedpage": "Go to linked page",
"wikibase-gotolinkedpage-lookup-fieldset": "Go to linked page by site
and item",
"wikibase-gotolinkedpage-lookup-site": "Site:",
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index 09bb7e7..7887bdb 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -163,6 +163,8 @@
"wikibase-itembytitle-submit": "Text for the submit button in the
search form.\n{{Identical|Search}}",
"wikibase-itembytitle-create": "Information about how to proceede to
create a new item. This message is presented when a user searched (or requested
by URL) for an item by site and page title (e.g. item, linked to a particular
Wikipedia page in a particular language), but no item was found that linked to
that page. This gives the user the option to create a new item with the page
title as the item label. The user will be sent to the Create item page and the
label would be pre-populated.\n\nParameters:\n* $1 - the URL string with the
site identifier and page name",
"wikibase-itembytitle-summary": "Summary what the Item By Title page is
about. Should explain what can be entered in the fields.\n\nFor right-to-left
languages, swap \"right\" and \"left\".\n\n* \"Site\" is
{{msg-mw|wikibase-itembytitle-lookup-site}}\n* \"Page\" is
{{msg-mw|wikibase-itembytitle-lookup-page}}",
+ "wikibase-itembytitle-lookup-error-site": "Error that an existing site
should be inserted",
+ "wikibase-itembytitle-lookup-error-item_not_found": "Error that no item
was found",
"special-gotolinkedpage": "{{doc-special|GoToLinkedPage}}\nTitle of the
special page. The linked page (sitelink) is identified through use of the site
and item ID. The lookup may have failed because there was no sitelink for that
item and site. See also the Wikidata glossary for
[[d:Wikidata:Glossary#Sitelinks|sitelink]] and
[[d:Wikidata:Glossary#Items|items]].",
"wikibase-gotolinkedpage-lookup-fieldset": "This is the title for the
fieldset on the special page for specifiying the search arguments. This is the
search for a linked page (sitelink) by site and item ID.",
"wikibase-gotolinkedpage-lookup-site": "Label for the textfield holding
the site ID. See also the Wikidata glossary for
[[d:Wikidata:Glossary#sitelinks|sitelinks]].\n{{Identical|Site}}",
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index 6fc39b3..856a350 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -235,6 +235,7 @@
);
if ( $siteExists && isset( $page ) ) {
+ $this->showErrorHTML( $this->msg(
'wikibase-itembytitle-lookup-error-item_not_found' ) );
$createLink = $this->getTitleFor( 'NewItem' );
$this->getOutput()->addHTML(
Html::openElement( 'div' )
@@ -246,6 +247,10 @@
. Html::closeElement( 'div' )
);
}
+
+ if ( !$siteExists && !empty( $page ) ) {
+ $this->showErrorHTML( $this->msg(
'wikibase-itembytitle-lookup-error-site' ) );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/229129
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b2a436d76f71289bb8faf36af07888d4518d97f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extens
[MediaWiki-commits] [Gerrit] Adapting mw.notify type warning - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229339
Change subject: Adapting mw.notify type warning
..
Adapting mw.notify type warning
Adapting the parameter type of mw.notify
Bug: T91955
Change-Id: I7f9a39c6a469c032a7f1db33a64d60b2878289bd
---
M repo/resources/wikibase.ui.entityViewInit.js
M view/resources/wikibase/utilities/wikibase.utilities.ui.css
2 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/39/229339/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 286cc57..93e9f4e 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -265,8 +265,7 @@
) {
var message = mw.msg(
'wikibase-anonymouseditwarning',
mw.msg(
'wikibase-entity-' + entityType ) );
- message = $( '' ).text(
message );
- mw.notify( message, { autoHide: false } );
+ mw.notify( message, { autoHide: false , type:
'warn' } );
}
} );
}
diff --git a/view/resources/wikibase/utilities/wikibase.utilities.ui.css
b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
index 3abf894..75b5299 100644
--- a/view/resources/wikibase/utilities/wikibase.utilities.ui.css
+++ b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
@@ -84,9 +84,4 @@
border-radius: 5px;
font-size: .9em;
}
-
-.wb-warning {
- color: #BA;
- font-weight: bold;
-}
/* /ERROR OUTPUT */
--
To view, visit https://gerrit.wikimedia.org/r/229339
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f9a39c6a469c032a7f1db33a64d60b2878289bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes css rules warn, error not applied - change (mediawiki/core)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229344
Change subject: Fixes css rules warn, error not applied
..
Fixes css rules warn, error not applied
This patch fixes the css rules for mw-notification-type-warn and
mw-notification-type-error to be more important, because otherwise they
were not displayed.
It is a fix for the following patch:
https://gerrit.wikimedia.org/r/#/c/105104/
Change-Id: If972e3649f1c2fb05a058a252922a039c6bb5926
---
M resources/src/mediawiki/mediawiki.notification.css
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/229344/1
diff --git a/resources/src/mediawiki/mediawiki.notification.css
b/resources/src/mediawiki/mediawiki.notification.css
index 632ae82..57d2b8e 100644
--- a/resources/src/mediawiki/mediawiki.notification.css
+++ b/resources/src/mediawiki/mediawiki.notification.css
@@ -21,12 +21,12 @@
font-weight: bold;
}
-.mw-notification-type-warn {
+.mw-notification-area .mw-notification.mw-notification-type-warn {
border-color: #F5BE00; /* yellow */
background-color: #E8;
}
-.mw-notification-type-error {
+.mw-notification-area .mw-notification.mw-notification-type-error {
border-color: #EB3941; /* red */
background-color: #FFF8F8;
}
--
To view, visit https://gerrit.wikimedia.org/r/229344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If972e3649f1c2fb05a058a252922a039c6bb5926
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changed sitelinks active input background - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229670
Change subject: Changed sitelinks active input background
..
Changed sitelinks active input background
Changed sitelinks active input background to be blue as it is with the
labels.
Change-Id: Ia421970f60b0529b64220cbcc9f7d2f64754b55d
---
M view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/229670/1
diff --git
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css
index 7d1f203..b311dc8 100644
---
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css
+++
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkview.css
@@ -43,6 +43,7 @@
.wikibase-sitelinkview input:focus {
border-color: #0b0080;
+ background-color: #D6F3FF;
}
.wikibase-sitelinkview-badges {
--
To view, visit https://gerrit.wikimedia.org/r/229670
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia421970f60b0529b64220cbcc9f7d2f64754b55d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moves entity spinner to entityViewinit - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229680
Change subject: Moves entity spinner to entityViewinit
..
Moves entity spinner to entityViewinit
Moves entity spinner to entityViewinit, because it needs jquery and css
files to be loaded
Bug: T108003
Change-Id: I8abcb099b50108c4665db4d4f5ca2402db16aa91
---
M repo/resources/wikibase.ui.entityViewInit.js
M view/resources/wikibase/wikibase.css
M view/src/EntityView.php
3 files changed, 11 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/80/229680/1
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 4485033..cdd66b6 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -386,6 +386,15 @@
);
}
+ //spinner
+ $( '.wikibase-entityview' ).addClass( 'loading' ).append(
+ $( '' ).addClass( 'mw-small-spinner wb-entity-spinner' )
+ );
+ window.setTimeout( function() {
+ $( '.wikibase-entityview' ).removeClass( 'loading' );
+ $( '.wb-entity-spinner' ).remove();
+ }, 7000 );
+
} )(
jQuery,
mediaWiki,
diff --git a/view/resources/wikibase/wikibase.css
b/view/resources/wikibase/wikibase.css
index 8c8ffd7..988afd8 100644
--- a/view/resources/wikibase/wikibase.css
+++ b/view/resources/wikibase/wikibase.css
@@ -143,7 +143,7 @@
position: relative;
}
-.wb-entity.loading > * {
+.wikibase-entityview.loading > * {
opacity: .3;
}
@@ -153,7 +153,7 @@
margin-left: -10px; /* half of the 20px width of .mw-small-spinner */
opacity: 1 !important;
position: absolute;
- top: 40px;
+ top: 140px;
}
.loading .wb-entity-spinner {
diff --git a/view/src/EntityView.php b/view/src/EntityView.php
index 1aa0959..8c0aaf5 100644
--- a/view/src/EntityView.php
+++ b/view/src/EntityView.php
@@ -103,8 +103,6 @@
$this->getSideHtml( $entityRevision )
);
- $html .= $this->getLoadingSpinnerInlineScript();
-
return $html;
}
@@ -129,26 +127,6 @@
}
return '';
- }
-
- private function getLoadingSpinnerInlineScript() {
- // Show loading spinner as long as JavaScript is initialising.
- // The fastest way to show it is placing the script right after
the corresponding HTML.
- // Remove it after a while in any case (e.g. some resources
might not have been loaded
- // silently, so JavaScript is not initialising).
- // Additionally attaching to window.error would only make sense
before any other
- // JavaScript is parsed.
- return Html::inlineScript( '
-if ( $ ) {
- $( ".wikibase-entityview" ).addClass( "loading" ).append(
- $( "" ).addClass( "mw-small-spinner wb-entity-spinner" )
- );
- window.setTimeout( function() {
- $( ".wikibase-entityview" ).removeClass( "loading" );
- $( ".wb-entity-spinner" ).remove();
- }, 7000 );
-}
-' );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/229680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8abcb099b50108c4665db4d4f5ca2402db16aa91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix merging of entity usage aspects - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/243135 Change subject: Fix merging of entity usage aspects .. Fix merging of entity usage aspects Fix merging of entity usage aspects by using array_merge instead of '+' in AffectedPagesFinder. Found while investigating bug T112649. Bug: T112649 Change-Id: I84f3b4dfa76731e4648a19913d0ad14e32ab02fb --- M client/includes/Changes/AffectedPagesFinder.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/35/243135/1 diff --git a/client/includes/Changes/AffectedPagesFinder.php b/client/includes/Changes/AffectedPagesFinder.php index b8d1376..69a5339 100644 --- a/client/includes/Changes/AffectedPagesFinder.php +++ b/client/includes/Changes/AffectedPagesFinder.php @@ -188,7 +188,7 @@ // @todo: more than one entity at once! array( $entityId ), // Look up pages that are marked as either using one of the changed or all aspects - $changedAspects + array( EntityUsage::ALL_USAGE ) + array_merge( $changedAspects, array( EntityUsage::ALL_USAGE ) ) ); // @todo: use iterators throughout! -- To view, visit https://gerrit.wikimedia.org/r/243135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84f3b4dfa76731e4648a19913d0ad14e32ab02fb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix docs in PageEntityUsages - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/243136
Change subject: Fix docs in PageEntityUsages
..
Fix docs in PageEntityUsages
Fix php docs in PageEntityUsages (return types)
Change-Id: I3723b6afeee89334203f9514b22b83a1e1ff2d9f
---
M client/includes/Usage/PageEntityUsages.php
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/36/243136/1
diff --git a/client/includes/Usage/PageEntityUsages.php
b/client/includes/Usage/PageEntityUsages.php
index b6f7f5b..f69f71f 100644
--- a/client/includes/Usage/PageEntityUsages.php
+++ b/client/includes/Usage/PageEntityUsages.php
@@ -85,7 +85,7 @@
*
* @see getAspectKeys()
*
-* string[] Sorted list of aspect names (without modifiers).
+* @return string[] Sorted list of aspect names (without modifiers).
*/
public function getAspects() {
$aspects = array();
@@ -105,7 +105,7 @@
*
* @see getAspects()
*
-* string[] Sorted list of full aspect names with modifiers.
+* @return string[] Sorted list of full aspect names with modifiers.
*/
public function getAspectKeys() {
$aspects = array();
@@ -174,6 +174,9 @@
return $aspects;
}
+ /**
+* @return string
+*/
public function __toString() {
$s = 'Page ' . $this->getPageId() . ' uses (';
$s .= implode( '|', array_keys( $this->getUsages() ) );
--
To view, visit https://gerrit.wikimedia.org/r/243136
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3723b6afeee89334203f9514b22b83a1e1ff2d9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Use YearMonthDayTimeParser in TimeParserFactory - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240714
Change subject: [WIP] Use YearMonthDayTimeParser in TimeParserFactory
..
[WIP] Use YearMonthDayTimeParser in TimeParserFactory
Use YearMonthDayTimeParser in TimeParserFactory to be able to parse
dates like February 29, 1700 (Julian)
Bug: T98194
Change-Id: Ib3796e2286ed229d391fdbd77bdbe99d621f5e29
---
M repo/includes/Parsers/TimeParserFactory.php
M repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
2 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/14/240714/1
diff --git a/repo/includes/Parsers/TimeParserFactory.php
b/repo/includes/Parsers/TimeParserFactory.php
index 89c5525..358dc82 100644
--- a/repo/includes/Parsers/TimeParserFactory.php
+++ b/repo/includes/Parsers/TimeParserFactory.php
@@ -11,6 +11,7 @@
use ValueParsers\ParserOptions;
use ValueParsers\PhpDateTimeParser;
use ValueParsers\ValueParser;
+use ValueParsers\YearMonthDayTimeParser;
/**
* @since 0.5
@@ -58,6 +59,7 @@
$parsers[] = new YearMonthTimeParser( $this->options );
$parsers[] = $isoTimestampParser;
$parsers[] = new MwTimeIsoParser( $this->options );
+ $parsers[] = new YearMonthDayTimeParser( $eraParser );
$parsers[] = new PhpDateTimeParser(
$this->getMonthNameUnlocalizer(),
$eraParser,
diff --git a/repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
b/repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
index 7c1ad08..86d8cce 100644
--- a/repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
+++ b/repo/tests/phpunit/includes/Parsers/TimeParserFactoryTest.php
@@ -37,7 +37,7 @@
$factory = new TimeParserFactory( new ParserOptions( array(
ValueParser::OPT_LANG => $languageCode ) ) );
$parser = $factory->getTimeParser();
- $this->assertTrue( $expected->equals( $parser->parse( $value )
) );
+ $this->assertEquals($expected->toArray(), $parser->parse(
$value )->toArray() );
}
public function validInputProvider() {
@@ -125,6 +125,8 @@
array( '+2013-07-01T00:00:00Z' ),
'1 Jul 2013' =>
array( '+2013-07-01T00:00:00Z' ),
+ 'February 29, 1500' =>
+ array( '+1500-02-29T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1 Jul 2013 BC' =>
array( '-2013-07-01T00:00:00Z',
TimeValue::PRECISION_DAY, $julian ),
'1 Jul 2013CE' =>
--
To view, visit https://gerrit.wikimedia.org/r/240714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3796e2286ed229d391fdbd77bdbe99d621f5e29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Hide references in CSS if JS is available" - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/241599
Change subject: Revert "Hide references in CSS if JS is available"
..
Revert "Hide references in CSS if JS is available"
This reverts commit e6b20d5ef27838a66c4acf4f2b9b498e671d17ea.
Change-Id: I46e72ae53e3b8360b375cd53ac1eaebfb1ad8422
---
M view/resources/wikibase/wikibase.css
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/99/241599/1
diff --git a/view/resources/wikibase/wikibase.css
b/view/resources/wikibase/wikibase.css
index 832f012..46e101e 100644
--- a/view/resources/wikibase/wikibase.css
+++ b/view/resources/wikibase/wikibase.css
@@ -510,11 +510,6 @@
clear: both;
}
-/* References are initially hidden if JS is enabled */
-.client-js .wikibase-statementview-references {
- display: none;
-}
-
.wikibase-referenceview {
position: relative;
background: #F8F8F8;
--
To view, visit https://gerrit.wikimedia.org/r/241599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e72ae53e3b8360b375cd53ac1eaebfb1ad8422
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move wikibase stuff to wikibase directory - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/251218 Change subject: Move wikibase stuff to wikibase directory .. Move wikibase stuff to wikibase directory Change-Id: I4ac95066a7af0b0587e308c6baa6bb411c177c8c --- M gui/index.html R gui/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js R gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js R gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/18/251218/1 diff --git a/gui/index.html b/gui/index.html index f853505..43b15b6 100644 --- a/gui/index.html +++ b/gui/index.html @@ -6,18 +6,18 @@ - - - + + + - + diff --git a/gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js b/gui/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js similarity index 100% rename from gui/vendor/codemirror/addon/hint/wikibase-rdf-hint.js rename to gui/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js diff --git a/gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js similarity index 100% rename from gui/vendor/codemirror/addon/hint/wikibase-sparql-hint.js rename to gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js diff --git a/gui/vendor/codemirror/addon/tooltip/WikibaseRDFTooltip.js b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js similarity index 100% rename from gui/vendor/codemirror/addon/tooltip/WikibaseRDFTooltip.js rename to gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js -- To view, visit https://gerrit.wikimedia.org/r/251218 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ac95066a7af0b0587e308c6baa6bb411c177c8c Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve contrast of brackets as requested by Lydia - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251241
Change subject: Improve contrast of brackets as requested by Lydia
..
Improve contrast of brackets as requested by Lydia
Change-Id: Ic4c7b4baf4f13285f5049fb81477f42fccbda6a1
---
M gui/style.css
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/41/251241/1
diff --git a/gui/style.css b/gui/style.css
index 97669ff..65b4edc 100644
--- a/gui/style.css
+++ b/gui/style.css
@@ -27,6 +27,7 @@
background-color: inherit;
}
+.cm-s-default .cm-bracket {color: #000;}
.exampleQueries{
width:160px;
--
To view, visit https://gerrit.wikimedia.org/r/251241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4c7b4baf4f13285f5049fb81477f42fccbda6a1
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Block statement saving on invalid and empty reference - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251486
Change subject: Block statement saving on invalid and empty reference
..
Block statement saving on invalid and empty reference
this also fixes Enable save button on reference change.
Bug: T117700
Bug: T117701
Change-Id: I064bb8650368242c61fe53d3be2a8b0fc89fc674
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 25 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/86/251486/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 82b1e39..7ab5757 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -319,6 +319,11 @@
self._trigger( 'afterremove' );
}
} )
+ .on( lia.prefixedEvent( 'change.'+ this.widgetName ),
+ function( event ) {
+ event.stopPropagation();
+ self._trigger( 'change' );
+ })
.on( 'listviewenternewitem', function( event, $newLi ) {
if ( event.target !== $listview[0] ) {
return;
@@ -787,6 +792,10 @@
return false;
}
+ if ( this._hasInvalidReferences() ) {
+ return false;
+ }
+
if ( this._qualifiers ) {
snaklistviews = this._qualifiers.value();
@@ -803,6 +812,22 @@
},
/**
+* @return {boolean}
+*/
+ _hasInvalidReferences: function() {
+ var isInvalid = false;
+ $.each( this._referencesListview.value(), function ( key,
referenceView ) {
+ if ( !referenceView.isValid() ) {
+ isInvalid = true;
+ return;
+ }
+ } );
+
+ return isInvalid;
+ },
+
+
+ /**
* @inheritdoc
* @protected
*
--
To view, visit https://gerrit.wikimedia.org/r/251486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I064bb8650368242c61fe53d3be2a8b0fc89fc674
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] When hitting cancel references should be thrown away - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251487
Change subject: When hitting cancel references should be thrown away
..
When hitting cancel references should be thrown away
Bug: T117963
Change-Id: I7a81c79fd981af723fb9212c35acb3ba611de1bb
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 4 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/87/251487/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 7ab5757..b149b68 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -683,7 +683,7 @@
this._stopEditingQualifiers( dropValue );
this._rankSelector.stopEditing( dropValue );
- this._stopEditingReferences( dropValue );
+ this._recreateReferences();
return PARENT.prototype._afterStopEditing.call( this, dropValue
);
},
@@ -691,15 +691,9 @@
/**
* @protected
*/
- _stopEditingReferences: function( dropValue ) {
- var references = !dropValue &&
this.options.value.getReferences().toArray();
-
- $.each( this._referencesListview.value(), function ( i,
referenceView ) {
- if ( !dropValue ) {
- referenceView.value( references[ i ] );
- }
- referenceView.stopEditing();
- } );
+ _recreateReferences: function() {
+ this._referencesListview.option( 'value', this.options.value
+ ? this.options.value.getReferences().toArray()
: [] );
this._drawReferencesCounter();
},
--
To view, visit https://gerrit.wikimedia.org/r/251487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a81c79fd981af723fb9212c35acb3ba611de1bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove referenceview edit mode handling - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251494
Change subject: Remove referenceview edit mode handling
..
Remove referenceview edit mode handling
Bug: T117702
Change-Id: I227c5ff2ac8842ea0e6b8f3490bdfa572997aa1a
---
M
view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js
M
view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
2 files changed, 12 insertions(+), 85 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/94/251494/1
diff --git
a/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js
b/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js
index 58d3fd0..3537d5b 100644
---
a/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js
+++
b/view/resources/jquery/wikibase/toolbar/controller/definitions/addtoolbar/statementview-referenceview.js
@@ -31,6 +31,9 @@
return;
}
+ $listview.closest( '.wikibase-statementview' )
+ .data( 'statementview' ).startEditing();
+
listview.enterNewItem().done( function(
$referenceview ) {
var referenceview = lia.liInstance(
$referenceview );
referenceview.focus();
diff --git
a/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
b/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
index ac516d4..bf44a5e 100644
---
a/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
+++
b/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
@@ -12,108 +12,32 @@
selector: ':' + $.wikibase.referenceview.prototype.namespace
+ '-' + $.wikibase.referenceview.prototype.widgetName,
events: {
- referenceviewcreate: function( event ) {
+ referenceviewafterstartediting: function( event ) {
var $referenceview = $( event.target ),
referenceview = $referenceview.data(
'referenceview' ),
options = {},
- $container = $referenceview.find(
'.wikibase-toolbar-container' );
-
- if ( !$container.length ) {
$container = $( '' ).appendTo(
$referenceview.find(
'.wikibase-referenceview-heading' )
);
- }
options.$container = $container;
- function removeFromListView() {
- var $statementview = $referenceview.closest(
':wikibase-statementview' ),
- statementview = $statementview.data(
'statementview' );
+ var $statementview = $referenceview.closest(
':wikibase-statementview' ),
+ statementview = $statementview.data( 'statementview' );
+ function removeFromListView() {
statementview._referencesListview.removeItem(
$referenceview );
}
- if ( !referenceview.options.statementGuid ||
!referenceview.value() ) {
- var $statementview = $referenceview.closest(
':wikibase-statementview' ),
- statementview = $statementview.data(
'statementview' );
- if ( !statementview.isInEditMode() ) {
- options.label = mw.msg(
'wikibase-cancel' );
- }
- $referenceview.removetoolbar( options )
- .on( 'removetoolbarremove.removetoolbar',
function( event ) {
- removeFromListView();
- } );
-
- return;
+ if ( ( !referenceview.options.statementGuid ||
!referenceview.value() ) && !statementview.isInEditMode() ) {
+ options.label = mw.msg( 'wikibase-cancel' );
}
-
- options.getHelpMessage = function() {
- return $.Deferred().resolve(
referenceview.options.helpMessage ).promise();
- };
-
- var edittoolbar = $referenceview.edittoolbar( options
).data(
[MediaWiki-commits] [Gerrit] Refactor edittoolbar.referenceview -> removetoolbar.referenc... - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251495
Change subject: Refactor edittoolbar.referenceview ->
removetoolbar.referenceview
..
Refactor edittoolbar.referenceview -> removetoolbar.referenceview
Bug: T117702
Change-Id: Ibf17413d27f9fc6cb135667620c73c1b259c9e90
---
M repo/resources/Resources.php
M repo/resources/wikibase.ui.entityViewInit.js
R
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
M view/resources/jquery/wikibase/toolbar/controller/resources.php
4 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/95/251495/1
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index d26067a..3f4eed6 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -74,9 +74,9 @@
'jquery.wikibase.toolbarcontroller.definitions.addtoolbar.statementview-referenceview',
'jquery.wikibase.toolbarcontroller.definitions.addtoolbar.statementview-snakview',
'jquery.wikibase.toolbarcontroller.definitions.edittoolbar.entitytermsview',
-
'jquery.wikibase.toolbarcontroller.definitions.edittoolbar.referenceview',
'jquery.wikibase.toolbarcontroller.definitions.edittoolbar.sitelinkgroupview',
'jquery.wikibase.toolbarcontroller.definitions.edittoolbar.statementview',
+
'jquery.wikibase.toolbarcontroller.definitions.removetoolbar.referenceview',
'jquery.wikibase.toolbarcontroller.definitions.removetoolbar.referenceview-snakview',
'jquery.wikibase.toolbarcontroller.definitions.removetoolbar.sitelinkgroupview-sitelinkview',
'jquery.wikibase.toolbarcontroller.definitions.removetoolbar.statementview-snakview',
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index 43249ad..741302d 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -25,10 +25,10 @@
edittoolbar: [
'statementview',
'entitytermsview',
- 'referenceview',
'sitelinkgroupview'
],
removetoolbar: [
+ 'referenceview',
'statementview-snakview',
'referenceview-snakview',
'sitelinkgroupview-sitelinkview'
diff --git
a/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
similarity index 91%
rename from
view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
rename to
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
index bf44a5e..3875a53 100644
---
a/view/resources/jquery/wikibase/toolbar/controller/definitions/edittoolbar/referenceview.js
+++
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
@@ -6,8 +6,10 @@
*
* @licence GNU GPL v2+
* @author H. Snater < mediaw...@snater.com >
+ * @author Adrian Heine
+ * @author Jonas Kress
*/
-$.wikibase.toolbarcontroller.definition( 'edittoolbar', {
+$.wikibase.toolbarcontroller.definition( 'removetoolbar', {
id: 'referenceview',
selector: ':' + $.wikibase.referenceview.prototype.namespace
+ '-' + $.wikibase.referenceview.prototype.widgetName,
diff --git a/view/resources/jquery/wikibase/toolbar/controller/resources.php
b/view/resources/jquery/wikibase/toolbar/controller/resources.php
index 1b775a6..0c66b9a 100644
--- a/view/resources/jquery/wikibase/toolbar/controller/resources.php
+++ b/view/resources/jquery/wikibase/toolbar/controller/resources.php
@@ -94,15 +94,14 @@
),
),
-
'jquery.wikibase.toolbarcontroller.definitions.edittoolbar.referenceview' =>
$moduleTemplate + array(
+
'jquery.wikibase.toolbarcontroller.definitions.removetoolbar.referenceview' =>
$moduleTemplate + array(
'scripts' => array(
- 'definitions/edittoolbar/referenceview.js',
+ 'definitions/removetoolbar/referenceview.js',
),
'dependencies' => array(
-
[MediaWiki-commits] [Gerrit] Small bug fixes - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251937
Change subject: Small bug fixes
..
Small bug fixes
Change-Id: I2dacf12b3884c6fdc3e222f11e7b696c55003925
---
M gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
M gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
2 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/37/251937/1
diff --git a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
index d16e7fe..8946465 100755
--- a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
+++ b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js
@@ -39,11 +39,6 @@
}
};
- CodeMirror.hint.sparql.async = true;
- CodeMirror.defaults.hintOptions = {};
- CodeMirror.defaults.hintOptions.closeCharacters = /[]/;
- CodeMirror.defaults.hintOptions.completeSingle = false;
-
function getSPARQLHints( term ){
var list = [];
@@ -60,7 +55,7 @@
var variables = [];
$.each(text.split(' '), function( key, word ){
- if( word.indexOf('?') === 0){
+ if( word.match(/^\?[a-zA-Z0-9]+$/)){
variables.push(word);
}
});
diff --git a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
index 254bc09..f729ad8 100644
--- a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
+++ b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
@@ -50,7 +50,6 @@
var posX = e.clientX, posY = (e.clientY +
$(window).scrollTop());
var token =
this.editor.getTokenAt(this.editor.coordsChar({left: posX, top: posY})).string;
- console.log(token);
if(!token.match(/.+\:(Q|P)[0-9]*/)){
return;
--
To view, visit https://gerrit.wikimedia.org/r/251937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2dacf12b3884c6fdc3e222f11e7b696c55003925
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove button on references snak removes only the snak - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251947
Change subject: Remove button on references snak removes only the snak
..
Remove button on references snak removes only the snak
Bug: T118161
Change-Id: I8772ece230700ffc9ceea30898ece1df9e925a80
---
M
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/47/251947/1
diff --git
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
index 3875a53..d0b0041 100644
---
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
+++
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
@@ -36,7 +36,9 @@
}
$referenceview.removetoolbar( options )
.on( 'removetoolbarremove.removetoolbar', function(
event ) {
- removeFromListView();
+ if ( event.target === $referenceview[0] ) {
+ removeFromListView();
+ }
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/251947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8772ece230700ffc9ceea30898ece1df9e925a80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixes after removing reference statements save button is sti... - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/251973
Change subject: Fixes after removing reference statements save button is still
disabled
..
Fixes after removing reference statements save button is still disabled
Bug:T118185
Change-Id: I4ec46a676e24dc95c51706f76506344048b1b950
---
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/251973/1
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index b05dc72..7f48430 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -317,6 +317,7 @@
}
if ( event.type === 'listviewitemremoved' ) {
self._trigger( 'afterremove' );
+ self._trigger( 'change' );
}
} )
.on( lia.prefixedEvent( 'change.' + this.widgetName ),
--
To view, visit https://gerrit.wikimedia.org/r/251973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ec46a676e24dc95c51706f76506344048b1b950
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add icons to text in toolbars - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252430
Change subject: Add icons to text in toolbars
..
Add icons to text in toolbars
Bug: T87757
Change-Id: Ifd00e0ec966a359e60e16bb813ec17e470d36077
---
M view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
A view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
A view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
A
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
A
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
A
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
A
view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
A view/resources/jquery/wikibase/toolbar/themes/default/images/icons/remove.svg
M
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbar.css
M
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
M
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
11 files changed, 98 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/30/252430/1
diff --git a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
old mode 100644
new mode 100755
index 7f7664c..d3a294d
--- a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
+++ b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.toolbar.js
@@ -133,7 +133,7 @@
} );
if ( this.options.renderItemSeparators &&
this.options.$content.length ) {
- $container.append( mw.wbTemplate(
'wikibase-toolbar-bracketed', $children ) );
+ $container.append( $children );
} else {
$container.append( $children );
}
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
new file mode 100755
index 000..62e5496
--- /dev/null
+++ b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/add.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
new file mode 100755
index 000..cf7858b
--- /dev/null
+++
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/check.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
new file mode 100755
index 000..1427670
--- /dev/null
+++
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-ltr.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
new file mode 100644
index 000..6e0ca93
--- /dev/null
+++
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/close-rtl.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
new file mode 100755
index 000..4cd6cda
--- /dev/null
+++
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-ltr.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
new file mode 100755
index 000..932997b
--- /dev/null
+++
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/edit-rtl.svg
@@ -0,0 +1,6 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
diff --git
a/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/remove.svg
b/view/resources/jquery/wikibase/toolbar/themes/default/images/icons/remove.svg
new file mode 100755
index 000..ef5f97b
--- /dev/null
+++
b/view/resources/jquery/wiki
[MediaWiki-commits] [Gerrit] Follow up patch to address all comments - change (mediawiki...Wikibase)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252673
Change subject: Follow up patch to address all comments
..
Follow up patch to address all comments
Change-Id: I6dac6f7b6a7a7651cdcb2696194448b7197cb232
---
M view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M
view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
M view/resources/wikibase/view/ToolbarViewController.js
4 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/252673/1
diff --git a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
index 5ed7278..cac26f7 100644
--- a/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
+++ b/view/resources/jquery/ui/jquery.ui.EditableTemplatedWidget.js
@@ -154,7 +154,8 @@
/**
* @return {Object} jQuery.Promise
-* No resolved parameters.
+* Resolved parameters:
+* - {*} [value] the data model object returned by save API call
* Rejected parameters:
* - {Error}
*/
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index a436dbb..4011157 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -315,9 +315,7 @@
if ( event.target === $listview[0] ) {
self._drawReferencesCounter();
}
- if ( event.type === 'listviewitemremoved' ) {
- self._trigger( 'change' );
- }
+ self._trigger( 'change' );
} )
.on( lia.prefixedEvent( 'change.' + this.widgetName ),
function( event ) {
@@ -786,7 +784,7 @@
return false;
}
- if ( this._referencesListview && this._hasInvalidReferences() )
{
+ if ( this._hasInvalidReferences() ) {
return false;
}
@@ -810,10 +808,15 @@
*/
_hasInvalidReferences: function() {
var isInvalid = false;
+
+ if ( !this._referencesListview ) {
+ return isInvalid;
+ }
+
$.each( this._referencesListview.value(), function ( key,
referenceView ) {
if ( !referenceView.isValid() ) {
isInvalid = true;
- return;
+ return false;
}
} );
diff --git
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
index d0b0041..959f932 100644
---
a/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
+++
b/view/resources/jquery/wikibase/toolbar/controller/definitions/removetoolbar/referenceview.js
@@ -31,9 +31,6 @@
statementview._referencesListview.removeItem(
$referenceview );
}
- if ( ( !referenceview.options.statementGuid ||
!referenceview.value() ) && !statementview.isInEditMode() ) {
- options.label = mw.msg( 'wikibase-cancel' );
- }
$referenceview.removetoolbar( options )
.on( 'removetoolbarremove.removetoolbar', function(
event ) {
if ( event.target === $referenceview[0] ) {
diff --git a/view/resources/wikibase/view/ToolbarViewController.js
b/view/resources/wikibase/view/ToolbarViewController.js
index 28b7cc1..26a6165 100644
--- a/view/resources/wikibase/view/ToolbarViewController.js
+++ b/view/resources/wikibase/view/ToolbarViewController.js
@@ -82,7 +82,7 @@
/**
* Stop editing
*
- * @param {boolean} dropValue Whether the current value should be kept and
+ * @param {boolean} [dropValue=false] Whether the current value should be kept
and
* persisted or dropped
*/
SELF.prototype.stopEditing = function( dropValue ) {
@@ -155,7 +155,7 @@
/**
* Set or clear error
*
- * @param {mixed|undefined} [error] The error or undefined, if error should be
+ * @param {mixed} [error] The error or undefined, if error should be
* cleared
*/
SELF.prototype.setError = function( error ) {
--
To view, visit https://gerrit.wikimedia.org/r/252673
To unsubscribe
[MediaWiki-commits] [Gerrit] [WIP] Refactor gui.js - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248689
Change subject: [WIP] Refactor gui.js
..
[WIP] Refactor gui.js
Refactor gui.js to be oo and split up into several classes.
Bug: T116464
Change-Id: Ic9f9c128d51a0220f461ea5174284e013e4529bf
---
A gui/js/wikibase/queryService/Api.js
A gui/js/wikibase/queryService/ui/App.js
A gui/js/wikibase/queryService/ui/Editor.js
3 files changed, 126 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/89/248689/1
diff --git a/gui/js/wikibase/queryService/Api.js
b/gui/js/wikibase/queryService/Api.js
new file mode 100644
index 000..7462900
--- /dev/null
+++ b/gui/js/wikibase/queryService/Api.js
@@ -0,0 +1,44 @@
+var wikibase = wikibase || { queryService: { ui: {}} };
+
+wikibase.queryService.Api = ( function( $ ) {
+ "use strict";
+
+ /**
+* API for the Wikibase query service
+*
+* @class wikibase.queryService.Api
+* @licence GNU GPL v2+
+* @author Jonas Kress
+* @constructor
+*/
+ function SELF() {
+ }
+
+ /**
+* Submit a query to the API
+*
+* @param {string[]} data
+* @return {jQuery.Promise}
+**/
+ SELF.prototype.submitQuery = function( data ){
+ };
+
+ /**
+* Get the result of the submitted query
+*
+* @return {string}
+**/
+ SELF.prototype.getResult = function(){
+ };
+
+ /**
+* Get the result of the submitted query as CSV
+*
+* @return {string}
+**/
+ SELF.prototype.getResultAsCSV = function(){
+ };
+
+ return SELF;
+
+}( jQuery ) );
diff --git a/gui/js/wikibase/queryService/ui/App.js
b/gui/js/wikibase/queryService/ui/App.js
new file mode 100644
index 000..705d559
--- /dev/null
+++ b/gui/js/wikibase/queryService/ui/App.js
@@ -0,0 +1,53 @@
+var wikibase = wikibase || { queryService: { ui: {}} };
+
+wikibase.queryService.ui.App = ( function( $ ) {
+ "use strict";
+
+ /**
+* A ui application for the Wikibase query service
+*
+* @class wikibase.queryService.ui.App
+* @licence GNU GPL v2+
+* @author Jonas Kress
+* @constructor
+*
+* @param {jQuery} $element
+* @param {wikibase.queryService.ui.Editor}
+* @param {wikibase.queryService.API}
+*/
+ function SELF( $element, editor, api ) {
+ this.$element = $element;
+ this.editor = editor;
+ this.api = api;
+
+ if( !this.api ){
+ this.api = new wikibase.queryService.Api();
+ }
+
+ if( !this.editor ){
+ this.editor = new wikibase.queryService.ui.Editor();
+ }
+ }
+
+ /**
+* @property {string}
+* @private
+**/
+ this.$element = null;
+
+ /**
+* @property {wikibase.queryService.API}
+* @private
+**/
+ this.api = null;
+
+ /**
+* @property {wikibase.queryService.ui.Editor}
+* @type wikibase.queryService.ui.Editor
+* @private
+**/
+ this.editor = null;
+
+
+ return SELF;
+}( jQuery ) );
diff --git a/gui/js/wikibase/queryService/ui/Editor.js
b/gui/js/wikibase/queryService/ui/Editor.js
new file mode 100644
index 000..30bae83
--- /dev/null
+++ b/gui/js/wikibase/queryService/ui/Editor.js
@@ -0,0 +1,29 @@
+var wikibase = wikibase || { queryService: { ui: {}} };
+
+wikibase.queryService.ui.Editor = ( function( $ ) {
+ "use strict";
+
+ /**
+* An ui editor for the Wikibase query service
+*
+* @class wikibase.queryService.ui.Editor
+* @licence GNU GPL v2+
+* @author Jonas Kress
+* @constructor
+*/
+ function SELF() {
+ }
+
+ /**
+* Construct an editor on the given textarea DOM element
+*
+* @param {jQuery} $element
+* @throws {Error} If given element is not a valid jQuery textarea
+**/
+ SELF.prototype.fromTextArea = function( $element ){
+ };
+
+
+ return SELF;
+
+}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/248689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9f9c128d51a0220f461ea5174284e013e4529bf
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SPARQL auto completion for keywords and ?variables - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248690
Change subject: SPARQL auto completion for keywords and ?variables
..
SPARQL auto completion for keywords and ?variables
Auto completion support for SPARQL keywords like SELECT, OPTIONAL, WHERE
{ } and SERVICE.
And also for defined ?variables within the document.
Bug: T116080
Change-Id: I40bf67ae766f8700ed07a1daf550c3b378387100
---
A gui/addon/hint/wikibase-sparql-hint.js
M gui/index.html
2 files changed, 129 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/90/248690/1
diff --git a/gui/addon/hint/wikibase-sparql-hint.js
b/gui/addon/hint/wikibase-sparql-hint.js
new file mode 100755
index 000..303e473
--- /dev/null
+++ b/gui/addon/hint/wikibase-sparql-hint.js
@@ -0,0 +1,128 @@
+/**
+ * Code completion for Wikibase entities RDF prefixes in SPARQL
+ *
+ * Determines entity type from list of prefixes and completes input
+ * based on search results from wikidata.org entities search API
+ *
+ * licence GNU GPL v2+
+ *
+ * @author Jens Ohlig
+ * @author Jan Zerebecki
+ * @author Jonas Kress
+ */
+
+( function ( mod ) {
+ if ( typeof exports == 'object' && typeof module == 'object' ) {//
CommonJS
+ mod( require( '../../lib/codemirror' ) );
+ } else if ( typeof define == 'function' && define.amd ) {// AMD
+ define( [ '../../lib/codemirror' ], mod );
+ } else {// Plain browser env
+ mod( CodeMirror );
+ }
+} )( function ( CodeMirror ) {
+ 'use strict';
+
+ var SPARQL_KEYWORDS = [ 'SELECT', 'OPTIONAL', 'WHERE', 'ORDER', 'ORDER
BY', 'DISTINCT', 'WHERE {\n\n}', 'SERVICE', 'SERVICE wikibase:label {\n
bd:serviceParam wikibase:language "en" .\n}',
+ 'BASE', 'PREFIX', 'REDUCED', 'FROM', 'LIMIT',
'OFFSET', 'HAVING', 'UNION'];
+
+ CodeMirror.registerHelper( 'hint', 'sparql', function ( editor,
callback, options ) {
+ var currentWord = getCurrentWord( getCurrentLine( editor ),
getCurrentCurserPosition( editor ) ),
+ hintList = [];
+
+
+ if ( currentWord.word.indexOf('?') === 0) {
+ hintList = hintList.concat( getVariableHints(
currentWord.word, getDefinedVariables( editor.doc.getValue() ) ) );
+ }
+
+ hintList = hintList.concat( getSPARQLHints( currentWord.word )
);
+
+ callback( getHintCompletion( editor, currentWord, hintList ) );
+
+ } );
+
+ CodeMirror.hint.sparql.async = true;
+ CodeMirror.defaults.hintOptions = {};
+ CodeMirror.defaults.hintOptions.closeCharacters = /[]/;
+ CodeMirror.defaults.hintOptions.completeSingle = false;
+
+ function getSPARQLHints( term ){
+ var list = [];
+
+ $.each(SPARQL_KEYWORDS, function( key, keyword ){
+ if( keyword.toLowerCase().indexOf( term.toLowerCase() )
=== 0){
+ list.push(keyword);
+ }
+ });
+
+ return list;
+ }
+
+ function getDefinedVariables( text ) {
+ var variables = [];
+
+ $.each(text.split(' '), function( key, word ){
+ if( word.indexOf('?') === 0){
+ variables.push(word);
+ }
+ });
+
+ return $.unique( variables );
+ }
+
+ function getVariableHints( term, variables ) {
+
+ var list = [];
+
+ $.each(variables, function( key, variable ){
+ if( variable.toLowerCase().indexOf( term.toLowerCase()
) === 0){
+ list.push(variable);
+ }
+ });
+
+ return list;
+ }
+
+ function getHintCompletion( editor, currentWord , list) {
+
+ var completion = { list: [] };
+ completion.from = CodeMirror.Pos( editor.getCursor().line,
currentWord.start );
+ completion.to = CodeMirror.Pos( editor.getCursor().line,
currentWord.end );
+ completion.list = list;
+
+ return completion;
+ }
+
+
+ function getCurrentWord(line, position) {
+ var words = line.split(' '), matchedWord = "", scannedPostion =
0;
+
+ $.each(words, function(key, word) {
+
+ scannedPostion += word.length;
+
+ if (key > 0) {// add spaces to position
+ scannedPostion++;
+ }
+
+ if (scannedPostion >= position) {
+ matchedWord = word;
+ return;
+ }
+ });
+
+ return {
+
[MediaWiki-commits] [Gerrit] Created toolbar and cleaned UI - change (wikidata...rdf)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/248692
Change subject: Created toolbar and cleaned UI
..
Created toolbar and cleaned UI
Created bootstrap toolbar and moved most of ui clutter to it.
In addition changed sample queries to be loaded from mediawiki.org.
Bug: T115837
Change-Id: Ie9a5215d27318ead40e38270dc68a25adc74e2cb
---
M gui/gui.js
M gui/index.html
2 files changed, 116 insertions(+), 121 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/92/248692/1
diff --git a/gui/gui.js b/gui/gui.js
index ba7a213..cd81f82 100644
--- a/gui/gui.js
+++ b/gui/gui.js
@@ -240,7 +240,7 @@
*/
function addPrefixes() {
var current = EDITOR.getValue();
- EDITOR.setValue(STANDARD_PREFIXES + current);
+ EDITOR.setValue(STANDARD_PREFIXES +'\n'+ current);
}
/**
@@ -250,7 +250,6 @@
var category, select, ns,
container = $('.namespace-shortcuts');
// add namespaces to dropdowns
- container.text('Namespace prefixes: ');
for ( category in NAMESPACE_SHORTCUTS) {
select = $('')
.attr('class', 'form-control')
@@ -372,46 +371,33 @@
*/
function setupExamples() {
var exampleQueries = document.getElementById('exampleQueries');
- exampleQueries.add(new Option('US presidents and spouses',
- 'PREFIX wikibase: \n' +
- 'PREFIX wd: \n' +
- 'PREFIX p: \n' +
- 'PREFIX wd: \n' +
- 'PREFIX p:
[MediaWiki-commits] [Gerrit] Code completion for Wikidata prefixes in SPARQL - change (wikidata...deploy)
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246697
Change subject: Code completion for Wikidata prefixes in SPARQL
..
Code completion for Wikidata prefixes in SPARQL
Create a hint addon for CodeMirror enabling auto complete for Wikidata
properties.
Bug: T101693
Change-Id: I646466777b252f41a71b62b04749a1614ac9021d
---
A gui/addon/hint/show-hint.css
A gui/addon/hint/show-hint.js
A gui/addon/hint/sparql-hint.js
M gui/gui.js
M gui/index.html
5 files changed, 557 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/deploy
refs/changes/97/246697/1
diff --git a/gui/addon/hint/show-hint.css b/gui/addon/hint/show-hint.css
new file mode 100755
index 000..924e638
--- /dev/null
+++ b/gui/addon/hint/show-hint.css
@@ -0,0 +1,38 @@
+.CodeMirror-hints {
+ position: absolute;
+ z-index: 10;
+ overflow: hidden;
+ list-style: none;
+
+ margin: 0;
+ padding: 2px;
+
+ -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+ -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+ box-shadow: 2px 3px 5px rgba(0,0,0,.2);
+ border-radius: 3px;
+ border: 1px solid silver;
+
+ background: white;
+ font-size: 90%;
+ font-family: monospace;
+
+ max-height: 20em;
+ overflow-y: auto;
+}
+
+.CodeMirror-hint {
+ margin: 0;
+ padding: 0 4px;
+ border-radius: 2px;
+ max-width: 19em;
+ overflow: hidden;
+ white-space: pre;
+ color: black;
+ cursor: pointer;
+}
+
+li.CodeMirror-hint-active {
+ background: #08f;
+ color: white;
+}
diff --git a/gui/addon/hint/show-hint.js b/gui/addon/hint/show-hint.js
new file mode 100755
index 000..a1e56c3
--- /dev/null
+++ b/gui/addon/hint/show-hint.js
@@ -0,0 +1,440 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+mod(require("../../lib/codemirror"));
+ else if (typeof define == "function" && define.amd) // AMD
+define(["../../lib/codemirror"], mod);
+ else // Plain browser env
+mod(CodeMirror);
+})(function(CodeMirror) {
+ "use strict";
+
+ var HINT_ELEMENT_CLASS= "CodeMirror-hint";
+ var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
+
+ // This is the old interface, kept around for now to stay
+ // backwards-compatible.
+ CodeMirror.showHint = function(cm, getHints, options) {
+if (!getHints) return cm.showHint(options);
+if (options && options.async) getHints.async = true;
+var newOpts = {hint: getHints};
+if (options) for (var prop in options) newOpts[prop] = options[prop];
+return cm.showHint(newOpts);
+ };
+
+ CodeMirror.defineExtension("showHint", function(options) {
+options = parseOptions(this, this.getCursor("start"), options);
+var selections = this.listSelections()
+if (selections.length > 1) return;
+// By default, don't allow completion when something is selected.
+// A hint function can have a `supportsSelection` property to
+// indicate that it can handle selections.
+if (this.somethingSelected()) {
+ if (!options.hint.supportsSelection) return;
+ // Don't try with cross-line selections
+ for (var i = 0; i < selections.length; i++)
+if (selections[i].head.line != selections[i].anchor.line) return;
+}
+
+if (this.state.completionActive) this.state.completionActive.close();
+var completion = this.state.completionActive = new Completion(this,
options);
+if (!completion.options.hint) return;
+
+CodeMirror.signal(this, "startCompletion", this);
+completion.update(true);
+ });
+
+ function Completion(cm, options) {
+this.cm = cm;
+this.options = options;
+this.widget = null;
+this.debounce = 0;
+this.tick = 0;
+this.startPos = this.cm.getCursor("start");
+this.startLen = this.cm.getLine(this.startPos.line).length -
this.cm.getSelection().length;
+
+var self = this;
+cm.on("cursorActivity", this.activityFunc = function() {
self.cursorActivity(); });
+ }
+
+ var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
+return setTimeout(fn, 1000/60);
+ };
+ var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
+
+ Completion.prototype = {
+close: function() {
+ if (!this.active()) return;
+ this.cm.state.completionActive = null;
+ this.tick = null;
+ this.cm.off("cursorActivity", this.activityFunc);
+
+ if (this.widget && this.data) CodeMirror.signal(this.data, "close");
+ if (this.widget) this.widget.close();
+ CodeMirror.signal(this.cm, "endCompletion", this.cm);
+},
+
+active: function() {
+ return this.cm.state.completionActive == this;
+},
+
+pick: function(data, i) {
+ var completion = data.list[i];
+ if (completion.hint) completion.hint(this.cm, data, completion);
[MediaWiki-commits] [Gerrit] Enable git review - change (wikidata...deploy)
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/246698 Change subject: Enable git review .. Enable git review Change-Id: Id944c1f042ff5b6f700d112054e2fff7ac853fc2 --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/deploy refs/changes/98/246698/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..09a3ca3 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=wikidata/query/deploy.git +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/246698 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id944c1f042ff5b6f700d112054e2fff7ac853fc2 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/deploy Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Display examples count in example dialog
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312233
Change subject: Display examples count in example dialog
..
Display examples count in example dialog
Change-Id: I2c93974a8f2f1c7226652973d8b6487ec921778a
---
M index.html
M wikibase/queryService/ui/QueryExampleDialog.js
2 files changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/33/312233/1
diff --git a/index.html b/index.html
index ba3b9f4..adb86e8 100644
--- a/index.html
+++ b/index.html
@@ -193,7 +193,9 @@
-
+
+
+
diff --git a/wikibase/queryService/ui/QueryExampleDialog.js
b/wikibase/queryService/ui/QueryExampleDialog.js
index 8a4022c..8c945aa 100644
--- a/wikibase/queryService/ui/QueryExampleDialog.js
+++ b/wikibase/queryService/ui/QueryExampleDialog.js
@@ -104,6 +104,7 @@
this._querySamplesApi.getExamples().done( function( examples ) {
self._examples = examples;
self._initTagCloud();
+ self._updateExamplesCount( examples.length );
$.each( examples, function( key, example ) {
if ( example.category !== category ) {
@@ -309,6 +310,14 @@
$matchingElements.each( function( i, el ) {
$( el ).prevAll( 'tr.active' ).first().show();
} );
+ this._updateExamplesCount( $matchingElements.length );
+ };
+
+ /**
+* @private
+*/
+ SELF.prototype._updateExamplesCount = function( count ) {
+ this._$element.find( '.count' ).text( count );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/312233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c93974a8f2f1c7226652973d8b6487ec921778a
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Only extract subdomain from valid URI
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312981
Change subject: Only extract subdomain from valid URI
..
Only extract subdomain from valid URI
Change-Id: Ib5c1e1f0e9dbf64d332990ff278e2e21b9d2725e
---
M lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
1 file changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/81/312981/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
index aa096f4..0b67a8b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js
@@ -259,11 +259,15 @@
* @private
*/
_grepSubDomainFromTerm: function() {
- // Extract either a subdomain (the word after "//") or
simply the first word.
- var matches = /\/\/(\w[\w-]+)/.exec( this._term )
- || /(\w[\w-]+)/.exec( this._term );
+ try {
+ var domain = ( new URL( this._term ) ).hostname;
+ // Extract either a subdomain (the word after
"//") or simply the first word.
+ var matches = /\/\/(\w[\w-]+)/.exec( domain )
|| /(\w[\w-]+)/.exec( domain );
- return matches ? matches[1].toLowerCase().replace(
/[\W_]+/g, '-' ) : null;
+ return matches ?
matches[1].toLowerCase().replace( /[\W_]+/g, '-' ) : null;
+ } catch ( e ) {
+ return null;
+ }
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/312981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5c1e1f0e9dbf64d332990ff278e2e21b9d2725e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Set title to of date time to 'Raw ISO timestamp'
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312983
Change subject: Set title to of date time to 'Raw ISO timestamp'
..
Set title to of date time to 'Raw ISO timestamp'
Bug: T144306
Change-Id: Ie6526bd0eb7d486f74d537dbd7499c2505942c63
---
M wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/83/312983/1
diff --git a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
index ff7fdfb..a6cec25 100644
--- a/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
+++ b/wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js
@@ -105,6 +105,9 @@
}
break;
case DATATYPE_DATETIME:
+ if ( !title ) {
+ title = 'Raw ISO timestamp';
+ }
var $dateLabel = $( '' ).text( this._formatDate(
value ) );
$dateLabel.attr( 'title', title + ': ' + value );
$html.append( $dateLabel );
--
To view, visit https://gerrit.wikimedia.org/r/312983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6526bd0eb7d486f74d537dbd7499c2505942c63
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: [WIP] Allow browsing of items properties in graph view
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/308966
Change subject: [WIP] Allow browsing of items properties in graph view
..
[WIP] Allow browsing of items properties in graph view
Change-Id: I8e31f44437c2c6c962504495b48dd9a244299fe1
---
M wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
1 file changed, 156 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/66/308966/1
diff --git a/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
index de9ca73..a7e41b0 100644
--- a/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/GraphResultBrowser.js
@@ -42,14 +42,164 @@
SELF.prototype = new
wikibase.queryService.ui.resultBrowser.AbstractResultBrowser();
/**
+* @private
+*/
+ SELF.prototype.nodeBrowser = {
+ selectedNodeId: null,
+ temporaryNodes: {},
+ temporaryEdges: {},
+
+ propertiesSparql: 'SELECT ?p (SAMPLE(?pl) AS ?pl) (COUNT(?o) AS
?count ) WHERE {'
+ + '<{entityUri}> ?p ?o .'
+ + ' ?o
?ol .'
+ + 'FILTER ( LANG(?ol) = "en" )'
+ + '?s
?p .'
+ + '?s rdfs:label ?pl .'
+ + 'FILTER ( LANG(?pl) = "en" )' + '} group
by ?p',
+
+ entitiesSparql: 'SELECT ?o ?ol WHERE {' + '<{entityUri}>
<{propertyUri}> ?o .'
+ + '?o
?ol .'
+ + 'FILTER ( LANG(?ol) = "en" )' + '} LIMIT 50',
+
+ getEntites: function( entityUri, propertyUri ) {
+
+ var deferred = $.Deferred();
+
+ var sparql = new wikibase.queryService.api.Sparql();
+ sparql.query(
+ this.entitiesSparql.replace(
'{entityUri}', entityUri ).replace(
+ '{propertyUri}',
propertyUri ) ).done( function() {
+ var data = sparql.getResultRawData();
+ var result = [];
+
+ $.each( data.results.bindings, function( i, row
) {
+ result.push( {
+ id: row.o.value,
+ label: row.ol.value
+ } );
+
+ } );
+
+ deferred.resolve( result );
+ } );
+
+ return deferred;
+ },
+
+ getProperties: function( entityUri ) {
+ var deferred = $.Deferred();
+
+ var sparql = new wikibase.queryService.api.Sparql();
+ sparql.query( this.propertiesSparql.replace(
'{entityUri}', entityUri ) ).done(
+ function() {
+ var data =
sparql.getResultRawData();
+ var result = [];
+
+ $.each( data.results.bindings,
function( i, row ) {
+ result.push( {
+ id: row.p.value,
+ label:
row.pl.value,
+ count:
row.count.value
+ } );
+
+ } );
+
+ deferred.resolve( result );
+ } );
+
+ return deferred;
+ }
+ };
+
+ SELF.prototype.nodeBrowserHandleClick = function( nodeId, nodes, edges
) {
+ var nb = this.nodeBrowser;
+
+ var clear = function() {
+ $.each( nb.temporaryNodes, function( i, n ) {
+ nodes.remove( n.id );
+ } );
+ $.each( nb.temporaryEdges, function( i, e ) {
+ edges.remove( e.id );
+ } );
+ nb.temporaryNodes = {};
+ nb.temporaryEdges = {};
+ };
+
+ if ( nb.temporaryNodes[nodeId] ) {
+ var n =
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Only execute tracking on live site
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/308970
Change subject: Only execute tracking on live site
..
Only execute tracking on live site
Change-Id: Ibd5a14607e26da883ee7b20956a3c7230a461f0d
---
M wikibase/queryService/api/Tracking.js
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/70/308970/1
diff --git a/wikibase/queryService/api/Tracking.js
b/wikibase/queryService/api/Tracking.js
index 416db22..4fb8feb 100644
--- a/wikibase/queryService/api/Tracking.js
+++ b/wikibase/queryService/api/Tracking.js
@@ -45,6 +45,11 @@
if ( !valueType ) {
valueType = 'c';
}
+
+ if ( location.hostname !== 'query.wikidata.org' ) {
+ return;// only track on wikidata.org
+ }
+
// https://www.wikidata.org/beacon/statsv?test.statsv.foo2=5c
return this._track( metricName + '=' + value + valueType );
};
--
To view, visit https://gerrit.wikimedia.org/r/308970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd5a14607e26da883ee7b20956a3c7230a461f0d
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui-deploy[production]: Merging from 934e98567227e730ed0200e7a757477c6d2caa4e:
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/308992 Change subject: Merging from 934e98567227e730ed0200e7a757477c6d2caa4e: .. Merging from 934e98567227e730ed0200e7a757477c6d2caa4e: Add tracking Change-Id: Ia7ef268803879660e14be39c8c469341d3cddcd6 --- A css/embed.style.min.d2f8f78470d60926aba6.css D css/embed.style.min.dca2e7aca63c6be6ce46.css A css/style.min.77aaa3143a11f322e273.css D css/style.min.833fd0d520506f259315.css M embed.html M i18n/ar.json M i18n/ast.json M i18n/az.json M i18n/bg.json M i18n/bn.json M i18n/br.json M i18n/cs.json M i18n/de.json M i18n/diq.json M i18n/dty.json M i18n/el.json M i18n/eo.json M i18n/es.json M i18n/eu.json M i18n/fr.json M i18n/gl.json M i18n/hans.json M i18n/hant.json M i18n/he.json M i18n/hu.json M i18n/ia.json M i18n/id.json M i18n/io.json M i18n/it.json M i18n/ja.json M i18n/jv.json M i18n/kn.json M i18n/ko.json M i18n/krl.json M i18n/lb.json M i18n/lt.json M i18n/mk.json A i18n/nan.json M i18n/nl.json M i18n/pl.json M i18n/pt.json M i18n/ru.json M i18n/sv.json M i18n/tcy.json M i18n/te.json M i18n/th.json M i18n/tr.json M i18n/uk.json M i18n/vi.json M index.html D js/embed.vendor.min.cc4299532c86cbd0291c.js A js/embed.vendor.min.ec1779feec09075e29f4.js A js/embed.wdqs.min.2c97462dfaecd761a675.js D js/embed.wdqs.min.3ab8ddc63469a642b81d.js A js/shim.min.8b647f5def0939bacc21.js D js/shim.min.d1421fd3535f8c49c96c.js D js/vendor.min.97c88c95ac9ec27a6c4b.js A js/vendor.min.bc73f7eecd6c16551a70.js D js/wdqs.min.3658491d8cf5fc8a43e4.js A js/wdqs.min.f1e887534938881a6422.js 60 files changed, 203 insertions(+), 196 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy refs/changes/92/308992/1 -- To view, visit https://gerrit.wikimedia.org/r/308992 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7ef268803879660e14be39c8c469341d3cddcd6 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui-deploy Gerrit-Branch: production Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Replace Explorer with embedded GraphView
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/316958 Change subject: Replace Explorer with embedded GraphView .. Replace Explorer with embedded GraphView Bug: T145241 Change-Id: Iec167571b6cc1875b8ececbcb957958e5b4ae583 --- M .jshintrc M index.html D mediawiki.js M style.css D vendor/wdqs-explorer/readme.txt D vendor/wdqs-explorer/vis.js D vendor/wdqs-explorer/wdqs-explorer.js D vendor/wdqs-explorer/wdqs.js M wikibase/queryService/ui/App.js M wikibase/queryService/ui/resultBrowser/AbstractChartResultBrowser.js M wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js M wikibase/queryService/ui/resultBrowser/MultiDimensionResultBrowser.js M wikibase/queryService/ui/resultBrowser/TableResultBrowser.js M wikibase/queryService/ui/resultBrowser/TreeMapResultBrowser.js M wikibase/queryService/ui/resultBrowser/helper/FormatterHelper.js 15 files changed, 13 insertions(+), 36,026 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/58/316958/1 -- To view, visit https://gerrit.wikimedia.org/r/316958 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec167571b6cc1875b8ececbcb957958e5b4ae583 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Omit all warnings in JsDuck
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/317793 Change subject: Omit all warnings in JsDuck .. Omit all warnings in JsDuck It seems the parameter "--warnings-exit-nonzero": true is not working and CI is failing, because wrong return code of JsDuck. This patch deactivates all warnings which is kind of bad, because we should fix the warnings in the longterm. Change-Id: I1248d50b12f4512a99c30ebf70ddb7e31a452f8d --- M jsduck.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/93/317793/1 diff --git a/jsduck.json b/jsduck.json index ea2e50c..c2a4949 100644 --- a/jsduck.json +++ b/jsduck.json @@ -5,8 +5,8 @@ "--warnings-exit-nonzero": true, "--builtin-classes": true, "--external": "HTMLDocument,Window,MouseEvent,KeyboardEvent,File,jQuery,jQuery.Promise,jQuery.Event", - "--warnings": ["-nodoc(class,public)", "-tag(license)"], + "--warnings": ["-all"], "--": [ "view/" ] -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/317793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1248d50b12f4512a99c30ebf70ddb7e31a452f8d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Polestar text, icon and embed integration
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317836
Change subject: Polestar text, icon and embed integration
..
Polestar text, icon and embed integration
Change-Id: Ife56278219cc1f1bc728c75c89ae9347b459a14d
---
M embed.html
M wikibase/queryService/ui/App.js
M wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
3 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/36/317836/1
diff --git a/embed.html b/embed.html
index 9d6d6e0..62d7874 100644
--- a/embed.html
+++ b/embed.html
@@ -78,6 +78,7 @@
+
@@ -121,6 +122,9 @@
},
Graph: {
class: 'GraphResultBrowser'
+ },
+ Polestar: {
+ class: 'PolestarResultBrowser'
}
};
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 9ef2e47..a610995 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -105,13 +105,6 @@
object: null,
$element: null
},
- Polestar: {
- icon: 'glyphicon-stats',
- label: 'Graph it!',
- class: 'PolestarResultBrowser',
- object: null,
- $element: null
- },
ImageGrid: {
icon: 'glyphicon-picture',
label: 'Image Grid',
@@ -188,6 +181,13 @@
class: 'GraphResultBrowser',
object: null,
$element: null
+ },
+ Polestar: {
+ icon: 'fa-certificate',
+ label: 'Polestar Tool',
+ class: 'PolestarResultBrowser',
+ object: null,
+ $element: null
}
};
diff --git a/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
index d0e6d17..b8a72a1 100644
--- a/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/PolestarResultBrowser.js
@@ -37,10 +37,9 @@
var $container = $( '' ).attr( {
'src': POLESTAR + '#' + JSON.stringify( polestarData ),
'class': 'graph-iframe'
- } ).height( '100vh' );
+ } ).height( '98vh' );
$element.append( $container );
- $container.scrollIntoView();
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/317836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife56278219cc1f1bc728c75c89ae9347b459a14d
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add 'request a query' and 'help portal' links to the help menu
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318290
Change subject: Add 'request a query' and 'help portal' links to the help menu
..
Add 'request a query' and 'help portal' links to the help menu
Change-Id: Idc4292cae4ee5d7e6010ef52faa3f199adc775b0
---
M i18n/en.json
M i18n/qqq.json
M index.html
3 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/90/318290/1
diff --git a/i18n/en.json b/i18n/en.json
index 078a21d..368e925 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,6 +17,8 @@
"wdqs-app-button-download": "Download",
"wdqs-app-button-link": "Link",
"wdqs-app-help-feedback": "Give Feedback!",
+"wdqs-app-help-request-query": "Request a query",
+"wdqs-app-help-portal": "Help Portal",
"wdqs-app-help-manual": "User Manual",
"wdqs-app-help-examples": "Example Queries",
"wdqs-app-help-datamodel": "RDF Data Model",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e090b34..b3c1e21 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,7 +19,9 @@
"wdqs-app-button-download": "Button download
result\n{{Identical|Download}}",
"wdqs-app-button-link": "Button get link to query\n{{Identical|Link}}",
"wdqs-app-help-feedback": "Button message in help dropdown",
+ "wdqs-app-help-request-query": "Button message in help dropdown",
"wdqs-app-help-manual": "Button message in help dropdown",
+ "wdqs-app-help-portal": "Button message in help dropdown",
"wdqs-app-help-examples": "Button message in help dropdown",
"wdqs-app-help-datamodel": "Button message in help dropdown",
"wdqs-app-help-prefixes": "Button message in help dropdown",
diff --git a/index.html b/index.html
index 7ce6229..695a059 100644
--- a/index.html
+++ b/index.html
@@ -75,7 +75,9 @@
https://www.mediawiki.org/w/index.php?title=Talk:Wikidata_query_service&action=edit§ion=new";
data-i18n="wdqs-app-help-feedback">
+ https://www.wikidata.org/wiki/Wikidata:Request_a_query?action=edit§ion=new";
data-i18n="wdqs-app-help-request-query">
+ https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help";
data-i18n="wdqs-app-help-portal">
https://www.mediawiki.org/wiki/Wikidata_query_service/User_Manual";
data-i18n="wdqs-app-help-manual">
https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/queries/examples";
data-i18n="wdqs-app-help-examples">
--
To view, visit https://gerrit.wikimedia.org/r/318290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc4292cae4ee5d7e6010ef52faa3f199adc775b0
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Change data updated popover placement to top
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318300
Change subject: Change data updated popover placement to top
..
Change data updated popover placement to top
Change-Id: I8e1776f2ca2ed4d2ef2012c4db747c3ce426e297
---
M wikibase/queryService/ui/App.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/00/318300/1
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 9ef2e47..a08dc10 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -406,7 +406,7 @@
self._sparqlApi.queryDataUpdatedTime().done( function(
time, difference ) {
e.popover( {
html: true,
- placement: 'bottom',
+ placement: 'top',
content: $.i18n(
'wdqs-app-footer-updated-seconds', difference ) + '.' + time
} ).popover( 'show' );
} ).fail( function() {
--
To view, visit https://gerrit.wikimedia.org/r/318300
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e1776f2ca2ed4d2ef2012c4db747c3ce426e297
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add 'layerLabel' to the columns used for map layers
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318503
Change subject: Add 'layerLabel' to the columns used for map layers
..
Add 'layerLabel' to the columns used for map layers
Bug:T144735
Change-Id: Ica7f1ddf94f49ec475ec4c9d96a98bfad5c01ce8
---
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
1 file changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/03/318503/1
diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index 03d177f..1d27eaf 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -9,7 +9,7 @@
var MAP_DATATYPE = 'http://www.opengis.net/ont/geosparql#wktLiteral';
var GLOBE_EARTH = 'Q2';
- var LAYER_COLUMN = 'layer';
+ var LAYER_COLUMNS = [ 'layer', 'layerLabel' ];
var LAYER_DEFAULT_GROUP = '_LAYER_DEFAULT_GROUP';
var TILE_LAYER = {
@@ -146,7 +146,7 @@
lon = longLat[0],
lat = longLat[1];
- var layer = row[ LAYER_COLUMN ] && row[
LAYER_COLUMN ].value || LAYER_DEFAULT_GROUP;
+ var layer = self._getMarkerGroupsLayer( row );
var marker = L.circleMarker( [ lat, lon ],
self._getMarkerStyle( layer ) )
.bindPopup( popup );
@@ -176,6 +176,22 @@
};
/**
+* @private
+*/
+ SELF.prototype._getMarkerGroupsLayer = function( row ) {
+ var layer = null;
+
+ LAYER_COLUMNS.some( function( column ) {
+ if ( row[ column ] && row[ column ].value ) {
+ layer = row[ column ].value;
+ return true;
+ }
+ } );
+
+ return layer || LAYER_DEFAULT_GROUP;
+ };
+
+ /**
* Maps group name to a certain color
* @private
*/
--
To view, visit https://gerrit.wikimedia.org/r/318503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica7f1ddf94f49ec475ec4c9d96a98bfad5c01ce8
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix chart height for Firefox
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318528
Change subject: Fix chart height for Firefox
..
Fix chart height for Firefox
Change-Id: Ied34571948674eececc9ac97ea7bc32db583d7c8
---
M wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/28/318528/1
diff --git
a/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
index 00fe18c..fa8fa0d 100644
--- a/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
@@ -84,10 +84,12 @@
*/
SELF.prototype.draw = function( $element ) {
var self = this;
- this._$element = $element;
+
+ this._$element = $( '' ).css( { width: '100%', height:
'98vh' } );
+ $element.html( this._$element );
this._createData();
- this._drawSvg( $element );
+ this._drawSvg();
this._createChart();
this._drawChart();
this._createLegendFilter();
@@ -123,8 +125,8 @@
this._data = data;
};
- SELF.prototype._drawSvg = function( $element ) {
- this._svg = dimple.newSvg( $element[0], '100%', '98vh' );
+ SELF.prototype._drawSvg = function() {
+ this._svg = dimple.newSvg( this._$element[0], '100%', '100%' );
};
SELF.prototype._createChart = function() {
--
To view, visit https://gerrit.wikimedia.org/r/318528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied34571948674eececc9ac97ea7bc32db583d7c8
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: [WIP] Introduce Line chart
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314008
Change subject: [WIP] Introduce Line chart
..
[WIP] Introduce Line chart
Bug: T142179
Change-Id: I7f0397f3a9173c5e48178d79b1a6e0bbf2547fe5
---
M .jshintrc
M embed.html
M index.html
M package.json
M wikibase/queryService/ui/App.js
A wikibase/queryService/ui/resultBrowser/LineChartResultBrowser.js
M wikibase/tests/index.html
M wikibase/tests/queryService/ui/resultBrowser/ResultBrowser.test.js
8 files changed, 148 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/08/314008/1
diff --git a/.jshintrc b/.jshintrc
index d181085..d0d4c66 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -44,6 +44,7 @@
"_": false,
"Cookies": false,
"vis": false,
- "moment": false
+ "moment": false,
+ "dimple": false
}
}
diff --git a/embed.html b/embed.html
index b56e593..1544956 100644
--- a/embed.html
+++ b/embed.html
@@ -54,6 +54,7 @@
+
@@ -68,6 +69,7 @@
+
@@ -90,6 +92,9 @@
BubbleChart: {
class: 'BubbleChartResultBrowser'
},
+ LineChart: {
+ class: 'LineChartResultBrowser',
+ },
TreeMap: {
class: 'TreeMapResultBrowser'
},
diff --git a/index.html b/index.html
index c0acdf4..a8385c8 100644
--- a/index.html
+++ b/index.html
@@ -232,6 +232,7 @@
+
@@ -276,6 +277,7 @@
+
diff --git a/package.json b/package.json
index 1bac8b3..a1afe2b 100644
--- a/package.json
+++ b/package.json
@@ -15,25 +15,26 @@
}
},
"dependencies": {
+"bootstrap": "^3.3.6",
+"bootstrap-table": "^1.10.1",
+"codemirror": "^5.15.2",
+"d3": "^3.5.17",
+"dimple-js": "^2.1.4",
+"downloadjs": "^1.4.4",
+"ekko-lightbox": "^4.0.1",
+"es6-shim": "^0.35.1",
+"jqcloud-npm": "^3.0.3",
"jquery": "^1.12.0",
"jquery.i18n": "git+https://github.com/wikimedia/jquery.i18n.git";,
"jquery.uls": "git+https://github.com/wikimedia/jquery.uls.git";,
-"bootstrap": "^3.3.6",
-"underscore": "^1.8.3",
-"codemirror": "^5.15.2",
-"bootstrap-table": "^1.10.1",
-"ekko-lightbox": "^4.0.1",
+"js-cookie": "^2.1.2",
"leaflet": "^0.7.7",
"leaflet-fullscreen": "^1.0.1",
"leaflet-zoombox": "^0.2.0",
-"d3": "^3.5.17",
-"select2": "^4.0.3",
-"js-cookie": "^2.1.2",
-"vis": "^4.16.1",
"moment": "^2.13.0",
-"es6-shim": "^0.35.1",
-"jqcloud-npm": "^3.0.3",
-"downloadjs": "^1.4.4"
+"select2": "^4.0.3",
+"underscore": "^1.8.3",
+"vis": "^4.16.1"
},
"devDependencies": {
"grunt": "0.4.5",
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 4c0a524..e444a14 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -125,6 +125,13 @@
object: null,
$element: null
},
+ LineChart: {
+ icon: 'stats',
+ label: 'Line Chart',
+ class: 'LineChartResultBrowser',
+ object: null,
+ $element: null
+ },
BubbleChart: {
icon: 'tint',
label: 'Bubble Chart',
diff --git a/wikibase/queryService/ui/resultBrowser/LineChartResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/LineChartResultBrowser.js
new file mode 100644
index 000..a9ee963
--- /dev/null
+++ b/wikibase/queryService/ui/resultBrowser/LineChartResultBrowser.js
@@ -0,0 +1,114 @@
+var wikibase = wikibase || {};
+wikibase.queryService = wikibase.queryService || {};
+wikibase.queryService.ui = wikibase.queryService.ui || {};
+wikibase.queryService.ui.resultBrowser =
wikibase.queryService.ui.resultBrowser || {};
+window.mediaWiki = window.mediaWiki || {};
+
+wikibase.queryService.ui.resultBrowser.LineChartResultBrowser = ( function( $,
d3, window ) {
+ 'use strict';
+
+ /**
+* A line chart result browser
+*
+* @class wikibase.queryService.ui.resultBrowser.LineChartResultBrowser
+* @license GNU GPL v2+
+*
+* @author Jonas Kress
+*
+* @constructor
+*/
+ function SELF() {
+ }
+
+ SELF.prototype = new
wikibase.queryService.ui.resultBrowser.AbstractChartResultBrowser();
+
+ /**
+* @property {boolean}
+
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseJavaScriptApi[master]: Release 2.1.2
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/31
Change subject: Release 2.1.2
..
Release 2.1.2
Bug:T141880
Change-Id: I9fa3bfd13a1389e03d475598f508f360b8f0dc5e
---
M README.md
M WikibaseJavaScriptApi.php
2 files changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseJavaScriptApi
refs/changes/88/31/1
diff --git a/README.md b/README.md
index 20795e0..b22dea4 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,10 @@
## Release notes
+### 2.1.2 (2016-10-31)
+
+* Forward error message parameters in `wikibase.api.RepoApiError`.
+
### 2.1.1 (2016-08-04)
* Follow up fix to HTML escaping in `wikibase.api.RepoApiError`.
diff --git a/WikibaseJavaScriptApi.php b/WikibaseJavaScriptApi.php
index 81ab456..767376b 100644
--- a/WikibaseJavaScriptApi.php
+++ b/WikibaseJavaScriptApi.php
@@ -5,7 +5,7 @@
return 1;
}
-define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '2.1.1' );
+define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '2.1.2' );
// Include the composer autoloader if it is present.
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/31
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fa3bfd13a1389e03d475598f508f360b8f0dc5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Javascript-Api version 2.1.2
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/318889 Change subject: Javascript-Api version 2.1.2 .. Javascript-Api version 2.1.2 Change-Id: Ib0d321b009f0149e5411e375a809a928ec5e4f7d --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/89/318889/1 diff --git a/composer.json b/composer.json index e244470..e3606e8 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "wikibase/internal-serialization": "~2.3", "wikibase/data-model-services": "~3.5", "wikibase/data-model-javascript": "~3.0.0", - "wikibase/javascript-api": "~2.1.1", + "wikibase/javascript-api": "~2.1.2", "wikibase/serialization-javascript": "~2.0.6", "diff/diff": "~2.0", "wikimedia/purtle": "~1.0" -- To view, visit https://gerrit.wikimedia.org/r/318889 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0d321b009f0149e5411e375a809a928ec5e4f7d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix:"Image Grid" option can't be selected in WDQS
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319049
Change subject: Fix:"Image Grid" option can't be selected in WDQS
..
Fix:"Image Grid" option can't be selected in WDQS
There is a nasty bug this is why image grind needs to be on second
position. I would really like to refactor the result views.
Bug:T149555
Change-Id: I1df3bbbaa3e3b646dc77820767d31282a2b2f7d4
---
M wikibase/queryService/ui/App.js
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/49/319049/1
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 911f8e5..6c867f8 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -105,13 +105,6 @@
object: null,
$element: null
},
- Polestar: {
- icon: 'fa-certificate',
- label: 'Graph builder',
- class: 'PolestarResultBrowser',
- object: null,
- $element: null
- },
ImageGrid: {
icon: 'glyphicon-picture',
label: 'Image Grid',
@@ -119,6 +112,13 @@
object: null,
$element: null
},
+ Polestar: {
+ icon: 'fa-certificate',
+ label: 'Graph builder',
+ class: 'PolestarResultBrowser',
+ object: null,
+ $element: null
+ },
Map: {
icon: 'glyphicon-map-marker',
label: 'Map',
--
To view, visit https://gerrit.wikimedia.org/r/319049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1df3bbbaa3e3b646dc77820767d31282a2b2f7d4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add Talossan (tzl) to Wikidata
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/319320 Change subject: Add Talossan (tzl) to Wikidata .. Add Talossan (tzl) to Wikidata Bug: T98314 Change-Id: Ia02c82d4c8ff588542e52bc4cfb8519544bc35fc --- M repo/includes/WikibaseRepo.php 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/20/319320/1 diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php index 5e24ac5..9a9d24b 100644 --- a/repo/includes/WikibaseRepo.php +++ b/repo/includes/WikibaseRepo.php @@ -1688,6 +1688,9 @@ // T137809 'otk', + + // T98314 + 'tzl', ) ) ), -- To view, visit https://gerrit.wikimedia.org/r/319320 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia02c82d4c8ff588542e52bc4cfb8519544bc35fc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix: Bubble Chart hover doesn’t display non-integer values
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319329
Change subject: Fix: Bubble Chart hover doesn’t display non-integer values
..
Fix: Bubble Chart hover doesn’t display non-integer values
Bug: T144246
Change-Id: I62fe6e56c1f63b94b0df21c77249807d85546633
---
M wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/29/319329/1
diff --git a/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
index bf5979c..50ce3b9 100644
--- a/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
@@ -102,7 +102,6 @@
}
var diameter = Math.min( $( window ).height(), $( window
).width() ),
- format = d3.format( ',d' ),
color = d3.scale.category20c(),
bubble = d3.layout.pack().sort( null ).size( [
diameter, diameter ] ).padding( 1.5 );
@@ -121,7 +120,7 @@
} );
node.append( 'title' ).text( function( d ) {
- return d.className + ': ' + format( d.value );
+ return d.className + ': ' + d.value;
} );
node.append( 'circle' ).attr( 'r', function( d ) {
--
To view, visit https://gerrit.wikimedia.org/r/319329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62fe6e56c1f63b94b0df21c77249807d85546633
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/319328 Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/wikidata/query/gui .. Merge branch 'master' of https://gerrit.wikimedia.org/r/wikidata/query/gui Change-Id: I8557247d069f189b7312b2493acd55b39d40b405 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/28/319328/1 -- To view, visit https://gerrit.wikimedia.org/r/319328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8557247d069f189b7312b2493acd55b39d40b405 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix: Unbuilt GUI does not display ULS labels properly
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319335
Change subject: Fix: Unbuilt GUI does not display ULS labels properly
..
Fix: Unbuilt GUI does not display ULS labels properly
Bug: T142741
Change-Id: I53aca7f5d00dc830dc82c69444ec377d5d0a8471
---
M wikibase/config.js
M wikibase/init.js
2 files changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/35/319335/1
diff --git a/wikibase/config.js b/wikibase/config.js
index 2939722..63a0306 100644
--- a/wikibase/config.js
+++ b/wikibase/config.js
@@ -11,6 +11,9 @@
wikibase: {
uri: 'https://www.wikidata.org/w/api.php'
}
+ },
+ i18nLoad: function( lang ) {
+ return $.i18n().load( 'i18n/' + lang + '.json', lang );
}
};
@@ -19,6 +22,12 @@
sparql: {
uri:
'https://query.wikidata.org/bigdata/namespace/wdq/sparql'
}
+ },
+ i18nLoad: function( lang ) {
+ return $.when(
+ $.i18n().load( 'i18n/' + lang +
'.json', lang ),
+ $.i18n().load(
'node_modules/jquery.uls/i18n/' + lang + '.json', lang )
+ );
}
} );
diff --git a/wikibase/init.js b/wikibase/init.js
index 226cab4..5db1b93 100644
--- a/wikibase/init.js
+++ b/wikibase/init.js
@@ -11,7 +11,7 @@
moment.locale( lang );
$.when(
- $.i18n().load( 'i18n/' + lang + '.json', lang )
+ config.i18nLoad( lang )
).done( function() {
$( '.wikibase-queryservice' ).i18n();
$( 'html' ).attr( { lang: lang, dir: $.uls.data.getDir(
lang ) } );
--
To view, visit https://gerrit.wikimedia.org/r/319335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53aca7f5d00dc830dc82c69444ec377d5d0a8471
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix: Map markers are to small
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319360
Change subject: Fix: Map markers are to small
..
Fix: Map markers are to small
-Changes markers size relative to zoom level
-Use leaflet 1.0
-Use prefer canvas option
Bug:T148496
Change-Id: I6f10afafeb05ef9a320bfabd2cf0de3a29f3eb14
---
M index.html
M package.json
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
3 files changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/60/319360/1
diff --git a/index.html b/index.html
index 13f7d8b..10a8379 100644
--- a/index.html
+++ b/index.html
@@ -210,9 +210,6 @@
-
- L_PREFER_CANVAS = true;
-
diff --git a/package.json b/package.json
index 5378a14..23a623b 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"jquery.i18n": "git+https://github.com/wikimedia/jquery.i18n.git";,
"jquery.uls": "git+https://github.com/wikimedia/jquery.uls.git";,
"js-cookie": "^2.1.2",
-"leaflet": "^0.7.7",
+"leaflet": "~1.0.0",
"leaflet-fullscreen": "^1.0.1",
"leaflet-zoombox": "^0.2.0",
"moment": "^2.13.0",
diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index 529998d..84b2566 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -62,11 +62,13 @@
maxZoom: 18,
minZoom: 2,
fullscreenControl: true,
+ preferCanvas: true,
layers: _.compact( markerGroups ) // convert object to
array
} ).fitBounds( markerGroups[ LAYER_DEFAULT_GROUP ].getBounds()
);
this._setTileLayer( map );
this._createControls( map, markerGroups );
+ this._createMarkerZoomResize( map, markerGroups );
$element.html( container );
};
@@ -104,6 +106,22 @@
control._update();
} );
}
+ };
+
+ /**
+* @private
+*/
+ SELF.prototype._createMarkerZoomResize = function( map, markerGroups ) {
+ var resize = function() {
+ var currentZoom = map.getZoom();
+ markerGroups[LAYER_DEFAULT_GROUP].setStyle( {
+ radius: ( currentZoom * ( 1 / 2 ) ),
+ weight: ( currentZoom * ( 1 / 5 ) )
+ } );
+ };
+
+ map.on( 'zoomend', resize );
+ resize();
};
/**
@@ -204,7 +222,6 @@
}
return {
- radius: 3,
color: color,
opacity: 0.8,
fillColor: color,
--
To view, visit https://gerrit.wikimedia.org/r/319360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f10afafeb05ef9a320bfabd2cf0de3a29f3eb14
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix: Map layer colors are poorly chosen, especially for very...
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/319537 Change subject: Fix: Map layer colors are poorly chosen, especially for very few layers .. Fix: Map layer colors are poorly chosen, especially for very few layers Bug: T148022 Change-Id: I40cc122d94e2c455334c4affb4cf090170194574 --- M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/37/319537/1 diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js index 04286df..8b6e73b 100644 --- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js +++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js @@ -237,7 +237,7 @@ * Maps group name to a certain color * @private */ - SELF.prototype._getMarkerGroupColor = d3.scale.category20(); + SELF.prototype._getMarkerGroupColor = d3.scale.category10(); /** * @private -- To view, visit https://gerrit.wikimedia.org/r/319537 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I40cc122d94e2c455334c4affb4cf090170194574 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Disable marker zoom resize when markers > 1000
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319536
Change subject: Disable marker zoom resize when markers > 1000
..
Disable marker zoom resize when markers > 1000
There was really bad performance for the battles query.
Change-Id: I1040e28d4f10d5e7555eec5b40b20992c78f46a1
---
M wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
1 file changed, 62 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/36/319536/1
diff --git a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
index 84b2566..04286df 100644
--- a/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
@@ -47,6 +47,18 @@
SELF.prototype = new
wikibase.queryService.ui.resultBrowser.AbstractResultBrowser();
/**
+* @property {L.Map}
+* @private
+**/
+ SELF.prototype._map = null;
+
+ /**
+* @property {Object}
+* @private
+**/
+ SELF.prototype._markerGroups = null;
+
+ /**
* Draw a map to the given element
*
* @param {jQuery} $element target element
@@ -56,19 +68,19 @@
$element.html( container );
- var markerGroups = this._getMarkerGroups(),
- map = L.map( 'map', {
+ this._createMarkerGroups();
+ this._map = L.map( 'map', {
center: [ 0, 0 ],
maxZoom: 18,
minZoom: 2,
fullscreenControl: true,
preferCanvas: true,
- layers: _.compact( markerGroups ) // convert object to
array
- } ).fitBounds( markerGroups[ LAYER_DEFAULT_GROUP ].getBounds()
);
+ layers: _.compact( this._markerGroups ) // convert
object to array
+ } ).fitBounds( this._markerGroups[ LAYER_DEFAULT_GROUP
].getBounds() );
- this._setTileLayer( map );
- this._createControls( map, markerGroups );
- this._createMarkerZoomResize( map, markerGroups );
+ this._setTileLayer();
+ this._createControls();
+ this._createMarkerZoomResize();
$element.html( container );
};
@@ -78,29 +90,31 @@
*
* @private
*/
- SELF.prototype._createControls = function( map, markerGroups ) {
+ SELF.prototype._createControls = function() {
+ var self = this;
+
//zoom control
- map.addControl( L.control.zoomBox( {
+ this._map.addControl( L.control.zoomBox( {
modal: false,
className: 'glyphicon glyphicon-zoom-in'
} ) );
- map.addControl( new ScrollToTopButton() );
+ this._map.addControl( new ScrollToTopButton() );
//layers control
- var numberOfLayers = Object.keys( markerGroups ).length;
+ var numberOfLayers = Object.keys( this._markerGroups ).length;
if ( numberOfLayers > 1 ) {
- var control = this._getLayerControl( markerGroups
).addTo( map );
+ var control = this._getLayerControl( this._markerGroups
).addTo( this._map );
// update layer control
- map.on( 'overlayadd overlayremove', function ( event ) {
- if ( event.layer !== markerGroups[
LAYER_DEFAULT_GROUP ] ) {
+ this._map.on( 'overlayadd overlayremove', function (
event ) {
+ if ( event.layer !== self._markerGroups[
LAYER_DEFAULT_GROUP ] ) {
return;
}
- $.each( markerGroups, function( i, layer ) {
+ $.each( self._markerGroups, function( i, layer
) {
if ( event.type === 'overlayadd' ) {
- map.addLayer( layer );
+ self._map.addLayer( layer );
} else {
- map.removeLayer( layer );
+ self._map.removeLayer( layer );
}
} );
control._update();
@@ -111,28 +125,43 @@
/**
* @private
*/
- SELF.prototype._createMarkerZoomResize = function( map, markerGroups ) {
+ SELF.prototype._cre
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Make brand configurable
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319576
Change subject: Make brand configurable
..
Make brand configurable
Change-Id: Ib6662b5c183165ab712f5dc735911736452836e3
---
M index.html
M wikibase/config.js
M wikibase/init.js
3 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/76/319576/1
diff --git a/index.html b/index.html
index 10a8379..4415033 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@
Toggle
navigation
- Wikidata Query Service
+
diff --git a/wikibase/config.js b/wikibase/config.js
index 63a0306..d6c7d9e 100644
--- a/wikibase/config.js
+++ b/wikibase/config.js
@@ -14,6 +14,10 @@
},
i18nLoad: function( lang ) {
return $.i18n().load( 'i18n/' + lang + '.json', lang );
+ },
+ brand: {
+ logo: 'logo.svg',
+ title: 'Wikidata Query'
}
};
@@ -28,6 +32,9 @@
$.i18n().load( 'i18n/' + lang +
'.json', lang ),
$.i18n().load(
'node_modules/jquery.uls/i18n/' + lang + '.json', lang )
);
+ },
+ brand: {
+ title: 'Localhost'
}
} );
diff --git a/wikibase/init.js b/wikibase/init.js
index 5db1b93..da79f29 100644
--- a/wikibase/init.js
+++ b/wikibase/init.js
@@ -3,6 +3,11 @@
var wb = wikibase.queryService;
+ function setBranding() {
+ $( '.navbar-brand img' ).attr( 'src', config.brand.logo );
+ $( '.navbar-brand a > span' ).text( config.brand.title );
+ }
+
function setLanguage( lang ) {
Cookies.set( 'lang', lang );
@@ -20,6 +25,8 @@
$( document ).ready(
function() {
+ setBranding();
+
var lang = Cookies.get( 'lang' ) ? Cookies.get( 'lang'
) : config.language;
setLanguage( config.language );//always load default
language as fallback language
setLanguage( lang );
--
To view, visit https://gerrit.wikimedia.org/r/319576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6662b5c183165ab712f5dc735911736452836e3
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Refactor fallback language
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319581
Change subject: Refactor fallback language
..
Refactor fallback language
Change-Id: Id718cbcbd1484dd55d861d54f995ba88a9741c8e
---
M wikibase/config.js
M wikibase/init.js
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/81/319581/1
diff --git a/wikibase/config.js b/wikibase/config.js
index d6c7d9e..f9b1b8b 100644
--- a/wikibase/config.js
+++ b/wikibase/config.js
@@ -13,7 +13,15 @@
}
},
i18nLoad: function( lang ) {
- return $.i18n().load( 'i18n/' + lang + '.json', lang );
+ var loadFallbackLang = null;
+ if ( lang !== this.language ) {
+ //load default language as fallback language
+ loadFallbackLang = $.i18n().load( 'i18n/' +
this.language + '.json', this.language );
+ }
+ return $.when(
+ loadFallbackLang,
+ $.i18n().load( 'i18n/' + lang +
'.json', lang )
+ );
},
brand: {
logo: 'logo.svg',
diff --git a/wikibase/init.js b/wikibase/init.js
index da79f29..014e80b 100644
--- a/wikibase/init.js
+++ b/wikibase/init.js
@@ -28,7 +28,6 @@
setBranding();
var lang = Cookies.get( 'lang' ) ? Cookies.get( 'lang'
) : config.language;
- setLanguage( config.language );//always load default
language as fallback language
setLanguage( lang );
var api = new wb.api.Wikibase( config.api.wikibase.uri
);
--
To view, visit https://gerrit.wikimedia.org/r/319581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id718cbcbd1484dd55d861d54f995ba88a9741c8e
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Introduce and publish npm and editor component support
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319590
Change subject: Introduce and publish npm and editor component support
..
Introduce and publish npm and editor component support
Change-Id: I074bf5c48fd9f11e188b8efac99fadc8235ca1e3
---
M README.md
A examples/editor.html
M package.json
3 files changed, 58 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/90/319590/1
diff --git a/README.md b/README.md
index 0782421..b6dee53 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,13 @@
$ cd gui
$ npm install
```
+
+Alternative use npm install
+
+```bash
+npm i wikidata-query-gui
+```
+
#Run tests
Run JSHint, JSCS and QUnit tests.
@@ -41,4 +48,14 @@
Please make sure you have defined a gitreview username:
```bash
git config --global --add gitreview.username "[username]"
-```
\ No newline at end of file
+```
+
+
+#Components
+## Editor
+This is a code mirror based SPARQL editor with code completion (ctrl+space)
+```
+var editor = new wikibase.queryService.ui.editor.Editor();
+editor.fromTextArea( $( '.editor' )[0] );
+```
+See [editor example](https://query.wikidata.org/examples/editor.html)
diff --git a/examples/editor.html b/examples/editor.html
new file mode 100644
index 000..416f912
--- /dev/null
+++ b/examples/editor.html
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+ Wikidata Query Service - Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $( document ).ready( function() {
+ var editor = new wikibase.queryService.ui.editor.Editor();
+ editor.fromTextArea( $( '.editor' )[0] );
+ } );
+
+
+
diff --git a/package.json b/package.json
index 23a623b..8103c74 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"dependencies": {
"bootstrap": "^3.3.6",
"bootstrap-table": "^1.10.1",
-"codemirror": "^5.15.2",
+"codemirror": "~5.20.2",
"d3": "^3.5.17",
"dimple-js": "^2.1.4",
"downloadjs": "^1.4.4",
--
To view, visit https://gerrit.wikimedia.org/r/319590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I074bf5c48fd9f11e188b8efac99fadc8235ca1e3
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Embed css cleanup and hide scrollbars
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319800
Change subject: Embed css cleanup and hide scrollbars
..
Embed css cleanup and hide scrollbars
Change-Id: Ic8f400845315b162027224cf1e43594364c91223
---
M embed.html
M wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
2 files changed, 49 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/00/319800/1
diff --git a/embed.html b/embed.html
index 9d6d6e0..8e68eeb 100644
--- a/embed.html
+++ b/embed.html
@@ -22,23 +22,62 @@
+
+
+body {
+ margin: 0;
+ padding: 0;
+ overflow-y: auto;
+}
+
+.logo {
+ position: absolute;
+ top: 0px;
+ height: 100%;
+ width: 100%;
+ background-size: 80% 80%;
+ background-image:
+
url(https://upload.wikimedia.org/wikipedia/commons/6/66/Wikidata-logo-en.svg);
+ background-repeat: no-repeat;
+ background-position: center;
+}
+
+#error {
+display: none;
+}
+
+.progress {
+ height:30px;;
+}
+
+.progress-bar {
+ width: 100%;
+ line-height: 30px;
+ font-size: 18px;
+}
+
+.link {
+ position: fixed;
+ bottom: 0px;
+ left: 0px;
+ padding: 0px 2px 0px 2px;
+ background-color: rgba(255, 255, 255, 0.8);
+}
+
-
- Loading
+
+ Loading
- https://upload.wikimedia.org/wikipedia/commons/6/66/Wikidata-logo-en.svg);
- background-repeat:no-repeat;
background-position:center;">
+
-
- Error
+
+ Error
- Edit on
query.Wikidata.org
+ Edit on query.Wikidata.org
diff --git a/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
index 50ce3b9..913590a 100644
--- a/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/BubbleChartResultBrowser.js
@@ -101,7 +101,7 @@
};
}
- var diameter = Math.min( $( window ).height(), $( window
).width() ),
+ var diameter = Math.min( $( window ).height() * 0.98, $( window
).width() ),
color = d3.scale.category20c(),
bubble = d3.layout.pack().sort( null ).size( [
diameter, diameter ] ).padding( 1.5 );
--
To view, visit https://gerrit.wikimedia.org/r/319800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8f400845315b162027224cf1e43594364c91223
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Avoid aggregation of all values in charts
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319815
Change subject: Avoid aggregation of all values in charts
..
Avoid aggregation of all values in charts
This will fix queries like this:
How many musicians dies at certain age
Change-Id: If5a138613a1ecdb2bff47ea8eaef3fc3b4c55e16
---
M wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/15/319815/1
diff --git
a/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
b/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
index d5ccc7c..0afaa8d 100644
--- a/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/AbstractDimpleChartResultBrowser.js
@@ -156,7 +156,8 @@
row = this._getRows()[0],
formatter = this._getFormatter(),
chart = this._chart,
- axis = [ 'y', 'x' ];
+ axis = [ 'y', 'x' ],
+ hasSeriesAxis = false;
$.each( this._getColumns(), function( i, key ) {
if ( axis.length === 0 ) {
@@ -175,15 +176,20 @@
}
if ( formatter.isLabel( row[key] ) ) {
chart.addCategoryAxis( axis.pop(), key );
+ hasSeriesAxis = true;
}
if ( formatter.isNumber( row[key] ) ) {
chart.addMeasureAxis( axis.pop(), key );
}
if ( formatter.isDateTime( row[key] ) ) {
chart.addTimeAxis( axis.pop(), key,
'%Y-%m-%dT%H:%M:%SZ', '%m-%d-%Y' );
+ hasSeriesAxis = true;
}
} );
+ if ( !hasSeriesAxis && !this._chartSeriesKey && chart.axes[0]) {
+ this._chartSeriesKey = chart.axes[0].measure;
+ }
};
SELF.prototype._createChartStory = function() {
--
To view, visit https://gerrit.wikimedia.org/r/319815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5a138613a1ecdb2bff47ea8eaef3fc3b4c55e16
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix:"Map" option can't be selected in WDQS
Jonas Kress (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319816
Change subject: Fix:"Map" option can't be selected in WDQS
..
Fix:"Map" option can't be selected in WDQS
It seems the one after polestar is not working, so we put polestart to
last position as long as this bug exists.
Bug:T149990
Change-Id: I5f279ea7a436b8dfd8584dfd99e20be0ac296a9b
---
M wikibase/queryService/ui/App.js
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/16/319816/1
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 6c867f8..eda711b 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -112,13 +112,6 @@
object: null,
$element: null
},
- Polestar: {
- icon: 'fa-certificate',
- label: 'Graph builder',
- class: 'PolestarResultBrowser',
- object: null,
- $element: null
- },
Map: {
icon: 'glyphicon-map-marker',
label: 'Map',
@@ -188,6 +181,13 @@
class: 'GraphResultBrowser',
object: null,
$element: null
+ },
+ Polestar: {
+ icon: 'fa-certificate',
+ label: 'Graph builder',
+ class: 'PolestarResultBrowser',
+ object: null,
+ $element: null
}
};
--
To view, visit https://gerrit.wikimedia.org/r/319816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f279ea7a436b8dfd8584dfd99e20be0ac296a9b
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Added documentation for main components
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/319843 Change subject: Added documentation for main components .. Added documentation for main components - Example dialog - Result views - SPARQL Change-Id: I1924263a525c3e8ecfbd72536328cb7412e28f45 --- M README.md A examples/dialog.html M examples/editor.html A examples/result.html A examples/sparql.html M wikibase/queryService/api/Sparql.js M wikibase/queryService/ui/QueryExampleDialog.js 7 files changed, 248 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/43/319843/1 diff --git a/README.md b/README.md index 73a1a7e..f226f70 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,47 @@ #Components ## Editor -This is a code mirror based SPARQL editor with code completion (ctrl+space) +A code mirror based SPARQL editor with code completion (ctrl+space) and tooltips ``` var editor = new wikibase.queryService.ui.editor.Editor(); editor.fromTextArea( $( '.editor' )[0] ); ``` See examples/editor.html + +## Example dialog + +A dialog that allows browsing of SPARQL examples +``` +new wikibase.queryService.ui.QueryExampleDialog( $element, querySamplesApi, callback, previewUrl ); +``` +See examples/dialog.html + +## SPARQL + +``` +var api = new wikibase.queryService.api.Sparql(); +api.query( query ).done( function(){ + var json = JSON.parse( api.getResultAsJson() ); + +} ); +``` +See examples/sparql.html +## Result Views +Views that allow rendering SPARQL results [see documentation](https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/Result_Views). + +``` +var api = new wikibase.queryService.api.Sparql(); +api.query( query ).done(function() { + var result = new wikibase.queryService.ui.resultBrowser.CoordinateResultBrowser(); + result.setResult( api.getResultRawData() ); + result.draw( element ); +} ); + + +See examples/result.html +``` + + + + + diff --git a/examples/dialog.html b/examples/dialog.html new file mode 100644 index 000..5a10be9 --- /dev/null +++ b/examples/dialog.html @@ -0,0 +1,65 @@ + + + + + + + Wikidata Query - Dialog + + + + + + + + + + + + + + + + + + + + Dialog + + + + + + + + + + + + + + + + + + + + + + + + + + + $( document ).ready( function() { + new wikibase.queryService.ui.QueryExampleDialog( + $( '#QueryExamples' ), + null, + function( query, title ) { + alert( title + '\n\n' + query ); + }, + 'https://query.wikidata.org/embed.html'); + } ); + + + diff --git a/examples/editor.html b/examples/editor.html index 4077a5c..623ddd7 100644 --- a/examples/editor.html +++ b/examples/editor.html @@ -4,8 +4,8 @@ - Wikidata Query Service - Editor - + Wikidata Query - Editor + @@ -27,7 +27,7 @@ - + $( document ).ready( function() { diff --git a/examples/result.html b/examples/result.html new file mode 100644 index 000..9c7b124 --- /dev/null +++ b/examples/result.html @@ -0,0 +1,78 @@ + + + + + + +Wikidata Query - Result Views + + + + + + [MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Bump data-values/javascript to 0.8.3Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/320173 Change subject: Bump data-values/javascript to 0.8.3 .. Bump data-values/javascript to 0.8.3 Bug:T150041 Change-Id: I4f0d55604276c8a84a4317255dace267434d005d --- M composer.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/73/320173/1 diff --git a/composer.json b/composer.json index 0546e11..0989755 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "data-values/validators": "~0.1.0", "data-values/data-types": "~0.5.0", "data-values/serialization": "~1.1", - "data-values/javascript": "~0.8.0", + "data-values/javascript": "~0.8.3", "data-values/value-view": "~0.18.0", "wikibase/data-model": "~6.2", "wikibase/data-model-serialization": "~2.2", -- To view, visit https://gerrit.wikimedia.org/r/320173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f0d55604276c8a84a4317255dace267434d005d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Refactor error extraction and move to api
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/315505 Change subject: Refactor error extraction and move to api .. Refactor error extraction and move to api Bug: T147114 Bug: T144666 Change-Id: I0c58cdcee72b25c60ec02b68bf25f4029641af01 --- M i18n/en.json M i18n/qqq.json M wikibase/queryService/api/Sparql.js M wikibase/queryService/ui/App.js 4 files changed, 89 insertions(+), 48 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/05/315505/1 diff --git a/i18n/en.json b/i18n/en.json index c9d68ba..078a21d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -48,5 +48,7 @@ "wdqs-action-error-display": "Unable to display result", "wdqs-action-timeout": "Query timeout limit reached", "wdqs-action-malformed-query": "Query is malformed", +"wdqs-action-server-error": "Server error", +"wdqs-action-unknow-error": "Unknown error", "wdqs-result-map-layers-all": "All layers" } \ No newline at end of file diff --git a/i18n/qqq.json b/i18n/qqq.json index 6eeaf23..31299e7 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -50,5 +50,7 @@ "wdqs-action-error-display": "Label for progressbar", "wdqs-action-timeout": "Label for progressbar", "wdqs-action-malformed-query": "Label for progressbar", +"wdqs-action-server-error": "Label for server error", + "wdqs-action-unknow-error": "Label for unknown error", "wdqs-result-map-layers-all": "Label for all layers in layer control on map view" } diff --git a/wikibase/queryService/api/Sparql.js b/wikibase/queryService/api/Sparql.js index 4d688d6..98bf89f 100644 --- a/wikibase/queryService/api/Sparql.js +++ b/wikibase/queryService/api/Sparql.js @@ -7,6 +7,18 @@ var SPARQL_SERVICE_URI = '//query.wikidata.org/bigdata/namespace/wdq/sparql'; + var ERROR_CODES = { + TIMEOUT: 10, + MALFORMED: 20, + SERVER: 30, + UNKNOWN: 100 + }; + + var ERROR_MAP = { + 'QueryTimeoutException: Query deadline is expired': ERROR_CODES.TIMEOUT, + 'MalformedQueryException: ': ERROR_CODES.MALFORMED + }; + /** * SPARQL API for the Wikibase query service * @@ -24,6 +36,11 @@ } /** +* @property {Object} +*/ + SELF.prototype.ERROR_CODES = ERROR_CODES; + + /** * @property {Number} * @private */ @@ -36,10 +53,10 @@ SELF.prototype._executionTime = null; /** -* @property {string} +* @property {Object} * @private */ - SELF.prototype._errorMessage = null; + SELF.prototype._error = null; /** * @property {Number} @@ -109,9 +126,7 @@ * @return {jQuery.Promise} query */ SELF.prototype.query = function( query ) { - var self = this, - deferred = $.Deferred(), - settings = { + var self = this, deferred = $.Deferred(), settings = { headers: { Accept: 'application/sparql-results+json' } @@ -120,7 +135,7 @@ this._queryUri = this._serviceUri + '?query=' + encodeURIComponent( query ); this._executionTime = Date.now(); - $.ajax( this._queryUri, settings ).done( function( data, textStatus, jqXHR ) { + $.ajax( this._queryUri, settings ).done( function( data, textStatus, request ) { self._executionTime = Date.now() - self._executionTime; if ( typeof data.boolean === 'boolean' ) { @@ -131,11 +146,11 @@ self._rawData = data; deferred.resolve(); - } ).fail( function( jqXHR ) { + } ).fail( function( request ) { self._executionTime = null; self._rawData = null; self._resultLength = null; - self._generateErrorMessage( jqXHR ); + self._generateErrorMessage( request ); deferred.reject(); } ); @@ -146,18 +161,41 @@ /** * Get execution time in ms of the submitted query */ - SELF.prototype._generateErrorMessage = function( jqXHR ) { - var message = 'ERROR: '; + SELF.prototype._generateErrorMessage = function( request, options, exception ) { + var error = { + code: null, + message: null, + debug: request.responseText + }; - if ( jqXHR.status === 0 ) { - message += 'Could not contact server'; +
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add title attribute to rank and value selection menu item
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/315655 Change subject: Add title attribute to rank and value selection menu item .. Add title attribute to rank and value selection menu item Bug: T139357 Change-Id: Ia64c51d7bced7ddd1ed6d51b13d5db183f9cb9aa --- M repo/i18n/en.json M repo/i18n/qqq.json M view/resources/jquery/wikibase/jquery.wikibase.statementview.RankSelector.js M view/resources/jquery/wikibase/resources.php 4 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/55/315655/1 diff --git a/repo/i18n/en.json b/repo/i18n/en.json index ffc0e8f..177580b 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -91,8 +91,11 @@ "wikibase-claimview-snak-tooltip": "Enter a value corresponding to the property named \"$1\". If the property has no designated value or the actual value is not known, you can choose an alternative value type by clicking the icon before the input box.", "wikibase-claimview-snak-new-tooltip": "After specifying a property you can enter a corresponding value. If the property has no designated value or the actual value is not known, you can choose an alternative value type by clicking the icon before the input box.", "wikibase-statementview-rank-preferred": "Preferred rank", + "wikibase-statementview-rank-tooltip-preferred": "Valid and up-to-date value", "wikibase-statementview-rank-normal": "Normal rank", + "wikibase-statementview-rank-tooltip-normal": "Valid value, though possibly historic", "wikibase-statementview-rank-deprecated": "Deprecated rank", + "wikibase-statementview-rank-tooltip-deprecated": "Value is known to be wrong but (used to be) commonly believed", "wikibase-statementview-references-counter": "$1{{PLURAL:$2|0=|$3+$2$4}} {{PLURAL:$1|reference|references}}", "wikibase-statementview-referencesheading-pendingcountertooltip": "{{PLURAL:$1|One reference|$1 references}} not saved yet", "wikibase-snakview-property-input-placeholder": "property", diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json index 1493122..2e4151b 100644 --- a/repo/i18n/qqq.json +++ b/repo/i18n/qqq.json @@ -122,8 +122,11 @@ "wikibase-claimview-snak-tooltip": "Tooltip message displayed when hovering/clicking the help icon next to the save, cancel and remove links of a claim (see [[d:Wikidata:Glossary#Claim]]).\n\nParameters:\n* $1 - the property name the user is about to edit a value of or add another value to", "wikibase-claimview-snak-new-tooltip": "Tooltip message displayed when hovering/clicking the help icon next to the save, cancel and remove links of a claim (see [[d:Wikidata:Glossary]]) when about to add a completely new claim which includes specifying the property.", "wikibase-statementview-rank-preferred": "Label of the [[d:Wikidata:Glossary#Rank-preferred|Preferred Rank]] item within the menu that allows adjusting a [[d:Wikidata:Glossary#Statement|Statement's]] [[d:Wikidata:Glossary#Rank|Rank]]. The message is additionally used as tooltip on the rank icon when the statement has assigned the Preferred rank.", + "wikibase-statementview-rank-tooltip-preferred": "Tooltip of the [[d:Wikidata:Glossary#Rank-preferred|Preferred Rank]] item within the menu that allows adjusting a [[d:Wikidata:Glossary#Statement|Statement's]] [[d:Wikidata:Glossary#Rank|Rank]].", "wikibase-statementview-rank-normal": "Label of the [[d:Wikidata:Glossary#Rank-normal|Normal Rank]] item within the menu that allows adjusting a [[d:Wikidata:Glossary#Statement|Statement's]] [[d:Wikidata:Glossary#Rank|Rank]]. The message is additionally used as tooltip on the rank icon when the statement has assigned the Normal Rank.", + "wikibase-statementview-rank-tooltip-normal": "Tooltip of the [[d:Wikidata:Glossary#Rank-normal|Normal Rank]] item within the menu that allows adjusting a [[d:Wikidata:Glossary#Statement|Statement's]] [[d:Wikidata:Glossary#Rank|Rank]].", "wikibase-statementview-rank-deprecated": "Label of the [[d:Wikidata:Glossary#Rank-deprecated|Deprecated Rank]] item within the menu that allows adjusting a [[d:Wikidata:Glossary#Statement|Statement's]] [[d:Wikidata:Glossary#Rank|Rank]]. The message is additionally used as tooltip on the rank icon when the statement has assigned the Deprecated Rank.", + "wikibase-statementview-rank-tooltip-deprecated": "Tooltip of the [[d:Wikidata:Glossary#Rank-deprecated|Deprecated Rank]] item within the menu that allows adjusting a [[d:Wikidata:Glossary#Statement|Statement's]] [[d:Wikidata:Glossary#Rank|Rank]].", "wikibase-statementview-references-counter": "Used in the heading for the references associated with a statement (see [[d:Wikidata:Glossary]]). The heading is giving information about how many ref
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Add title attribute to "add" for adding a statement and stat...
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/315948 Change subject: Add title attribute to "add" for adding a statement and statement group .. Add title attribute to "add" for adding a statement and statement group Bug: T139360 Change-Id: I71c62b3d4e9fdb2bfab468adf12fbbed791456a5 --- M repo/i18n/en.json M repo/i18n/qqq.json M view/resources/jquery/wikibase/jquery.wikibase.statementgrouplistview.js M view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js M view/resources/jquery/wikibase/resources.php M view/resources/wikibase/view/StructureEditorFactory.js M view/resources/wikibase/view/ViewFactory.js 7 files changed, 24 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/48/315948/1 diff --git a/repo/i18n/en.json b/repo/i18n/en.json index 177580b..48a98ef 100644 --- a/repo/i18n/en.json +++ b/repo/i18n/en.json @@ -26,6 +26,10 @@ "wikibase-addreference": "add reference", "wikibase-save-inprogress": "Saving…", "wikibase-remove-inprogress": "Removing…", + "wikibase-statementlistview-add": "add", + "wikibase-statementlistview-add-tooltip": "Add a new value.", + "wikibase-statementgrouplistview-add": "add", + "wikibase-statementgrouplistview-add-tooltip": "Add a new statement.", "wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "In more languages", "wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link": "https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Wikibase/Configuring_languages";, "wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link-label": "Configure", diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json index 2e4151b..0ad830f 100644 --- a/repo/i18n/qqq.json +++ b/repo/i18n/qqq.json @@ -57,6 +57,10 @@ "wikibase-addreference": "Label of the link to add a reference to a statement (see [[d:Wikidata:Glossary]]).", "wikibase-save-inprogress": "[[File:Screenshot WikidataRepo 2012-05-25 L.png|right|350px]]\n[[File:Screenshot WikidataRepo 2012-05-25 J.png|right|350px]]\n[[File:Screenshot WikidataRepo 2012-05-25 K.png|right|350px]]\nThis is a generic placeholder message used while a save is in progress, and replaces the save and cancel links.\n{{Identical|Saving}}", "wikibase-remove-inprogress": "[[File:Screenshot WikidataRepo 2012-05-25 L.png|right|350px]]\n[[File:Screenshot WikidataRepo 2012-05-25 M.png|right|350px]]\nThis is a generic placeholder message used while a remove is in progress, and replaces the edit and remove.", + "wikibase-statementlistview-add": "[[File:Screenshot WikidataRepo 2012-05-13 F.png|right|0x150px]]\n[[File:Screenshot WikidataRepo 2012-05-13 A.png|right|0x150px]]\nThis is a text used for a link (fig. 3 on [[m:Wikidata/Notes/JavaScript ui implementation]]) that puts the user interface into edit mode for an additional element of type statement.\n{{Identical|Add}}", + "wikibase-statementlistview-add-tooltip": "[[File:Screenshot WikidataRepo 2012-05-13 F.png|right|0x150px]]\n[[File:Screenshot WikidataRepo 2012-05-13 A.png|right|0x150px]]\nThis is a tooltip text used for a link (fig. 3 on [[m:Wikidata/Notes/JavaScript ui implementation]]) that puts the user interface into edit mode for an additional element of type statement.\n{{Identical|Add}}", + "wikibase-statementgrouplistview-add": "[[File:Screenshot WikidataRepo 2012-05-13 F.png|right|0x150px]]\n[[File:Screenshot WikidataRepo 2012-05-13 A.png|right|0x150px]]\nThis is a text used for a link (fig. 3 on [[m:Wikidata/Notes/JavaScript ui implementation]]) that puts the user interface into edit mode for an additional element of type statement list.\n{{Identical|Add}}", + "wikibase-statementgrouplistview-add-tooltip": "[[File:Screenshot WikidataRepo 2012-05-13 F.png|right|0x150px]]\n[[File:Screenshot WikidataRepo 2012-05-13 A.png|right|0x150px]]\nThis is a tooltip text used for a link (fig. 3 on [[m:Wikidata/Notes/JavaScript ui implementation]]) that puts the user interface into edit mode for an additional element of type statement list.\n{{Identical|Add}}", "wikibase-entitytermsview-entitytermsforlanguagelistview-toggler": "Link to show/hide the list of labels, aliases and descriptions in the user's languages. The list is part of an entity's user interface representation header and may be used to view and alter labels, aliases and descriptions in the languages configured by the user.", "wikibase-entitytermsview-entitytermsforlanguagelistview-configure-link": "Link to (URL of) the help page providing information about how to configure the list of languages. The link is shown next to the link to show/hide the language list if the user has JavaScript enabled and not yet configured one or more [[mw:Extension:Babel|B
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Make loading progress bar more prominent
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/315969 Change subject: Make loading progress bar more prominent .. Make loading progress bar more prominent Bug: T148042 Change-Id: I3b92a4bb421f6860ffc2e24b12a707817531a96d --- M embed.html 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/69/315969/1 diff --git a/embed.html b/embed.html index b56e593..4dfd7f6 100644 --- a/embed.html +++ b/embed.html @@ -25,9 +25,9 @@ - + Loading + progress-bar-striped active" style="width: 100%; line-height:30px; font-size:18px;">Loading https://upload.wikimedia.org/wikipedia/commons/6/66/Wikidata-logo-en.svg); -- To view, visit https://gerrit.wikimedia.org/r/315969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b92a4bb421f6860ffc2e24b12a707817531a96d Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Show JSON parse error
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/316579 Change subject: Show JSON parse error .. Show JSON parse error Bug: T148504 Change-Id: I0b6d5e93d5cd911db8d319c85318f06aa89f655f --- M wikibase/queryService/api/Sparql.js 1 file changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/79/316579/1 diff --git a/wikibase/queryService/api/Sparql.js b/wikibase/queryService/api/Sparql.js index 98bf89f..2d5d5b0 100644 --- a/wikibase/queryService/api/Sparql.js +++ b/wikibase/queryService/api/Sparql.js @@ -146,11 +146,11 @@ self._rawData = data; deferred.resolve(); - } ).fail( function( request ) { + } ).fail( function( request, options, exception ) { self._executionTime = null; self._rawData = null; self._resultLength = null; - self._generateErrorMessage( request ); + self._generateErrorMessage( request, options, exception ); deferred.reject(); } ); @@ -163,36 +163,35 @@ */ SELF.prototype._generateErrorMessage = function( request, options, exception ) { var error = { - code: null, + code: ERROR_CODES.UNKNOWN, message: null, debug: request.responseText }; - if ( request.status === 0 ) { + if ( request.status === 0 || exception ) { error.code = ERROR_CODES.SERVER; - error.message = exception; - } else { + error.message = exception.message; + } - try { - var errorToMatch = error.debug.substring( error.debug - .indexOf( 'java.util.concurrent.ExecutionException:' ) ); + try {//extract error from server response + var errorToMatch = error.debug.substring( error.debug + .indexOf( 'java.util.concurrent.ExecutionException:' ) ); - for ( var errorKey in ERROR_MAP ) { - if ( errorToMatch.indexOf( errorKey ) !== -1 ) { - error.code = ERROR_MAP[ errorKey ]; - } + for ( var errorKey in ERROR_MAP ) { + if ( errorToMatch.indexOf( errorKey ) !== -1 ) { + error.code = ERROR_MAP[ errorKey ]; + error.message = null; } - - if ( error.code === null || error.code === ERROR_CODES.MALFORMED ) { - error.message = error.debug - .match( - /(java\.util\.concurrent\.ExecutionException\:)+(.*)(Exception\:)+(.*)/ ) - .pop().trim(); - } - - } catch ( e ) { - error.code = ERROR_CODES.UNKNOWN; } + + if ( error.code === ERROR_CODES.UNKNOWN || error.code === ERROR_CODES.MALFORMED ) { + error.message = error.debug + .match( + /(java\.util\.concurrent\.ExecutionException\:)+(.*)(Exception\:)+(.*)/ ) + .pop().trim(); + } + + } catch ( e ) { } this._error = error; -- To view, visit https://gerrit.wikimedia.org/r/316579 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b6d5e93d5cd911db8d319c85318f06aa89f655f Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Rework translation/article creation UI
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/324398 Change subject: Rework translation/article creation UI .. Rework translation/article creation UI Bug: T151858 Change-Id: I3d4a95a544846de9762a7587f5ae5d249cfe9799 --- M extension.json M i18n/en.json M i18n/qqq.json M modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.css M modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js 5 files changed, 78 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder refs/changes/98/324398/1 diff --git a/extension.json b/extension.json index 06eba6a..f44a0dc 100644 --- a/extension.json +++ b/extension.json @@ -40,6 +40,7 @@ "articleplaceholder-abouttopic-create-article-submit-button", "articleplaceholder-abouttopic-create-article-label", "articleplaceholder-abouttopic-create-article-mandatory", + "articleplaceholder-abouttopic-create-emtpy-article-button", "articleplaceholder-abouttopic-translate-article-button", "articleplaceholder-abouttopic-translate-article-label", "cancel" diff --git a/i18n/en.json b/i18n/en.json index daf7912..cbd8cd5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -15,6 +15,7 @@ "articleplaceholder-abouttopic-create-article-label": "Article title", "articleplaceholder-abouttopic-create-article-mandatory": "The title of the article is mandatory.", "articleplaceholder-abouttopic-create-article-button": "Create an article", + "articleplaceholder-abouttopic-create-emtpy-article-button": "Start a new article", "articleplaceholder-abouttopic-translate-article-label": "Source language:", "articleplaceholder-abouttopic-translate-article-button": "Translate article", "articleplaceholder-abouttopic-create-article-submit-button": "Submit", diff --git a/i18n/qqq.json b/i18n/qqq.json index 22b3318..95238da 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -18,6 +18,7 @@ "articleplaceholder-abouttopic-create-article-label": "Label of the article page title input in the 'Create article' popup.", "articleplaceholder-abouttopic-create-article-mandatory": "Used as an error message in the 'Create article', if the article title wasn't supplied.", "articleplaceholder-abouttopic-create-article-button": "Label on create article button", + "articleplaceholder-abouttopic-create-emtpy-article-button": "Label on create new empty article", "articleplaceholder-abouttopic-translate-article-label": "Label of the source language input in the 'Translate article' popup.\n{{Identical|Source language}}", "articleplaceholder-abouttopic-translate-article-button": "Label of the Translate button to start translating the article/item.", "articleplaceholder-abouttopic-create-article-submit-button": "Label on submit button\n{{Identical|Submit}}", diff --git a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.css b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.css index 386ab2c..5007bc7 100644 --- a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.css +++ b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.css @@ -1,3 +1,17 @@ .oo-ui-processDialog > .oo-ui-window-frame { - min-height: 20em; + min-height: 25em; } + +.oo-ui-layout .create-options{ + padding-left: 2em; + padding-right: 2em; +} + +.oo-ui-layout .create-options > .oo-ui-radioOptionWidget { + margin-top: 1.5em; +} + +.oo-ui-layout .create-options > .oo-ui-dropdownInputWidget { + padding-left: 3em; + padding-right: 3em; +} \ No newline at end of file diff --git a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js index bd8f55d..ecfc739 100644 --- a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js +++ b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js @@ -24,10 +24,16 @@ CreateArticleTranslationDialog.prototype.languageInput = null; /** -* @property {OO.ui.CheckboxInputWidget} +* @property {OO.ui.RadioOptionWidget} * @protected */ - CreateArticleTranslationDialog.prototype.translateCheckbox = null; + CreateArticleTranslationDialog.prototype.translateOption = null; + + /** +* @property {OO.ui.Radio
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: Fix constructor parameters for TermIndexEntry
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/324410 Change subject: Fix constructor parameters for TermIndexEntry .. Fix constructor parameters for TermIndexEntry Change-Id: Ib90f1df8896e0d543ee825496bdab2afe15b10bf --- M tests/phpunit/includes/SearchHookHandlerTest.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder refs/changes/10/324410/1 diff --git a/tests/phpunit/includes/SearchHookHandlerTest.php b/tests/phpunit/includes/SearchHookHandlerTest.php index fe4ac50..fcf7fd8 100644 --- a/tests/phpunit/includes/SearchHookHandlerTest.php +++ b/tests/phpunit/includes/SearchHookHandlerTest.php @@ -79,7 +79,6 @@ 'termLanguage' => $languageCode, 'termType' => $termType, 'entityId' => $entityId, - 'entityType' => $entityId->getEntityType(), ] ); } -- To view, visit https://gerrit.wikimedia.org/r/324410 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib90f1df8896e0d543ee825496bdab2afe15b10bf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticlePlaceholder Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Remove scrolling yes
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/324733 Change subject: Remove scrolling yes .. Remove scrolling yes Change-Id: Iea6f828b25dea18cf4170142fc38c88713e9f859 --- M wikibase/queryService/ui/App.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/33/324733/1 diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js index 47a6b74..59c11ec 100644 --- a/wikibase/queryService/ui/App.js +++ b/wikibase/queryService/ui/App.js @@ -527,7 +527,7 @@ var $link = $( '' ) .attr( 'href', 'embed.html#' + b + window.location.hash.substring( 1 ) ); var $html = $( '' ).text( - '' ).click( function() { $html.select(); -- To view, visit https://gerrit.wikimedia.org/r/324733 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea6f828b25dea18cf4170142fc38c88713e9f859 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticlePlaceholder[master]: QUnit setup and basic tests for create article dialog
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/324912 Change subject: QUnit setup and basic tests for create article dialog .. QUnit setup and basic tests for create article dialog Bug: T151858 Change-Id: I51d2fa9ec18f48ad0cdf757537dbc783650705d0 --- M .jshintrc M Gruntfile.js M modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js M modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.js M package.json A tests/qunit/index.html A tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.test.js A tests/qunit/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticleTranslation.test.js 8 files changed, 316 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder refs/changes/12/324912/1 diff --git a/.jshintrc b/.jshintrc index ca5db31..18db22d 100644 --- a/.jshintrc +++ b/.jshintrc @@ -16,6 +16,8 @@ "jQuery": false, "mediaWiki": false, "module": true, - "OO": false + "OO": false, + "QUnit": false, + "sinon": false } } diff --git a/Gruntfile.js b/Gruntfile.js index 56ff218..f30f818 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,9 +1,6 @@ /*jshint node:true */ module.exports = function ( grunt ) { - grunt.loadNpmTasks( 'grunt-contrib-jshint' ); - grunt.loadNpmTasks( 'grunt-jsonlint' ); - grunt.loadNpmTasks( 'grunt-banana-checker' ); - grunt.loadNpmTasks( 'grunt-jscs' ); + require( 'load-grunt-tasks' )( grunt ); grunt.initConfig( { jshint: { @@ -12,7 +9,8 @@ }, all: [ '*.js', - 'modules/**/*.js' + 'modules/**/*.js', + 'tests/**/*.js' ] }, jscs: { @@ -27,9 +25,14 @@ '**/*.json', '!node_modules/**' ] + }, + qunit: { + all: [ + 'tests/qunit/*.html' + ] } } ); - grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana', 'qunit' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js index 65cdea2..7d4934e 100644 --- a/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js +++ b/modules/ext.articleplaceholder.createArticle/ext.articleplaceholder.createArticle.js @@ -13,7 +13,7 @@ function CreateArticleDialog() { CreateArticleDialog.super.call( this, { size: 'medium' - } ); // jshint:ignore + } ); this.createContentLayout(); } @@ -165,8 +165,10 @@ * @return {jQuery.Promise} */ CreateArticleDialog.prototype.onSubmit = function () { - var title = this.titleInput.getValue(), - deferred = $.Deferred(); + var self = this, + title = this.titleInput.getValue(), + deferred = $.Deferred(), + url = null; new mw.Api().get( { formatversion: 2, @@ -182,9 +184,10 @@ if ( query.pages[ 0 ].missing ) { title = mw.Title.newFromUserInput( title, 0 ); - document.location.href = mw.config.get( 'wgServer' ) + title.getUrl( { + url = mw.config.get( 'wgServer' ) + title.getUrl( { action: 'edit' } ); + self.forwardTo( url ); deferred.resolve(); } else { deferred.reject( mw.msg( 'articleplaceholder-abouttopic-article-exists-error' ) ); @@ -194,6 +197,13 @@ return deferred; }; + /** +* @protected +*/ + CreateArticleDialog.prototype.forwardTo = function ( url ) { + document.location.href = url; + }; + module.exports.CreateArticleDialog = CreateArticleDialog; } )( jQuery, mediaWiki, OO, module ); diff --git a/modules/ext.articleplaceholder.createA
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Visual seperation of qualifiers, references
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/303769 Change subject: Visual seperation of qualifiers, references .. Visual seperation of qualifiers, references Bug: T141862 Change-Id: I58aa5d8848c4b9ce9786321960038d011a303961 --- M view/resources/wikibase/wikibase.css 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/69/303769/1 diff --git a/view/resources/wikibase/wikibase.css b/view/resources/wikibase/wikibase.css index 1f63664..1fe1a2e 100644 --- a/view/resources/wikibase/wikibase.css +++ b/view/resources/wikibase/wikibase.css @@ -294,10 +294,6 @@ background-color: #E5C8B5; } -.wikibase-statementgrouplistview .wikibase-statementview.wb-edit, -.wikibase-statementgrouplistview .wikibase-statementview.wb-edit .wb-claim { - background-color: #D6F3FF; -} .wikibase-statementgrouplistview .wikibase-statementview.wb-error, .wikibase-statementgrouplistview .wikibase-statementview.wb-error .wb-claim { background-color: #FFDFC9; -- To view, visit https://gerrit.wikimedia.org/r/303769 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58aa5d8848c4b9ce9786321960038d011a303961 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix: Set Codemirror hint max width
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/304027 Change subject: Fix: Set Codemirror hint max width .. Fix: Set Codemirror hint max width Change-Id: I78113ec96b48d9b0a9c7533cc1ca56ad041af9af --- M style.css 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/27/304027/1 diff --git a/style.css b/style.css index 4c26515..eb3ac12 100644 --- a/style.css +++ b/style.css @@ -60,6 +60,11 @@ .CodeMirror-scroll { min-height: 300px; } + +.CodeMirror-hint { + max-width: 19em; +} + .queryEditor { min-height: 273px; } -- To view, visit https://gerrit.wikimedia.org/r/304027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78113ec96b48d9b0a9c7533cc1ca56ad041af9af Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Revert "Rewrite wikitext parsing regular expressions in Quer...
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/304199 Change subject: Revert "Rewrite wikitext parsing regular expressions in QuerySamples" .. Revert "Rewrite wikitext parsing regular expressions in QuerySamples" This reverts commit 19b3d04e4f8ebf8528423b7564717cc44dc54bbe. Change-Id: I10cc04cfc8ccf67c4ea2a9153f655cb03235f081 --- M wikibase/queryService/api/QuerySamples.js 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/99/304199/1 diff --git a/wikibase/queryService/api/QuerySamples.js b/wikibase/queryService/api/QuerySamples.js index 8214688..db8f0fb 100644 --- a/wikibase/queryService/api/QuerySamples.js +++ b/wikibase/queryService/api/QuerySamples.js @@ -38,10 +38,13 @@ }, dataType: 'jsonp' } ) - .done( function ( data ) { - var wikitext = data.query.pages[Object.keys( data.query.pages )].revisions[0]['*']; - deferred.resolve( self._extract( wikitext ) ); - } ); + .done( + function ( data ) { + var wikitext = data.query.pages[Object.keys( data.query.pages )].revisions[0]['*']; + wikitext = wikitext.replace( /\{\{!\}\}/g, '|' ); + + deferred.resolve( self._extract( wikitext ) ); + } ); return deferred; }; @@ -74,10 +77,10 @@ * @private */ SELF.prototype._extractExamples = function ( section, sectionHeader ) { - var regexParagraph = /^=+([^=]+)=+\n[^=]*?(\{\{SPARQL\s*\|[\s\S]*?\}\})/gm, - regexQuery = /\|\s*query\s*=([^|]*?)(?:\||\}\})/, - regexExtraPrefix = /\|\s*extraprefix\s*=([^|]*?)(?:\||\}\})/, - regexTags = /\{\{Q\|([^{|}]+)\|([^{|}]+)\}\}/gi, + var regexParagraph = /(?:[\=]+)([^\=]*)(?:[\=]+)\n(?:[]*?)(?:[^=]*?)({{SPARQL\s*\|[\s\S]*?}}\n){1}/g, + regexQuery = /query\s*\=([^]+)(?:}}|\|)/, + regexExtraPrefix = /extraprefix\s*\=([^]+?)(?:\||}})+/, + regexTags = /{{Q\|([^]+?)\|([^]+?)}}+/g, m, examples = []; @@ -85,7 +88,7 @@ var paragraph = m[0], title = m[1].trim(), tags = [], tag, href = PAGE_URL + '#' + encodeURIComponent( title.replace( / /g, '_' ) ).replace( /%/g, '.' ), sparqlTemplate = m[2], - query = sparqlTemplate.match( regexQuery )[1].replace( /\{\{!\}\}/g, '|' ).trim(); + query = sparqlTemplate.match( regexQuery )[1].trim(); if ( sparqlTemplate.match( regexExtraPrefix ) ) { query = sparqlTemplate.match( regexExtraPrefix )[1] + '\n\n' + query; -- To view, visit https://gerrit.wikimedia.org/r/304199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10cc04cfc8ccf67c4ea2a9153f655cb03235f081 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Improve grunt and npm for i18n
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/304209 Change subject: Improve grunt and npm for i18n .. Improve grunt and npm for i18n Load uls and i18 with npm Merge i18n files in build process Remove unused build script Change-Id: I829522306478698b72da789bd4ffe42c800476ba --- M Gruntfile.js M index.html M package.json D scripts/gui-update.sh D vendor/jquery.i18n/jquery.i18n.emitter.js D vendor/jquery.i18n/jquery.i18n.fallbacks.js D vendor/jquery.i18n/jquery.i18n.js D vendor/jquery.i18n/jquery.i18n.language.js D vendor/jquery.i18n/jquery.i18n.messagestore.js D vendor/jquery.i18n/jquery.i18n.parser.js D vendor/jquery.uls/css/jquery.uls.compact.css D vendor/jquery.uls/css/jquery.uls.css D vendor/jquery.uls/css/jquery.uls.grid.css D vendor/jquery.uls/css/jquery.uls.lcd.css D vendor/jquery.uls/css/jquery.uls.mobile.css D vendor/jquery.uls/i18n/aeb-latn.json D vendor/jquery.uls/i18n/af.json D vendor/jquery.uls/i18n/am.json D vendor/jquery.uls/i18n/anp.json D vendor/jquery.uls/i18n/ar.json D vendor/jquery.uls/i18n/as.json D vendor/jquery.uls/i18n/ast.json D vendor/jquery.uls/i18n/av.json D vendor/jquery.uls/i18n/awa.json D vendor/jquery.uls/i18n/az.json D vendor/jquery.uls/i18n/azb.json D vendor/jquery.uls/i18n/ba.json D vendor/jquery.uls/i18n/bbc-latn.json D vendor/jquery.uls/i18n/bcc.json D vendor/jquery.uls/i18n/bcl.json D vendor/jquery.uls/i18n/be-tarask.json D vendor/jquery.uls/i18n/be.json D vendor/jquery.uls/i18n/bg.json D vendor/jquery.uls/i18n/bgn.json D vendor/jquery.uls/i18n/bn.json D vendor/jquery.uls/i18n/br.json D vendor/jquery.uls/i18n/bs.json D vendor/jquery.uls/i18n/bto.json D vendor/jquery.uls/i18n/ca.json D vendor/jquery.uls/i18n/ce.json D vendor/jquery.uls/i18n/ckb.json D vendor/jquery.uls/i18n/cs.json D vendor/jquery.uls/i18n/cv.json D vendor/jquery.uls/i18n/cy.json D vendor/jquery.uls/i18n/da.json D vendor/jquery.uls/i18n/de-formal.json D vendor/jquery.uls/i18n/de.json D vendor/jquery.uls/i18n/diq.json D vendor/jquery.uls/i18n/dsb.json D vendor/jquery.uls/i18n/dty.json D vendor/jquery.uls/i18n/el.json D vendor/jquery.uls/i18n/en-gb.json D vendor/jquery.uls/i18n/en.json D vendor/jquery.uls/i18n/eo.json D vendor/jquery.uls/i18n/es.json D vendor/jquery.uls/i18n/et.json D vendor/jquery.uls/i18n/eu.json D vendor/jquery.uls/i18n/fa.json D vendor/jquery.uls/i18n/fi.json D vendor/jquery.uls/i18n/fo.json D vendor/jquery.uls/i18n/fr.json D vendor/jquery.uls/i18n/fur.json D vendor/jquery.uls/i18n/fy.json D vendor/jquery.uls/i18n/ga.json D vendor/jquery.uls/i18n/gd.json D vendor/jquery.uls/i18n/gl.json D vendor/jquery.uls/i18n/glk.json D vendor/jquery.uls/i18n/gn.json D vendor/jquery.uls/i18n/gom-deva.json D vendor/jquery.uls/i18n/gom-latn.json D vendor/jquery.uls/i18n/got.json D vendor/jquery.uls/i18n/gsw.json D vendor/jquery.uls/i18n/gu.json D vendor/jquery.uls/i18n/hak.json D vendor/jquery.uls/i18n/haw.json D vendor/jquery.uls/i18n/he.json D vendor/jquery.uls/i18n/hi.json D vendor/jquery.uls/i18n/hr.json D vendor/jquery.uls/i18n/hrx.json D vendor/jquery.uls/i18n/hsb.json D vendor/jquery.uls/i18n/hu.json D vendor/jquery.uls/i18n/hy.json D vendor/jquery.uls/i18n/ia.json D vendor/jquery.uls/i18n/id.json D vendor/jquery.uls/i18n/ie.json D vendor/jquery.uls/i18n/ilo.json D vendor/jquery.uls/i18n/inh.json D vendor/jquery.uls/i18n/is.json D vendor/jquery.uls/i18n/it.json D vendor/jquery.uls/i18n/ja.json D vendor/jquery.uls/i18n/ka.json D vendor/jquery.uls/i18n/kab.json D vendor/jquery.uls/i18n/khw.json D vendor/jquery.uls/i18n/kk-cyrl.json D vendor/jquery.uls/i18n/km.json D vendor/jquery.uls/i18n/kn.json D vendor/jquery.uls/i18n/ko.json D vendor/jquery.uls/i18n/krc.json D vendor/jquery.uls/i18n/ksh.json D vendor/jquery.uls/i18n/ku-latn.json D vendor/jquery.uls/i18n/ky.json D vendor/jquery.uls/i18n/lb.json D vendor/jquery.uls/i18n/lez.json D vendor/jquery.uls/i18n/li.json D vendor/jquery.uls/i18n/lki.json D vendor/jquery.uls/i18n/lrc.json D vendor/jquery.uls/i18n/lt.json D vendor/jquery.uls/i18n/lv.json D vendor/jquery.uls/i18n/map-bms.json D vendor/jquery.uls/i18n/mg.json D vendor/jquery.uls/i18n/min.json D vendor/jquery.uls/i18n/mk.json D vendor/jquery.uls/i18n/ml.json D vendor/jquery.uls/i18n/mn.json D vendor/jquery.uls/i18n/mr.json D vendor/jquery.uls/i18n/ms.json D vendor/jquery.uls/i18n/mt.json D vendor/jquery.uls/i18n/mzn.json D vendor/jquery.uls/i18n/nah.json D vendor/jquery.uls/i18n/nap.json D vendor/jquery.uls/i18n/nb.json D vendor/jquery.uls/i18n/nds-nl.json D vendor/jquery.uls/i18n/ne.json D vendor/jquery.uls/i18n/nl-informal.json D vendor/jquery.uls/i18n/nl.json D vendor/jquery.uls/i18n/nn.json D vendor/jquery.uls/i18n/nso.json D vendor/jquery.uls/i18n/oc.json D vendor/jquery.uls/i18n/olo.json D vendor/jquery.uls/i18n/om.json D vendor/jquery.uls/i18n/or.json D vendor/jquery.uls/i18n/os.json D vendor/jquery.uls/i18n/pa.json D vendor/jquery.uls/i18n/pl.json D vendor/jquery.uls/i18n
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Improve embed code
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/304473 Change subject: Improve embed code .. Improve embed code Change-Id: If01287c227608ae1d61d66d6189745984f199373 --- M wikibase/queryService/ui/App.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/73/304473/1 diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js index 2ee73f4..726d185 100644 --- a/wikibase/queryService/ui/App.js +++ b/wikibase/queryService/ui/App.js @@ -457,7 +457,7 @@ var $link = $( '' ).attr( 'href', 'embed.html#' + b + window.location.hash.substring( 1 ) ); var $html = $( '' ).text( - '' ).click( function() { $html.select(); } ); -- To view, visit https://gerrit.wikimedia.org/r/304473 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If01287c227608ae1d61d66d6189745984f199373 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Allow blank translations in BananaChecker
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/304791 Change subject: Allow blank translations in BananaChecker .. Allow blank translations in BananaChecker Change-Id: Ib565170843dc45fcb7a5ea9492bd3d2b2acfef6f Fixes: 06:56:05 Running "banana:all" (banana) task 06:56:05 >> The "de" translation has 1 blank translation: 06:56:05 >> The translation of "wdqs-app-footer-updated-after" is blank. --- M Gruntfile.js 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/91/304791/1 diff --git a/Gruntfile.js b/Gruntfile.js index ed71236..0cace3c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,8 +29,11 @@ ] }, banana: { - all: 'i18n/' - }, + all: 'i18n/', + options: { + disallowBlankTranslations: false + } + }, clean: { release: [ dist -- To view, visit https://gerrit.wikimedia.org/r/304791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib565170843dc45fcb7a5ea9492bd3d2b2acfef6f Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Show categories in query example dialog
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/302452 Change subject: Show categories in query example dialog .. Show categories in query example dialog Bug: T140576 Change-Id: Iab349defa93d7e4aa4d66d29c370040fb5e9212e --- M index.html M wikibase/queryService/api/QuerySamples.js M wikibase/queryService/ui/QueryExampleDialog.js 3 files changed, 86 insertions(+), 43 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/52/302452/1 diff --git a/index.html b/index.html index d85f206..22406f8 100644 --- a/index.html +++ b/index.html @@ -195,7 +195,7 @@ - + diff --git a/wikibase/queryService/api/QuerySamples.js b/wikibase/queryService/api/QuerySamples.js index 042fe5b..db8f0fb 100644 --- a/wikibase/queryService/api/QuerySamples.js +++ b/wikibase/queryService/api/QuerySamples.js @@ -5,6 +5,10 @@ wikibase.queryService.api.QuerySamples = ( function ( $ ) { 'use strict'; + var API_ENDPOINT = 'https://www.mediawiki.org/w/api.php'; + var PAGE_URL = 'https://www.mediawiki.org/wiki/Wikibase/Indexing/SPARQL_Query_Examples'; + var PAGE_TITLE = 'Wikibase/Indexing/SPARQL_Query_Examples'; + /** * QuerySamples API for the Wikibase query service * @@ -23,13 +27,12 @@ */ SELF.prototype.getExamples = function () { - var examples = [], - deferred = $.Deferred(); + var deferred = $.Deferred(), + self = this; $.ajax( { - url: 'https://www.mediawiki.org/w/api.php?action=query&prop=revisions&titles=Wikibase/' + - 'Indexing/SPARQL_Query_Examples&rvprop=content', + url: API_ENDPOINT + '?action=query&prop=revisions&titles=' + encodeURIComponent( PAGE_TITLE ) + '&rvprop=content', data: { format: 'json' }, @@ -37,49 +40,77 @@ } ) .done( function ( data ) { - var wikitext = data.query.pages[Object.keys( data.query.pages )].revisions[0]['*']; wikitext = wikitext.replace( /\{\{!\}\}/g, '|' ); - var re = /(?:[\=]+)([^\=]*)(?:[\=]+)\n(?:[]*?)(?:[^=]*?)({{SPARQL\s*\|[\s\S]*?}}\n){1}/g, - regexQuery = /query\s*\=([^]+)(?:}}|\|)/, - regexExtraPrefix = /extraprefix\s*\=([^]+?)(?:\||}})+/, - regexTags = /{{Q\|([^]+?)\|([^]+?)}}+/g, - m; - - while ( ( m = re.exec( wikitext ) ) !== null ) { - var paragraph = m[0], - title = m[1].trim( ), - tags = [], - tag, - href = 'https://www.mediawiki.org/wiki/Wikibase/Indexing/SPARQL_Query_Examples#' + - encodeURIComponent( title.replace( / /g, '_' ) ).replace( - /%/g, '.' ), - sparqlTemplate = m[2], - query = sparqlTemplate.match( regexQuery )[1].trim(); - - if ( sparqlTemplate.match( regexExtraPrefix ) ) { - query = sparqlTemplate.match( regexExtraPrefix )[1] + '\n\n' + query; - } - if ( paragraph.match( regexTags ) ) { - while ( ( tag = regexTags.exec( paragraph ) ) !== null ) { - tags.push( tag[2].trim() + ' (' + tag[1].trim() + ')' ); - } -
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Move example page to wikidata.org
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/302456 Change subject: Move example page to wikidata.org .. Move example page to wikidata.org Change-Id: I113e2c75ac604b827c2889ee367a3ab7af475c4e --- M wikibase/queryService/api/QuerySamples.js 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/56/302456/1 diff --git a/wikibase/queryService/api/QuerySamples.js b/wikibase/queryService/api/QuerySamples.js index db8f0fb..1a2f01b 100644 --- a/wikibase/queryService/api/QuerySamples.js +++ b/wikibase/queryService/api/QuerySamples.js @@ -5,9 +5,9 @@ wikibase.queryService.api.QuerySamples = ( function ( $ ) { 'use strict'; - var API_ENDPOINT = 'https://www.mediawiki.org/w/api.php'; - var PAGE_URL = 'https://www.mediawiki.org/wiki/Wikibase/Indexing/SPARQL_Query_Examples'; - var PAGE_TITLE = 'Wikibase/Indexing/SPARQL_Query_Examples'; + var API_ENDPOINT = 'https://www.wikidata.org/w/api.php'; + var PAGE_URL = 'https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/queries/examples'; + var PAGE_TITLE = 'Wikidata:SPARQL query service/queries/examples'; /** * QuerySamples API for the Wikibase query service -- To view, visit https://gerrit.wikimedia.org/r/302456 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I113e2c75ac604b827c2889ee367a3ab7af475c4e Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Fix Sinon not found in CI
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/302672 Change subject: Fix Sinon not found in CI .. Fix Sinon not found in CI Change-Id: Id3b427d5f21ebb0cc92c832885dac7bdae8b8538 --- M wikibase/tests/index.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/72/302672/1 diff --git a/wikibase/tests/index.html b/wikibase/tests/index.html index 202808b..3b157bd 100644 --- a/wikibase/tests/index.html +++ b/wikibase/tests/index.html @@ -16,7 +16,7 @@ - + -- To view, visit https://gerrit.wikimedia.org/r/302672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3b427d5f21ebb0cc92c832885dac7bdae8b8538 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Change embedding link text
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/302685 Change subject: Change embedding link text .. Change embedding link text Bug: T138766 Change-Id: I39041978d4669e5616bce3bf7ce337df0ae17861 --- M embed.html 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/85/302685/1 diff --git a/embed.html b/embed.html index ecde69f..0ba8432 100644 --- a/embed.html +++ b/embed.html @@ -38,7 +38,7 @@ - Wikidata.org + Edit on query.Wikidata.org -- To view, visit https://gerrit.wikimedia.org/r/302685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39041978d4669e5616bce3bf7ce337df0ae17861 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Result preview in example dialog
Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/302743 Change subject: Result preview in example dialog .. Result preview in example dialog Change-Id: I0d0a45b9ab23ae3c04aa43bb1e6a6ec3cf4be2ab --- M wikibase/queryService/ui/QueryExampleDialog.js 1 file changed, 18 insertions(+), 11 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/43/302743/1 diff --git a/wikibase/queryService/ui/QueryExampleDialog.js b/wikibase/queryService/ui/QueryExampleDialog.js index c33c366..55878cf 100644 --- a/wikibase/queryService/ui/QueryExampleDialog.js +++ b/wikibase/queryService/ui/QueryExampleDialog.js @@ -222,13 +222,9 @@ SELF.prototype._addExample = function( title, query, href, tags ) { var self = this; - var link = $( '' ).text( title ).attr( - 'href', '#' ).click( function() { - self._callback( query, title ); - } ), edit = $( '' ).attr( 'href', href ).attr( 'target', - '_blank' ).append( - '' ), preview = $( - '' ).popover( + var link = $( '' ).text( title ).attr( 'href', '#' ).click( function() { self._callback( query, title ); } ), + edit = $( '' ).attr( 'href', href ).attr( 'target', '_blank' ).append( '' ), + source = $( '' ).popover( { placement: 'bottom', trigger: 'hover', @@ -236,12 +232,23 @@ title: 'Preview', content: $( '' ).text( query ), html: true + } ), + preview = $( '' ).popover( + { + placement: 'right', + trigger: 'hover', + container: 'body', + title: 'Preview', + content: $( '' ), + html: true } ); - tags = $( '' ).text( tags.join( '|' ) ).hide(); - var example = $( '' ); - example.append( $( '' ).append( link ).append( ' ', edit ) ); - example.append( $( '' ).append( preview ) ); + tags = $( '' ).text( tags.join( '|' ) ).hide(); + + var example = $( '' ); + example.append( $( '' ).append( link ).append( ' ', edit ) ); + example.append( $( '' ).append( source ) ); + example.append( $( '' ).append( preview ) ); example.append( tags ); this._$element.find( '.searchable' ).append( example ); -- To view, visit https://gerrit.wikimedia.org/r/302743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d0a45b9ab23ae3c04aa43bb1e6a6ec3cf4be2ab Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/gui Gerrit-Branch: master Gerrit-Owner: Jonas Kress (WMDE) ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
1 2 3 4 5 >
