Commit f11b5ca5 authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch...

Merge branch '409-wenn-karten-in-den-ergebnissen-angezeigt-werden-scrollt-der-firefox-nicht-mehr-korrekt' into 'development'

Resolve "Wenn Karten in den Ergebnissen angezeigt werden scrollt der Firefox nicht mehr korrekt."

Closes #409

See merge request !648
parents e3a10c6f 30ea38d9
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
{
"css/themes/default.css": "css/themes/default-a9062cf83c.css",
"js/all.js": "js/all-a6733fb0ee.js",
"js/quicktips.js": "js/quicktips-34d41bc58a.js"
"css/themes/default.css": "css/themes/default-39c89a0e8d.css",
"js/all.js": "js/all-33a9cda328.js",
"js/quicktips.js": "js/quicktips-4563c0221a.js"
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
$(document).ready(function() {
getDocumentReadyForUse($("#foki > li.active > a").attr("aria-controls"));
$('iframe').iFrameResize({
'autoResize': false,
'heightCalculationMethod': 'documentElementScroll'
});
$('iframe').iFrameResize();
botProtection();
});
......
......@@ -36,7 +36,7 @@
<div class="result row" id="map">
<div class="number col-sm-1 hidden-xs"></div>
<div class="resultInformation col-xs-12 col-sm-11">
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" style="width: 100%; height:0; border:0;"></iframe>
<iframe class="" src="https://maps.metager.de/metager/{{ $metager->getQ() }}" scrolling="no" tabindex="-1" style="width: 100%; height:0; border:0;"></iframe>
</div>
</div>
@endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment