fix load page

Author: bodgan-medvedev

web/index.html

@@ -110,6 +110,7 @@ <h2 style="    line-height: 0.7;">Abab.io
     width: 100%;">
 
 </div>
+
 </body>
 
 </html>

web/src/js/ABAB.js

@@ -237,9 +237,11 @@ function updatePlugins() {
     });
 }
 function initMap() {
+    console.log('[google maps] init;');
     ABAB.map.fn(true);
     ABAB.map.init=true;
 
+
 }
 var ABAB = {
     map:{
@@ -252,7 +254,9 @@ var ABAB = {
                 fn();
             }
         },
-        fn:function(){}
+        fn:function(){
+            for(var i_f in ABAB.map.cb_function_arr) ABAB.map.cb_function_arr[i_f]();
+        }
     },
     event: {},
     page: null,
@@ -279,7 +283,8 @@ var ABAB = {
         ABAB.pageObj.page = page;
         ABAB.pageObj.tab_page = tabPage;
         ractiveComponent.rootApp.set('pageActive', 'contentApplication');
-        if ('Rooms' == page) {
+        console.log('Start page:',page);
+        if ('Rooms' === page) {
             if (!tabPage) tabPage = 'all';
             requireElement({name: 'Rooms', ver: '1.1.0', element: '#content_block'}, {
                 cnt: 0,

web/src/views/App/App.html

@@ -547,8 +547,8 @@
 
 </main>
 
-<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBdhvXM0GiPDf6_-KdeHZmxrtbR4hG8bIc&callback=initMap"/>
 <script src="https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/markerclusterer.js"/>
+<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBdhvXM0GiPDf6_-KdeHZmxrtbR4hG8bIc&callback=initMap"/>
 
 
 

web/src/views/App/App.js

@@ -1,13 +1,12 @@
-
-var geocode =false;
+var geocode = false;
 var reactiveApp = Ractive.extend({
     oninit: function () {
 
         console.log('reactiveApp oninit');
         procent = 0.23;
         if (location.hash.replace('#', '').split('-')[0] && location.hash.replace('#', '').split('-')[0] != '') {
             ABAB.setPage(location.hash.replace('#', '').split('-')[0], location.hash.replace('#', '').split('-')[1], true);
-            procent = 0.30;
+            if (location.hash.replace('#', '').split('-')[0] !== 'Rooms') procent = 0.30;
         }
         else
             ABAB.setPage('Rooms');
@@ -71,8 +70,8 @@ if (localStorage.getItem('auth')) {
         localStorage.removeItem('auth');
     }
 }
-ractiveComponent['rootApp'].on('update_filter', function (e,id) {
-    var formarr = $('#'+id).serializeArray();
+ractiveComponent['rootApp'].on('update_filter', function (e, id) {
+    var formarr = $('#' + id).serializeArray();
     var form_obj = {};
     for (var i in formarr) {
         if (form_obj[formarr[i].name] && typeof form_obj[formarr[i].name] === 'string') {
@@ -82,9 +81,9 @@ ractiveComponent['rootApp'].on('update_filter', function (e,id) {
         } else
             form_obj[formarr[i].name] = formarr[i].value
     }
-    form_obj.people_count = {$gte:form_obj.people_count};
-    form_obj.children_count = {$gte:form_obj.children_count};
-    ABAB.event['update_filter'](form_obj,true);
+    form_obj.people_count = {$gte: form_obj.people_count};
+    form_obj.children_count = {$gte: form_obj.children_count};
+    ABAB.event['update_filter'](form_obj, true);
 });
 ractiveComponent['rootApp'].on('location_input_scan', function () {
 
@@ -225,9 +224,9 @@ $('#location_input_scan').flexdatalist({
 
     if (json && json.city) {
 
-        if(json.city === 'Moscow'){
+        if (json.city === 'Moscow') {
             console.error('One and the same city can have several names');
-            json.city  = 'Moskva';
+            json.city = 'Moskva';
         }
         find = {
             $or: [{
@@ -238,16 +237,16 @@ $('#location_input_scan').flexdatalist({
             }, {"address.country": {'$regex': json.city, '$options': 'i'}}]
         };
     }
-    if(json && json.city && json.city === 'Russia') json.city = 'Москва';
+    if (json && json.city && json.city === 'Russia') json.city = 'Москва';
     geocode.geocode({address: (json.city || '') + ',' + (json.country || '')}, function (results, status) {
         console.log(results);
-        if(results.length >0) {
+        if (results.length > 0) {
             map.setCenter({lng: results[0].geometry.location.lng(), lat: results[0].geometry.location.lat()});
             map.setZoom(8);
-        }else{
-            console.warn('[map geocode] address not fount:',json)
+        } else {
+            console.warn('[map geocode] address not fount:', json)
         }
     });
-    ABAB.event['update_filter'](find,true);
+    ABAB.event['update_filter'](find, true);
 
 });

web/src/views/Rooms/Rooms.js

@@ -2,6 +2,8 @@ var map = false;
 var markers = [];
 var reactiveRooms = Ractive.extend({
     oninit: function () {
+        console.log('reactiveRooms oninit');
+
         ABAB.map.call_wait_auth(function () {
             geocode = new google.maps.Geocoder();
             map = new google.maps.Map(document.getElementById('map-canvas'), {
@@ -12,7 +14,6 @@ var reactiveRooms = Ractive.extend({
             procent = 0.25;
         });
 
-        console.log('reactiveRooms oninit');
 
     }
 });