fix(xgplayer): emit error when have no url; fix progress problem in m…

…obile
bytedance · Oct 17, 2018 · f86fd8d · f86fd8d
1 parent b059edc
commit f86fd8d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 21 deletions.
diff --git a/packages/xgplayer/browser/index.js b/packages/xgplayer/browser/index.js
diff --git a/packages/xgplayer/dist/index.js b/packages/xgplayer/dist/index.js
diff --git a/packages/xgplayer/package.json b/packages/xgplayer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "xgplayer",
- "version": "1.1.3-beta",
+ "version": "1.1.3-beta-3",
  "description": "video player",
  "main": "./dist/index.js",
  "scripts": {

diff --git a/packages/xgplayer/src/control/error.js b/packages/xgplayer/src/control/error.js
@@ -15,18 +15,20 @@ let error = function () {
  }
 
  util.addClass(player.root, 'xgplayer-is-error')
- refresh = error.querySelector('.xgplayer-error-refresh');
- ['touchstart', 'click'].forEach(item => {
- refresh.addEventListener(item, function (e) {
- e.preventDefault()
- e.stopPropagation()
- let p = e.target || e.srcElement
- if (p && p.tagName.toLocaleLowerCase() === 'span') {
- player.controls.style.display = 'flex'
- player.reload()
- }
+ refresh = error.querySelector('.xgplayer-error-refresh')
+ if (refresh) {
+ ['touchstart', 'click'].forEach(item => {
+ refresh.addEventListener(item, function (e) {
+ e.preventDefault()
+ e.stopPropagation()
+ let p = e.target || e.srcElement
+ if (p && p.tagName.toLocaleLowerCase() === 'span') {
+ player.controls.style.display = 'flex'
+ player.reload()
+ }
+ })
  })
- })
+ }
  })
 
  player.once('destroy', () => {

diff --git a/packages/xgplayer/src/control/pc.js b/packages/xgplayer/src/control/pc.js
@@ -54,9 +54,9 @@ let pc = function () {
  btn.addEventListener(item, function (e) {
  e.preventDefault()
  e.stopPropagation()
- if (!player.config.url) {
- return
- }
+ // if (!player.config.url) {
+ //  return
+ // }
  if (util.hasClass(root, 'xgplayer-nostart')) {
  util.removeClass(root, 'xgplayer-nostart') // for ie quick switch
  util.addClass(root, 'xgplayer-is-enter')

diff --git a/packages/xgplayer/src/style/player.scss b/packages/xgplayer/src/style/player.scss
@@ -870,6 +870,16 @@
  }
 }
 .xgplayer-mobile{
+ .xgplayer-progress-played:after{
+ display: block;
+ top: -5px;
+ }
+ .xgplayer-progress:hover,.xgplayer-progress:focus{
+ .xgplayer-progress-outer{
+ height: 3px;
+ margin-top: 8.5px;
+ }
+ }
  &.xgplayer-ended{
  .xgplayer-start{
  display: none;