Fix some zi/zo issues.

common/content/buffer.js

@@ -215,13 +215,7 @@ function Buffer() //{{{
 
     mappings.add(myModes, ["<C-c>"],
         "Stop loading",
-        function ()
+        function () { window.BrowserStop(); });
-        {
-            if(config.stop)
-                config.stop();
-            else
-                window.BrowserStop();
-        });
 
     // scrolling
     mappings.add(myModes, ["j", "<Down>", "<C-e>"],
@@ -603,17 +597,7 @@ function Buffer() //{{{
 
     commands.add(["st[op]"],
         "Stop loading",
-<<<<<<< HEAD:common/content/buffer.js
-        function ()
-        {
-            if (config.stop)
-                config.stop();
-            else
-                window.BrowserStop();
-        },
-=======
         function () { window.BrowserStop(); },
->>>>>>> a9f04ee3d00b282e7a91b37eb23168fb39e9de5b:common/content/buffer.js
         { argCount: "0" });
 
     commands.add(["vie[wsource]"],

common/content/events.js

@@ -1222,8 +1222,32 @@ function Events() //{{{
                     return;
                 }
 
-                if (config.focusChange())
+                if (config.name == "Muttator")
-                    return void config.focusChange(win);
+                {
+                    // we switch to -- MESSAGE -- mode for Muttator, when the main HTML widget gets focus
+                    if (hasHTMLDocument(win) || elem instanceof HTMLAnchorElement)
+                    {
+                        if (config.isComposeWindow)
+                        {
+                            //liberator.dump("Compose editor got focus");
+                            modes.set(modes.INSERT, modes.TEXTAREA);
+                        }
+                        else if (liberator.mode != modes.MESSAGE)
+                            liberator.mode = modes.MESSAGE;
+                        return;
+                    }
+                }
+
+                if (config.name == "Xulmus")
+                {
+                    // Switch to -- PLAYER -- mode for Songbird Media Player.
+                    if (config.isPlayerWindow)
+                        liberator.mode = modes.PLAYER;
+                    else
+                        liberator.mode =  modes.NORMAL;
+                    return;
+                }
+
 
                 urlbar = document.getElementById("urlbar");
                 if (elem == null && urlbar && urlbar.inputField == lastFocus)

common/content/tabs.js

@@ -109,14 +109,17 @@ function Tabs() //{{{
     // hide tabs initially
     if (config.name == "Vimperator")
         getBrowser().mStrip.getElementsByClassName("tabbrowser-tabs")[0].collapsed = true;
-
+/*
+    if (config.name == "Xulmus")
+        getBrowser()._strip.getElementsByClassName(
+*/
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// OPTIONS /////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
     options.add(["showtabline", "stal"],
         "Control when to show the tab bar of opened web pages",
-        "number", config.optionDefaults['stal'],
+        "number", config.name == "Vimperator" ? 2 : 0,
         {
             setter: function (value)
             {
@@ -148,7 +151,7 @@ function Tabs() //{{{
             validator: Option.validateCompleter
         });
 
-    if (config.hasTabbrowser)
+    if (config.name == "Vimperator" || config.name == "Xulmus")
     {
         options.add(["activate", "act"],
             "Define when tabs are automatically activated",
@@ -238,7 +241,7 @@ function Tabs() //{{{
         function (count) { tabs.select("-" + (count < 1 ? 1 : count), true); },
         { flags: Mappings.flags.COUNT });
 
-    if (config.hasTabbrowser)
+    if (config.name == "Vimperator" || config.name == "Xulmus")
     {
         mappings.add([modes.NORMAL], ["b"],
             "Open a prompt to switch buffers",
@@ -449,7 +452,7 @@ function Tabs() //{{{
         function () { tabs.select(0, false); },
         { argCount: "0" });
 
-    if (config.hasTabbrowser)
+    if (config.name == "Vimperator" || config.name == "Xulmus")
     {
         // TODO: "Zero count" if 0 specified as arg, multiple args and count ranges?
         commands.add(["b[uffer]"],
@@ -584,7 +587,6 @@ function Tabs() //{{{
             });
     }
 
-    /* Why not xulmus? */
     if (liberator.has("session") && config.name != "Xulmus")
     {
         // TODO: extract common functionality of "undoall"

common/content/ui.js

@@ -2105,23 +2105,21 @@ function StatusLine() //{{{
             }
 
             // when session information is available, add [+] when we can go backwards
-            let modified = "";
+            if (config.name == "Vimperator")
-            if (window.getWebNavigation)
             {
                 let sh = window.getWebNavigation().sessionHistory;
+                let modified = "";
                 if (sh.index > 0)
                     modified += "+";
                 if (sh.index < sh.count -1)
                     modified += "-";
-            }
-            if (liberator.has("bookmarks")) {
                 if (bookmarks.isBookmarked(buffer.URL))
                     modified += "\u2764"; // a heart symbol: ❤
                     //modified += "\u2665"; // a heart symbol: ♥
-            }
 
-            if (modified)
+                if (modified)
-                url += " [" + modified + "]";
+                    url += " [" + modified + "]";
+            }
 
             urlWidget.value = url;
         },

muttator/content/config.js

@@ -102,17 +102,6 @@ const config = { //{{{
             function () { buffer.viewSelectionSource(); }]*/
     ],
 
-    focusChange: function(win) {
-        // we switch to -- MESSAGE -- mode for Muttator, when the main HTML widget gets focus
-        if (hasHTMLDocument(win) || elem instanceof HTMLAnchorElement)
-        {
-            if (config.isComposeWindow)
-                modes.set(modes.INSERT, modes.TEXTAREA);
-            else if (liberator.mode != modes.MESSAGE)
-                liberator.mode = modes.MESSAGE;
-        }
-    },
-
     // they are sorted by relevance, not alphabetically
     helpFiles: ["intro.html", "version.html"],
      /* "tutorial.html", "starting.html",
@@ -122,10 +111,6 @@ const config = { //{{{
         "various.html"
         ],*/
 
-    optionDefaults: {
-        stal: 2,
-    },
-
     scripts: [
         "addressbook.js",
         "mail.js",

vimperator/content/config.js

@@ -110,8 +110,6 @@ const config = { //{{{
             function () { buffer.viewSelectionSource(); }]
     ],
 
-    hasTabbrowser: true,
-
     // they are sorted by relevance, not alphabetically
     helpFiles: [
         "intro.html", "tutorial.html", "starting.html", "browsing.html",
@@ -122,10 +120,6 @@ const config = { //{{{
         "various.html", "index.html", "version.html"
     ],
 
-    optionDefaults: {
-        stal: 0,
-    },
-
     scripts: [
         "bookmarks.js",
         "tabs.js",

xulmus/content/config.js

@@ -138,16 +138,6 @@ const config = { //{{{
             function () { SBSubscribe(); }]
     ],
 
-    focusChange: function() {
-        // Switch to -- PLAYER -- mode for Songbird Media Player.
-        if (config.isPlayerWindow)
-            liberator.mode = modes.PLAYER;
-        else
-            liberator.mode = modes.NORMAL;
-    },
-
-    hasTabbrowser: true,
-
     //TODO : Write intro.html and tutorial.html
     // they are sorted by relevance, not alphabetically
     helpFiles: [
@@ -159,20 +149,12 @@ const config = { //{{{
         "developer.html", "various.html", "index.html", "version.html"
     ],
 
-    optionDefaults: {
-        stal: 0,
-    },
-
     scripts: [
         "bookmarks.js",
         "tabs.js",
         "player.js",
     ],
 
-    stop: function() {
-        getBrowser().mCurrentBrowser.stop();
-    },
-
     init: function ()
     {
         //Adding a mode for Player