VE updated. FS bug fixed.

CyberAula · Feb 23, 2015 · c4f2f5a · c4f2f5a
1 parent 665cfaa
commit c4f2f5a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/lib/plugins/vish_editor/app/assets/javascripts/vishEditor.js b/lib/plugins/vish_editor/app/assets/javascripts/vishEditor.js
@@ -16297,7 +16297,9 @@ VISH.Events = function(V, $, undefined) {
     var fsParams = V.FullScreen.getFSParams();
     if(typeof fsParams.currentFSElement == "undefined") {
       if(typeof fsParams.lastFSElement != "undefined" && (fsParams.lastFSElement != document.documentElement && new Date - fsParams.lastFSTimestamp < 1E3)) {
-        return
+        if($("body").is(":-webkit-full-screen-ancestor")) {
+          return
+        }
       }
     }else {
       if(typeof fsParams.currentFSElement != "undefined" && fsParams.currentFSElement != document.documentElement) {

diff --git a/lib/plugins/vish_editor/app/assets/javascripts/vishEditor.min.js b/lib/plugins/vish_editor/app/assets/javascripts/vishEditor.min.js
diff --git a/lib/plugins/vish_editor/app/assets/javascripts/vishViewer.js b/lib/plugins/vish_editor/app/assets/javascripts/vishViewer.js
@@ -15931,7 +15931,9 @@ VISH.Events = function(V, $, undefined) {
     var fsParams = V.FullScreen.getFSParams();
     if(typeof fsParams.currentFSElement == "undefined") {
       if(typeof fsParams.lastFSElement != "undefined" && (fsParams.lastFSElement != document.documentElement && new Date - fsParams.lastFSTimestamp < 1E3)) {
-        return
+        if($("body").is(":-webkit-full-screen-ancestor")) {
+          return
+        }
       }
     }else {
       if(typeof fsParams.currentFSElement != "undefined" && fsParams.currentFSElement != document.documentElement) {

diff --git a/lib/plugins/vish_editor/app/assets/javascripts/vishViewer.min.js b/lib/plugins/vish_editor/app/assets/javascripts/vishViewer.min.js