tooltipUtils refactor

src/autocompleters/wikibase.js

@@ -40,7 +40,7 @@ module.exports = function(yashe, name) {
 
         getEntities(API_ENDPOINT,query)
           .done((data)=>setHints(data,callback))
-          .fail(
+          .fail( //I had to do this for one wikibase instance I don't know why...
               ()=>getEntities(API_ENDPOINT.replace('/w/','/wiki/'),query)
               .done((data)=>setHints(data,callback))
           )

src/config/defaults.js

@@ -18,6 +18,29 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX wd: <http://www.wikidata.org/entity/>
 PREFIX wdt: <http://www.wikidata.org/prop/direct/>
 
+start = @<human>
+
+<human> EXTRA wdt:P31 {
+  wdt:P31 [wd:Q5];
+  wdt:P21 [wd:Q6581097 wd:Q6581072 wd:Q1097630 wd:Q1052281 wd:Q2449503 wd:Q48270]?;  
+  wdt:P19 . ?;                    
+  wdt:P569 . ? ;               
+  wdt:P735 . * ;                
+  wdt:P734 . * ;               
+  wdt:P106 . * ;                
+  wdt:P27 @<country> *;  
+  wdt:P22 @<human> *;          
+  wdt:P25 @<human> *;          
+  wdt:P3373 @<human> *;         
+  wdt:P26 @<human> *;         
+  wdt:P40 @<human> *;          
+  wdt:P1038 @<human> *;       
+  wdt:P103 @<language> *;
+  wdt:P1412 @<language> *;
+  wdt:P6886  @<language> *;
+  rdfs:label rdf:langString+;
+}
+
 <country> EXTRA wdt:P31 {
   wdt:P31 [wd:Q6256 wd:Q3024240 wd:Q3624078] +;
 }

src/utils/pretty/prettyUtils.js

@@ -21,7 +21,7 @@ function prettify(yashe){
     // It is true that without this check the user
     // wouldn't appreciate the difference but yashe
     // would be doing operations that would appear 
-    // in the undo stack
+    // in the undo/redo stack
     if(previousValue!=prettified){
         yashe.setValue(prettified) ;
         prettifyComments();

src/utils/tooltipUtils.js

@@ -58,11 +58,11 @@ var triggerTooltip = function(yashe, e) {
   if(wikiElement!== undefined  && wikiElement!== ''){
     let endpoint = wikiUtils.getEndPoint(yashe,prefixName);
     if(endpoint!=null){
-      checkEntity(wikiElement,endpoint)
+      wikiUtils.getEntity(wikiElement,endpoint)
           .done((data)=>{loadTooltip(yashe,data,wikiElement,posX,posY)})
       .fail(
         ()=>{
-          checkEntity(wikiElement,endpoint.replace('/w/','/wiki/'))
+          wikiUtils.getEntity(wikiElement,endpoint.replace('/w/','/wiki/'))
             .done((data)=>{loadTooltip(yashe,data,wikiElement,posX,posY)})
         });  
     }
@@ -71,42 +71,9 @@ var triggerTooltip = function(yashe, e) {
 }
 
 var loadTooltip = function(yashe,data,wikiElement,posX,posY){
-  if(!data.error){
-
-      var userLang;
-      var entity = '';
-      var description=''
-      var theme;
-      //Gets the preference languaje from the navigator
-      userLang = (navigator.language || navigator.userLanguage).split("-")[0]
-
-
-      var content = data.entities[wikiElement.toUpperCase()]
-
-      //Check if the property/entity exist
-      if(!content.labels)return;
-
-      //Some properties and entities are only avalible in English
-      //So if they do not exist we take it in English
-      if(content.labels[userLang] && content.descriptions[userLang]){
-
-          entity = content.labels[userLang].value +' ('+wikiElement+')'
-          description = content.descriptions[userLang].value
-
-      }else{
-
-          let lb = content.labels['en'];
-          let desc = content.descriptions['en'];
-          if(lb){
-            entity = lb.value +' ('+wikiElement+')';
-          }
-          if(desc){
-             description = desc.value
-          }
-
-      }
-
-      theme = yashe.getOption('theme');
+    var entityData  = wikiUtils.getEntityData(wikiElement,data);
+    if(entityData.title!=''){
+      let theme = yashe.getOption('theme');
       let cssStyle = themeStyles['default'];
       if(theme=='dark'){
         cssStyle = themeStyles['dark'];
@@ -124,23 +91,12 @@ var loadTooltip = function(yashe,data,wikiElement,posX,posY){
         .append(
           $('<div class="wikidata_tooltip">').css(cssStyle)
           .append(
-            $('<div>').html(entity).css(styles.title))
+            $('<div>').html(entityData.title).css(styles.title))
           .append(
-            $('<div>').html(description).css(styles.description)))
+            $('<div>').html(entityData.description).css(styles.description)))
         .appendTo('body').fadeIn( 'slow' );
     }
-}
-
-//  U S A R         M  É  T  O  D  O    P  Á  R  A  M  S
-var checkEntity = function (entity,endPoint){
-  return $.get(
-    {
-
-      url: endPoint+'api.php?action=wbgetentities&format=json&ids='+entity,
-      dataType: 'jsonp',
-
-    })
-
+
 }
 
 

src/utils/wikiUtils.js

@@ -38,7 +38,11 @@ const NAMESPACE_SHORTCUTS = {
         wdata: 'http://www.wikidata.org/wiki/Special:EntityData/'
     }
 
-const WIKIDATA_ENDPOINT= 'https://www.wikidata.org/w/'
+const WIKIDATA_ENDPOINT= 'https://www.wikidata.org/w/';
+const GET_ENTITY_QUERY = {
+  action:'wbgetentities',
+  format: 'json'
+}
 
 
 
@@ -115,6 +119,49 @@ var isWikidataPrefix = function(yashe,token){
     return false;
 }
 
+var getEntity = function(entity,endpoint){
+  GET_ENTITY_QUERY.ids = entity;
+  return $.get({
+      url: endpoint+'api.php?'+$.param(GET_ENTITY_QUERY),
+      dataType: 'jsonp',
+  });
+}
+
+var getEntityData = function(element,data){
+  var userLang;
+  var content;
+  var entityData = {title:'',description:''}
+  if(!data.error){
+    //Gets the preference languaje from the navigator
+    userLang = (navigator.language || navigator.userLanguage).split("-")[0]
+
+    content = data.entities[element.toUpperCase()]
+
+    //Check if the property/entity exist
+    if(!content.labels)return;
+
+    //Some properties and entities are only avalible in English
+    if(content.labels[userLang] && content.descriptions[userLang]){
+
+      entityData.title = content.labels[userLang].value +' ('+element+')'
+      entityData.description = content.descriptions[userLang].value
+
+    }else{ //English by default
+
+        let lb = content.labels['en'];
+        let desc = content.descriptions['en'];
+        if(lb){
+          entityData.title = lb.value +' ('+element+')';
+        }
+        if(desc){
+          entityData.description = desc.value
+        }
+
+    }
+  }
+  return entityData;
+}
+
 
 module.exports = {
 
@@ -123,6 +170,8 @@ module.exports = {
     getEndPoint:getEndPoint,
     isWikidataPrefix:isWikidataPrefix,
     isWikidataEntitiesPrefix:isWikidataEntitiesPrefix,
-    isWikidataPropertiesPrefix:isWikidataPropertiesPrefix
+    isWikidataPropertiesPrefix:isWikidataPropertiesPrefix,
+    getEntity:getEntity,
+    getEntityData:getEntityData
 
 }