Bladeren bron

[bugfix][Fix #49] Overflow

B Thibault 8 jaren geleden
bovenliggende
commit
ee6a2630d4
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      cli/msgFormatter.js
  2. 1 1
      srv/public/slack.min.js

+ 1 - 1
cli/msgFormatter.js

@@ -98,7 +98,7 @@ function formatText(fullText) {
             if (c === '<') {
                 do {
                     _msgContent += msgContent[i++];
-                } while (msgContent[i -1] !== '>');
+                } while (msgContent[i -1] !== '>' && msgContent[i]);
                 i--;
                 continue;
             }

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

@@ -13,7 +13,7 @@ ma;b.appendChild(e);b.b.className=M;b.b.textContent=K.G;b.b.addEventListener("cl
 function ia(a){var b=document.createElement("div");b.className=qa;b.addEventListener("click",function(){N(this,!1)}.bind(a));return b}function ra(a,b,c){a.i.a.textContent=b;a.i.b.textContent=c;return a}L.prototype.D=function(a){a=a||document.body;a.appendChild(this.b);a.appendChild(this.i);return this};L.prototype.close=function(){this.i.remove();this.b.remove();return this};function sa(a,b){a.a.push(b);return a};var M="button",na="button-container",pa="dialog",qa="dialog-overlay",ja="dialog-title",ka="dialog-title-label",la="dialog-title-close",ma="dialog-body",oa="dialog-footer";function ta(a){return a.replace(/:([^ \t:]+):/g,function(b,c){var d=ua(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 O(a){if(!a||""==a)return"";a=a.split(/\r?\n/g);for(var b=0,c=a.length;b<c;b++){for(var d=a[b].trim(),f="",e={},h=!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=F.a.a[c[0]],c[1]=a?"@"+a.name:K.N),c[0]="#"+c[0],c[2]="slackmsg-link slackmsg-link-user";else if("#"===b)c[1]?"#"!==c[1][0]&&(c[1]="#"+c[1]):(a=F.a.f[c[0]],c[1]=a?"#"+a.name:K.M),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=ta(d),k=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},q=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<k&&(" "===d[g]||"\t"===d[g]);)g++;"&gt;"===d.substr(g,4)&&(h=!0,g+=4);for(;g<k;g++){var m=d[g];if("<"===m){do f+=d[g++];while(">"!==d[g-1]);g--}else if(!e["slackmsg-style-bold"]&&"*"===m&&d[g+1]&&l(d,g,m))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-bold"]=!0,f+=q(e);else if(!e["slackmsg-style-strike"]&&"~"===m&&d[g+1]&&l(d,g,m))Object.keys(e).length&&
+a[b]!=c&&a[b+1]==c)return!0;b++}return!1},q=function(a){return Object.keys(e).length?'<span class="'+Object.keys(a).join(" ")+'">':""};g<k&&(" "===d[g]||"\t"===d[g]);)g++;"&gt;"===d.substr(g,4)&&(h=!0,g+=4);for(;g<k;g++){var m=d[g];if("<"===m){do f+=d[g++];while(">"!==d[g-1]&&d[g]);g--}else if(!e["slackmsg-style-bold"]&&"*"===m&&d[g+1]&&l(d,g,m))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-bold"]=!0,f+=q(e);else if(!e["slackmsg-style-strike"]&&"~"===m&&d[g+1]&&l(d,g,m))Object.keys(e).length&&
 (f+="</span>"),e["slackmsg-style-strike"]=!0,f+=q(e);else if(!e["slackmsg-style-code"]&&"`"===m&&d[g+1]&&l(d,g,m))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-code"]=!0,f+=q(e);else if(!e["slackmsg-style-italic"]&&"_"===m&&d[g+1]&&l(d,g,m))Object.keys(e).length&&(f+="</span>"),e["slackmsg-style-italic"]=!0,f+=q(e);else{var p=!1,f=f+m;do{if(e["slackmsg-style-bold"]&&"*"!==m&&"*"===d[g+1])delete e["slackmsg-style-bold"],p=!0;else if(e["slackmsg-style-strike"]&&"~"!==m&&"~"===d[g+1])delete e["slackmsg-style-strike"],
 p=!0;else if(e["slackmsg-style-code"]&&"`"!==m&&"`"===d[g+1])delete e["slackmsg-style-code"],p=!0;else if(e["slackmsg-style-italic"]&&"_"!==m&&"_"===d[g+1])delete e["slackmsg-style-italic"],p=!0;else break;m=d[++g]}while(g<k);p&&(f+="</span>"+q(e))}}va(e)||(console.warn("formatter warning"),f+="</span>");a[b]=h?'<span class="slackmsg-style-quote">'+f+"</span>":f}return a.length?a.join("<br/>"):""};var P=[],Q=0;
 function wa(){var a=document.createDocumentFragment(),b=Object.keys(F.a.f||{}),c=[],d=[],f=[],e=[];b.sort(function(a,b){return a[0]!==b[0]?a[0]-b[0]:F.a.f[a].name.localeCompare(F.a.f[b].name)});b.forEach(function(a){a=F.a.f[a];if(!a.h&&!1!==a.s)if(a instanceof x){if(!a.c.g){var b;b=document.createElement("li");var h=document.createElement("a");b.id="room_"+a.id;h.href="#"+a.id;b.className="slack-context-room slack-ims";h.textContent=a.c.name;b.appendChild(R());b.appendChild(h);a.c.c||b.classList.add("away");