devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

새 지도 map.html 디버깅 코드 제거, 실제 데이터로 이식 준비

Browse Source
This commit is contained in:
Hide_D
2018-01-31 17:32:49 +09:00
parent 1352009350
commit fd8ab0e4b0
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tmp_map/map.html
+35
View File
@@ -10,6 +10,41 @@
<link href="../twe/css/normalize.css" rel="stylesheet"> <link href="../twe/css/normalize.css" rel="stylesheet">
<link href="../twe/css/common.css" rel="stylesheet"> <link href="../twe/css/common.css" rel="stylesheet">
<link href="map.css" rel="stylesheet"> <link href="map.css" rel="stylesheet">
<script>
function getQueryVariable(variable) {
var query = window.location.search.substring(1);
var vars = query.split('&');
for (var i = 0; i < vars.length; i++) {
var pair = vars[i].split('=');
if (decodeURIComponent(pair[0]) == variable) {
return decodeURIComponent(pair[1]);
}
}
return null;
}
var isDetailMap = getQueryVariable('detail');
var clickableAll = false;
if(isDetailMap === null){
isDetailMap = true;
}
else{
isDetailMap = (isDetailMap != '0');
}
$(function(){
function tmp(a){
console.log(a.text);
//return false;
}
reloadWorldMap(isDetailMap, clickableAll, tmp, 'goCity.php?id={0}');
});
</script>
</head> </head>
<body style="background-color:black;"> <body style="background-color:black;">
<div class="world_map"> <div class="world_map">
tmp_map/map.js
+1 -15
View File
@@ -14,7 +14,7 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate)
var cityPosition = getCityPosition(); var cityPosition = getCityPosition();
//OBJ : startYear, year, month, cityList, nationList, spyList, ourCityList, shownByGeneralList, myCity //OBJ : startYear, year, month, cityList, nationList, spyList, shownByGeneralList, myCity
var $world_map = $('.world_map'); var $world_map = $('.world_map');
function setMapBackground(obj){ function setMapBackground(obj){
@@ -288,7 +288,6 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate)
$linkObj.append($imgObj); $linkObj.append($imgObj);
if(city.state > 0){ if(city.state > 0){
console.log(city.state);
var state_text = 'wrong'; var state_text = 'wrong';
if(city.state < 10){ if(city.state < 10){
state_text = 'good'; state_text = 'good';
@@ -390,7 +389,6 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate)
if($map_body.data('touchMode')){ if($map_body.data('touchMode')){
return true; return true;
} }
console.log('mouseenter');
var $this = $(this); var $this = $(this);
@@ -462,15 +460,3 @@ function reloadWorldMap(isDetailMap, clickableAll, selectCallback, hrefTemplate)
.then(saveCityInfo); .then(saveCityInfo);
} }
$(function(){
var isDetailMap = false;
var clickableAll = false;
function tmp(a){
console.log(a);
//return false;
}
reloadWorldMap(isDetailMap, clickableAll, tmp, 'goCity.php?id={0}');
});