title wikiBtn

weso · Aug 7, 2020 · 4ae7dfe · 4ae7dfe
1 parent 3223cdd
commit 4ae7dfe
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/dist/yashe.bundled.min.js b/dist/yashe.bundled.min.js
diff --git a/src/main.js b/src/main.js
@@ -220,7 +220,7 @@ const extendCmInstance = function(yashe) {
       prettyUtils.prettify(yashe);
       if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
     }else{
-
+      interact.showErrAlertMsg(yashe);
     }
   }
 
@@ -396,7 +396,9 @@ root.storeContent = function(yashe) {
 root.prettify = function(yashe){
   if(!yashe.hasErrors()){
     prettyUtils.prettify(yashe);   
-   // if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
+    if(yashe.hasErrors())yashe.undo(); //Just in case the prettify fail
+  }else{
+    interact.showErrAlertMsg(yashe);
   }
 }
 
@@ -406,10 +408,12 @@ root.prettify = function(yashe){
  * @return {string} Check result
  */
 const checkSyntax = function(yashe) {
-  return syntaxUtils.checkSyntax(yashe);
+  syntaxUtils.checkSyntax(yashe);
+  return syntaxUtils.reCheckSyntax(yashe);
 };
 
 
+
 // ---- Static Utils -----
 
 // first take all codeMirror references and store them in the YASHE object

diff --git a/src/utils/interactUtils.js b/src/utils/interactUtils.js
@@ -27,7 +27,7 @@ var startWikiFormat = function(yashe){
 var stopWikiFormat = function(yashe,history){
   yashe.wikiFormatInProgress = false;
   setTimeout(() => { //Just to wait until the last comment is setted
-    $('#wikiBtn').attr("title", "Add Wikidata Comments");
+    $('#wikiBtn').attr("title", "Generate Wikidata Comments");
     $('#wikiBtn').empty();
     $('#wikiBtn').removeClass("yashe_stopBtn");
     $('#wikiBtn').addClass("yashe_wikiBtnAfter");

diff --git a/src/utils/syntaxUtils.js b/src/utils/syntaxUtils.js
@@ -67,9 +67,6 @@ var checkSyntax = function(yashe) {
         yashe.setGutterMarker(l, "gutterErrorBar", warningEl);
 
 
-        //$('.CodeMirror-gutters').css('box-shadow','0px 0px 6px 1px #FFB5B5');
-        $('.CodeMirror-linenumber').css('color','#FF4A4A')
-      //  $('.CodeMirror-gutters').css('background',' #FFE3E3');
         yashe.queryValid = false;
         return false;
       }
@@ -103,8 +100,6 @@ var checkSyntax = function(yashe) {
 
     yashe.shapes = Object.assign([],yashe.defShapes);
 
-    $('.CodeMirror-gutters').css('box-shadow','none');
-    $('.CodeMirror-linenumber').css('color','#999') 
     yashe.prevQueryValid = yashe.queryValid;
     return true;
   };
@@ -225,6 +220,14 @@ var checkSyntax = function(yashe) {
       yashe.setGutterMarker(line, "gutterErrorBar", warningEl);
   }
 
+
+  var reCheckSyntax =  function(yashe){
+    setTimeout(() => {
+      checkSyntax(yashe);
+    }, 380);
+  }
+
   module.exports = {
-    checkSyntax:checkSyntax
+    checkSyntax:checkSyntax,
+    reCheckSyntax:reCheckSyntax
   };