Загрузка категорий на этапе формирования страницы, без AJAX
This commit is contained in:
parent
c1588c2c4f
commit
a3fc9c73e0
|
|
@ -68,6 +68,11 @@ class IndexController extends Controller
|
||||||
self::addVar('pointLat', 0);
|
self::addVar('pointLat', 0);
|
||||||
self::addVar('pointLng', 0);
|
self::addVar('pointLng', 0);
|
||||||
|
|
||||||
|
$categoryArray = array();
|
||||||
|
foreach ($category as $cat) {
|
||||||
|
$categoryArray[] = $cat->getValues();
|
||||||
|
}
|
||||||
|
|
||||||
$og = array();
|
$og = array();
|
||||||
if (isset($_GET['point']) && $_GET['point'] && is_numeric($_GET['point']))
|
if (isset($_GET['point']) && $_GET['point'] && is_numeric($_GET['point']))
|
||||||
{
|
{
|
||||||
|
|
@ -95,6 +100,7 @@ class IndexController extends Controller
|
||||||
|
|
||||||
self::render('indexTemplate.php', array(
|
self::render('indexTemplate.php', array(
|
||||||
'categories' => $category,
|
'categories' => $category,
|
||||||
|
'categoryArray' => $categoryArray,
|
||||||
'user' => App::$user,
|
'user' => App::$user,
|
||||||
'routes' => $routes,
|
'routes' => $routes,
|
||||||
'favorites' => $favorites,
|
'favorites' => $favorites,
|
||||||
|
|
|
||||||
|
|
@ -117,6 +117,11 @@
|
||||||
<area onclick="hideBigLogo();" shape="rect" coords="0,0,40,40" style="cursor: pointer" title="Спрятать надолго"/>
|
<area onclick="hideBigLogo();" shape="rect" coords="0,0,40,40" style="cursor: pointer" title="Спрятать надолго"/>
|
||||||
<area href="https://vk.com/wikipoints" shape="rect" coords="40,0,230,40" title="Посетить группу в VK - это интересно и полезно!" target="_blank"/>
|
<area href="https://vk.com/wikipoints" shape="rect" coords="40,0,230,40" title="Посетить группу в VK - это интересно и полезно!" target="_blank"/>
|
||||||
</map>
|
</map>
|
||||||
|
<?php if (isset($categoryArray)): ?>
|
||||||
|
<script type="text/javascript">
|
||||||
|
var categoryArray = '<?= json_encode($categoryArray)?>';
|
||||||
|
</script>
|
||||||
|
<?php endif; ?>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
if ($.cookie('doNotShowVKgroup')) {
|
if ($.cookie('doNotShowVKgroup')) {
|
||||||
|
|
|
||||||
|
|
@ -184,9 +184,7 @@ function showRandomPoint()
|
||||||
*/
|
*/
|
||||||
function initCategories()
|
function initCategories()
|
||||||
{
|
{
|
||||||
$.ajax({
|
data = JSON.parse(categoryArray);
|
||||||
url: "/json/categories/",
|
|
||||||
success: function (data) {
|
|
||||||
for (var k in data) {
|
for (var k in data) {
|
||||||
categories[data[k]['id']] = L.icon({
|
categories[data[k]['id']] = L.icon({
|
||||||
iconUrl: data[k]['icon'],
|
iconUrl: data[k]['icon'],
|
||||||
|
|
@ -196,11 +194,7 @@ function initCategories()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
initPoints();
|
return initPoints();
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue