瀏覽代碼

Update Viewport. Fix ViewportDecorator.isFullscreenAvailable()

customisations
alemart 1 年之前
父節點
當前提交
448420beb5
共有 1 個檔案被更改,包括 8 行新增11 行删除
  1. 8
    11
      src/core/viewport.ts

+ 8
- 11
src/core/viewport.ts 查看文件

249
                     if(container === (document as any).webkitFullscreenElement)
249
                     if(container === (document as any).webkitFullscreenElement)
250
                         resolve();
250
                         resolve();
251
                     else
251
                     else
252
-                        reject(new AccessDeniedError());
252
+                        reject(new TypeError());
253
                 }, 100);
253
                 }, 100);
254
             });
254
             });
255
         }
255
         }
256
 
256
 
257
-        // check if fullscreen is supported
257
+        // check if the fullscreen mode is available
258
         if(!document.fullscreenEnabled)
258
         if(!document.fullscreenEnabled)
259
             return Speedy.Promise.reject(new AccessDeniedError());
259
             return Speedy.Promise.reject(new AccessDeniedError());
260
 
260
 
278
             if(doc.webkitExitFullscreen === undefined)
278
             if(doc.webkitExitFullscreen === undefined)
279
                 return Speedy.Promise.reject(new NotSupportedError());
279
                 return Speedy.Promise.reject(new NotSupportedError());
280
             else if(doc.webkitFullscreenElement === null)
280
             else if(doc.webkitFullscreenElement === null)
281
-                return Speedy.Promise.reject(new TypeError('Not in fullscreen mode'));
281
+                return Speedy.Promise.reject(new IllegalOperationError('Not in fullscreen mode'));
282
 
282
 
283
             // webkitExitFullscreen() does not return a value
283
             // webkitExitFullscreen() does not return a value
284
             doc.webkitExitFullscreen();
284
             doc.webkitExitFullscreen();
656
      */
656
      */
657
     isFullscreenAvailable(): boolean
657
     isFullscreenAvailable(): boolean
658
     {
658
     {
659
-        return this._base.fullscreenAvailable;
659
+        return this._base.isFullscreenAvailable();
660
     }
660
     }
661
 
661
 
662
     /**
662
     /**
758
         super._init();
758
         super._init();
759
         this._active = true;
759
         this._active = true;
760
 
760
 
761
-        // bound resize
762
-        const resize = this._resize.bind(this);
763
-
764
         // Configure the resize listener. We want the viewport
761
         // Configure the resize listener. We want the viewport
765
         // to adjust itself if the phone/screen is resized or
762
         // to adjust itself if the phone/screen is resized or
766
         // changes orientation
763
         // changes orientation
776
 
773
 
777
             timeout = setTimeout(() => {
774
             timeout = setTimeout(() => {
778
                 timeout = null;
775
                 timeout = null;
779
-                resize();
776
+                this._resize();
780
             }, 50);
777
             }, 50);
781
         };
778
         };
782
         window.addEventListener('resize', onWindowResize);
779
         window.addEventListener('resize', onWindowResize);
784
         // handle changes of orientation
781
         // handle changes of orientation
785
         // (is this needed? we already listen to resize events)
782
         // (is this needed? we already listen to resize events)
786
         if(screen.orientation !== undefined)
783
         if(screen.orientation !== undefined)
787
-            screen.orientation.addEventListener('change', resize);
784
+            screen.orientation.addEventListener('change', this._resize.bind(this));
788
         else
785
         else
789
-            window.addEventListener('orientationchange', resize); // deprecated
786
+            window.addEventListener('orientationchange', this._resize.bind(this)); // deprecated
790
 
787
 
791
         // trigger a resize to setup the sizes / the CSS
788
         // trigger a resize to setup the sizes / the CSS
792
-        resize();
789
+        this._resize();
793
     }
790
     }
794
 
791
 
795
     /**
792
     /**

Loading…
取消
儲存