mirror
/
facilmap
kopia lustrzana https://github.com/FacilMap/facilmap
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixing loading screen

before-bootstrap
Candid Dauth 2014-04-10 01:58:36 +02:00
rodzic ac96715927
commit 5b8fe9f69a
2 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
frontend/js/ng.js
Wyświetl plik

@ -59,6 +59,7 @@
$scope.currentMarker = null; $scope.currentMarker = null;
$scope.messages = [ ]; $scope.messages = [ ];
$scope.padUrl = location.protocol + "//" + location.host + location.pathname; $scope.padUrl = location.protocol + "//" + location.host + location.pathname;
$scope.error = false;
socket.emit("setPadId", location.pathname.match(/[^\/]*$/)[0]); socket.emit("setPadId", location.pathname.match(/[^\/]*$/)[0]);
@ -288,7 +289,7 @@
}); });
socket.on("disconnect", function() { socket.on("disconnect", function() {
$scope.loaded = false; $scope.error = true;
$scope.showMessage("error", "The connection to the server was lost."); $scope.showMessage("error", "The connection to the server was lost.");
}) })

2
frontend/pad.html
Wyświetl plik

@ -13,7 +13,7 @@
Loading... Loading...
</div> </div>
<div id="map"></div> <div id="map"></div>
<div id="map-disabled-cover" ng-hide="!error &amp;&amp; loaded"></div> <div id="map-disabled-cover" ng-show="!loaded || error"></div>
<ul id="toolbox"> <ul id="toolbox">
<li><a href="javascript:" ng-click="addMarker()">Add marker</a></li> <li><a href="javascript:" ng-click="addMarker()">Add marker</a></li>