Permalink
Browse files

Ticket #22 - Pull request cleanup

  • Loading branch information...
1 parent b78120d commit 27022ed247c74b3cf24c6e180f51ee19b4d63bff @OscarGodson committed Jan 22, 2013
Showing with 26 additions and 14 deletions.
  1. +13 −7 epiceditor/js/epiceditor.js
  2. +13 −7 src/editor.js
View
20 epiceditor/js/epiceditor.js
@@ -598,7 +598,7 @@
_elementStates = {}
self._goFullscreen = function (el) {
-
+
if (self.is('fullscreen')) {
self._exitFullscreen(el);
return;
@@ -607,9 +607,11 @@
if (nativeFs) {
if (nativeFsWebkit) {
el.webkitRequestFullScreen();
- } else if (nativeFsMoz) {
+ }
+ else if (nativeFsMoz) {
el.mozRequestFullScreen();
- } else if (nativeFsW3C) {
+ }
+ else if (nativeFsW3C) {
el.requestFullscreen();
}
}
@@ -716,9 +718,11 @@
else {
if (nativeFsWebkit) {
document.webkitCancelFullScreen();
- } else if (nativeFsMoz) {
+ }
+ else if (nativeFsMoz) {
document.mozCancelFullScreen();
- } else if (nativeFsW3C) {
+ }
+ else if (nativeFsW3C) {
document.exitFullscreen();
}
}
@@ -770,13 +774,15 @@
self._exitFullscreen(fsElement);
}
}, false);
- } else if (nativeFsMoz) {
+ }
+ else if (nativeFsMoz) {
document.addEventListener('mozfullscreenchange', function () {
if (!document.mozFullScreen && self._eeState.fullscreen) {
self._exitFullscreen(fsElement);
}
}, false);
- } else if (nativeFsW3C) {
+ }
+ else if (nativeFsW3C) {
document.addEventListener('fullscreenchange', function () {
if (document.fullscreenElement == null && self._eeState.fullscreen) {
self._exitFullscreen(fsElement);
View
20 src/editor.js
@@ -598,7 +598,7 @@
_elementStates = {}
self._goFullscreen = function (el) {
-
+
if (self.is('fullscreen')) {
self._exitFullscreen(el);
return;
@@ -607,9 +607,11 @@
if (nativeFs) {
if (nativeFsWebkit) {
el.webkitRequestFullScreen();
- } else if (nativeFsMoz) {
+ }
+ else if (nativeFsMoz) {
el.mozRequestFullScreen();
- } else if (nativeFsW3C) {
+ }
+ else if (nativeFsW3C) {
el.requestFullscreen();
}
}
@@ -716,9 +718,11 @@
else {
if (nativeFsWebkit) {
document.webkitCancelFullScreen();
- } else if (nativeFsMoz) {
+ }
+ else if (nativeFsMoz) {
document.mozCancelFullScreen();
- } else if (nativeFsW3C) {
+ }
+ else if (nativeFsW3C) {
document.exitFullscreen();
}
}
@@ -770,13 +774,15 @@
self._exitFullscreen(fsElement);
}
}, false);
- } else if (nativeFsMoz) {
+ }
+ else if (nativeFsMoz) {
document.addEventListener('mozfullscreenchange', function () {
if (!document.mozFullScreen && self._eeState.fullscreen) {
self._exitFullscreen(fsElement);
}
}, false);
- } else if (nativeFsW3C) {
+ }
+ else if (nativeFsW3C) {
document.addEventListener('fullscreenchange', function () {
if (document.fullscreenElement == null && self._eeState.fullscreen) {
self._exitFullscreen(fsElement);

0 comments on commit 27022ed

Please sign in to comment.