shaka-player 3.2.0 → 3.2.4

package/ui/less/containers.less

@@ -157,6 +157,9 @@
     /* 32px tall controls. */
     height: 32px;
 
+    /* Consistent alignment of buttons. */
+    line-height: 0.5;
+
     /* Consistent margins (external) and padding (internal) between controls. */
     .bottom-panels-elements-margin();
 
@@ -226,13 +229,9 @@
   transition-delay: 500ms;
 
   /* These are defaults which are overridden by JS or cue styles. */
-  span:not(.shaka-text-wrapper) {
-    display: inline;
-    font-size: 20px;
-    line-height: 1.4;  // relative to font size.
-    background-color: rgba(0, 0, 0, 0.8);
-    color: rgb(255, 255, 255);
-  }
+  font-size: 20px;
+  line-height: 1.4;  // relative to font size.
+  color: rgb(255, 255, 255);
 
   span.shaka-text-wrapper {
     display: inline;

package/ui/locales/ru.json

@@ -1,10 +1,10 @@
 {
-  "AD_DURATION": "Продолжительность объявления",
-  "AD_PROGRESS": "Объявление [AD_ON] из [NUM_ADS]",
-  "AD_TIME": "Объявление: [AD_TIME]",
+  "AD_DURATION": "Продолжительность рекламы",
+  "AD_PROGRESS": "Реклама [AD_ON] из [NUM_ADS]",
+  "AD_TIME": "Реклама: [AD_TIME]",
   "AUTO_QUALITY": "Авто",
   "BACK": "Назад",
-  "CAPTIONS": "Титры",
+  "CAPTIONS": "Субтитры",
   "CAST": "Транслировать...",
   "ENTER_LOOP_MODE": "Зациклить текущее видео",
   "ENTER_PICTURE_IN_PICTURE": "Перейти в режим \"Картинка в картинке\"",
@@ -20,8 +20,8 @@
   "MULTIPLE_LANGUAGES": "Несколько языков",
   "MUTE": "Отключить звук",
   "NOT_APPLICABLE": "Неприменимо",
-  "OFF": "Включить",
-  "ON": "Отключить",
+  "OFF": "Выкл.",
+  "ON": "Вкл.",
   "PAUSE": "Пауза",
   "PICTURE_IN_PICTURE": "Картинка в картинке",
   "PLAY": "Воспроизвести",

package/ui/localization.js

@@ -23,17 +23,18 @@ goog.require('shaka.util.LanguageUtils');
  * If a string is not available, it will return the localized
  * form in the closest related locale.
  *
- * @implements {EventTarget}
  * @final
  * @export
  */
-shaka.ui.Localization = class {
+shaka.ui.Localization = class extends shaka.util.FakeEventTarget {
   /**
    * @param {string} fallbackLocale
    *    The fallback locale that should be used. It will be assumed that this
    *    locale should have entries for just about every request.
    */
   constructor(fallbackLocale) {
+    super();
+
     /** @private {string} */
     this.fallbackLocale_ = shaka.util.LanguageUtils.normalize(fallbackLocale);
 
@@ -62,41 +63,16 @@ shaka.ui.Localization = class {
      * @private {!Map.<string, !Map.<string, string>>}
      */
     this.localizations_ = new Map();
-
-    /**
-     * The event target that we will wrap so that we can fire events
-     * without having to manage the listeners directly.
-     *
-     * @private {!EventTarget}
-     */
-    this.events_ = new shaka.util.FakeEventTarget();
-  }
-
-  /**
-   * @override
-   * @export
-   */
-  addEventListener(type, listener, options) {
-    this.events_.addEventListener(type, listener, options);
-  }
-
-  /**
-   * @override
-   * @export
-   */
-  removeEventListener(type, listener, options) {
-    // Apparently Closure says we can be passed a null |option|, but we can't
-    // pass a null option, so if we get have a null-like |option|, force it to
-    // be undefined.
-    this.events_.removeEventListener(type, listener, options || undefined);
   }
 
   /**
    * @override
    * @export
    */
-  dispatchEvent(event) {
-    return this.events_.dispatchEvent(event);
+  release() {
+    // Placeholder so that readers know this implements IReleasable (via
+    // FakeEventTarget)
+    super.release();
   }
 
   /**
@@ -130,28 +106,20 @@ shaka.ui.Localization = class {
         (locale) => !this.localizations_.has(locale));
 
     if (missing.length) {
-      /** @type {shaka.ui.Localization.UnknownLocalesEvent} */
-      const eMissing = {
-        'locales': missing,
-      };
-
-      this.events_.dispatchEvent(new shaka.util.FakeEvent(
+      this.dispatchEvent(new shaka.util.FakeEvent(
           Class.UNKNOWN_LOCALES,
-          eMissing));
+          (new Map()).set('locales', missing)));
     }
 
     const found = shaka.util.Iterables.filter(
         this.currentLocales_,
         (locale) => this.localizations_.has(locale));
 
-    /** @type {shaka.ui.Localization.LocaleChangedEvent} */
-    const eFound = {
-      'locales': found.length ? found : [this.fallbackLocale_],
-    };
-
-    this.events_.dispatchEvent(new shaka.util.FakeEvent(
+    const data = (new Map()).set(
+        'locales', found.length ? found : [this.fallbackLocale_]);
+    this.dispatchEvent(new shaka.util.FakeEvent(
         Class.LOCALE_CHANGED,
-        eFound));
+        data));
   }
 
   /**
@@ -201,7 +169,7 @@ shaka.ui.Localization = class {
     // data from.
     this.updateCurrentMap_();
 
-    this.events_.dispatchEvent(new FakeEvent(Class.LOCALE_UPDATED));
+    this.dispatchEvent(new FakeEvent(Class.LOCALE_UPDATED));
 
     return this;
   }
@@ -253,14 +221,11 @@ shaka.ui.Localization = class {
     // number of locales. Since we don't know which ones we actually checked,
     // just tell them the preferred locale.
 
-    /** @type {shaka.ui.Localization.UnknownLocalizationEvent} */
-    const e = {
-      // Make a copy to avoid leaking references.
-      'locales': Array.from(this.currentLocales_),
-      'missing': id,
-    };
-
-    this.events_.dispatchEvent(new FakeEvent(Class.UNKNOWN_LOCALIZATION, e));
+    const data = new Map()
+        // Make a copy to avoid leaking references.
+        .set('locales', Array.from(this.currentLocales_))
+        .set('missing', id);
+    this.dispatchEvent(new FakeEvent(Class.UNKNOWN_LOCALIZATION, data));
 
     return '';
   }
@@ -381,18 +346,16 @@ shaka.ui.Localization = class {
     }
 
     if (missing.size > 0) {
-      /** @type {shaka.ui.Localization.MissingLocalizationsEvent} */
-      const e = {
-        // Make a copy of the preferred locales to avoid leaking references.
-        'locales': Array.from(preferredLocales),
-        // Because most people like arrays more than sets, convert the set to
-        // an array.
-        'missing': Array.from(missing),
-      };
-
-      this.events_.dispatchEvent(new shaka.util.FakeEvent(
+      const data = new Map()
+          // Make a copy of the preferred locales to avoid leaking references.
+          .set('locales', Array.from(preferredLocales))
+          // Because more people like arrays more than sets, convert the set to
+          // an array.
+          .set('missing', Array.from(missing));
+
+      this.dispatchEvent(new shaka.util.FakeEvent(
           shaka.ui.Localization.MISSING_LOCALIZATIONS,
-          e));
+          data));
     }
   }
 
@@ -478,52 +441,42 @@ shaka.ui.Localization.LOCALE_CHANGED = 'locale-changed';
 shaka.ui.Localization.LOCALE_UPDATED = 'locale-updated';
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>
- * }}
- *
+ * @event shaka.ui.Localization.UnknownLocalesEvent
+ * @property {string} type
+ *   'unknown-locales'
  * @property {!Array.<string>} locales
  *    The locales that the user wanted but could not be found.
  * @exportDoc
  */
-shaka.ui.Localization.UnknownLocalesEvent;
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>,
- *   'missing': string
- * }}
- *
+ * @event shaka.ui.Localization.MissingLocalizationsEvent
+ * @property {string} type
+ *   'unknown-localization'
  * @property {!Array.<string>} locales
  *    The locales that the user wanted.
  * @property {string} missing
  *    The id of the unknown entry.
  * @exportDoc
  */
-shaka.ui.Localization.UnknownLocalizationEvent;
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>,
- *   'missing': !Array.<string>
- * }}
- *
+ * @event shaka.ui.Localization.MissingLocalizationsEvent
+ * @property {string} type
+ *   'missing-localizations'
  * @property {string} locale
  *    The locale that the user wanted.
  * @property {!Array.<string>} missing
  *    The ids of the missing entries.
  * @exportDoc
  */
-shaka.ui.Localization.MissingLocalizationsEvent;
 
 /**
- * @typedef {{
- *   'locales': !Array.<string>
- * }}
- *
+ * @event shaka.ui.Localization.LocaleChangedEvent
+ * @property {string} type
+ *   'locale-changed'
  * @property {!Array.<string>} locales
  *    The new set of locales that user wanted,
  *    and that were successfully found.
  * @exportDoc
  */
-shaka.ui.Localization.LocaleChangedEvent;

package/ui/pip_button.js

@@ -130,9 +130,8 @@ shaka.ui.PipButton = class extends shaka.ui.Element {
         await document.exitPictureInPicture();
       }
     } catch (error) {
-      this.controls.dispatchEvent(new shaka.util.FakeEvent('error', {
-        detail: error,
-      }));
+      this.controls.dispatchEvent(new shaka.util.FakeEvent(
+          'error', (new Map()).set('detail', error)));
     }
   }
 

package/ui/seek_bar.js

@@ -15,7 +15,6 @@ goog.require('shaka.ui.RangeElement');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.Timer');
-goog.requireType('shaka.ads.CuePoint');
 goog.requireType('shaka.ui.Controls');
 
 
@@ -83,7 +82,7 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
      */
     this.wasPlaying_ = false;
 
-    /** @private {!Array.<!shaka.ads.CuePoint>} */
+    /** @private {!Array.<!shaka.extern.AdCuePoint>} */
     this.adCuePoints_ = [];
 
     this.eventManager.listen(this.localization,

package/ui/text_selection.js

@@ -64,6 +64,7 @@ shaka.ui.TextSelection = class extends shaka.ui.SettingsMenu {
 
     this.eventManager.listen(this.player, 'texttrackvisibility', () => {
       this.onCaptionStateChange_();
+      this.updateTextLanguages_();
     });
 
     this.eventManager.listen(this.player, 'textchanged', () => {