bug fixing embed dialog

tursics · Apr 21, 2017 · e7b8a30 · e7b8a30
1 parent 546a1f3
commit e7b8a30
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/karte-mahe-2017.css b/karte-mahe-2017.css
@@ -421,13 +421,18 @@
 }
 #popupShare li.ui-block-a {
 }
-#popupShare li.ui-tabs-active {
-	border-bottom: 4px solid #38aadd;
-	border-radius: 20%;
+#popupShare ul.ui-tabs-nav .ui-btn {
+	background: #fff;
+	border-color: #ddd;
+}
+#popupShare li.ui-tabs-active .ui-btn.ui-btn-active {
+	background: #f1f8fc;
+	color: #38aadd;
+	padding-bottom: .9em;
+	border-bottom: 2px solid #38aadd;
 }
 #popupShare iframe {
 	border: 1px solid #555 !important;
-	border-radius: 1.2em;
 }
 #popupShare .ui-input-text {
 	background: #fff;

diff --git a/karte-mahe-2017.html b/karte-mahe-2017.html
@@ -50,10 +50,10 @@
 	<link rel="apple-touch-icon" sizes="144x144" href="/assets/apple-icon-144x144.png">
 	<link rel="apple-touch-icon" sizes="152x152" href="/assets/apple-icon-152x152.png">
 	<link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-icon-180x180.png">
-	<link rel="icon" type="image/png" sizes="192x192"  href="/assets/android-icon-192x192.png">
-	<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon-16x16.png">
-	<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon-32x32.png">
-	<link rel="icon" type="image/png" sizes="96x96" href="/assets/favicon-96x96.png">
+	<link rel="icon" type="image/png" sizes="192x192"  href="./assets/android-icon-192x192.png">
+	<link rel="icon" type="image/png" sizes="16x16" href="./assets/favicon-16x16.png">
+	<link rel="icon" type="image/png" sizes="32x32" href="./assets/favicon-32x32.png">
+	<link rel="icon" type="image/png" sizes="96x96" href="./assets/favicon-96x96.png">
 	<meta name="msapplication-TileColor" content="#ffffff">
 	<meta name="msapplication-TileImage" content="/assets/ms-icon-144x144.png">
 	<meta name="theme-color" content="#ffffff">
@@ -122,7 +122,7 @@ <h3>Wie kaputt ist Ihre Schule?</h3>
 				<div data-role="tabs" id="tabs" style="padding:0;">
 					<div data-role="navbar">
 						<ul>
-							<li><a href="#shareLink" id="tabShareLink" data-ajax="false">Link teilen</a></li>
+							<li><a href="#shareLink" id="tabShareLink" data-ajax="false" class="ui-btn-active">Link teilen</a></li>
 							<li><a href="#embedMap" id="tabEmbedMap" data-ajax="false">Karte einbetten</a></li>
 						</ul>
 					</div>
@@ -158,7 +158,7 @@ <h3>Wie kaputt ist Ihre Schule?</h3>
 							</div>
 						</div>
 						<iframe></iframe>
-						<div style="text-align:center;margin:0;"><a href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-a" data-rel="back">Schließen</a></div>
+						<div style="text-align:center;margin:.8em 0 0 0;"><a href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-inline ui-btn-a" data-rel="back">Schließen</a></div>
 					</div>
 				</div>
 			</div>

diff --git a/karte-mahe-2017.js b/karte-mahe-2017.js
@@ -625,12 +625,14 @@ function createMarker(data) {
 function selectSuggestion(selection) {
 	'use strict';
 
-	$.each(layerGroup._layers, function (key, val) {
-		if (val.options.data.Gebaeudenummer === selection) {
-			map.panTo(new L.LatLng(val.options.data.lat, val.options.data.lng));
-			updateMapSelectItem(val.options.data);
-		}
-	});
+	if (null !== layerGroup._layers) {
+		$.each(layerGroup._layers, function (key, val) {
+			if (val.options.data.Gebaeudenummer === selection) {
+				map.panTo(new L.LatLng(val.options.data.lat, val.options.data.lng));
+				updateMapSelectItem(val.options.data);
+			}
+		});
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -703,7 +705,7 @@ function initSearchBox(data) {
 }
 
 // -----------------------------------------------------------------------------
-
+/*
 function printerLabelClick() {
 	if (location.pathname.replace(/^\//, '') === this.pathname.replace(/^\//, '') && (location.hostname === this.hostname)) {
 		var hash = this.hash,
@@ -729,7 +731,7 @@ function printerLabelClick() {
 		}
 	}
 }
-
+*/
 // -----------------------------------------------------------------------------
 
 function initSocialMedia() {
@@ -833,7 +835,7 @@ $(document).on("pageshow", "#pageMap", function () {
 
 		$('#inputEmbedURI').val(html);
 		if (-1 === $('#embedMap iframe')[0].outerHTML.indexOf('width="' + x + '"')) {
-			$('#embedMap iframe')[0].outerHTML = html;
+			$('#embedMap iframe')[0].outerHTML = html.replace('.html"', '.html?foo=' + (new Date().getTime()) + '"');
 			$('#embedMap input').focus().select();
 		}
 	}
@@ -871,7 +873,7 @@ $(document).on("pageshow", "#pageMap", function () {
 	});
 
 	$('#selectEmbedSize').val('400x300').selectmenu('refresh');
-	$('#selectEmbedSize').on('click', function (e) {
+	$('#selectEmbedSize').on('change', function (e) {
 		updateEmbedURI();
 		$('#popupShare').popup('reposition', 'positionTo: window');
 	});
@@ -882,7 +884,7 @@ $(document).on("pageshow", "#pageMap", function () {
 $(function () {
 	'use strict';
 
-	$('a[href*="#"]:not([href="#"])').click(printerLabelClick);
+//	$('a[href*="#"]:not([href="#"])').click(printerLabelClick);
 
 	var isIFrame = true;
 	try {