Merge pull request #3919 from avalonmediasystem/develop

Latest from develop

vendor/assets/javascripts/mediaelement/mediaelement-and-player.js

@@ -1744,14 +1744,14 @@ Object.assign(_player2.default.prototype, {
  }
 
  t.timefloat.style.left = leftPos + 'px';
+ t.timefloat.style.bottom = '3px';
  t.timefloatcurrent.innerHTML = (0, _time.secondsToTimeCode)(t.newTime, player.options.alwaysShowHours, player.options.showTimecodeFrameCount, player.options.framesPerSecond, player.options.secondsDecimalLength, player.options.timeFormat);
  t.timefloat.style.display = 'block';
  }
  }
  } else if (!_constants.IS_IOS && !_constants.IS_ANDROID && t.timefloat) {
  leftPos = t.timefloat.offsetWidth + width >= t.getElement(t.container).offsetWidth ? t.timefloat.offsetWidth / 2 : 0;
  t.timefloat.style.left = leftPos + 'px';
- t.timefloat.style.left = leftPos + 'px';
  t.timefloat.style.bottom = '3px';
  t.timefloat.style.display = 'block';
  }

vendor/assets/stylesheets/mediaelement/mediaelementplayer.scss

@@ -437,7 +437,6 @@ Reference: http://blog.rrwd.nl/2015/04/04/the-screen-reader-text-class-why-and-h
 .mejs__time-float {
  background: #eee;
  border: solid 1px #333;
- bottom: 100%;
  color: #111;
  display: none;
  height: 14px;

yarn.lock

@@ -1336,12 +1336,11 @@ aws4@^1.8.0:
  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@^0.19.0:
- version "0.19.0"
- resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
- integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
+ version "0.19.1"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.1.tgz#8a6a04eed23dfe72747e1dd43c604b8f1677b5aa"
+ integrity sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==
  dependencies:
  follow-redirects "1.5.10"
- is-buffer "^2.0.2"
 
 babel-loader@^8.0.5:
  version "8.0.5"
@@ -3819,11 +3818,6 @@ is-buffer@^1.1.5:
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.2:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
- integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-callable@^1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
@@ -4686,11 +4680,6 @@ [email protected], "mkdirp@>=0.5 0", mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdir
  dependencies:
  minimist "0.0.8"
 
-moment@^2.22.2:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
- integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
-
 move-concurrently@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6368,7 +6357,7 @@ react-redux@^6.0.0:
 
 "react-structural-metadata-editor@https://github.com/avalonmediasystem/react-structural-metadata-editor":
  version "1.1.0"
- resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#24780f0f09e9f40bb0c476fdb634b08682c0bee9"
+ resolved "https://github.com/avalonmediasystem/react-structural-metadata-editor#2ad6225343776e499d37c8cdc5f8581e8a2b76e6"
  dependencies:
  "@babel/runtime" "^7.4.4"
  "@fortawesome/fontawesome-svg-core" "^1.2.4"
@@ -6380,7 +6369,6 @@ react-redux@^6.0.0:
  base-64 "^0.1.0"
  hls.js "0.12.3-canary.4258"
  lodash "4.17.13"
- moment "^2.22.2"
  peaks.js "0.10.1"
  prop-types "^15.6.2"
  react-bootstrap "^0.32.4"