Smalyshev has uploaded a new change for review. https://gerrit.wikimedia.org/r/252149
Change subject: Merge commit 'refs/changes/40/251940/1' of https://gerrit.wikimedia.org/r/wikidata/query/rdf ...................................................................... Merge commit 'refs/changes/40/251940/1' of https://gerrit.wikimedia.org/r/wikidata/query/rdf Conflicts: gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js Change-Id: I27fefc14f6d163098cb9d4c19492f774e778e4b0 --- M gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js M gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js 2 files changed, 0 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf refs/changes/49/252149/1 diff --git a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js index d8ee5c1..313a07c 100755 --- a/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js +++ b/gui/wikibase/codemirror/addon/hint/wikibase-sparql-hint.js @@ -58,16 +58,12 @@ } }; -<<<<<<< HEAD (8fa71e Small bug fixes) - function getSPARQLHints( term ){ -======= CodeMirror.hint.sparql.async = true; CodeMirror.defaults.hintOptions = {}; CodeMirror.defaults.hintOptions.closeCharacters = /[]/; CodeMirror.defaults.hintOptions.completeSingle = false; function getSPARQLHints( term ) { ->>>>>>> BRANCH (3d1164 Clean up code style in gui/wikibase/codemirror/addon/*) var list = []; $.each( SPARQL_KEYWORDS, function ( key, keyword ) { @@ -82,15 +78,9 @@ function getDefinedVariables( text ) { var variables = []; -<<<<<<< HEAD (8fa71e Small bug fixes) - $.each(text.split(' '), function( key, word ){ - if( word.match(/^\?\w+$/)){ - variables.push(word); -======= $.each( text.split( ' ' ), function ( key, word ) { if ( word.indexOf( '?' ) === 0 ){ variables.push( word ); ->>>>>>> BRANCH (3d1164 Clean up code style in gui/wikibase/codemirror/addon/*) } }); diff --git a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js index b7f8ba1..ebbdaf2 100644 --- a/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js +++ b/gui/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js @@ -51,12 +51,7 @@ var posX = e.clientX, posY = e.clientY + $( window ).scrollTop(); -<<<<<<< HEAD (8fa71e Small bug fixes) - var token = this.editor.getTokenAt(this.editor.coordsChar({left: posX, top: posY})).string; -======= var token = this.editor.getTokenAt( this.editor.coordsChar( { left: posX, top: posY } ) ).string; - console.log( token ); ->>>>>>> BRANCH (3d1164 Clean up code style in gui/wikibase/codemirror/addon/*) if ( !token.match( /.+\:(Q|P)[0-9]*/ ) ) { return; -- To view, visit https://gerrit.wikimedia.org/r/252149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27fefc14f6d163098cb9d4c19492f774e778e4b0 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/query/rdf Gerrit-Branch: master Gerrit-Owner: Smalyshev <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
