Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1188 from geoadmin/fix_fullscreen
Browse files Browse the repository at this point in the history
Display popups and swipe over the map in full screen mode
  • Loading branch information
procrastinatio committed Mar 4, 2014
2 parents 619198b + a5b63c8 commit 122d23e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/components/fullscreen/FullscreenDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
template: "<a href='#' ng-if='fullscreenSupported' " +
"ng-click='click()' translate>full_screen</a>",
link: function(scope, element, attrs) {
var fullScreenCssClass = 'ga-full-screen';
// Use the documentElement element in order to check if the
// Fullscreen API is usable
// Documentation about Fullscreen API flavours:
Expand Down Expand Up @@ -39,6 +40,7 @@

if (scope.fullscreenSupported) {
var onFullscreenChange = function() {
$(document.body).addClass(fullScreenCssClass);
// Bug in Safari
scope.map.updateSize();
var target = scope.map.getTarget();
Expand All @@ -47,6 +49,7 @@
document.webkitFullscreenElement ||
document.msFullscreenElement)) {
gaPermalink.refresh();
$(document.body).removeClass(fullScreenCssClass);
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/index.mako.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</div>
<div ga-swipe
ga-swipe-map="map"
ga-swipe-active="isSwipeActive"
ga-swipe-active="isSwipeActive"
style="display:none;">
</div>
</div> <!-- #map -->
Expand Down
6 changes: 6 additions & 0 deletions src/style/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ form {
}
}

.ga-full-screen {
.ga-swipe, [ga-popup] {
z-index: 3000000000;
}
}

#copyrightsdata {
font-size: 11px;
position: absolute;
Expand Down

0 comments on commit 122d23e

Please sign in to comment.