wiki updated; closes #261

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 38104b5c417f64f0f4db31bca53afa4322a8c1fe..0b1bc0c4e6a2d1097a5f3ebd9a3df9badb6a0d6f 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -7,8 +7,9 @@
                                                                                                                        
 --]]
 
                                                                                                                        
 --]]
 

-local helpers      = require("lain.helpers")

 local first_line   = require("lain.helpers").first_line
 local first_line   = require("lain.helpers").first_line

+local make_widget  = require("lain.helpers").make_widget_textbox
+local newtimer     = require("lain.helpers").newtimer

 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")


@@ -19,6 +20,7 @@ local math         = { abs    = math.abs,
                        min    = math.min }
 local string       = { format = string.format }
 
                        min    = math.min }
 local string       = { format = string.format }
 

+local ipairs       = ipairs

 local type         = type
 local tonumber     = tonumber
 local setmetatable = setmetatable
 local type         = type
 local tonumber     = tonumber
 local setmetatable = setmetatable


@@ -27,7 +29,7 @@ local setmetatable = setmetatable
 -- lain.widgets.bat
 
 local function worker(args)
 -- lain.widgets.bat
 
 local function worker(args)

-    local bat       = helpers.make_widget_textbox()
+    local bat       = make_widget()

     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}


@@ -172,7 +174,7 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    helpers.newtimer(battery, timeout, bat.update)
+    newtimer(battery, timeout, bat.update)

 
     return bat
 end
 
     return bat
 end

diff --git a/wiki b/wiki
index 7ab4e0b101587030066c45f0b0a1950532bf8a98..bcf8a8d6050cb57415d8bfa4260ea7547bff0833 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 7ab4e0b101587030066c45f0b0a1950532bf8a98
+Subproject commit bcf8a8d6050cb57415d8bfa4260ea7547bff0833