diff OptionPage.xml @ 13:6cb9a2936580

Miscellanous Lua code consistency improvements: - no semicolon except between statements on same line - use of implicit cast to bool in if/while conditions, instead of various eq/neq against true, false or nil - no parenthesis around if/while conditions (C-ism) - avoid long function calls in if conditions - removed space in comma-separated expressions lists in multiple assignments - added spaces between arguments of functions calls - use tabs for indentation (in Lua files only) - don't reverse == in if conditions, like "if 42==foo then" (C-ism) - removed some extra parenthesis in complex expressions (C-ism) - added spaces around operators in most expressions for ease of reading - added comma after last element of table initializers - removed space after # operator - moved comment prefix of disabled code into tab (to keep disabled code aligned)
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:29:45 +0000
parents d186f8cd5000
children 80192bc4a108
line wrap: on
line diff
--- a/OptionPage.xml	Tue Apr 16 15:19:23 2013 +0000
+++ b/OptionPage.xml	Thu Apr 25 01:29:45 2013 +0000
@@ -55,8 +55,8 @@
 		self:RegisterEvent("VARIABLES_LOADED")
 	</OnLoad>
 	<OnEvent>
-		if(event == "VARIABLES_LOADED") then
-			CyborgMMO_GetBindingButtonText(self:GetName());
+		if event == "VARIABLES_LOADED" then
+			CyborgMMO_GetBindingButtonText(self:GetName())
 		end
 	</OnEvent>
 	<OnClick>
@@ -136,7 +136,7 @@
 		</Frames>
 		<Scripts>
 			<OnLoad>
-				CyborgMMO_LoadStrings(getglobal(self:GetName().."Name"));
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Name"))
 			</OnLoad>
 		</Scripts>
 	</Frame>
@@ -346,10 +346,10 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 					</OnLoad>
 					<OnClick>
-						if(self:GetChecked() == 1) then
+						if self:GetChecked() == 1 then
 							CyborgMMO_SetMiniMapButton(true)
 						else
 							CyborgMMO_SetMiniMapButton(false)
@@ -385,10 +385,10 @@
 				</Layers>
 				<Scripts>
 					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
+						CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 					</OnLoad>
 					<OnClick>
-						if(self:GetChecked() == 1) then
+						if self:GetChecked() == 1 then
 							CyborgMMO_SetCyborgHeadButton(true)
 						else
 							CyborgMMO_SetCyborgHeadButton(false)
@@ -410,10 +410,10 @@
 				</Anchors>
 				<Scripts>
 					<OnLoad>
-						CyborgMMO_LoadStrings(getglobal(self:GetName()));
+						CyborgMMO_LoadStrings(getglobal(self:GetName()))
 					</OnLoad>
 					<OnClick>
-						CyborgMMO_SetDefaultSettings();
+						CyborgMMO_SetDefaultSettings()
 					</OnClick>
 				</Scripts>
 			</Button>
@@ -560,7 +560,7 @@
 						</ThumbTexture>
 						<Scripts>
 							<OnLoad>
-								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
+								CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
 							</OnLoad>
 							<OnValueChanged>
 								CyborgMMO_SetMainPageSize(self:GetValue())
@@ -573,9 +573,9 @@
 
 		<Scripts>
 			<OnLoad>
-				CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"));
-				msg("Loaded Option Page");
-				self = CyborgMMO_OptionView.new(self);
+				CyborgMMO_LoadStrings(getglobal(self:GetName().."Title"))
+				msg("Loaded Option Page")
+				self = CyborgMMO_OptionView.new(self)
 			</OnLoad>
 		</Scripts>
 	</Frame>
@@ -671,7 +671,7 @@
         </Anchors>
         <Scripts>
           <OnClick>
-            HideUIPanel(self:GetParent());
+            HideUIPanel(self:GetParent())
           </OnClick>
         </Scripts>
       </Button>
@@ -681,19 +681,19 @@
       <OnLoad>
 			CyborgMMO_LoadStrings(getglobal(self:GetName().."HeaderText"))
 			CyborgMMO_LoadStrings(getglobal(self:GetName().."ExitButton"))
-        self:RegisterForClicks("AnyUp");
+        self:RegisterForClicks("AnyUp")
       </OnLoad>
       <OnClick>
-        CyborgMMO_BindingFrameOnKeyDown(self, button);
+        CyborgMMO_BindingFrameOnKeyDown(self, button)
       </OnClick>
       <OnKeyDown>
-        CyborgMMO_BindingFrameOnKeyDown(self, key);
+        CyborgMMO_BindingFrameOnKeyDown(self, key)
       </OnKeyDown>
       <OnMouseWheel>
-        if (delta > 0) then
-          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELUP");
+        if delta > 0 then
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELUP")
         else
-          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELDOWN");
+          CyborgMMO_BindingFrameOnKeyDown(self, "MOUSEWHEELDOWN")
         end
       </OnMouseWheel>
     </Scripts>