From 5598b80ef4778cfd36e95aa6faf009150ad97283 Mon Sep 17 00:00:00 2001
From: Sarjuuk <junkdump@gmx.net>
Date: Thu, 16 Mar 2017 18:48:41 +0100
Subject: [PATCH] Quests/Map  * correctly apply styles to map selector  *
 correcly prepare map selector string

---
 pages/quest.php     |  4 ++--
 static/js/global.js | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pages/quest.php b/pages/quest.php
index a2f631c0..a12f0079 100644
--- a/pages/quest.php
+++ b/pages/quest.php
@@ -831,11 +831,11 @@ class QuestPage extends GenericPage
             $areas = new ZoneList(array(['id', array_keys($mObjectives)]));
             if (!$areas->error)
             {
-                $someIDX = 0;                               // todo (low): UNK value ... map priority, floor, mapId..? values seen: 0,3; doesn't seem to affect anything
+                $someIDX = 0;                               // todo (low): UNK value ... map priority, floor, mapId..? values seen: 0 - 3; doesn't seem to affect anything
                 foreach ($areas->iterate() as $id => $__)
                 {
                     $mObjectives[$id]['zone'] = $areas->getField('name', true);
-                    $mZones[] = [$id, $someIDX];
+                    $mZones[] = [$id, ++$someIDX];
                 }
             }
         }
diff --git a/static/js/global.js b/static/js/global.js
index e29540c4..e7ca4cf8 100644
--- a/static/js/global.js
+++ b/static/js/global.js
@@ -18412,20 +18412,20 @@ Mapper.prototype = {
                     if(types.start && types.end)
                     {
                         entry.className += ' icontiny';
-                        entry.style += ' background-image', 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_startend.gif)';
-                        entry.style += ' padding-left', '20px';
+                        entry.style.backgroundImage = 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_startend.gif)';
+                        entry.style.paddingLeft  = '20px';
                     }
                     else if(types.start)
                     {
                         entry.className += ' icontiny';
-                        entry.style += ' background-image', 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_start.gif)';
-                        entry.style += ' padding-left', '14px';
+                        entry.style.backgroundImage = 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_start.gif)';
+                        entry.style.paddingLeft  = '14px';
                     }
                     else if(types.end)
                     {
                         entry.className += ' icontiny';
-                        entry.style += ' background-image', 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_end.gif)';
-                        entry.style += ' padding-left', '16px';
+                        entry.style.backgroundImage = 'url(' + g_staticUrl + '/images/wow/icons/tiny/quest_end.gif)';
+                        entry.style.paddingLeft  = '16px';
                     }
                 }
                 $WH.ae(container, entry);
@@ -18554,10 +18554,10 @@ Mapper.prototype = {
             {
                 var parts = LANG.mapper_objectives.oex_sy.split('$$');
                 $WH.ae(span, $WH.ct(parts[0]));
-                primaryLink = zoneLinks(this, span, startZones, typesByZone);
-                $WH.ae(span, $WH.ct(parts[1]));
                 secondaryLink = zoneLinks(this, span, objZones, typesByZone);
                 $WH.ae(span, $WH.ct(parts[1]));
+                primaryLink = zoneLinks(this, span, startZones, typesByZone);
+                $WH.ae(span, $WH.ct(parts[2]));
             }
             else if(types.start.length > 0 && types.end.length > 0 && types.objective.length > 0) // objectives in x, starts in y, ends in z
             {
@@ -18566,7 +18566,7 @@ Mapper.prototype = {
                 primaryLink = zoneLinks(this, span, startZones, typesByZone);
                 $WH.ae(span, $WH.ct(parts[1]));
                 secondaryLink = zoneLinks(this, span, objZones, typesByZone);
-                $WH.ae(span, $WH.ct(parts[1]));
+                $WH.ae(span, $WH.ct(parts[2]));
                 tertiaryLink = zoneLinks(this, span, endZones, typesByZone);
                 $WH.ae(span, $WH.ct(parts[3]));
             }