From d6d65d5563cecf295b249154d1614f58ec5cd9a0 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 28 Nov 2008 16:29:40 +0000
Subject: [PATCH] Move "Waiting..." message to the end of the completion list

---
 content/completion.js |  4 ++--
 content/tabs.js       |  2 +-
 content/ui.js         | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/completion.js b/content/completion.js
index fddc786b..801bc33d 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -201,8 +201,8 @@ CompletionContext.prototype = {
         this.process = format.process || this.process;
     },
 
-    get message() this._message || (this.incomplete ? "Waiting..." : null),
-    set message(val) this._message = val,
+    //get message() this._message || (this.incomplete ? "Waiting..." : null),
+    //set message(val) this._message = val,
 
     get regenerate() this._generate && (!this.completions || !this.itemCache[this.key] || this.cache.offset != this.offset),
     set regenerate(val) { if (val) delete this.itemCache[this.key] },
diff --git a/content/tabs.js b/content/tabs.js
index d39b9268..7bd748fa 100644
--- a/content/tabs.js
+++ b/content/tabs.js
@@ -568,7 +568,7 @@ function Tabs() //{{{
                 if (/\btabopen\b/.test(options["activate"]))
                     activate = !activate;
 
-                for (let i in range(0, Math.max(1, args.count)))
+                for (let i in util.range(0, Math.max(1, args.count)))
                     tabs.cloneTab(tab, activate);
             },
             {
diff --git a/content/ui.js b/content/ui.js
index 79b42057..041fa072 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -1369,7 +1369,7 @@ function ItemList(id) //{{{
 
         items.contextList.forEach(function init_eachContext(context) {
             delete context.cache.nodes;
-            if (!context.items.length && !context.message)
+            if (!context.items.length && !context.message && !context.incomplete)
                 return;
             context.cache.nodes = [];
             dom(<div key="root">
@@ -1379,6 +1379,7 @@ function ItemList(id) //{{{
                     <div key="message" highlight="CompMsg" style="display: none"/>
                     <div key="up" highlight="CompLess"/>
                     <div key="items" highlight="Completions"/>
+                    <div key="waiting" highlight="CompMsg">Waiting...</div>
                     <div key="down" highlight="CompMore"/>
                 </div>, context.cache.nodes);
             divNodes.completions.appendChild(context.cache.nodes.root);
@@ -1418,14 +1419,13 @@ function ItemList(id) //{{{
                 return;
             haveCompletions = true;
 
-            nodes.message.style.display = "none";
             if (context.message)
-            {
-                nodes.up.style.display = "none";
-                nodes.down.style.display = "none";
                 nodes.message.textContent = context.message;
-                nodes.message.style.display = "block";
-            }
+            nodes.message.style.display = context.message ? "block" : "none";
+            nodes.waiting.style.display = context.incomplete ? "block" : "none";
+            nodes.up.style.display = "none";
+            nodes.down.style.display = "none";
+
             let root = nodes.root
             let items = nodes.items;
             let [start, end] = getRows(context);