[MediaWiki-commits] [Gerrit] Fix tooltips & completion - change (wikidata...gui)

[Smalyshev (Code Review)]

Smalyshev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/271943

Change subject: Fix tooltips & completion
......................................................................

Fix tooltips & completion

Change-Id: Ia1be51a6815a3c43173a58b1985c4e70aab29e81
---
M wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
M wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
M wikibase/queryService/RdfNamespaces.js
3 files changed, 16 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/43/271943/1

diff --git a/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js 
b/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
index 3a3f992..b5bd9bc 100755
--- a/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
+++ b/wikibase/codemirror/addon/hint/wikibase-rdf-hint.js
@@ -153,7 +153,7 @@
        }
 
        function extractPrefixes( text ) {
-               var prefixes = {},
+               var prefixes = 
wikibase.queryService.RdfNamespaces.getPrefixMap(ENTITY_TYPES),
                        lines = text.split( '\n' ),
                        matches;
 
diff --git a/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js 
b/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
index 75f97b9..43a550f 100644
--- a/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
+++ b/wikibase/codemirror/addon/tooltip/WikibaseRDFTooltip.js
@@ -93,7 +93,7 @@
        };
 
        SELF.prototype._extractPrefixes = function ( text ) {
-               var prefixes = {},
+               var prefixes = 
wikibase.queryService.RdfNamespaces.getPrefixMap(ENTITY_TYPES),
                        lines = text.split( '\n' ),
                        matches;
 
diff --git a/wikibase/queryService/RdfNamespaces.js 
b/wikibase/queryService/RdfNamespaces.js
index 4ae78ee..9c4a377 100644
--- a/wikibase/queryService/RdfNamespaces.js
+++ b/wikibase/queryService/RdfNamespaces.js
@@ -42,6 +42,10 @@
                }
        };
 
+       RdfNamespaces.ALL_PREFIXES = $.map(RdfNamespaces.NAMESPACE_SHORTCUTS,
+                       function(n) { return n }
+       ).reduce(function(p, v, i) { return $.extend(p, v) }, {})
+
        RdfNamespaces.STANDARD_PREFIXES = [
                'PREFIX wd: <http://www.wikidata.org/entity/>',
                'PREFIX wdt: <http://www.wikidata.org/prop/direct/>',
@@ -52,5 +56,15 @@
                'PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>'
                ];
 
+       RdfNamespaces.getPrefixMap = function(entityTypes) {
+               var prefixes = {};
+               $.each( RdfNamespaces.ALL_PREFIXES, function ( prefix, url ) {
+                       if ( entityTypes[ url ] ) {
+                               prefixes[ prefix ] = entityTypes[ url ];
+                       }
+               });
+               return prefixes;
+       };
+
 })(wikibase.queryService.RdfNamespaces);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/271943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1be51a6815a3c43173a58b1985c4e70aab29e81
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalys...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits