refactoring statusline.js

 * new class StatusField
 * each fields to be StatusField instance
 * add fields easily from a plugin

Author: teramako

common/content/bookmarks.js

@@ -151,14 +151,14 @@ const Bookmarks = Module("bookmarks", {
                         if (self.isBookmark(itemId)) {
                             let bmark = loadBookmark(readBookmark(itemId));
                             storage.fireEvent(name, "add", bmark);
-                            statusline.updateBookmark();
+                            statusline.updateField("bookmark");
                         }
                     }
                 },
                 onItemRemoved: function onItemRemoved(itemId, folder, index) {
                     if (deleteBookmark(itemId)) {
                         storage.fireEvent(name, "remove", itemId);
-                        statusline.updateBookmark();
+                        statusline.updateField("bookmark");
                     }
                 },
                 onItemChanged: function onItemChanged(itemId, property, isAnnotation, value) {

common/content/buffer.js

@@ -161,7 +161,7 @@ const Buffer = Module("buffer", {
 
     // called when the active document is scrolled
     _updateBufferPosition: function _updateBufferPosition() {
-        statusline.updateBufferPosition();
+        statusline.updateField("position");
         // modes.show();
     },
 
@@ -254,9 +254,9 @@ const Buffer = Module("buffer", {
         // happens when the users switches tabs
         onLocationChange: function onLocationChange() {
             onLocationChange.superapply(this, arguments);
-            statusline.updateUrl();
-            statusline.updateBookmark();
-            statusline.updateHistory();
+            statusline.updateField("location");
+            statusline.updateField("bookmark");
+            statusline.updateField("history");
 
             // This is a bit scary but we trigger ignore mode when the new URL is in the list
             // of pages with ignored keys and then exit it on a new page but ONLY, if:
@@ -273,7 +273,7 @@ const Buffer = Module("buffer", {
             autocommands.trigger("LocationChange", { url: buffer.URL });
 
             // if this is not delayed we get the position of the old buffer
-            setTimeout(function () { statusline.updateBufferPosition(); }, 250);
+            setTimeout(function () { statusline.updateField("position"); }, 250);
         },
         // called at the very end of a page load
         asyncUpdateUI: function asyncUpdateUI() {
@@ -284,17 +284,17 @@ const Buffer = Module("buffer", {
             let ssli = options["showstatuslinks"];
             if (link && ssli) {
                 if (ssli == 1) {
-                    statusline.updateUrl("Link: " + link);
-                    statusline.updateBookmark(link);
+                    statusline.updateField("location", "Link: " + link);
+                    statusline.updateField("bookmark", link);
                 }
                 else if (ssli == 2)
                     liberator.echo("Link: " + link, commandline.DISALLOW_MULTILINE);
             }
 
             if (link == "") {
                 if (ssli == 1) {
-                    statusline.updateUrl();
-                    statusline.updateBookmark();
+                    statusline.updateField("location");
+                    statusline.updateField("bookmark");
                 }
                 else if (ssli == 2)
                     modes.show();

common/content/events.js

@@ -1061,7 +1061,7 @@ const Events = Module("events", {
         finally {
             let motionMap = (this._input.pendingMotionMap && this._input.pendingMotionMap.names[0]) || "";
             if (!(modes.extended & modes.HINTS))
-                statusline.updateInputBuffer(motionMap + this._input.buffer);
+                statusline.updateField("input", motionMap + this._input.buffer);
         }
     },
 

common/content/hints.js

@@ -82,7 +82,7 @@ const Hints = Module("hints", {
      * Reset hints, so that they can be cleanly used again.
      */
     _reset: function () {
-        statusline.updateInputBuffer("");
+        statusline.updateField("input", "");
         this._hintString = "";
         this._hintNumber = 0;
         this._usedTabKey = false;
@@ -103,7 +103,7 @@ const Hints = Module("hints", {
      * Display the current status to the user.
      */
     _updateStatusline: function () {
-        statusline.updateInputBuffer((hints.escNumbers ? mappings.getMapLeader() : "") + (this._hintNumber ? this._num2chars(this._hintNumber) : ""));
+        statusline.updateField("input", (hints.escNumbers ? mappings.getMapLeader() : "") + (this._hintNumber ? this._num2chars(this._hintNumber) : ""));
     },
 
     /**

common/content/liberator.xul

@@ -87,8 +87,14 @@
                     <toolbaritem id="liberator-message-toolbar" flex="1">
                         <label class="plain" collapsed="false" id="liberator-message" flex="1" crop="end" liberator:highlight="Normal"/>
                     </toolbaritem>
-                    <toolbaritem id="liberator-status-toolbar" flex="10000000" >
-                        <label flex="1" class="plain" id="liberator-status" crop="center" style="text-align: end;" liberator:highlight="StatusLine"/>
+                    <toolbaritem id="liberator-status" flex="10000000" liberator:highlight="StatusLine">
+                        <spacer liberatorPosition="-1" flex="10000000"/>
+                        <label id="liberator-status-input"/>
+                        <label id="liberator-status-location" flex="1" crop="center"/>
+                        <label id="liberator-status-history"/>
+                        <label id="liberator-status-bookmark"/>
+                        <label id="liberator-status-tabcount"/>
+                        <label id="liberator-status-position"/>
                     </toolbaritem>
                 </toolbar>
                 <hbox id="liberator-commandline" class="liberator-container" liberator:highlight="CmdLine">