Skip to content
Permalink
Browse files

Misc/Fixups

 * fixed typo inlocalization
 * have the profiler queue run at least one cycle so it can get registered as successfully started
 * a map popup will no longer scroll the page to bottom
 * replaced an input placeholder image with proper placeholder property
  • Loading branch information...
Sarjuuk committed May 7, 2018
1 parent 4f0d045 commit 09d2013012c923433af886da38e95eca1208f7c3
Showing with 13 additions and 10 deletions.
  1. +1 −1 localization/locale_frfr.php
  2. +7 −7 prQueue
  3. +2 −1 static/css/Profiler.css
  4. +1 −1 static/js/global.js
  5. +2 −0 static/js/profile.js
@@ -760,7 +760,7 @@
'maxStanding' => "Niveau maximum",
'quartermaster' => "Intendant",
'customRewRate' => "Taux de récompense personnalisé",
'_transfer' => 'La réputation de cette faction sera convertie en <a href="?faction=%d" class="q1">%s</a> si vous transférez vers <span class="icon-%s">%s</span>.]',
'_transfer' => 'La réputation de cette faction sera convertie en <a href="?faction=%d" class="q1">%s</a> si vous transférez vers <span class="icon-%s">%s</span>.',
'cat' => array(
1118 => ["Classique", 469 => "Alliance", 169 => "Cartel Gentepression", 67 => "Horde", 891 => "Forces de l'Alliance", 892 => "Forces de la Horde"],
980 => ["The Burning Crusade", 936 => "Shattrath"],
14 prQueue
@@ -44,6 +44,13 @@ $error = function ($type, $realmGUID, $realmId)
// if (CFG_PROFILER_ENABLE) - wont work because it is not redefined if changed in config
while (DB::Aowow()->selectCell('SELECT value FROM ?_config WHERE `key` = "profiler_enable"'))
{
if (($tDiff = (microtime(true) - $tCycle)) < (CFG_PROFILER_QUEUE_DELAY / 1000))
{
$wait = (CFG_PROFILER_QUEUE_DELAY / 1000) - $tDiff;
CLI::write('sleeping '.Lang::nf($wait, 2).'s..');
usleep($wait * 1000 * 1000);
}

$row = DB::Aowow()->selectRow('SELECT * FROM ?_profiler_sync WHERE status = ?d ORDER BY requestTime ASC', PR_QUEUE_STATUS_WAITING);
if (!$row)
{
@@ -97,13 +104,6 @@ while (DB::Aowow()->selectCell('SELECT value FROM ?_config WHERE `key` = "profil
CLI::write('unknown type #'.$row['type'].' to sync into profiler. Removing from queue...', CLI::LOG_ERROR);
}

if (($tDiff = (microtime(true) - $tCycle)) < (CFG_PROFILER_QUEUE_DELAY / 1000))
{
$wait = (CFG_PROFILER_QUEUE_DELAY / 1000) - $tDiff;
CLI::write('sleeping '.Lang::nf($wait, 2).'s..');
usleep($wait * 1000 * 1000);
}

$tCycle = microtime(true);

// mark as ready
@@ -123,10 +123,11 @@
background-position: left bottom;
}

/* aowow - use placeholder property instead of texture
input.search-character {
background: white url(../images/enus/character.gif) 0.2em center no-repeat !important;
}

*/
/*********************************************/

.profiler-header {
{
tempParent = $WH.ce('div');
tempParent.id = 'fewuiojfdksl';
$WH.ae(document.body, tempParent);
$WH.aef(document.body, tempParent); // aowow - aef() insteead of ae() - rather scroll page to top instead of bottom
var map = new Mapper({ parent: tempParent.id });
map.setLink(opt.link, true);
map.toggleZoom();
@@ -617,6 +617,8 @@ function pr_onBreadcrumbUpdate() // Add character lookup textbox to the breadcru
i.className = 'search-character';
i.type = 'text';

i.placeholder = LANG.tab_character + LANG.ellipsis; // aowow - use placeholder text instead of background texture

i.onfocus = function()
{
this.className = '';

0 comments on commit 09d2013

Please sign in to comment.
You can’t perform that action at this time.