Merge remote-tracking branch 'origin/master' into development

Total-RP · Jul 23, 2016 · 29102b3 · 29102b3
2 parents 8486dc6 + 83d4f2c
commit 29102b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/totalRP3/core/impl/globals.lua b/totalRP3/core/impl/globals.lua
@@ -29,7 +29,7 @@ TRP3_API = {
 		dropDownElements = "%s: |cff00ff00%s"
 	},
 	globals = {
-		DEBUG_MODE = TRP3_DEBUG or true,
+		DEBUG_MODE = TRP3_DEBUG or false,
 		empty = {},
 
 		addon_name = "Total RP 3",
@@ -38,7 +38,7 @@ TRP3_API = {
 		addon_id_length = 15,
 
 		version = 18,
-		version_display = "1.1.3",
+		version_display = "1.1.3.1",
 
 		player = UnitName("player"),
 		player_realm = GetRealmName(),

diff --git a/totalRP3/core/impl/popup.lua b/totalRP3/core/impl/popup.lua
@@ -189,7 +189,6 @@ local function showPopup(popup)
 	TRP3_PopupsFrame:Show();
 	popup:Show();
 end
-TRP3_API.popup.showPopup = showPopup;
 
 local function hidePopups()
 	TRP3_PopupsFrame:Hide();
@@ -683,6 +682,7 @@ function TRP3_API.popup.showPopup(popupID, popupPosition, popupArgs)
 	if popupPosition and popupPosition.parent then
 		popup.frame:SetParent(popupPosition.parent);
 		popup.frame:SetPoint(popupPosition.point or "CENTER", popupPosition.parent, popupPosition.parentPoint or "CENTER", 0, 0);
+		popup.frame:SetFrameLevel(popupPosition.parent:GetFrameLevel() + 20);
 		popup.frame:Show();
 	else
 		popup.frame:SetParent(TRP3_PopupsFrame);