Merge pull request #420 from sim590/unpack-lua51-compat

[etc/awesome.git] / widget / contrib / task.lua

diff --git a/widget/contrib/task.lua b/widget/contrib/task.lua
index 302642e974299e7b97403ce2c19bb2b30eeaabc4..536e0063087abd4b5152516dbbc218be735fd7ed 100644 (file)
--- a/widget/contrib/task.lua
+++ b/widget/contrib/task.lua
@@ -1,9 +1,8 @@
-

 --[[
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Jan Xie                         
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Jan Xie
+

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


@@ -11,7 +10,7 @@ local markup  = require("lain.util").markup
 local awful   = require("awful")
 local naughty = require("naughty")
 local mouse   = mouse
 local awful   = require("awful")
 local naughty = require("naughty")
 local mouse   = mouse

-local string  = { format = string.format, gsub = string.gsub }
+local string  = string

 
 -- Taskwarrior notification
 -- lain.widget.contrib.task
 
 -- Taskwarrior notification
 -- lain.widget.contrib.task


@@ -24,12 +23,7 @@ function task.hide()
 end
 
 function task.show(scr)
 end
 
 function task.show(scr)

-
-    if task.followtag then
-        task.notification_preset.screen = awful.screen.focused()
-    elseif scr then
-        task.notification_preset.screen = scr
-    end
+    task.notification_preset.screen = task.followtag and awful.screen.focused() or scr or 1

 
     helpers.async({ awful.util.shell, "-c", task.show_cmd }, function(f)
         local widget_focused = true
 
     helpers.async({ awful.util.shell, "-c", task.show_cmd }, function(f)
         local widget_focused = true


@@ -46,12 +40,12 @@ function task.show(scr)
 
         if widget_focused then
             task.hide()
 
         if widget_focused then
             task.hide()

-            task.notification = naughty.notify({
-                    preset = task.notification_preset,
-                    title  = "task next",
-                    text   = markup.font(task.notification_preset.font,
-                        awful.util.escape(f:gsub("\n*$", "")))
-                })
+            task.notification = naughty.notify {
+                preset = task.notification_preset,
+                title  = "task next",
+                text   = markup.font(task.notification_preset.font,
+                         awful.util.escape(f:gsub("\n*$", "")))
+            }

         end
     end)
 end
         end
     end)
 end