ソースを参照

[bugfix] command list

B Thibault 8 年 前
コミット
c44a0e4959
2 ファイル変更6 行追加6 行削除
  1. 3 3
      cli/msgInput.js
  2. 3 3
      srv/public/mimouchat.min.js

+ 3 - 3
cli/msgInput.js

@@ -132,10 +132,10 @@ function autoComplete(inputDom) {
                 (inputFinished && currentCmd.name === inputCmd))
                 commands.push(currentCmd);
         }
+        commands.sort(function(a, b) {
+            return a.category.localeCompare(b.category) || a.name.localeCompare(b.name);
+        });
     }
-    commands.sort(function(a, b) {
-        return a.category.localeCompare(b.category) || a.name.localeCompare(b.name);
-    });
     slashDom.textContent = '';
     if (commands.length) {
         var slashFrag = document.createDocumentFragment(),

+ 3 - 3
srv/public/mimouchat.min.js

@@ -36,11 +36,11 @@ function Wa(a,b){var c=document.createElement("li"),d=document.createElement("sp
 return c}
 function Xa(a){var b,c=document.getElementById("slashList");c.dataset.cursor&&delete c.dataset.cursor;var d=[],e=a.value;if(a.selectionStart===a.selectionEnd&&a.selectionStart){for(var f=a.selectionStart,g=a.selectionEnd;f&&" "!==e[f-1];f--);for(b=e.length;g<b&&" "!==e[g];g++);if(f!==g&&0<g-f-1){if("#"===e[f]){var h=O.l;b=e.substr(f+1,g-f-1);for(var k in h)h[k].name.length>=b.length&&h[k].name.substr(0,b.length)===b&&d.push(h[k])}else if("@"===e[f])for(k in h=P instanceof t?O.i:P.i,b=e.substr(f+1,
 g-f-1),h){var m=h[k].getName();m.length>=b.length&&m.substr(0,b.length)===b&&d.push(h[k])}else if(":"===e[f]&&window.searchEmojis){b=e.substr(f+1,g-f-1);m=window.searchEmojis(b);for(h in m){var m=window.makeEmoji(h,!1),n=document.createElement("span");n.appendChild(m);n.className="emoji-small";d.push({name:":"+h+":",ya:n,la:Ya.name})}for(k in O.b.data)k.length>=b.length&&k.substr(0,b.length)===b&&(h=document.createElement("span"),h.className="emoji-small",h.appendChild(Za(k)),d.push({name:":"+k+":",
-ya:h,la:"custom"}))}d.length&&(c.dataset.cursor=JSON.stringify([f,g]))}}if(!d.length&&"/"===e[0]){k=e.indexOf(" ");f=-1!==k;k=-1===k?e.length:k;b=e.substr(0,k);f?(a=$a.Ua(b))&&d.push(a):(d=$a.nb(b),c.dataset.cursor=JSON.stringify([0,a.selectionEnd]));a=O?O.h.data:{};for(var l in a)e=a[l],(!f&&e.name.substr(0,k)===b||f&&e.name===b)&&d.push(e)}d.sort(function(a,b){return a.V.localeCompare(b.V)||a.name.localeCompare(b.name)});c.textContent="";if(d.length){l=document.createDocumentFragment();k=0;for(a=
+ya:h,la:"custom"}))}d.length&&(c.dataset.cursor=JSON.stringify([f,g]))}}if(!d.length&&"/"===e[0]){k=e.indexOf(" ");f=-1!==k;k=-1===k?e.length:k;b=e.substr(0,k);f?(a=$a.Ua(b))&&d.push(a):(d=$a.nb(b),c.dataset.cursor=JSON.stringify([0,a.selectionEnd]));a=O?O.h.data:{};for(var l in a)e=a[l],(!f&&e.name.substr(0,k)===b||f&&e.name===b)&&d.push(e);d.sort(function(a,b){return a.V.localeCompare(b.V)||a.name.localeCompare(b.name)})}c.textContent="";if(d.length){l=document.createDocumentFragment();k=0;for(a=
 d.length;k<a;k++)if(e=d[k],e instanceof ga){if(!p){var p=!0;l.appendChild(Va(J.ka))}b=document.createElement("span");b.className="chat-command-userIcon";b.style.backgroundImage='url("'+pa(e)+'")';l.appendChild(Wa("@"+e.getName(),b))}else e instanceof v?(p||(p=!0,l.appendChild(Va(J.l))),l.appendChild(Wa("#"+e.name))):e.ya?(p!==e.la&&(p=e.la,l.appendChild(Va(e.la))),l.appendChild(Wa(e.name,e.ya))):(p!==e.V&&(p=e.V,l.appendChild(Va(e.V))),l.appendChild(Wa(e)));c.appendChild(l)}}
 function Q(){document.getElementById("msgInput").focus()}
-function ab(){var a=0,b=document.getElementById("msgInput");b.addEventListener("input",function(){if(P){var b=Date.now();a+3E3<b&&(O.self.L||P instanceof t)&&(N(new M("POST","api/typing?room="+P.id)),a=b);Xa(this)}});b.addEventListener("keydown",function(a){if(9===a.keyCode)return a.preventDefault(),console.log("COUGHT"),!1});document.getElementById("slashList").addEventListener("click",function(a){if(P){var b=a.target;if(a=this.dataset.cursor)for(a=JSON.parse(a);b&&b!==this;){if(b.dataset.input){var c=
-document.getElementById("msgInput"),b=b.dataset.input;c.value.length<=a[1]&&(b+=" ");c.value=c.value.substr(0,a[0])+b+c.value.substr(a[1]);c.selectionStart=c.selectionEnd=a[0]+b.length;Xa(c);c.focus();break}b=b.parentElement}}})};var bb=[],cb=0;
+function ab(){var a=0,b=document.getElementById("msgInput");b.addEventListener("input",function(){if(P){var b=Date.now();a+3E3<b&&(O.self.L||P instanceof t)&&(N(new M("POST","api/typing?room="+P.id)),a=b);Xa(this)}});b.addEventListener("keydown",function(a){if(9===a.keyCode)return a.preventDefault(),!1});document.getElementById("slashList").addEventListener("click",function(a){if(P){var b=a.target;if(a=this.dataset.cursor)for(a=JSON.parse(a);b&&b!==this;){if(b.dataset.input){var c=document.getElementById("msgInput"),
+b=b.dataset.input;c.value.length<=a[1]&&(b+=" ");c.value=c.value.substr(0,a[0])+b+c.value.substr(a[1]);c.selectionStart=c.selectionEnd=a[0]+b.length;Xa(c);c.focus();break}b=b.parentElement}}})};var bb=[],cb=0;
 function db(){var a=document.createDocumentFragment(),b=wa(function(a){return!a.fa&&!1!==a.ba}),c=[],d=[],e=[],f=[],g={};b.sort(function(a,b){if(a[0]!==b[0])return a[0]-b[0];var c=D(C.context,a),d=D(C.context,b);a=c.l[a];b=d.l[b];return a.name===b.name?(g[a.id]=J.xa(c.a.name,a.name),g[b.id]=J.xa(d.a.name,b.name),c.a.name.localeCompare(d.a.name)):a.name.localeCompare(b.name)});b.forEach(function(a){a=va(a);if(a instanceof t){var b;if(b=!a.a.Ra){var h=g[a.id];b=document.createElement("li");var n=document.createElement("a");
 b.id="room_"+a.id;n.href="#"+a.id;b.className="chat-context-room chat-ims presence-indicator";n.textContent=h||a.a.getName();b.appendChild(eb());b.appendChild(n);a.a.L||b.classList.add("presence-away");P===a&&b.classList.add("selected");a.R>a.C&&(b.classList.add("unread"),b.classList.add("unreadHi"));b=h=b}b&&(a.A?c.push(h):f.push(h))}else if(h=g[a.id],b=document.createElement("li"),n=document.createElement("a"),b.id="room_"+a.id,n.href="#"+a.id,a.h?(b.className="chat-context-room chat-group",b.dataset.count=
 Object.keys(a.i||{}).length):b.className="chat-context-room chat-channel",P===a&&b.classList.add("selected"),n.textContent=h||a.name,b.appendChild(eb()),b.appendChild(n),a.R>a.C&&(b.classList.add("unread"),0<=R.indexOf(a)&&b.classList.add("unreadHi")),h=b)a.A?c.push(h):a.h?e.push(h):d.push(h)});c.length&&a.appendChild(fb(J.A));c.forEach(function(b){a.appendChild(b)});d.length&&a.appendChild(fb(J.l));d.forEach(function(b){a.appendChild(b)});e.forEach(function(b){a.appendChild(b)});f.length&&a.appendChild(fb(J.eb));