Skip to content

Commit e28cc07

Browse files
committed
Merge pull request #11 from Frank3K/fullscreenchangecomplete
Add option to add an event handler to $animate add/remove fullscreen class
2 parents 154a7ed + c355b40 commit e28cc07

File tree

5 files changed

+19
-5
lines changed

5 files changed

+19
-5
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
"tests"
2222
],
2323
"dependencies": {
24-
"screenfull": "~2.0.0"
24+
"screenfull": "~3.0.0"
2525
}
2626
}

dist/angular-screenfull.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
var ctrl = this;
5959

6060
ctrl.onFullscreenChange = onFullscreenChange;
61+
ctrl.onFullscreenChangeComplete = onFullscreenChangeComplete;
6162
ctrl.requestFullscreen = requestFullscreen;
6263
ctrl.removeFullscreen = removeFullscreen;
6364
ctrl.toggleFullscreen = toggleFullscreen;
@@ -66,7 +67,9 @@
6667

6768
function subscribeToEvents () {
6869
var fullscreenchange = function () {
69-
$animate[ctrl.isFullscreen() ? 'addClass' : 'removeClass']($elm, 'fullscreen');
70+
$animate[ctrl.isFullscreen() ? 'addClass' : 'removeClass']($elm, 'fullscreen').then(function(){
71+
$scope.$emit('fullscreenchangecomplete');
72+
});
7073
// TODO: document using ngdoc
7174
$scope.$emit('fullscreenchange');
7275
$scope.$apply();
@@ -87,6 +90,10 @@
8790
return $scope.$on('fullscreenchange', handler);
8891
}
8992

93+
function onFullscreenChangeComplete (handler) {
94+
return $scope.$on('fullscreenchangecomplete', handler);
95+
}
96+
9097
function requestFullscreen () {
9198
if (ctrl.fullscreenEnabled()) {
9299
screenfull.request($elm[0]);

dist/angular-screenfull.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ gulp.task('ngdocs', ['clean-ngdocs'], function () {
4242
},
4343
scripts: [
4444
'dist/angular-screenfull.js',
45-
'https://cdnjs.cloudflare.com/ajax/libs/screenfull.js/2.0.0/screenfull.js'
45+
'https://cdnjs.cloudflare.com/ajax/libs/screenfull.js/3.0.0/screenfull.js'
4646
]
4747
};
4848
return gulp.src(['./src/**/*.js', './src/**/*.ngdoc'])

src/directive/fullscreen.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
var ctrl = this;
5454

5555
ctrl.onFullscreenChange = onFullscreenChange;
56+
ctrl.onFullscreenChangeComplete = onFullscreenChangeComplete;
5657
ctrl.requestFullscreen = requestFullscreen;
5758
ctrl.removeFullscreen = removeFullscreen;
5859
ctrl.toggleFullscreen = toggleFullscreen;
@@ -61,7 +62,9 @@
6162

6263
function subscribeToEvents () {
6364
var fullscreenchange = function () {
64-
$animate[ctrl.isFullscreen() ? 'addClass' : 'removeClass']($elm, 'fullscreen');
65+
$animate[ctrl.isFullscreen() ? 'addClass' : 'removeClass']($elm, 'fullscreen').then(function(){
66+
$scope.$emit('fullscreenchangecomplete');
67+
});
6568
// TODO: document using ngdoc
6669
$scope.$emit('fullscreenchange');
6770
$scope.$apply();
@@ -82,6 +85,10 @@
8285
return $scope.$on('fullscreenchange', handler);
8386
}
8487

88+
function onFullscreenChangeComplete (handler) {
89+
return $scope.$on('fullscreenchangecomplete', handler);
90+
}
91+
8592
function requestFullscreen () {
8693
if (ctrl.fullscreenEnabled()) {
8794
screenfull.request($elm[0]);

0 commit comments

Comments
 (0)