8.3.01

Release

Data.lua

@@ -604,7 +604,7 @@ _V["SETTING_LIST"] = {
 			,["isDisabled"] = function() return WQT.settings.pin.disablePoI end
 			}
 	-- Pin icons
-	,{["type"] = _V["SETTING_TYPES"].subTitle, ["categoryID"] = "MAPPINS", ["label"] = _L["ICONS"]}
+	,{["type"] = _V["SETTING_TYPES"].subTitle, ["categoryID"] = "MAPPINS", ["label"] = _L["MINI_ICONS"]}
 	,{["type"] = _V["SETTING_TYPES"].checkBox, ["categoryID"] = "MAPPINS", ["label"] = _L["PIN_TYPE"], ["tooltip"] = _L["PIN_TYPE_TT"]
 			, ["valueChangedFunc"] = function(value) 
 				WQT.settings.pin.typeIcon = value;
@@ -663,6 +663,13 @@ _V["TIME_REMAINING_CATEGORY"] = {
 	,["veryLong"] = 6 -- >3d
 }
 
+_V["QUESTS_NOT_COUNTING"] = {
+		[261] = true -- Account Wide
+		,[256] = true -- PvP Conquest
+		,[102] = true -- Island Weekly Quest
+		--,[270] = true -- Threat Emissary <-- Actually does count
+	}
+
 _V["NUMBER_ABBREVIATIONS_ASIAN"] = {
 		{["value"] = 1000000000, ["format"] = _L["NUMBERS_THIRD"]}
 		,{["value"] = 100000000, ["format"] = _L["NUMBERS_SECOND"], ["decimal"] = true}
@@ -976,7 +983,8 @@ _V["WQT_FACTION_DATA"] = {
 	,[2373] = 	{ ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = "Horde" ,["texture"] = 2909044 } -- Unshackled
 	,[2391] = 	{ ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = nil ,["texture"] = 2909316 } -- Rustbolt
 	,[2400] = 	{ ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = "Alliance" ,["texture"] = 2909043 } -- Waveblade Ankoan
-	,[2417] = 	{ ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = nil ,["texture"] = 3068678 } -- Uldum Accord
+	,[2417] = 	{ ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = nil ,["texture"] = 3196264 } -- Uldum Accord
+	,[2415] = 	{ ["expansion"] = LE_EXPANSION_BATTLE_FOR_AZEROTH ,["playerFaction"] = nil ,["texture"] = 3196265 } -- Rajani
 }
 -- Add localized faction names
 for k, v in pairs(_V["WQT_FACTION_DATA"]) do
@@ -986,14 +994,15 @@ end
 -- This is just easier to maintain than changing the entire string every time
 local _patchNotes = {
 		{["version"] = "8.3.01"
+			,["intro"] = {"Rejoice, for the long standing issue with PvP Conquest hidden quests counting to your max quests, was finally fixed by Blizzard! ... Alright enough rejoicing, 8.3 introduces the Threat Emissary Quest which has the exact same issue. gg no re"}
 			,["new"] = {
 				"Support for everything 8.3."
 				,"New type filter: Threat. Filters the new N'zoth world quests."
 			}
 			,["changes"] = {
 				"Overhauled the settings menu. With this change, following settings have been reworked:"
 				,"'Bigger Pins' is now called 'Pin Scale' which instead uses a slider for more freedom."
-				,"'Reward Texture' is now called 'Center Content'."
+				,"'Reward Texture' is now called 'Main Icon Type'."
 			}
 			,["fixes"] = {
 				"Fixed some time display issues around the moment a timer should switch to a different color."

Locals.lua

@@ -26,7 +26,7 @@ L["PIN_FADE_ON_PING_TT"]	= "When a map pin is being highlighted, fade out all ot
 
 L["QUEST_LIST"]		= "Quest List"
 L["MAP_PINS"]		= "Map Pins"
-L["ICONS"]			= "Icons"
+L["MINI_ICONS"]			= "Mini Icons"
 L["PIN_SCALE"]		= "Pin Scale";
 L["PIN_SCALE_TT"]	= "Change the size of the map pins";
 L["PIN_REWARDS"]	= "Reward texture";
@@ -52,7 +52,7 @@ L["PIN_RING_COLOR_TT"]	= "Ring color based on reward type."
 L["PIN_RING_TIME"]	= "Time Left"
 L["PIN_RIMG_TIME_TT"]	= "Ring color based on time left."
 L["PIN_RING_QUALITY_TT"] = "Ring color based on quest rarity."
-L["PIN_CENTER"]		= "Center Content"
+L["PIN_CENTER"]		= "Main Icon Type"
 L["PIN_CENTER_TT"]	= "Select the appearance of the center of the map pin"
 L["BLIZZARD"] 		= "Blizzard"
 L["PIN_BLIZZARD_TT"] 	= "Mimic Blizzard's pin appearance."
@@ -411,6 +411,98 @@ L["USE_TOMTOM"] = "允許TomTom"
 L["USE_TOMTOM_TT"] = "在此插件添加TomTom功能。"
 L["WHATS_NEW"] = "最新消息"
 L["WHATS_NEW_TT"] = "查看World Quest Tab更新說明。"
+L["WQT_FULLSCREEN_BUTTON_TT"] = "左鍵點擊以切換世界任務列表。右鍵點擊並拖動以變更位置。"L["ALWAYS_ALL"] = "總是所有任務"
+L["ALWAYS_ALL_TT"] = "總是顯示當前區域所有資料片相關的任務"
+L["AMOUNT_COLORS"] = "數值著色"
+L["AMOUNT_COLORS_TT"] = "在任務列表中根據獎勵類型在數值上著色"
+L["AUTO_EMISARRY"] = "只限自動特使"
+L["AUTO_EMISARRY_TT"] = "點擊世界地圖的特使獎勵版，將暫時性啟用'只有特使'過濾器。"
+L["COMBATLOCK"] = "戰鬥中無法使用"
+L["CONTAINER_DRAG"] = "移動"
+L["CONTAINER_DRAG_TT"] = "拖動到其他位置"
+L["DEFAULT_TAB"] = "預設標籤"
+L["DEFAULT_TAB_TT"] = [=[將WQT設定為預設啟用標籤。
+這不適用於等級110以下角色。]=]
+L["EMISSARY_COUNTER"] = "特使任務計數器"
+L["EMISSARY_COUNTER_TT"] = "在特使標籤添加計數以指示你每個特使任務的進度。"
+L["FILTER_PINS"] = "過濾地圖顯示"
+L["FILTER_PINS_TT"] = "將過濾套用到地圖上的任務點"
+L["FORMAT_GROUP_CREATE"] = "輸入|cFFFFFFFF%d|r 為此任務建立一個隊伍。 或輸入其名稱：|cFFFFFFFF%s|r。考慮兩者兼用，讓沒有插件的玩家也可以找到你的隊伍。"
+L["FORMAT_GROUP_SEARCH"] = "輸入|cFFFFFFFF%d|r 搜索此任務的隊伍。 或輸入其名稱：|cFFFFFFFF%s|r。"
+L["FORMAT_GROUP_TYPO"] = "它似乎是打錯字。輸入任一個|cFFFFFFFF%d|r，或|cFFFFFFFF%s|r。"
+L["GROUP_SEARCH_INFO"] = "暴雪阻止插件為大多數世界任務自動尋找隊伍。 因此，玩家必須手動填寫搜索框。"
+L["LFG_BUTTONS"] = "啟用LFG按鈕"
+L["LFG_BUTTONS_TT"] = "在目標追蹤中的世界任務添加尋求組隊按鈕。啟用此設置會導至記憶體與CPU使用率增加。|cFFFF5555A需要重載以讓設置生效。|r"
+L["LIST_FULL_TIME"] = "擴展時間"
+L["LIST_FULL_TIME_TT"] = "包含時間的第二刻度，在天之後加入小時，在小時之後加入分鐘。"
+L["LIST_SETTINGS"] = "列表設置"
+L["LOAD_UTILITIES"] = "載入工具"
+L["LOAD_UTILITIES_TT"] = "載入像是計數以及距離排序的工具功能。 |cFFFF5555當停用此功能時需要重載。|r"
+L["LOAD_UTILITIES_TT_DISABLED"] = "|cFFFF5555World Quest Tab的工具並未在您的插件列表中啟用。|r"
+L["MAP_FILTER_DISABLED"] = "在世界地圖過濾已停用。"
+L["MAP_FILTER_DISABLED_BUTTON_INFO"] = "已在世界地圖過濾中停用。右鍵點擊來重新啟用此過濾"
+L["MAP_FILTER_DISABLED_INFO"] = "停用過濾或許會隱藏某些任務。您可以在地圖右上的放大鏡重新啟用它們。"
+L["MAP_FILTER_DISABLED_TITLE"] = "某些世界地圖過濾已停用"
+L["NO_FACTION"] = "無陣營"
+L["NUMBERS_FIRST"] = "%g萬"
+L["NUMBERS_SECOND"] = "%g億"
+L["NUMBERS_THIRD"] = "%g"
+L["OPTIONS_INFO"] = "[WQT]設定選項可以在過濾按鍵下找到"
+L["PIN_BIGGER"] = "地圖上顯示大型圖示"
+L["PIN_BIGGER_TT"] = "增加地圖示大小以提高可見性"
+L["PIN_DISABLE"] = "停用任務點更改"
+L["PIN_DISABLE_TT"] = "防止世界任務追蹤更改地圖任務點。"
+L["PIN_FADE_ON_PING"] = "突顯後淡出"
+L["PIN_FADE_ON_PING_TT"] = "當一個地圖任務點被突顯時，淡出其他所有任務點以提高可視性。"
+L["PIN_RARITY_ICON"] = "任務稀有度圖示"
+L["PIN_RARITY_ICON_TT"] = "稀有任務的任務點添加稀有圖示。"
+L["PIN_REWARD_TYPE"] = "獎勵類型圖示"
+L["PIN_REWARD_TYPE_TT"] = "在地圖圖示下顯示獎勵類型圖示"
+L["PIN_REWARDS"] = "顯示任務獎勵圖示"
+L["PIN_REWARDS_TT"] = "將地圖上圖示改為顯示任務獎勵類型"
+L["PIN_RIMG_NONE_TT"] = "環邊不做任何改變"
+L["PIN_RIMG_TIME_TT"] = "依剩餘時間著色"
+L["PIN_RING_COLOR"] = "獎勵著色"
+L["PIN_RING_COLOR_TT"] = "依獎勵類型著色"
+L["PIN_RING_NONE"] = "預設"
+L["PIN_RING_QUALITY_TT"] = "環形顏色基於任務稀有度。"
+L["PIN_RING_TIME"] = "剩餘時間"
+L["PIN_RING_TITLE"] = "圖示環邊類型"
+L["PIN_SETTINGS"] = "地圖標誌設置"
+L["PIN_SHOW_CONTINENT"] = "大陸任務點顯示"
+L["PIN_SHOW_CONTINENT_TT"] = "在大陸地圖上顯示所有任務。"
+L["PIN_TIME"] = "地圖上顯示剩餘時間"
+L["PIN_TIME_ICON"] = "剩餘時間圖示"
+L["PIN_TIME_ICON_TT"] = "添加基於時間顏色的的剩餘時間圖示。"
+L["PIN_TIME_TT"] = "在圖示上加入任務剩餘時間"
+L["PIN_TYPE"] = "任務類型圖示"
+L["PIN_TYPE_TT"] = "在地圖圖示下顯示特殊任務類型圖示"
+L["QUEST_COUNTER"] = "任務日誌計數"
+L["QUEST_COUNTER_INFO"] = "以下的|cFFFFd100%d|r隱藏任務計入您的任務上限而且無法忽略。這最終是暴雪的問題。"
+L["QUEST_COUNTER_TITLE"] = "隱藏任務"
+L["QUEST_COUNTER_TT"] = "顯示您預設任務日誌中的任務數。"
+L["SAVE_SETTINGS"] = "儲存過濾/排序"
+L["SAVE_SETTINGS_TT"] = "在每次登入與重載間儲存過濾與排序設置。"
+L["SHOW_FACTION"] = "顯示陣營"
+L["SHOW_FACTION_TT"] = "在任務列表顯示陣營圖示"
+L["SHOW_TYPE"] = "顯示類型"
+L["SHOW_TYPE_TT"] = "在任務列表顯示類型圖示"
+L["SHOW_ZONE"] = "顯示區域"
+L["SHOW_ZONE_TT"] = "當列表包含多個區域的任務時顯示區域標籤。"
+L["TIME"] = "時間"
+L["TOMTOM_AUTO_ARROW"] = "追蹤的路徑點"
+L["TOMTOM_AUTO_ARROW_TT"] = "Shift+點擊以試圖追蹤一個任務。或者使用下拉選單中的選項，將自動建立一個TomTom的路徑點。"
+L["TOMTOM_CLICK_ARROW"] = "點擊建立路徑點"
+L["TOMTOM_CLICK_ARROW_TT"] = "為最後點擊的世界任務創建一個TomTom路徑點和箭頭。刪除以此方式添加的先前的路徑點。"
+L["TRACKDD_TOMTOM"] = "加入TomTom"
+L["TRACKDD_TOMTOM_REMOVE"] = "從TomTom移除"
+L["TYPE_EMISSARY"] = "特使任務"
+L["TYPE_EMISSARY_TT"] = "只顯示當前選擇特使的任務。此過濾覆寫其他所有過濾。"
+L["TYPE_INVASION"] = "入侵"
+L["USE_TOMTOM"] = "允許TomTom"
+L["USE_TOMTOM_TT"] = "在此插件添加TomTom功能。"
+L["WHATS_NEW"] = "最新消息"
+L["WHATS_NEW_TT"] = "查看World Quest Tab更新說明。"
 L["WQT_FULLSCREEN_BUTTON_TT"] = "左鍵點擊以切換世界任務列表。右鍵點擊並拖動以變更位置。"
 
 L["IS_AZIAN_CLIENT"]	= true

MapPinProvider.lua

@@ -335,11 +335,9 @@ function WQT_PinMixin:SetupCanvasType(pinType, parentMapFrame, isWatched)
 end
 
 function WQT_PinMixin:PlaceIcons()
-	local title = C_TaskQuest.GetQuestInfoByQuestID(self.questID);
 	local numIcons = #self.icons;
 	if (numIcons > 0) then
 		local angle = ICON_ANGLE_START - (ICON_ANGLE_DISTANCE*(numIcons-1))/2
-		local index = 1;
 		local numIcons = min(#self.icons, ICON_MAX_AMOUNT);
 		for i = 1, numIcons do
 			local iconFrame = self.icons[i];
@@ -374,7 +372,6 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
 	local _, _, _, timeStringShort = WQT_Utils:GetQuestTimeString(questInfo);
 	local _, _, worldQuestType, rarity, isElite = GetQuestTagInfo(questInfo.questId);
 	local isBonus = not worldQuestType;
-	local settingPinReward = WQT_Utils:GetSetting("pin", "reward");
 	local settingCenterType = WQT_Utils:GetSetting("pin", "centerType");
 
 	self.scale = scale
@@ -416,7 +413,6 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
 		local color = WORLD_QUEST_QUALITY_COLORS[rarity];
 		if (color) then
 			local iconFrame = self:AddIcon(_V["PATH_CUSTOM_ICONS"], 0, 0.25, 0, 0.5);
-			local r, g, b = color.color:GetRGB()
 			iconFrame.Icon:SetVertexColor(color.color:GetRGB());
 			iconFrame.Icon:SetScale(1.15);
 			iconFrame.BG:Hide();
@@ -462,7 +458,6 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
 	self:PlaceIcons();
 
 	-- Main Icon
-	local showIcon = (questInfo.reward.type == WQT_REWARDTYPE.missing or questInfo.reward.texture ~= "");
 	self.CustomTypeIcon:SetShown(false);
 	self.CustomUnderlay:SetShown(isElite);
 	self.CustomSelectedGlow:Hide()
@@ -584,7 +579,7 @@ function WQT_PinMixin:UpdatePinTime()
 		self.timeIcon.Icon:SetVertexColor(color:GetRGB());
 	end
 
-	if (category == _V["TIME_REMAINING_CATEGORY"].expired) then
+	if (timeCategory == _V["TIME_REMAINING_CATEGORY"].expired) then
 		self.isExpired = true;
 		return SECONDS_PER_HOUR;
 	end

MapPinProvider.xml

@@ -15,7 +15,7 @@
 					</Anchors>
 				</Texture>
 			</Layer>
-			<Layer level="BACKGROUND" textureSubLevel="9" setAllPoints="true">
+			<Layer level="BACKGROUND" textureSubLevel="9">
 				<Texture parentKey="BG" alpha="0.75" file="Interface\GLUES\Models\UI_MainMenu_Legion\UI_Legion_Shadow" setAllPoints="true">
 					<Size x="16" y="16"/>
 					<Anchors>

Settings.lua

@@ -159,7 +159,7 @@ function WQT_SettingsQuestListMixin:UpdateState()
 	-- 74160s == 20h 36m
 	local timeString;
 	if (WQT.settings.list.fullTime) then
-		timeString = SecondsToTime(74160, true, true);
+		timeString = SecondsToTime(74160, true, false);
 	else
 		timeString = D_HOURS:format(74160 / SECONDS_PER_HOUR);
 	end
@@ -355,46 +355,6 @@ function WQT_SettingsButtonMixin:Init(data)
 	self:UpdateState();
 end
 
---------------------------------
--- WQT_ScrollFrameMixin
---------------------------------
-
-WQT_ScrollFrameMixin = {};
-
-function WQT_ScrollFrameMixin:OnLoad()
-	self.offset = 0;
-	self.scrollStep = 30;
-	self.max = 0;
-	self.scrollBar:SetMinMaxValues(0, 0);
-	self.scrollBar:SetValue(0);
-end
-
-function WQT_ScrollFrameMixin:UpdateChildFramePosition()
-	if (self.scrollChild) then
-		self.scrollChild:SetPoint("TOPLEFT", self, 0, self.offset);
-	end
-end
-
-function WQT_ScrollFrameMixin:ScrollValueChanged(value)
-	self.offset = max(0, min(value, self.max));
-	self:UpdateChildFramePosition();
-end
-
-function WQT_ScrollFrameMixin:OnMouseWheel(delta)
-	self.offset = self.offset - delta * self.scrollStep;
-	self.offset = max(0, min(self.offset, self.max));
-	self:UpdateChildFramePosition();
-	self.scrollBar:SetValue(self.offset);
-end
-
-function WQT_ScrollFrameMixin:SetChildHeight(height)
-	self.scrollChild:SetHeight(height);
-	self.max = max(0, height - self:GetHeight());
-	self.offset = min(self.offset, self.max);
-
-	self.scrollBar:SetMinMaxValues(0, self.max);
-end
-
 --------------------------------
 -- WQT_SettingsFrameMixin
 --------------------------------
@@ -403,16 +363,12 @@ WQT_SettingsFrameMixin = {};
 
 function WQT_SettingsFrameMixin:OnLoad()
 	-- Because we can't destroy frames, keep a pool of each type to re-use
-	self.categoryPool = CreateFramePool("BUTTON", self.ScrollFrame.scrollChild, "WQT_SettingCategoryTemplate");
-	self.checkBoxPool = CreateFramePool("FRAME", self.ScrollFrame.scrollChild, "WQT_SettingCheckboxTemplate", function(pool, frame) frame:Reset(); end);
-	self.subTitlePool = CreateFramePool("FRAME", self.ScrollFrame.scrollChild, "WQT_SettingSubTitleTemplate", function(pool, frame) frame:Reset(); end);
-	self.sliderPool = CreateFramePool("FRAME", self.ScrollFrame.scrollChild, "WQT_SettingSliderTemplate", function(pool, frame) frame:Reset(); end);
-	self.dropDownPool = CreateFramePool("FRAME", self.ScrollFrame.scrollChild, "WQT_SettingDropDownTemplate", function(pool, frame) frame:Reset(); end);
-	self.buttonPool = CreateFramePool("FRAME", self.ScrollFrame.scrollChild, "WQT_SettingButtonTemplate", function(pool, frame) frame:Reset(); end);
-
-	self.ScrollFrame.buttonHeight = 40;
-	self.ScrollFrame.scrollChild:SetWidth(self.ScrollFrame:GetWidth());
-	self.ScrollFrame.scrollChild:SetPoint("RIGHT", self.ScrollFrame)
+	self.categoryPool = CreateFramePool("BUTTON", self.ScrollFrame.ScrollChild, "WQT_SettingCategoryTemplate");
+	self.checkBoxPool = CreateFramePool("FRAME", self.ScrollFrame.ScrollChild, "WQT_SettingCheckboxTemplate", function(pool, frame) frame:Reset(); end);
+	self.subTitlePool = CreateFramePool("FRAME", self.ScrollFrame.ScrollChild, "WQT_SettingSubTitleTemplate", function(pool, frame) frame:Reset(); end);
+	self.sliderPool = CreateFramePool("FRAME", self.ScrollFrame.ScrollChild, "WQT_SettingSliderTemplate", function(pool, frame) frame:Reset(); end);
+	self.dropDownPool = CreateFramePool("FRAME", self.ScrollFrame.ScrollChild, "WQT_SettingDropDownTemplate", function(pool, frame) frame:Reset(); end);
+	self.buttonPool = CreateFramePool("FRAME", self.ScrollFrame.ScrollChild, "WQT_SettingButtonTemplate", function(pool, frame) frame:Reset(); end);
 
 	self.categoryless = {};
 	self.categories = {};
@@ -475,7 +431,7 @@ function WQT_SettingsFrameMixin:CreateCategory(data)
 	if (data.previewFrame) then
 		local frame = _G[data.previewFrame];
 		if (frame) then
-			frame:SetParent(self.ScrollFrame.scrollChild);
+			frame:SetParent(self.ScrollFrame.ScrollChild);
 			if (frame.UpdateState) then
 				frame:UpdateState();
 			end
@@ -556,9 +512,9 @@ function WQT_SettingsFrameMixin:PlaceSetting(setting)
 	if (self.previous) then
 		setting:SetPoint("TOPLEFT", self.previous, "BOTTOMLEFT");
 	else
-		setting:SetPoint("TOPLEFT", self.ScrollFrame.scrollChild, 0, -SETTINGS_PADDING_TOP);
+		setting:SetPoint("TOPLEFT", self.ScrollFrame.ScrollChild, 0, -SETTINGS_PADDING_TOP);
 	end
-	setting:SetPoint("RIGHT", self.ScrollFrame.scrollChild);
+	setting:SetPoint("RIGHT", self.ScrollFrame.ScrollChild);
 	setting:Show();
 
 	self.previous = setting;

Settings.xml

@@ -75,7 +75,7 @@
 		<Frames>
 			<Button parentKey="Preview" inherits="WQT_QuestTemplate" enableMouse="false" hidden="false">
 				<Anchors>
-					<Anchor point="LEFT"/>
+					<Anchor point="LEFT" x="1"/>
 				</Anchors>
 				<Scripts>
 					<OnClick />
@@ -271,55 +271,11 @@
 	<Frame name="WQT_SettingsFrame" parent="WQT_OverlayFrame" mixin="WQT_SettingsFrameMixin" hidden="true">
 		<Size x="257" y="462" />
 		<Frames>
-			<ScrollFrame parentKey="ScrollFrame" mixin="WQT_ScrollFrameMixin">
+			<ScrollFrame inherits="WQT_OverlayScrollFrameTemplate" parentKey="ScrollFrame">
 				<Anchors>
 					<Anchor point="TOPLEFT"/>
 					<Anchor point="BOTTOMRIGHT" x="-20"/>
 				</Anchors>
-
-				<Frames>
-					<Slider parentKey="scrollBar">	
-						<Size x="4"/>
-						<HitRectInsets left="-5" right="-4" />
-						<Anchors>
-							<Anchor point="TOPLEFT" relativePoint="TOPRIGHT" x="5" y="-27"/>
-							<Anchor point="BOTTOMLEFT" relativePoint="BOTTOMRIGHT" x="5" y="0"/>
-						</Anchors>
-						<Layers>
-							<Layer level="BACKGROUND">
-								<Texture name="$parentTrack" parentKey="trackBG">
-									<Anchors>
-										<Anchor point="TOPLEFT" x="0" y="0"/>
-										<Anchor point="BOTTOMRIGHT" x="0" y="0"/>
-									</Anchors>
-									<Color r="0" g="0" b="0" a="1"/>
-								</Texture>
-							</Layer>
-						</Layers>
-						<ThumbTexture name="$parentThumbTexture" inherits="HybridScrollBarButton" file="Interface\Buttons\UI-ScrollBar-Knob" parentKey="thumbTexture">
-							<Size x="18" y="24"/>
-							<TexCoords left="0.20" right="0.80" top="0.125" bottom="0.875"/>
-						</ThumbTexture>
-						<Scripts>
-							<OnValueChanged>
-								self:GetParent():ScrollValueChanged(value);
-							</OnValueChanged>
-						</Scripts>
-					</Slider>
-				</Frames>
-
-				<ScrollChild>
-					<Frame parentKey="scrollChild">
-						<Anchors>
-							<Anchor point="TOPLEFT" x="0" y="0"/>
-							<Anchor point="RIGHT"/>
-						</Anchors>
-					</Frame>
-				</ScrollChild>
-				<Scripts>
-					<OnLoad method="OnLoad"/>
-					<OnMouseWheel method="OnMouseWheel"/>
-				</Scripts>
 			</ScrollFrame>
 		</Frames>
 		<Scripts>