Fixed scope bugs

classes/backlight/arc_widget.lua

@@ -28,7 +28,7 @@ function P:set_tooltip(text)
 end
 
 function P:new()
-	widget = {}
+	local widget = {}
 	setmetatable(widget, self)
 	self.__index = self
 

classes/backlight/backlight.lua

@@ -2,7 +2,9 @@ local widget_types = {
 	arc = require("classes/backlight/arc_widget")
 }
 
-local P = {}
+local P = {
+	name = "backlight"
+}
 
 
 ---
@@ -82,13 +84,12 @@ function P:backlight_set(value)
 	self:_update_widget()
 end
 
-
 ---
 -- Create new
 ---
 function P:new(args)
 	-- Arguments
-	b = {
+	local b = {
 		update_interval = args.update_interal or 5,
 		min_value = args.min_value or 1,
 		max_value = args.max_value or 100,
@@ -99,24 +100,21 @@ function P:new(args)
 		-- if this is false, ui will show an error and most methods will
 		-- do nothing. Updated in _get_status()
 	}
+	setmetatable(b, self)
+	self.__index = self
 
 	b.widget = widget_types[b.widget_type]:new()
 
 	b.widget.widget:connect_signal("button::press",
 		function(_, _, _, button, mods)
-			-- Scroll up
+			if (button == 4) then  -- Scroll up
-			if (button == 4) then
 				b:backlight_up()
-			-- Scroll down
+			elseif (button == 5) then  -- Scroll down
-			elseif (button == 5) then
 				b:backlight_down()
 			end
 		end
 	)
 
-	setmetatable(b, self)
-	self.__index = self
-
 	-- This timer keeps mute and volume status up-to-date.
 	b.timer = gears.timer {
 		timeout   = b.update_interval,

classes/battery/arc_widget.lua

@@ -64,7 +64,7 @@ function P:set_tooltip(text)
 end
 
 function P:new()
-	widget = {
+	local widget = {
 		state = "error"
 	}
 	setmetatable(widget, self)

classes/battery/battery.lua

@@ -3,7 +3,9 @@ local widget_types = {
 	prog = require("classes/battery/prog_widget")
 }
 
-local P = {}
+local P = {
+	name = "battery"
+}
 
 
 ---
@@ -51,7 +53,7 @@ end
 function P:_check_notification()
 	if not self.charging then
 		for i=1, #self.warnings do
-			v = self.warnings[i]
+			local v = self.warnings[i]
 			if (self.battery_percent <= v) and (not self._warning_log[i]) then
 				self._warning_log[i] = true
 
@@ -83,7 +85,7 @@ end
 ---
 function P:new(args)
 	-- Arguments
-	b = {
+	local b = {
 		update_interval = args.update_interal or 5,
 		widget_type = args.widget_type or "arc",
 		warnings = {5, 10, 25, 50},  -- Percentages to warn at (must be in order)

classes/battery/prog_widget.lua

@@ -46,7 +46,7 @@ function P:set_tooltip(text)
 end
 
 function P:new()
-	widget = {
+	local widget = {
 		state = "error"
 	}
 	setmetatable(widget, self)

classes/volume/arc_widget.lua

@@ -32,7 +32,7 @@ function P:set_tooltip(text)
 end
 
 function P:new()
-	widget = {}
+	local widget = {}
 	setmetatable(widget, self)
 	self.__index = self
 

classes/volume/bar_widget.lua

@@ -22,7 +22,7 @@ function P:set_tooltip(text)
 end
 
 function P:new()
-	widget = {}
+	local widget = {}
 	setmetatable(widget, self)
 	self.__index = self
 

classes/volume/volume.lua

@@ -3,7 +3,9 @@ local widget_types = {
 	arc = require("classes/volume/arc_widget")
 }
 
-local P = {}
+local P = {
+	name = "volume"
+}
 
 ---
 -- Internal methods
@@ -166,7 +168,7 @@ end
 ---
 function P:new(args)
 	-- Arguments
-	v = {
+	local v = {
 		pa_options = args.cli_options or "",
 		pa_sink = args.pa_sink or "",
 		update_interval = args.update_interal or 5,