Pārlūkot izejas kodu

[bugfix] shrug should not be italic

B Thibault 8 gadi atpakaļ
vecāks
revīzija
4ecf487299
2 mainītis faili ar 12 papildinājumiem un 6 dzēšanām
  1. 8 2
      cli/ui.js
  2. 4 4
      srv/public/slack.min.js

+ 8 - 2
cli/ui.js

@@ -408,9 +408,15 @@ function formatSlackText(fullText) {
             });
         msgContent = formatEmojis(msgContent);
         var msgLength = msgContent.length;
-        var checkEnd = function(str, pos, c) {
+        var isAlphadec = function(c) {
+            return ((c >= 'A' && c <= 'Z') ||
+                (c >= 'a' && c <= 'z') ||
+                (c >= '0' && c <= '9') ||
+                "àèìòùÀÈÌÒÙáéíóúýÁÉÍÓÚÝâêîôûÂÊÎÔÛãñõÃÑÕäëïöüÿÄËÏÖÜŸçÇߨøÅ寿œ".indexOf(c) !== -1);
+        }
+        ,checkEnd = function(str, pos, c) {
             while (str[pos]) {
-                if (str[pos] != ' ' && str[pos] != c && str[pos +1] == c) {
+                if (isAlphadec(str[pos]) && str[pos] != c && str[pos +1] == c) {
                     return true;
                 }
                 pos++;

+ 4 - 4
srv/public/slack.min.js

@@ -20,10 +20,10 @@ a.footer_icon:l.classList.add("hidden")):(l.classList.add("hidden"),q.classList.
 function Q(a){a:{for(var b=a,c={};!c[b];){if(a=C.a.c[b])if("alias:"==a.substr(0,6))c[b]=!0,b=a.substr(6);else{b=document.createElement("span");b.className="emoji-custom emoji";b.style.backgroundImage="url('"+a+"')";a=b;break a}break}a=b}"string"===typeof a&&"makeEmoji"in window&&(a=window.makeEmoji(a));return"string"===typeof a?null:a}
 function qa(a){return a.replace(/:([^ \t:]+):/g,function(b,c){var d=Q(c);if(d){var f=document.createElement("span");f.className=b===a?"emoji-medium":"emoji-small";f.appendChild(d);return f.outerHTML}return b})}
 function T(a){a=a.split(/\r?\n/g);for(var b=0,c=a.length;b<c;b++){for(var d=a[b].trim(),f="",e={},m=!1,g=0,d=d.replace(RegExp("<([@#]?)([^>]*)>","g"),function(a,b,c){c=c.split("|");if("@"===b)c[1]?"@"!==c[1][0]&&(c[1]="@"+c[1]):(a=t(C.a,c[0]),c[1]=a?"@"+a.name:F.H),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-user";else if("#"===b)c[1]?"#"!==c[1][0]&&(c[1]="#"+c[1]):(a=y(C.a,c[0]),c[1]=a?"#"+a.name:F.G),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-chan";else if(-1!==c[0].indexOf("://"))c[1]||
-(c[1]=c[0]),c[2]="slackmsg-link";else return a;return'<a href="'+c[0]+'" class="'+c[2]+'"'+(b?"":' target="_blank"')+">"+c[1]+"</a>"}),d=qa(d),h=d.length,l=function(a,b,c){for(;a[b];){if(" "!=a[b]&&a[b]!=c&&a[b+1]==c)return!0;b++}return!1},k=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<h&&(" "===d[g]||"\t"===d[g]);)g++;"&gt;"===d.substr(g,4)&&(m=!0,g+=4);for(;g<h;g++){var p=d[g];if("<"===p){do f+=d[g++];while(">"!==d[g-1]);g--}else if(!e["slackmsg-style-bold"]&&
-"*"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-bold"]=!0,f+=k(e);else if(!e["slackmsg-style-strike"]&&"~"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-strike"]=!0,f+=k(e);else if(!e["slackmsg-style-code"]&&"`"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-code"]=!0,f+=k(e);else if(!e["slackmsg-style-italic"]&&"_"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-italic"]=
-!0,f+=k(e);else{var q=!1,f=f+p;do{if(e["slackmsg-style-bold"]&&"*"!==p&&"*"===d[g+1])delete e["slackmsg-style-bold"],q=!0;else if(e["slackmsg-style-strike"]&&"~"!==p&&"~"===d[g+1])delete e["slackmsg-style-strike"],q=!0;else if(e["slackmsg-style-code"]&&"`"!==p&&"`"===d[g+1])delete e["slackmsg-style-code"],q=!0;else if(e["slackmsg-style-italic"]&&"_"!==p&&"_"===d[g+1])delete e["slackmsg-style-italic"],q=!0;else break;p=d[++g]}while(g<h);q&&(f+="</span>"+k(e))}}e&&(f+="</span>");a[b]=m?'<span class="slackmsg-style-quote">'+
-f+"</span>":f}return a.join("<br/>")}function O(a,b,c){b.l?(a=S(a,b,c),a.classList.add("slackmsg-me_message")):a=S(a,b,c);b.i&&a.classList.add("slackmsg-edited");return a}
+(c[1]=c[0]),c[2]="slackmsg-link";else return a;return'<a href="'+c[0]+'" class="'+c[2]+'"'+(b?"":' target="_blank"')+">"+c[1]+"</a>"}),d=qa(d),h=d.length,l=function(a,b,c){for(;a[b];){var d=a[b];if(("A"<=d&&"Z">=d||"a"<=d&&"z">=d||"0"<=d&&"9">=d||-1!=="\u00e0\u00e8\u00ec\u00f2\u00f9\u00c0\u00c8\u00cc\u00d2\u00d9\u00e1\u00e9\u00ed\u00f3\u00fa\u00fd\u00c1\u00c9\u00cd\u00d3\u00da\u00dd\u00e2\u00ea\u00ee\u00f4\u00fb\u00c2\u00ca\u00ce\u00d4\u00db\u00e3\u00f1\u00f5\u00c3\u00d1\u00d5\u00e4\u00eb\u00ef\u00f6\u00fc\u00ff\u00c4\u00cb\u00cf\u00d6\u00dc\u0178\u00e7\u00c7\u00df\u00d8\u00f8\u00c5\u00e5\u00c6\u00e6\u0153".indexOf(d))&&
+a[b]!=c&&a[b+1]==c)return!0;b++}return!1},k=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<h&&(" "===d[g]||"\t"===d[g]);)g++;"&gt;"===d.substr(g,4)&&(m=!0,g+=4);for(;g<h;g++){var p=d[g];if("<"===p){do f+=d[g++];while(">"!==d[g-1]);g--}else if(!e["slackmsg-style-bold"]&&"*"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-bold"]=!0,f+=k(e);else if(!e["slackmsg-style-strike"]&&"~"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&
+(f+="</span>"),e["slackmsg-style-strike"]=!0,f+=k(e);else if(!e["slackmsg-style-code"]&&"`"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-code"]=!0,f+=k(e);else if(!e["slackmsg-style-italic"]&&"_"===p&&d[g+1]&&l(d,g,p))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-italic"]=!0,f+=k(e);else{var q=!1,f=f+p;do{if(e["slackmsg-style-bold"]&&"*"!==p&&"*"===d[g+1])delete e["slackmsg-style-bold"],q=!0;else if(e["slackmsg-style-strike"]&&"~"!==p&&"~"===d[g+1])delete e["slackmsg-style-strike"],
+q=!0;else if(e["slackmsg-style-code"]&&"`"!==p&&"`"===d[g+1])delete e["slackmsg-style-code"],q=!0;else if(e["slackmsg-style-italic"]&&"_"!==p&&"_"===d[g+1])delete e["slackmsg-style-italic"],q=!0;else break;p=d[++g]}while(g<h);q&&(f+="</span>"+k(e))}}e&&(f+="</span>");a[b]=m?'<span class="slackmsg-style-quote">'+f+"</span>":f}return a.join("<br/>")}function O(a,b,c){b.l?(a=S(a,b,c),a.classList.add("slackmsg-me_message")):a=S(a,b,c);b.i&&a.classList.add("slackmsg-edited");return a}
 function L(){var a=0,b=0,c="";if(U)c="!"+F.B+" - ",document.getElementById("linkFavicon").href="favicon_err.png";else{for(var d in V)V.hasOwnProperty(d)&&(a+=V[d].w,b+=V[d].o);b?c="(!"+b+") - ":a&&(c="("+a+") - ");document.getElementById("linkFavicon").href=b||a?"favicon.png?h="+b+"&m="+a:"favicon_ok.png"}c+=C.a.f.name;document.title=c}
 function ra(){if("Notification"in window)if("granted"===Notification.permission){var a=Date.now();if(I+3E4<a){var b=new Notification(F.C);I=a;setTimeout(function(){b.close()},5E3)}}else"denied"!==Notification.permission&&Notification.requestPermission()}
 function W(){var a=document.createDocumentFragment(),b=D.id;C.b[b]&&C.b[b].a.forEach(function(c){c.f||(c=O(b,c),a.appendChild(c))});var c=document.getElementById("chatWindow");c.textContent="";c.appendChild(a);c.scrollTop=c.scrollHeight-c.clientHeight}