Fix resizer (lynckia#965)

Arri98 · Jul 13, 2017 · b39d04d · b39d04d
1 parent 714178d
commit b39d04d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git a/erizo_controller/erizoClient/gulpfile.js b/erizo_controller/erizoClient/gulpfile.js
@@ -46,7 +46,9 @@ targets.forEach(
 
 gulp.task('lint', () => {
   return gulp.src(config.paths.js)
-  .pipe(plugins.eslint());
+  .pipe(plugins.eslint())
+  .pipe(plugins.eslint.format())
+  .pipe(plugins.eslint.failAfterError());
 });
 
 gulp.task('watch', () => {

diff --git a/erizo_controller/erizoClient/src/Erizo.js b/erizo_controller/erizoClient/src/Erizo.js
@@ -3,8 +3,10 @@ import { LicodeEvent, RoomEvent, StreamEvent } from './Events';
 import Stream from './Stream';
 import Logger from './utils/Logger';
 
-require("expose-loader?adapter!../lib/adapter.js");
-require("script-loader!./utils/L.Resizer.js");
+// eslint-disable-next-line 
+require('expose-loader?adapter!../lib/adapter.js');
+// eslint-disable-next-line
+require('script-loader!./utils/L.Resizer.js');
 
 
 const Erizo = {

diff --git a/erizo_controller/erizoClient/src/ErizoFc.js b/erizo_controller/erizoClient/src/ErizoFc.js
@@ -9,7 +9,7 @@ const Erizo = {
   LicodeEvent,
   RoomEvent,
   StreamEvent,
-  Stream
+  Stream,
 };
 
 export default Erizo;
diff --git a/erizo_controller/erizoClient/src/utils/L.Resizer.js b/erizo_controller/erizoClient/src/utils/L.Resizer.js
@@ -267,18 +267,6 @@ if (window.addEventListener) {
   window.attachEvent('onload', init);
 }
 
-  // Only used for the dirty checking, so the event callback count is limted
-  //  to max 1 call per fps per sensor.
-  // In combination with the event based resize sensor this saves cpu time,
-  // because the sensor is too fast and
-  // would generate too many unnecessary events.
-const customRequestAnimationFrame = window.requestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      function delay(fn) {
-        return window.setTimeout(fn, 20);
-      };
-
   /**
    * Iterate over each of the provided element(s).
    *
@@ -347,6 +335,18 @@ L.ResizeSensor = function ResizeSensor(element, callback = () => {}) {
        * @param {Function}    resized
        */
   function attachResizeEvent(htmlElement, resized) {
+    // Only used for the dirty checking, so the event callback count is limted
+    //  to max 1 call per fps per sensor.
+    // In combination with the event based resize sensor this saves cpu time,
+    // because the sensor is too fast and
+    // would generate too many unnecessary events.
+    const customRequestAnimationFrame = window.requestAnimationFrame ||
+    window.mozRequestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    function delay(fn) {
+      return window.setTimeout(fn, 20);
+    };
+
     const newElement = htmlElement;
     if (!newElement.resizedAttached) {
       newElement.resizedAttached = new EventQueue();

diff --git a/erizo_controller/erizoClient/src/views/VideoPlayer.js b/erizo_controller/erizoClient/src/views/VideoPlayer.js
@@ -54,11 +54,11 @@ const VideoPlayer = (spec) => {
   // It will stop the VideoPlayer and remove it from the HTML
   that.destroy = () => {
     that.video.pause();
-    delete that.Loggerr;
+    delete that.resizer;
     that.parentNode.removeChild(that.div);
   };
 
-  that.Logger = () => {
+  that.resize = () => {
     const width = that.container.offsetWidth;
     const height = that.container.offsetHeight;
 
@@ -132,7 +132,7 @@ const VideoPlayer = (spec) => {
   if (spec.options.resizer !== false) {
     that.resizer = L.ResizeSensor(that.container, that.resize);
 
-    that.Logger();
+    that.resize();
   }
 
   // Bottom Bar