Merge branch 'develop' into downloads

Conflicts:
	config/webview.lua

Makefile

@@ -59,8 +59,6 @@ install:
 	install -m644 README.md AUTHORS COPYING* $(DOCDIR)
 	cp -r lib/ $(INSTALLDIR)/share/luakit/
 	chmod -R 755 $(INSTALLDIR)/share/luakit/lib/
-	cp -r scripts/ $(INSTALLDIR)/share/luakit/
-	chmod -R 755 $(INSTALLDIR)/share/luakit/scripts/
 	install -D luakit $(INSTALLDIR)/bin/luakit
 	install -d $(DESTDIR)/etc/xdg/luakit/
 	install -D config/*.lua $(DESTDIR)/etc/xdg/luakit/

config/binds.lua

@@ -120,9 +120,6 @@ binds.mode_binds = {
         buf("^ZZ$",                     function (w) w:close_win() end),
         buf("^D$",                      function (w) w:close_win() end),
 
-        -- Link following
-        key({},          "f",           function (w) w:set_mode("follow") end),
-
         -- Bookmarking
         key({},          "B",           function (w) w:enter_cmd(":bookmark " .. ((w:get_current() or {}).uri or "http://") .. " ") end),
         buf("^gb$",                     function (w) w:navigate(bookmarks.dump_html()) end),

config/modes.lua

@@ -17,20 +17,22 @@ end
 window.init_funcs.modes_setup = function (w)
     -- Calls the `enter` and `leave` mode hooks.
     w.win:add_signal("mode-changed", function (_, mode)
-        -- Call the last modes `leave` hook.
-        if current and current.leave then
-            current.leave(w)
-        end
-
-        -- Update window binds
-        w:update_binds(mode)
+        local leave = (current or {}).leave
 
         -- Get new modes functions
         current = modes[mode]
+
+        -- Call the last modes `leave` hook.
+        if leave then leave(w) end
+
+        -- Check new mode
         if not current then
             error("changed to un-handled mode: " .. mode)
         end
 
+        -- Update window binds
+        w:update_binds(mode)
+
         -- Call new modes `enter` hook.
         if current.enter then current.enter(w) end
     end)
@@ -138,25 +140,3 @@ new_mode("search", {
         p:show()
     end,
 })
-
--- Setup follow mode
-new_mode("follow", {
-    enter = function (w)
-        local i, p = w.ibar.input, w.ibar.prompt
-        w:eval_js_from_file(lousy.util.find_data("scripts/follow.js"))
-        w:eval_js("clear(); show_hints();")
-        p.text = "Follow:"
-        p:show()
-        i.text = ""
-        i:show()
-        i:focus()
-        i:set_position(-1)
-    end,
-    leave = function (w)
-        if w.eval_js then w:eval_js("clear();") end
-    end,
-    changed = function (w, text)
-        local ret = w:eval_js(string.format("update(%q);", text))
-        w:emit_form_root_active_signal(ret)
-    end,
-})

config/rc.lua

@@ -31,6 +31,7 @@ require "webview"
 require "binds"
 
 -- Init scripts
+require "follow"
 require "formfiller"
 require "go_input"
 require "follow_selected"

config/webview.lua

@@ -171,7 +171,7 @@ webview.init_funcs = {
         -- 'link' contains the download link
         -- 'filename' contains the suggested filename (from server or webkit)
         view:add_signal("download-request", function (v, link, filename)
-            w.dbar:download(link, w.window)
+            w:download(link, w.window)
         end)
     end,
 

config/window.lua

@@ -526,6 +526,9 @@ window.methods = {
         w:update_buf()
     end,
 
+    -- Small wrapper to ease the use of the download bar
+    download = function (w, link) w.dbar:download(link) end,
+
     -- Tab label functions
     -- TODO: Move these functions into a module (I.e. lousy.widget.tablist)
     make_tab_label = function (w, pos)