From b171aa35af0676ee90ab7a2c8074f5b3f833bed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 29 Jul 2019 14:26:26 +0800 Subject: [PATCH 001/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/login/LoginDialog.js | 2 +- public/react/src/modules/message/js/Messagerouting.js | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 public/react/src/modules/message/js/Messagerouting.js diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 50038366d..2db1929b9 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -360,7 +360,7 @@ class LoginDialog extends Component { if(response.status===200){ if (response.data.status === 402) { - window.location.href = response.data.url; + // window.location.href = response.data.url; }else if (response.data.status === -2) { notification.open({ message: '提示', diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js new file mode 100644 index 000000000..e69de29bb From 6630cae57f44c3f155b413a516cbf775aa0d7768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 30 Jul 2019 10:28:20 +0800 Subject: [PATCH 002/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 6 +- .../src/modules/message/css/messagemy.css | 6 + .../src/modules/message/js/MessagChat.js | 21 + .../react/src/modules/message/js/MessagSub.js | 125 ++++ .../src/modules/message/js/MessagePrivate.js | 21 + .../src/modules/message/js/Messagerouting.js | 77 ++ public/react/src/modules/tpm/TPMIndexHOC.js | 5 +- .../modules/user/LoginRegisterComponent.js | 702 +++++++++--------- 8 files changed, 618 insertions(+), 345 deletions(-) create mode 100644 public/react/src/modules/message/css/messagemy.css create mode 100644 public/react/src/modules/message/js/MessagChat.js create mode 100644 public/react/src/modules/message/js/MessagSub.js create mode 100644 public/react/src/modules/message/js/MessagePrivate.js diff --git a/public/react/src/App.js b/public/react/src/App.js index 49dac07cd..e7ff43e79 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -18,9 +18,9 @@ import Notcompletedysl from './modules/user/Notcompletedysl'; import Trialapplicationysl from './modules/login/Trialapplicationysl'; import Trialapplicationreview from './modules/user/Trialapplicationreview'; import Addcourses from "./modules/courses/coursesPublic/Addcourses"; -import AccountProfile from"./modules/user/AccountProfile"; - +import AccountProfile from "./modules/user/AccountProfile"; +import Messagerouting from "./modules/message/js/Messagerouting"; import Trialapplication from './modules/login/Trialapplication' import NotFoundPage from './NotFoundPage' @@ -377,7 +377,7 @@ class App extends Component { - + {/* */} {/*列表页*/} {/**/} diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css new file mode 100644 index 000000000..4bdd0f999 --- /dev/null +++ b/public/react/src/modules/message/css/messagemy.css @@ -0,0 +1,6 @@ +.myw120{ + width: 120px; +} +.myh120{ + height: 120px; +} \ No newline at end of file diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js new file mode 100644 index 000000000..0598efb30 --- /dev/null +++ b/public/react/src/modules/message/js/MessagChat.js @@ -0,0 +1,21 @@ +import React, { Component } from 'react'; +//私信聊天页面 +class MessagChat extends Component{ + constructor(props) { + super(props); + this.state={ + + } + } + + componentDidMount(){ + } + render() { + return ( +
+ +
+ ) + } +} +export default MessagChat; \ No newline at end of file diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js new file mode 100644 index 000000000..a58d059a7 --- /dev/null +++ b/public/react/src/modules/message/js/MessagSub.js @@ -0,0 +1,125 @@ +import React, { Component } from 'react'; +import { + Spin, + Pagination, +} from "antd"; +import axios from 'axios'; + +//消息页面 +class MessagSub extends Component{ + constructor(props) { + super(props); + this.state={ + page:1, + limit:10, + typeysl:"", + count:0, + isSpin:true, + } + } + // 初始化数据 + componentDidMount(){ + debugger + console.log("初始化数据了"); + this.getdata("",this.state.page); + } + + //塞选页数 + paginationonChanges=(pageNumber)=>{ + this.setState({ + page: pageNumber, + }) + this.getdata(this.state.typeysl,pageNumber); + + } + //获取数据源 + getdata=(types,page)=>{ + this.setState({ + isSpin:true, + }) + let{limit}=this.state; + let url = `/users/tidings.json`; + axios.get((url),{params:{ + type:types, + page:page, + per_page:limit, + }}).then((result) => { + if (result) { + console.log(types); + console.log(result); + if(result.data.message!==undefined){ + console.log("5151515151"); + return; + } + console.log("调用了消失的方法"); + console.log("5454545454"); + this.setState({ + count:result.data.count, + typeysl:types, + isSpin:false, + }) + } + }).catch((error) => { + console.log(error); + this.setState({ + isSpin:false, + }) + }) + } + + componentWillUnmount(){ + // 卸载异步操作设置状态 + this.setState = (state, callback) => { + return; + } + } + render() { + let{page,limit,typeysl,count,isSpin}=this.state; + console.log("6868686868"); + console.log(isSpin); + return ( +
+ {/*头部筛选数据*/} + + {/*下面内容页面*/} +
+ {/*这里可以进行数据处理*/} + +
+ + +
+ + + {/*页数*/} +
+
+ +
+
+ +
+
+ ) + } +} +export default MessagSub; \ No newline at end of file diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js new file mode 100644 index 000000000..7a7c61174 --- /dev/null +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -0,0 +1,21 @@ +import React, { Component } from 'react'; +//私信页面 +class MessagePrivate extends Component{ + constructor(props) { + super(props); + this.state={ + + } + } + + componentDidMount(){ + } + render() { + return ( +
+ +
+ ) + } +} +export default MessagePrivate; \ No newline at end of file diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index e69de29bb..6cf717e6d 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -0,0 +1,77 @@ +import React, { Component } from 'react'; +import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; +import {Input,Pagination,Tooltip} from 'antd'; +import {TPMIndexHOC} from "../../../modules/tpm/TPMIndexHOC"; +import {Link,NavLink} from 'react-router-dom'; +import { WordsBtn ,ActionBtn,SnackbarHOC,markdownToHTML,getImageUrl} from 'educoder'; +import axios from 'axios'; +import MessagSub from "./MessagSub"; +import MessagePrivate from "./MessagePrivate"; +import MessagChat from "./MessagChat"; +import "../css/messagemy.css" +// MessagSub 消息自路由 +// MessagePrivate 私信 +class Messagerouting extends Component{ + constructor(props) { + super(props); + this.state={ + routing:1, + } + } + + componentDidMount(){ + + } + // 切换路由 + + SwitchonClick=(value)=>{ + this.setState({ + routing:value, + }) + } + render() { + let{routing} =this.state; + return ( +
+
+ {/*左边*/} +
+ {/*头像*/} +
+ + + +

杨树林

+

工程师

+
+ {/*路由跳转*/} + +
+ + {/*右边*/} +
+
+ {/*消息自路由*/} + {routing===1? :""} + + {/*私信*/} + {routing===2? :""} + + {/*私信聊天页面*/} + {routing===3?:""} +
+
+
+ +
+ ) + } +} +export default SnackbarHOC() (TPMIndexHOC ( Messagerouting )); \ No newline at end of file diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index e092c17d4..2e40d006a 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -264,7 +264,10 @@ export function TPMIndexHOC(WrappedComponent) { "is_teacher": false, "tidding_count": 0 } - */ + */ + if(response=== undefined){ + return + } if (response.data) { this.initCommonState(response.data) this.setState({ diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index eb0a3a5c2..cffc633f5 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -14,12 +14,12 @@ import './common.css' import './commontwo.css' const { TabPane } = Tabs; const loginInputsyl = { -"width":"434px", -"height": "462px", -"-webkit-box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)", -"box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)", -"border-radius": "6px", -"background": "#fff" + "width":"434px", + "height": "462px", + "-webkit-box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)", + "box-shadow": "3px 10px 21px 0px rgba(76,76,76,0.15)", + "border-radius": "6px", + "background": "#fff" } //父组件EducoderLogin.js @@ -66,6 +66,7 @@ class LoginRegisterComponent extends Component { pciphone:true, MyEduCoderModals:false, registered:undefined, + Phonenumberisnotcodmms:undefined, } } @@ -103,13 +104,14 @@ class LoginRegisterComponent extends Component { pciphone:true, MyEduCoderModals:false, registered:undefined, + Phonenumberisnotcodmms:undefined, } } } //判断是否是手机端 - IsPC=()=> { + IsPC=()=> { var userAgentInfo = navigator.userAgent; var Agents = ["Android", "iPhone", "SymbianOS", "Windows Phone", @@ -162,7 +164,7 @@ class LoginRegisterComponent extends Component { StudyMakeMoney = () => { // 调用父组件方法 - this.props.Setshowbool(3); + // this.props.Setlogins(3); this.setState({ login: "", @@ -170,7 +172,12 @@ class LoginRegisterComponent extends Component { logins: "", passwords: "", codes: "", - }) + }); + try { + this.props.Setshowbool(3); + }catch (e) { + + } } onTabChange = (activeKey) => { console.log("onTabChange"); @@ -294,6 +301,7 @@ class LoginRegisterComponent extends Component { //登入接口 postLogin = () => { + if (this.state.login === undefined || this.state.login == "") { this.setState({ Phonenumberisnotco:"账号不能为空", @@ -310,34 +318,35 @@ class LoginRegisterComponent extends Component { login: this.state.login, password: this.state.password, }).then((response) => { + debugger if (response === undefined) { return } if(response.data.status === -2){ - if("该手机号尚未注册" || "该邮箱尚未注册"){ - this.setState({ - Phonenumberisnotco:response.data.message, - }) - return; - } - else if("错误的账号或密码"){ - this.setState({ - Phonenumberisnotco:response.data.message, - }) - return; - } - else if("违反平台使用规范，账号已被锁定"){ - this.setState({ - Phonenumberisnotco:response.data.message, - }) - - return; - } - else { - this.openNotification(response.data.message); - return; - } + if(response.data.message==="该手机号尚未注册" || response.data.message==="该邮箱尚未注册"){ + this.setState({ + Phonenumberisnotco:response.data.message, + }) + return; + } + else if(response.data.message==="错误的账号或密码"){ + this.setState({ + Phonenumberisnotcodmms:response.data.message, + }) + return; + } + else if(response.data.message==="违反平台使用规范，账号已被锁定"){ + this.setState({ + Phonenumberisnotco:response.data.message, + }) + + return; + } + else { + this.openNotification(response.data.message); + return; + } } @@ -468,7 +477,7 @@ class LoginRegisterComponent extends Component { // }) this.setMyEduCoderModals(); } - } + } }).catch((error) => { }) @@ -489,54 +498,54 @@ class LoginRegisterComponent extends Component { // this.setState({dragOk: true}) if(result){ - if(result.data.status===-2){ - if (id === 1) { - if(result.data.message==="该手机号码或邮箱已被注册"){ - this.setState({ - Phonenumberisnotco: undefined, - Phonenumberisnotcobool: false, - dragOk:true, - }) - }else { - this.setState({ - Phonenumberisnotco: result.data.message, - Phonenumberisnotcobool: true, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - console.log("s5"); - - } - return; - } else if (id === 2) { - this.setState({ - Phonenumberisnotcos: result.data.message, - Phonenumberisnotcobool: true, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - console.log("s6"); - - return; - } - }else { - if (id === 1) { - this.setState({ - Phonenumberisnotco: undefined, - Phonenumberisnotcobool: false, - dragOk:true, - }) - return; - } else if (id === 2) { - this.setState({ - Phonenumberisnotcos: undefined, - Phonenumberisnotcobool: false, - dragOk:true, - }) - return; - } - } - } + if(result.data.status===-2){ + if (id === 1) { + if(result.data.message==="该手机号码或邮箱已被注册"){ + this.setState({ + Phonenumberisnotco: undefined, + Phonenumberisnotcobool: false, + dragOk:true, + }) + }else { + this.setState({ + Phonenumberisnotco: result.data.message, + Phonenumberisnotcobool: true, + dragOk:false, + Whethertoverify:this.state.Whethertoverify===true?false:true, + }) + console.log("s5"); + + } + return; + } else if (id === 2) { + this.setState({ + Phonenumberisnotcos: result.data.message, + Phonenumberisnotcobool: true, + dragOk:false, + Whethertoverify:this.state.Whethertoverify===true?false:true, + }) + console.log("s6"); + + return; + } + }else { + if (id === 1) { + this.setState({ + Phonenumberisnotco: undefined, + Phonenumberisnotcobool: false, + dragOk:true, + }) + return; + } else if (id === 2) { + this.setState({ + Phonenumberisnotcos: undefined, + Phonenumberisnotcobool: false, + dragOk:true, + }) + return; + } + } + } }).catch((error) => { @@ -597,12 +606,12 @@ class LoginRegisterComponent extends Component { }) return; } - if(this.state.pciphone===true) { - if (this.state.dragOk === false) { - this.openNotification("拖动滑块验证"); - return; - } - } + if(this.state.pciphone===true) { + if (this.state.dragOk === false) { + this.openNotification("拖动滑块验证"); + return; + } + } if (this.state.getverificationcodes === true) { this.setState({ @@ -660,12 +669,14 @@ class LoginRegisterComponent extends Component { this.setState({ Phonenumberisnotco: undefined, Phonenumberisnotcobool: false, + Phonenumberisnotcodmms:undefined, login: stirngt, }) }else{ this.setState({ login: stirngt, Phonenumberisnotco:undefined, + Phonenumberisnotcodmms:undefined, }) } @@ -729,61 +740,61 @@ class LoginRegisterComponent extends Component { this.Emailphonenumberverification(e.target.value, 1); } inputOnBlurzhuche = (e, id) => { - if (e.target.value.length === 0) { - this.setState({ - Phonenumberisnotcos: undefined, - Phonenumberisnotcobool: false, - }) - return; - } - // var telephone = $("#telephoneAdd.tianjia_phone").val(); - var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/; - // var email = $("#add_email.tianjia_email").val(); - var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/; - - // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。 - var stringdata = undefined; - if (!regph.test(e.target.value)) { - stringdata = "手机号格式不正确"; - this.setState({ - Phonenumberisnotcos: stringdata, - Phonenumberisnotcobool: true, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - } else { - this.setState({ - Phonenumberisnotcos: undefined, - Phonenumberisnotcobool: false, + if (e.target.value.length === 0) { + this.setState({ + Phonenumberisnotcos: undefined, + Phonenumberisnotcobool: false, + }) + return; + } + // var telephone = $("#telephoneAdd.tianjia_phone").val(); + var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/; + // var email = $("#add_email.tianjia_email").val(); + var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/; - }) - return - } + // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。 + var stringdata = undefined; + if (!regph.test(e.target.value)) { + stringdata = "手机号格式不正确"; + this.setState({ + Phonenumberisnotcos: stringdata, + Phonenumberisnotcobool: true, + dragOk:false, + Whethertoverify:this.state.Whethertoverify===true?false:true, + }) + } else { + this.setState({ + Phonenumberisnotcos: undefined, + Phonenumberisnotcobool: false, - if (!regemail.test(e.target.value)) { - if ((e.target.value.indexOf("@") != -1) === true) { - stringdata = "邮箱格式不正确"; - } else { - stringdata = "手机号格式不正确"; + }) + return + } - } - this.setState({ - Phonenumberisnotcos: stringdata, - Phonenumberisnotcobool: true, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - return + if (!regemail.test(e.target.value)) { + if ((e.target.value.indexOf("@") != -1) === true) { + stringdata = "邮箱格式不正确"; } else { - this.setState({ - Phonenumberisnotcos: undefined, - Phonenumberisnotcobool: false, + stringdata = "手机号格式不正确"; - }) - this.Emailphonenumberverification(e.target.value, id); - return } + this.setState({ + Phonenumberisnotcos: stringdata, + Phonenumberisnotcobool: true, + dragOk:false, + Whethertoverify:this.state.Whethertoverify===true?false:true, + }) + return + } else { + this.setState({ + Phonenumberisnotcos: undefined, + Phonenumberisnotcobool: false, + + }) this.Emailphonenumberverification(e.target.value, id); + return + } + this.Emailphonenumberverification(e.target.value, id); } //获取登入密码 passwordonChange = (e) => { @@ -798,6 +809,7 @@ class LoginRegisterComponent extends Component { this.setState({ password: stirngt, Phonenumberisnotcodmm:undefined, + Phonenumberisnotcodmms:undefined, }) // this.setState({ // password: e.target.value @@ -807,28 +819,28 @@ class LoginRegisterComponent extends Component { loginInputonChanges = (e) => { console.log(e.target.value); var stirngt; - if(e.target.value.length>0){ - var str= e.target.value.replace(/\s*/g,"") - stirngt=str; - }else{ - stirngt= e.target.value; - } - if (e.target.value.length === 0) { - this.setState({ - Phonenumberisnotcos: undefined, - Phonenumberisnotcobool: false, - logins: stirngt, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - }else{ - this.setState({ - logins: stirngt, - Phonenumberisnotcos: undefined, - dragOk:false, - Whethertoverify:this.state.Whethertoverify===true?false:true, - }) - } + if(e.target.value.length>0){ + var str= e.target.value.replace(/\s*/g,"") + stirngt=str; + }else{ + stirngt= e.target.value; + } + if (e.target.value.length === 0) { + this.setState({ + Phonenumberisnotcos: undefined, + Phonenumberisnotcobool: false, + logins: stirngt, + dragOk:false, + Whethertoverify:this.state.Whethertoverify===true?false:true, + }) + }else{ + this.setState({ + logins: stirngt, + Phonenumberisnotcos: undefined, + dragOk:false, + Whethertoverify:this.state.Whethertoverify===true?false:true, + }) + } } //获取注册密码 @@ -858,7 +870,7 @@ class LoginRegisterComponent extends Component { this.setState({ tab:e.key }) - console.log(e.key); + console.log(e.key); if(e.key === 0){ this.setState({ Phonenumberisnotcos:undefined @@ -916,6 +928,7 @@ class LoginRegisterComponent extends Component { // 注册 readAgreement, pciphone, + Phonenumberisnotcodmms, } = this.state // height: 346px; if (this.state.seconds === 0) { @@ -925,30 +938,30 @@ class LoginRegisterComponent extends Component { console.log(classpass); return ( -
- - -
- - 登录 - 注册 - - - { - parseInt(tab[0])==0 && -
- + +
+ + 登录 + 注册 + + + { + parseInt(tab[0])==0 && +
+ - - this.inputOnBlur(e, 1)} - style={{marginTop: '30px', height: '38px'}}> - - { - Phonenumberisnotco && Phonenumberisnotco != "" ? -

- {Phonenumberisnotco} -

- :
- } - - - { - Phonenumberisnotcodmm && Phonenumberisnotcodmm != "" ? -

- {Phonenumberisnotcodmm} -

- :
- } - - - - -
- } - - - { - parseInt(tab[0])==1 && -
- this.inputOnBlurzhuche(e, 2)} - style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}> - { - Phonenumberisnotcos && Phonenumberisnotcos !== "" ? -

- {Phonenumberisnotcos} -

- :
+ } + + + this.inputOnBlur(e, 1)} + style={{marginTop: '30px', height: '38px'}}> + + { + Phonenumberisnotco && Phonenumberisnotco != "" ? +

+ {Phonenumberisnotco} +

+ :
+ } + + + { + Phonenumberisnotcodmm && Phonenumberisnotcodmm != "" ? +

+ {Phonenumberisnotcodmm} +

+ : (Phonenumberisnotcodmms=== undefined?
:"") + } + { + Phonenumberisnotcodmms && Phonenumberisnotcodmms != "" ? +

+ {Phonenumberisnotcodmms} +

+ : "" + } + + + + +
+ } + + + { + parseInt(tab[0])==1 && +
+ this.inputOnBlurzhuche(e, 2)} + style={{marginTop: '30px' , height: '38px',color:'#999999',fontSize:"14px"}}> + { + Phonenumberisnotcos && Phonenumberisnotcos !== "" ? +

+ {Phonenumberisnotcos} +

+ :
+ + } + {this.state.MyEduCoderModals===true? {this.setNotcompleteds()}} + />:""} + + { + Whethertoverify===false&&pciphone===true? + + + : + "" - } - {this.state.MyEduCoderModals===true? {this.setNotcompleteds()}} - />:""} - - { - Whethertoverify===false&&pciphone===true? - - - : - "" - - } - { - Whethertoverify===true&&pciphone===true? - - + } + { + Whethertoverify===true&&pciphone===true? + + : "" - } + } -
- { - pciphone===true? - ( - Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk !== "" ? +
+ { + pciphone===true? + ( + Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk !== "" ?

{Phonenumberisnotcosytdhk}

:
- ) - :"" - } -
- - - -
- - - - { - getverificationcodes === undefined ? - - : getverificationcodes === true ? - - : - - } - -
-
- { - Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ? -

- {Phonenumberisnotcosyzm} -

- :
+ ) + :"" + } +
+ + + +
+ + + + { + getverificationcodes === undefined ? + + : getverificationcodes === true ? + + : + + } + +
+
+ { + Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ? +

+ {Phonenumberisnotcosyzm} +

+ :
- } -
+ } +
- - this.Showandhide(key)}> - - }> - { - Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ? -

- {Phonenumberisnotcosymmm} -

- :
- - } - 我已阅读并同意 + } + + this.Showandhide(key)}> + + }> + { + Phonenumberisnotcosymmm && Phonenumberisnotcosymmm !== "" ? +

+ {Phonenumberisnotcosymmm} +

+ :
+ + } + 我已阅读并同意 《服务协议条款》 - + -
- } -
-
+
+ } +
+ ); } } From 5479c7f8879604f77ff53cdd230829c78f947a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 30 Jul 2019 10:36:01 +0800 Subject: [PATCH 003/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/LoginRegisterComponent.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index cffc633f5..9199aa51d 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -368,6 +368,12 @@ class LoginRegisterComponent extends Component { if(weekArray===undefined){ weekArray="/"; } + if(weekArray===null){ + weekArray="/"; + } + if(weekArray==="null"){ + weekArray="/"; + } window.location.href = weekArray; } } From 899827917ad86125990c2c94d6da83346cd8cd16 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 30 Jul 2019 14:42:50 +0800 Subject: [PATCH 004/221] =?UTF-8?q?=E6=89=80=E9=80=89=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E5=88=86=E7=8F=AD=E8=87=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coursesPublic/form/SchoolSelect.js | 2 +- .../courses/members/modal/AddStudentModal.js | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/form/SchoolSelect.js b/public/react/src/modules/courses/coursesPublic/form/SchoolSelect.js index e1a9062e3..67cf3c842 100644 --- a/public/react/src/modules/courses/coursesPublic/form/SchoolSelect.js +++ b/public/react/src/modules/courses/coursesPublic/form/SchoolSelect.js @@ -57,7 +57,7 @@ class SchoolSelect extends Component{ const { value, onChange } = this.props; return ( 姓名: {this.setState({name: e.target.value})}} - style={{ width: '242px'}} + style={{ width: '221px'}} > 单位: {/* {this.setState({school_name: e.target.value})}} @@ -210,14 +210,7 @@ class AddStudentModal extends Component{ >搜索 {/* */} - {course_groups && course_groups.length &&
- 分班: - -
} +

@@ -271,6 +264,14 @@ class AddStudentModal extends Component{ + {course_groups && course_groups.length &&

+ 所选学生分班至(选填): + +
} : } From b728139be22d7e7196d01695515e4de0a822cf74 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Tue, 30 Jul 2019 16:25:50 +0800 Subject: [PATCH 005/221] login --- .../src/modules/courses/members/modal/AddStudentModal.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js index 34af1d01a..1ad02c9f4 100644 --- a/public/react/src/modules/courses/members/modal/AddStudentModal.js +++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js @@ -240,7 +240,12 @@ class AddStudentModal extends Component{ 12 }> - + From f0e6da586ad340b22241b3799a5be7696d939f1e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 31 Jul 2019 16:59:08 +0800 Subject: [PATCH 006/221] foruM --- public/react/src/modules/forums/MemoDetail.js | 36 ++++++++++--------- public/react/src/modules/forums/MemoNew.js | 14 ++++---- public/react/src/modules/forums/Post.css | 3 ++ public/react/src/modules/forums/PostItem.js | 4 +-- .../src/modules/forums/PostPaginationHOC.js | 14 ++++---- .../react/src/modules/forums/UserSection.js | 2 +- .../src/modules/forums/shixun/MemoShixun.js | 10 +++--- 7 files changed, 45 insertions(+), 38 deletions(-) diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index e504dae77..f2be85ffe 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -54,12 +54,12 @@ class MemoDetail extends Component { const { match } = this.props - const memoUrl = `/api/v1/memos/${match.params.memoId}`; + const memoUrl = `/memos/${match.params.memoId}.json`; this.setState({ memoLoading: true }) axios.get(memoUrl,{ - withCredentials: true, + // withCredentials: true, }) .then((response) => { const memo = response.data.memo @@ -91,9 +91,9 @@ class MemoDetail extends Component { }) delete response.data.memo_replies; this.props.initForumState(response.data) - const user = response.data.current_user; - user.tidding_count = response.data.tidding_count; - this.props.initCommonState(user) + // const user = response.data.current_user; + // user.tidding_count = response.data.tidding_count; + // this.props.initCommonState(user) } this.setState({ memoLoading: false @@ -119,7 +119,7 @@ class MemoDetail extends Component { const deleteUrl = `/api/v1/memos/${memo.id}`; // 获取memo list axios.delete(deleteUrl, { - withCredentials: true, + // withCredentials: true, }) .then((response) => { const status = response.data.status @@ -587,7 +587,7 @@ class MemoDetail extends Component { const set_top_or_down_Url = `/api/v1/memos/${memo.id}/set-top-or-down?${paramsUrl}`; // 获取memo list axios.get(set_top_or_down_Url, { - withCredentials: true, + // withCredentials: true, }) .then((response) => { const status = response.data.status @@ -619,7 +619,7 @@ class MemoDetail extends Component { score: _reward, user_id: author_info.user_id }, { - withCredentials: true, + // withCredentials: true, }) .then((response) => { const { code } = response.data; @@ -659,10 +659,14 @@ class MemoDetail extends Component { const { memo, recommend_shixun, current_user,author_info } = this.props; const { comments, hasMoreComments, goldRewardDialogOpen } = this.state; - if (this.state.memoLoading) { + if (!memo || this.state.memoLoading) { return
} - current_user.user_url = `/users/${current_user.login}`; + let _current_user = {} + if (current_user) { + _current_user = current_user + } + (_current_user.user_url = `/users/${_current_user.login}`); memo.isDetailPage = true; // TODO 图片上传地址 return ( @@ -681,11 +685,11 @@ class MemoDetail extends Component { data-tip-down={`获得平台奖励金币：${memo.reward}`} > {memo.reward} } - { current_user && (current_user.admin === true || current_user.user_id === author_info.user_id) && + { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) &&
    - { current_user.admin === true && + { _current_user.admin === true && ( memo.sticky === true ?
  • this.setTop(memo)}>取消置顶
    • : @@ -701,15 +705,15 @@ class MemoDetail extends Component {
} - + 返回
{moment(memo.time).fromNow()} 发布
- { current_user.admin && + { _current_user.admin && @@ -770,7 +774,7 @@ class MemoDetail extends Component { {memo.replies_count}
- { const { status, message, memo_id } = response.data; @@ -281,7 +281,7 @@ class MemoNew extends Component { }, attachments: attachmentsMap }, { - withCredentials: true, + // withCredentials: true, }) .then((response) => { const { status, message, memo_id } = response.data; @@ -298,7 +298,7 @@ class MemoNew extends Component { componentDidMount() { const newMemoUrl = `/api/v1/memos/new` axios.get(newMemoUrl,{ - withCredentials: true, + // withCredentials: true, }) .then((response) => { const data = response.data; @@ -319,9 +319,9 @@ class MemoNew extends Component { // repertoiresTagMap }) - const user = response.data.current_user; - user.tidding_count = response.data.tidding_count; - this.props.initCommonState(user) + // const user = response.data.current_user; + // user.tidding_count = response.data.tidding_count; + // this.props.initCommonState(user) // 初始化 csrf meta const $ = window.$ @@ -338,7 +338,7 @@ class MemoNew extends Component { if (memoId) { const memoUrl = `/api/v1/memos/${match.params.memoId}/edit`; axios.get(memoUrl,{ - withCredentials: true, + // withCredentials: true, }) .then((response) => { const tag_list = response.data.tag_list diff --git a/public/react/src/modules/forums/Post.css b/public/react/src/modules/forums/Post.css index d10857a60..7b9792dea 100644 --- a/public/react/src/modules/forums/Post.css +++ b/public/react/src/modules/forums/Post.css @@ -8,6 +8,9 @@ min-height: 400px; position: relative; } + #forum_index_list .forum_table .forum_table_item { + background: #fff; + } .noMemosTip { position: absolute; right: 10px; diff --git a/public/react/src/modules/forums/PostItem.js b/public/react/src/modules/forums/PostItem.js index aa610184f..a56badb80 100644 --- a/public/react/src/modules/forums/PostItem.js +++ b/public/react/src/modules/forums/PostItem.js @@ -46,11 +46,11 @@ class PostItem extends Component {

- {memo.username} + {memo.user_name} {/*最后回复：todo{memo.username} memo.language && memo.language != 'other' && {memo.language} */} - {moment(memo.updated_at).fromNow()} + {/* {moment(memo.updated_at).fromNow()} */} {memo.tag && memo.tag.length ? 来自 {memo.tag.join('/')} : ''} {/*C++*/} diff --git a/public/react/src/modules/forums/PostPaginationHOC.js b/public/react/src/modules/forums/PostPaginationHOC.js index 25e397318..8e16f2e50 100644 --- a/public/react/src/modules/forums/PostPaginationHOC.js +++ b/public/react/src/modules/forums/PostPaginationHOC.js @@ -165,7 +165,7 @@ return function wrap(WrappedComponent) { let paramsUrl = queryString.stringify(params) - const memosUrl = '/api/v1/memos?' + paramsUrl // /${challenge.identifier}/star + const memosUrl = '/memos.json?' + paramsUrl // /${challenge.identifier}/star this.setState({ currentPage, @@ -174,7 +174,7 @@ return function wrap(WrappedComponent) { }) // 获取memo list axios.get(memosUrl,{ - withCredentials: true, + // withCredentials: true, }) .then((response) => { const memo_count = response.data.memo_count @@ -186,9 +186,9 @@ return function wrap(WrappedComponent) { this.fetchMemos(maxPage); return; } - const user = response.data.current_user; - user.tidding_count = response.data.tidding_count; - this.props.initCommonState(user) + // const user = response.data.current_user; + // user.tidding_count = response.data.tidding_count; + // this.props.initCommonState(user) this.props.initForumState(response.data) this.setState({ p_forum_id: params.forum, @@ -245,7 +245,7 @@ return function wrap(WrappedComponent) { const set_top_or_down_Url = `/api/v1/memos/${memo.id}/set-top-or-down?${paramsUrl}`; // 获取memo list axios.get(set_top_or_down_Url, { - withCredentials: true, + // withCredentials: true, }) .then((response) => { const status = response.data.status @@ -268,7 +268,7 @@ return function wrap(WrappedComponent) { const deleteUrl = `/api/v1/memos/${memo.id}`; // 获取memo list axios.delete(deleteUrl, { - withCredentials: true, + // withCredentials: true, }) .then((response) => { const status = response.data.status diff --git a/public/react/src/modules/forums/UserSection.js b/public/react/src/modules/forums/UserSection.js index 8ea9bad2a..4e8bdb45c 100644 --- a/public/react/src/modules/forums/UserSection.js +++ b/public/react/src/modules/forums/UserSection.js @@ -41,7 +41,7 @@ class UserSection extends Component { render() { const { match, history, author_info , current_user } = this.props - if (!author_info) { + if (!author_info || !current_user) { return
} return ( diff --git a/public/react/src/modules/forums/shixun/MemoShixun.js b/public/react/src/modules/forums/shixun/MemoShixun.js index 9d75da00d..f82ed2e34 100644 --- a/public/react/src/modules/forums/shixun/MemoShixun.js +++ b/public/react/src/modules/forums/shixun/MemoShixun.js @@ -83,7 +83,7 @@ class MemoShixun extends Component { } const stringifid = queryString.stringify(paramsObject); - const url = `/api/v1/discusses?${stringifid}` // /${challenge.identifier}/star + const url = `/discusses.json?${stringifid}` // /${challenge.identifier}/star // 获取memo list this.setState({ @@ -91,13 +91,13 @@ class MemoShixun extends Component { loadingMemos: true }) axios.get(url,{ - withCredentials: true, + // withCredentials: true, }) .then((response) => { if (response.data) { - const user = response.data.current_user; - user.tidding_count = response.data.tidding_count; - this.props.initCommonState(user) + // const user = response.data.current_user; + // user.tidding_count = response.data.tidding_count; + // this.props.initCommonState(user) this.props.initForumState(response.data) // const { hot_tags } = response.data; From b313d0627151c6300d51bfdcb8219089412156fc Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 31 Jul 2019 17:22:51 +0800 Subject: [PATCH 007/221] huifu --- public/react/src/modules/forums/MemoDetail.js | 10 +++++----- public/react/src/modules/forums/PostPaginationHOC.js | 10 ++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index f2be85ffe..d340a5014 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -223,7 +223,7 @@ class MemoDetail extends Component { this.createNewComment(commentContent, id, editor); return; } - const url = `/api/v1/memos/${id}/reply`; + const url = `/memos/${id}/reply.json`; const { comments } = this.state; const user = this._getUser(); /* @@ -473,14 +473,14 @@ class MemoDetail extends Component { return; } } - const url = `/api/v1/memos/${memo.id}/reply`; + const url = `/memos/${memo.id}/reply.json`; let { comments } = this.state; const user = this._getUser(); axios.post(url, { content: content }, { - withCredentials: true + // withCredentials: true } ).then((response) => { if (response.data.status === -1) { @@ -584,9 +584,9 @@ class MemoDetail extends Component { params.forum_id = this.state.p_forum_id; } let paramsUrl = urlStringify(params) - const set_top_or_down_Url = `/api/v1/memos/${memo.id}/set-top-or-down?${paramsUrl}`; + const set_top_or_down_Url = `/memos/${memo.id}/sticky_or_cancel.json?${paramsUrl}`; // 获取memo list - axios.get(set_top_or_down_Url, { + axios.post(set_top_or_down_Url, { // withCredentials: true, }) .then((response) => { diff --git a/public/react/src/modules/forums/PostPaginationHOC.js b/public/react/src/modules/forums/PostPaginationHOC.js index 8e16f2e50..3922eae41 100644 --- a/public/react/src/modules/forums/PostPaginationHOC.js +++ b/public/react/src/modules/forums/PostPaginationHOC.js @@ -242,16 +242,18 @@ return function wrap(WrappedComponent) { params.forum_id = this.state.p_forum_id; } let paramsUrl = urlStringify(params) - const set_top_or_down_Url = `/api/v1/memos/${memo.id}/set-top-or-down?${paramsUrl}`; + const set_top_or_down_Url = `/memos/${memo.id}/sticky_or_cancel.json?${paramsUrl}`; // 获取memo list - axios.get(set_top_or_down_Url, { + axios.post(set_top_or_down_Url, { // withCredentials: true, }) .then((response) => { const status = response.data.status if (status === 0) { - const { memo_list } = response.data; - this.props.initForumState({ memo_list }) + this.fetchMemos(1, '') + + // const { memo_list } = response.data; + // this.props.initForumState({ memo_list }) // 刷新列表 // TODO 服务端直接返回第一页列表 // this.props.history.replace('/') From f3a744b7121435ba95cdd9223ea6bf36df21327d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 31 Jul 2019 21:19:55 +0800 Subject: [PATCH 008/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 7 +- public/react/src/AppConfig.js | 1 - .../modules/forums/MemoDetailMDEditortwo.js | 346 ++++++++--------- .../src/modules/message/css/messagemy.css | 65 +++- .../src/modules/message/js/MessagChat.js | 215 ++++++++++- .../react/src/modules/message/js/MessagSub.js | 109 ++++-- .../src/modules/message/js/MessagePrivate.js | 142 ++++++- .../src/modules/message/js/Messagerouting.js | 76 +++- .../messagemodal/WriteaprivateletterModal.js | 354 ++++++++++++++++++ 9 files changed, 1090 insertions(+), 225 deletions(-) create mode 100644 public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js diff --git a/public/react/src/App.js b/public/react/src/App.js index e7ff43e79..156651b3b 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -19,8 +19,6 @@ import Trialapplicationysl from './modules/login/Trialapplicationysl'; import Trialapplicationreview from './modules/user/Trialapplicationreview'; import Addcourses from "./modules/courses/coursesPublic/Addcourses"; import AccountProfile from "./modules/user/AccountProfile"; - -import Messagerouting from "./modules/message/js/Messagerouting"; import Trialapplication from './modules/login/Trialapplication' import NotFoundPage from './NotFoundPage' @@ -225,7 +223,10 @@ const Interestpage = Loadable({ loader: () => import('./modules/login/EducoderInteresse'), loading: Loading, }) - +const Messagerouting= Loadable({ + loader: () => import('./modules/message/js/Messagerouting'), + loading: Loading, +}) class App extends Component { constructor(props) { super(props) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 2ad7df0d5..e89d59d69 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -43,7 +43,6 @@ export function initAxiosInterceptors(props) { // proxy = "https://testeduplus2.educoder.net" proxy="http://47.96.87.25:48080/" - // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制 const requestMap = {}; diff --git a/public/react/src/modules/forums/MemoDetailMDEditortwo.js b/public/react/src/modules/forums/MemoDetailMDEditortwo.js index 5eae90400..cc3a2b1af 100644 --- a/public/react/src/modules/forums/MemoDetailMDEditortwo.js +++ b/public/react/src/modules/forums/MemoDetailMDEditortwo.js @@ -1,173 +1,173 @@ -import React, { Component } from 'react'; -import { Redirect } from 'react-router'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import PropTypes from 'prop-types'; - -import classNames from 'classnames' - -import { isDev } from 'educoder' - -import './MemoDetailEditor.css' - -require('codemirror/lib/codemirror.css'); - -const $ = window.$; -///作业回答 专用 -class MemoDetailMDEditortwo extends Component { - constructor(props) { - super(props) - this.state = { - isInited: this.props.usingMockInput ? false : true, - isError: false, - errorMsg: '' - } - } - componentDidUpdate(prevProps, prevState, snapshot) { - if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) { - // this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo"); - // window._kk = this.keEditor - } - } - - initMDEditor = () => { - // 因为props.memo不存在时，本组件不会被加载，这里直接在didMount里初始化即可 - const placeholder = '我要回复...' - // const imageUrl = `/upload_with_markdown?container_id=${this.props.memo.id}&container_type=Memo`; - const imageUrl = `/api/attachments.json`; - - // 执行太快了，样式不正常 - window.__tt = 400; - setTimeout(() => { - var commentMDEditor = window.create_editorMD_4comment("memo_comment_editorMd", '', this.props.height || 240, placeholder, imageUrl, () => { - commentMDEditor.focus() - - this.initDrag() - - commentMDEditor.cm.on("change", (_cm, changeObj) => { - this.setState({ - isError: false, - errorMsg: '' - }) - }) - }, { - watch: false, - dialogLockScreen: false, - }); - this.commentMDEditor = commentMDEditor; - window.commentMDEditor = commentMDEditor; - - }, window.__tt) - } - componentDidMount() { - !this.props.usingMockInput && this.initMDEditor() - } - initDrag = () => { - window.initMDEditorDragResize(".editor__resize", this.commentMDEditor) - } - - onCommit = () => { - const content = this.commentMDEditor.getValue(); - // this.props.showError == - if (this.props.showError == true) { - if (!content || content.trim() == "") { - this.setState({ - isError: true, - errorMsg: '不能为空' - }) - return; - } else if (content.length > 2000) { - this.setState({ - isError: true, - errorMsg: '不能超过2000个字符' - }) - return; - } - - this.setState({ - isError: false, - errorMsg: '' - }) - } - window.$(document).trigger("onReply", { commentContent: content - , id: this.props.memo.id, editor: this.commentMDEditor } ); - - } - - showEditor() { - $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => { - if (this.commentMDEditor) { - this.commentMDEditor.cm.focus() - } else { - $('#commentInput input')[0].click() - } - }); - } - onMockInputClick = () => { - this.setState({isInited: true}) - this.initMDEditor() - } - render() { - const { match, history, memo, placeholder } = this.props - const { isInited, errorMsg } = this.state - if (!memo) { - return
- } - - return ( - - - - -
-
- -
-
调整高度
- { errorMsg && {errorMsg} } - - 发送 - -
- - ); - } -} - -export default ( MemoDetailMDEditortwo ); +import React, { Component } from 'react'; +import { Redirect } from 'react-router'; + +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; + +import PropTypes from 'prop-types'; + +import classNames from 'classnames' + +import { isDev } from 'educoder' + +import './MemoDetailEditor.css' + +require('codemirror/lib/codemirror.css'); + +const $ = window.$; +///作业回答 专用 +class MemoDetailMDEditortwo extends Component { + constructor(props) { + super(props) + this.state = { + isInited: this.props.usingMockInput ? false : true, + isError: false, + errorMsg: '' + } + } + componentDidUpdate(prevProps, prevState, snapshot) { + if (this.props.memo && (!prevProps.memo || this.props.memo.id != prevProps.memo.id)) { + // this.keEditor = window.sd_create_editor_from_data(this.props.memo.id, null, "100%", "Memo"); + // window._kk = this.keEditor + } + } + + initMDEditor = () => { + // 因为props.memo不存在时，本组件不会被加载，这里直接在didMount里初始化即可 + const placeholder = '我要回复...' + // const imageUrl = `/upload_with_markdown?container_id=${this.props.memo.id}&container_type=Memo`; + const imageUrl = `/api/attachments.json`; + + // 执行太快了，样式不正常 + window.__tt = 400; + setTimeout(() => { + var commentMDEditor = window.create_editorMD_4comment("memo_comment_editorMd", '', this.props.height || 240, placeholder, imageUrl, () => { + commentMDEditor.focus(); + + this.initDrag(); + + commentMDEditor.cm.on("change", (_cm, changeObj) => { + this.setState({ + isError: false, + errorMsg: '' + }) + }) + }, { + watch: false, + dialogLockScreen: false, + }); + this.commentMDEditor = commentMDEditor; + window.commentMDEditor = commentMDEditor; + + }, window.__tt) + }; + componentDidMount() { + !this.props.usingMockInput && this.initMDEditor() + } + initDrag = () => { + window.initMDEditorDragResize(".editor__resize", this.commentMDEditor) + } + + onCommit = () => { + const content = this.commentMDEditor.getValue(); + // this.props.showError == + if (this.props.showError == true) { + if (!content || content.trim() == "") { + this.setState({ + isError: true, + errorMsg: '不能为空' + }) + return; + } else if (content.length > 2000) { + this.setState({ + isError: true, + errorMsg: '不能超过2000个字符' + }) + return; + } + + this.setState({ + isError: false, + errorMsg: '' + }) + } + window.$(document).trigger("onReply", { commentContent: content + , id: this.props.memo.id, editor: this.commentMDEditor } ); + + } + + showEditor() { + $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => { + if (this.commentMDEditor) { + this.commentMDEditor.cm.focus() + } else { + $('#commentInput input')[0].click() + } + }); + } + onMockInputClick = () => { + this.setState({isInited: true}) + this.initMDEditor() + } + render() { + const { match, history, memo, placeholder } = this.props + const { isInited, errorMsg } = this.state + if (!memo) { + return
+ } + + return ( + + + + +
+
+ +
+
调整高度
+ { errorMsg && {errorMsg} } + + 发送 + +
+ + ); + } +} + +export default ( MemoDetailMDEditortwo ); diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css index 4bdd0f999..0da203568 100644 --- a/public/react/src/modules/message/css/messagemy.css +++ b/public/react/src/modules/message/css/messagemy.css @@ -3,4 +3,67 @@ } .myh120{ height: 120px; -} \ No newline at end of file +} +.myimgw48{ + width: 48px; +} +.myimgh48{ + height: 48px; +} +.mycenter{ + display: flex; + justify-content: center +} +.myw100baifenbi{ + width: 100%; +} +.ant-modal-header{ + border-radius: 0px !important; +} +.search-new{ + width: 100% !important; + margin-bottom: 0px !important; +height: 32px; +position: relative;} +.search-span{ +display: block; +position: absolute; +width: 100%; +height: 100%; +left: 0px; +top: 0px; +background-color: #F4F4F4; +border: 1px solid #EAEAEA; +border-radius: 4px; +z-index: 1; +} +.search-new-input{ +width: 100% !important; +height: 32px; +padding-left: 5px; +border: none; +box-sizing: border-box; +background: none; +outline: none; +position: absolute; +left: 0px; +top: 1px; +z-index: 2;} +.search-new img,.search-new a,.search-new .searchicon{ +cursor: pointer; +position: absolute; +right: 2px; +top: 2px; +z-index: 2; +} +.search-new a{top: 0px} +.search-new-input:focus + .search-span{background-color: #fff;} +.task-hide-2 + {height: 40px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; +} + diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 0598efb30..fbe2b7a0a 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -1,21 +1,230 @@ import React, { Component } from 'react'; +import "../css/messagemy.css" +import {getImageUrl} from 'educoder'; +import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; +import axios from 'axios'; //私信聊天页面 class MessagChat extends Component{ constructor(props) { super(props); this.state={ - + isSpin:false, + isSpins:false, + limit:20, + page:1, + datay:[], } } componentDidMount(){ + this.getdata(1); + console.log("MessagChat"); + console.log(this.props); + } + // 滑动刷新 + contentViewScrolledit=(e)=>{ + + //滑动到底判断 + if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ + console.log("滑动到底判断"); + let {page}=this.state; + let newpage=page+1 + this.getdata(newpage); + } + + }; + //获取数据地方 + getdata=(page)=>{ + this.setState({ + isSpins:true, + }); + let{limit}=this.state; + let url = `/users/${this.props.current_user.user_id}/private_messages.json`; + // let url = `/users/71519/private_messages.json`; + axios.get((url),{params:{ + page:page, + per_page:limit, + }}).then((result) => { + if (result) { + // console.log(types); + // console.log(result); + if(result.data.message!==undefined){ + // console.log("5151515151"); + return; + } + // console.log("调用了消失的方法"); + // console.log("5454545454"); + + + if(result.data!==null){ + if(result.data.private_messages!==null){ + if(result.data.private_messages.length>0){ + for (var i=0;i { + console.log(error); + this.setState({ + isSpins:false, + }) + }) + }; + // 跳转页面 + smyJump =(i)=>{ + console.log("跳转页面"); + console.log(i); + this.props.Modifyur(i); + }; + FormatTime=(timestamp)=> { + var datetime = new Date(timestamp.replace(/-/,"/")) + var mistiming = Math.round(new Date() / 1000) - datetime; + var postfix = mistiming > 0 ? '前' : '后' + mistiming = Math.abs(mistiming) + var arrr = ['年', '个月', '星期', '天', '小时', '分钟', '秒']; + var arrn = [31536000, 2592000, 604800, 86400, 3600, 60, 1]; + + for (var i = 0; i < 7; i++) { + var inm = Math.floor(mistiming / arrn[i]) + if (inm != 0) { + return inm + arrr[i] + postfix + } + } } render() { + let{isSpins,datay}=this.state; return ( -
+
+ {/*私信对话框*/} +
+ {/*左边*/} +
+

+ this.smyJump(2)}> + 117llj与你的私信 +

+ {/*聊天页面*/} +
+
+
+

2019/07/20

+ {/*右边*/} +
+ 1?1558048024 +
+ +
hello
+
+ 删除 +
+
+ 22:20 +
+ +
+
+ + + + + + + +
+ + {/*回复*/} +
+ + + +
+ + + +
+ {/*右边*/} +
+ {/*右边头部*/} +

私信列表

+ +
+ {/*列表数据*/} + { + datay===undefined? + "" + :datay.map((item,key)=>{ + return( +
+
+ +
+

+ + {item.target.name} + {item.unread === true? + + :""} + + {(time)=>this.FormatTime(item.send_time)} +

+

+
+ +
+
+ ) + })} + + + + +
+ + + +
+ + + + + + + + +
) } } -export default MessagChat; \ No newline at end of file +export default MessagChat; + + +// onClick="delete_confirm_box('/users/innov/delete_message?mess_id=25137', '确定要删除该条记录吗？')" +// +// {/*左边*/} +//
+// 71519?1564061748 +//
+// +//
你好
+//
+// 删除 +//
+//
+// 22:21 +//
\ No newline at end of file diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index a58d059a7..bf61fc3ff 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -4,7 +4,8 @@ import { Pagination, } from "antd"; import axios from 'axios'; - +import {getImageUrl} from 'educoder'; +import "../css/messagemy.css" //消息页面 class MessagSub extends Component{ constructor(props) { @@ -14,14 +15,15 @@ class MessagSub extends Component{ limit:10, typeysl:"", count:0, - isSpin:true, + isSpin:false, + data:undefined, } } // 初始化数据 componentDidMount(){ - debugger console.log("初始化数据了"); this.getdata("",this.state.page); + // this.Messageprivatemessageunreadmessage(); } //塞选页数 @@ -45,18 +47,20 @@ class MessagSub extends Component{ per_page:limit, }}).then((result) => { if (result) { - console.log(types); - console.log(result); + // console.log(types); + // console.log(result); if(result.data.message!==undefined){ - console.log("5151515151"); + // console.log("5151515151"); return; } - console.log("调用了消失的方法"); - console.log("5454545454"); + // console.log("调用了消失的方法"); + // console.log("5454545454"); this.setState({ + page:page, count:result.data.count, typeysl:types, isSpin:false, + data:result.data.tidings===null?undefined:result.data.tidings===undefined?undefined:result.data.tidings===[]?undefined:result.data.tidings==="[]"?undefined:result.data.tidings.length===0?undefined:result.data.tidings, }) } }).catch((error) => { @@ -74,48 +78,93 @@ class MessagSub extends Component{ } } render() { - let{page,limit,typeysl,count,isSpin}=this.state; - console.log("6868686868"); - console.log(isSpin); + let{page,limit,typeysl,count,isSpin,data}=this.state; + // console.log("6868686868"); + // console.log(data); return (
{/*头部筛选数据*/} {/*下面内容页面*/} -
+
{/*这里可以进行数据处理*/} - -
- - -
+
+ + + { + data===undefined? +
+ +

暂无数据哦~

+
+ :data.map((item,key)=>{ + return( +
+
+ +
+

+ {item.trigger_user.name} + {item.time} + {this.state.typeysl==="apply"?( + item.status===0? + 待处理:"" + ):""} + {this.state.typeysl==="apply"?( + item.status===1? + 已处理:"" + ):""} + +

+

+ { + item.content + } +

+ +
+ + +
+ +
+ ) + })} {/*页数*/} -
-
- + { data===undefined?"" + : + (count>10? +
+
+ +
+
:"" + ) + + }
-
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 7a7c61174..8885d101b 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -1,20 +1,158 @@ import React, { Component } from 'react'; +import { + Spin, + Pagination, +} from "antd"; +import axios from 'axios'; +import {getImageUrl} from 'educoder'; +import "../css/messagemy.css" +import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 class MessagePrivate extends Component{ constructor(props) { super(props); this.state={ - - } + page:1, + limit:10, + count:0, + data:undefined, + isSpin:false, + modalsType:false, + }; + console.log("MessagePrivate"); + console.log(this.props); } componentDidMount(){ + this.getdata(1); + }; + + //获取数据地方 + getdata=(page)=>{ + this.setState({ + isSpin:true, + }); + let{limit}=this.state; + let url = `/users/${this.props.current_user.user_id}/private_messages.json`; + // let url = `/users/71519/private_messages.json`; + axios.get((url),{params:{ + page:page, + per_page:limit, + }}).then((result) => { + if (result) { + // console.log(types); + // console.log(result); + if(result.data.message!==undefined){ + // console.log("5151515151"); + return; + } + // console.log("调用了消失的方法"); + // console.log("5454545454"); + this.setState({ + page:page, + count:result.data.count, + isSpin:false, + data:result.data.private_messages===null?undefined:result.data.private_messages===undefined?undefined:result.data.private_messages===[]?undefined:result.data.private_messages==="[]"?undefined:result.data.private_messages.length===0?undefined:result.data.private_messages, + }) + } + }).catch((error) => { + console.log(error); + this.setState({ + isSpin:false, + }) + }) + }; + + paginationonChanges=(pageNumber)=>{ + this.setState({ + page: pageNumber, + }) + this.getdata(pageNumber); + }; + okmodalsType=()=>{ + this.setState({ + modalsType:true, + }) + } + cancelmodalsType=()=>{ + this.setState({ + modalsType:false, + }) + }; + // 跳转页面 + smyJump =(i)=>{ + console.log("跳转页面"); + console.log(i); + this.props.Modifyur(i); } render() { + let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; + // console.log( this.props); + // console.log("37"); return (
+ { + modalsType===true? + this.smyJump(is)} > + :"" + } +
+

+ 全部私信 + this.okmodalsType()}>写私信 +

+ + + { + data===undefined? +
+ +

暂无数据哦~

+
+ :data.map((item,key)=>{ + return( + +
this.smyJump(3)}> + + + +
+

+ this.smyJump()} className="mr20 private_message_a">{item.target.name} + 与你的私信 + [{item.message_count}{"条"}] + {item.send_time} +

+ + +
+ {item.unread === true ?:""} +
+ ) + })} + + + +
+ + {/*页数*/} + { data===undefined?"" + : + (count>10? +
+
+ +
+
+ :"" + ) + + }
+ ) } } diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 6cf717e6d..56eafec7e 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -16,21 +16,71 @@ class Messagerouting extends Component{ super(props); this.state={ routing:1, + unread_message_count:0, + unread_tiding_count:0, } } componentDidMount(){ } - // 切换路由 + componentDidUpdate(prevProps) { + // console.log("11111111111"); + // console.log(prevProps); + // console.log("22222222222"); + // console.log(this.props); + // console.log("33333333333"); + if(prevProps.current_user !== this.props.current_user){ + this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); + } + } + //消息未读 + Messageprivatemessageunreadmessage=(user_id)=>{ + const url=`/users/${user_id}/unread_message_info.json` + axios.get(url).then((result) => { + if(result===undefined){ + return + } + console.log("消息未读1"); + console.log(result); + this.setState({ + unread_message_count:result.data.unread_message_count, + unread_tiding_count:result.data.unread_tiding_count, + }) + }).catch((error) => { + console.log(error) + }) + }; SwitchonClick=(value)=>{ this.setState({ routing:value, - }) + }); + this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); + }; + + + + Message2=(data)=>{ + console.log("64"); + console.log(data); + this.setState({ + unread_message_count:data.unread_message_count, + unread_tiding_count:data.unread_tiding_count, + }) + }; + + //跳转到链接 + Modifyur=(i)=>{ + console.log("跳转到链接"); + console.log(i); + this.setState({ + routing:i, + }) } render() { - let{routing} =this.state; + let{routing,unread_message_count,unread_tiding_count} =this.state; + console.log(this.props); return (
@@ -38,34 +88,36 @@ class Messagerouting extends Component{
{/*头像*/}
- - + + -

杨树林

-

工程师

+

{this.props.current_user&&this.props.current_user.username}

+

{this.props.current_user&&this.props.current_user.user_identity}

{/*路由跳转*/}
{/*右边*/}
-
+
{/*消息自路由*/} - {routing===1? :""} + {routing===1?this.Message2()}> :""} {/*私信*/} - {routing===2? :""} + {routing===2?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}> :""} {/*私信聊天页面*/} - {routing===3?:""} + {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""}
diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js new file mode 100644 index 000000000..bb23b4f25 --- /dev/null +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -0,0 +1,354 @@ +import React, { Component } from 'react'; +import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; +import axios from 'axios'; +// import '../../modules/user/common.css'; +//完善个人资料 +class WriteaprivateletterModal extends Component { + + constructor(props) { + super(props) + this.state ={ + modalsType:false, + Pleaseselectthesender:false, + Pleaseselectthesenders:false, + inputvulue:"", + inputvulues:"", + floatingboxdisplay:false, + users:[], + Personalid:undefined, + isSpin:false, + Recentcontacts:false, + floatingboxdisplays:false, + + } + + } + componentDidMount() { + //用户id + console.log(this.props.current_user.user_id); + this.Recentcontacts(); + + } + //获取最近联系人 + Recentcontacts=()=>{ + this.setState({ + isSpin:true + }); + const url =`/users/${this.props.current_user.user_id}/recent_contacts.json` + axios.get(url).then((result) => { + if(result===undefined){ + return + } + console.log(result); + this.setState({ + users:result.data.users, + Recentcontacts:false, + floatingboxdisplay:true, + isSpin:false + }) + }).catch((error) => { + console.log(error) + this.setState({ + isSpin:false + }) + }) + }; + + //发送私信 + SendprivatemessageAPI=(idvalue,contentvalue)=>{ + const url =`/users/${this.props.current_user.user_id}/private_messages.json` + let data={ + target_id:idvalue, + content:contentvalue, + } + axios.post(url, data).then((result) => { + if(result===undefined){ + return + } + this.setState({ + floatingboxdisplays:false, + Pleaseselectthesender:false, + }); + this.props.smyJump(3); + console.log(result); + }).catch((error) => { + console.log(error) + }) + }; + + //搜索私信人 + Retrieveprivatemessageusers=(value)=>{ + this.setState({ + isSpin:true + }) + const url =`/users_for_private_messages.json` + axios.get((url),{params:{ + keyword:value, + }}).then((result) => { + if(result===undefined){ + return + } + this.setState({ + users:result.data.users, + Recentcontacts:true, + floatingboxdisplay:true, + isSpin:false + }) + console.log(result); + }).catch((error) => { + console.log(error) + this.setState({ + isSpin:false + }) + }) + }; + + modalCancel=()=>{ + // var weekArray = JSON.parse(window.sessionStorage.getItem('yslgeturls')); + // if(weekArray===undefined){ + // weekArray="/"; + // } + // if(weekArray===null){ + // weekArray="/"; + // } + // if(weekArray==="null"){ + // weekArray="/"; + // } + // window.location.href = weekArray; + } + + setDownload=()=>{ + // window.location.href ='/account/profile'; + }; + + // 搜索 + search_message_person=()=>{ + console.log("点击搜索按钮"); + if(this.state.inputvulue.length===0){ + this.Recentcontacts(); + }else { + this.Retrieveprivatemessageusers(this.state.inputvulue); + + } + }; + + //取消事件 + HideModal=()=>{ + this.props.cancelmodalsType(); + }; + + //确认事件 + OKModal=()=>{ + let{inputvulue,Personalid,inputvulues}=this.state; + // console.log("发送私信了"); + // console.log(inputvulue); + // console.log(Personalid); + // console.log(inputvulues); + if(inputvulue.length===0){ + this.setState({ + Pleaseselectthesender:true + }); + return; + + } + if(inputvulues.length===0){ + this.setState({ + floatingboxdisplays:true + }) + return; + } + else { + if(Personalid===undefined){ + this.setState({ + Pleaseselectthesender:true + }); + return + } + + + this.SendprivatemessageAPI(Personalid,inputvulues) + + } + }; + + // 回车事件 + Myοnkeydοwn=()=>{ + console.log("点击了回车事件"); + if(this.state.inputvulue.length===0){ + this.Recentcontacts(); + }else { + this.Retrieveprivatemessageusers(this.state.inputvulue); + + } + }; + + //判断点击的键盘的keyCode是否为13，是就调用上面的搜索函数 + handleEnterKey = (e) => { + console.log(""); + if(e.nativeEvent.keyCode === 13){ //e.nativeEvent获取原生的事件对像 + this.Myοnkeydοwn() + } + }; + // 查找联系人输入模式 + setdatafunsval=(e)=>{ + if(e.target.value.length===0){ + this.setState({ + inputvulue:e.target.value, + Pleaseselectthesender:false, + floatingboxdisplay:true, + Personalid:undefined + }); + this.Recentcontacts(); + }else { + this.setState({ + inputvulue:e.target.value, + Pleaseselectthesender:false, + floatingboxdisplay:true, + }); + } + + console.log(e.target.value); + }; + // 输入内容 + setdatafunsvals=(e)=>{ + console.log(e.target.value); + this.setState({ + inputvulues:e.target.value, + Pleaseselectthesenders:false, + floatingboxdisplays:false, + floatingboxdisplay:false, + }); + } + //失去焦点 + myonBlur=(e)=>{ + console.log("失去焦点了"); + e.preventDefault(); + this.setState({ + // floatingboxdisplay:false, + }) +}; + //获取焦点 + myonFocus=(e)=>{ + console.log("获取到焦点了"); + this.setState({ + floatingboxdisplay:true, + }) + }; + + //获取用户信息 + Getuserinformation=(item)=>{ + console.log("获取到了用户信息"); + console.log(item.id); + this.setState({ + Personalid:item.id===undefined?undefined:item.id===null?undefined:item.id, + inputvulue:item.name, + floatingboxdisplay:false, + }) + } + + + render() { + // console.log(this.props) + let{Pleaseselectthesender,inputvulue,inputvulues,floatingboxdisplay,users,floatingboxdisplays,Recentcontacts,isSpin}=this.state; + return( + +
+
+ {/*搜索框*/} + {/*
*/} + {/* */} + {/* */} + {/* this.search_message_person()}/>*/} + {/*
*/} +
+ this.search_message_person()}/> + } + /> +
+ {/*搜索框下面悬浮框*/} +
+ +

{Recentcontacts===false?"最近联系人":"搜索结果"}

+ + { + users.map((item,key)=>{ + return( +

this.Getuserinformation(item)}> + 1?1558048024 + {item.name} +

+ ) + }) + } + + {/*

*/} + {/* 1?1558048024*/} + {/* 实践教学*/} + {/*

*/} + {/*

*/} + {/* B?1532489442*/} + {/* innov*/} + {/*

*/} + +
+ + +
+ {/*私信内容*/} +
+ + 200 +
+
+ { + Pleaseselectthesender === true ? +

请选择发送对象

+ :(floatingboxdisplays ===false?

:"") + } + { + floatingboxdisplays===true? +

请输入发送内容

+ : "" + } + {/*确认事件*/} +

+ this.HideModal()} className="pop_close task-btn mr30">取消 + this.OKModal()} id="submit_send_letter">确定 +

+ {/*
*/} + {/*

完善您的资料，将获得更多的使用权限

*/} + {/* */} + {/*
*/} + + ) + } +} + +export default WriteaprivateletterModal; \ No newline at end of file From 8c7652a5a6d4bd2a3091b5b518fbd56aeec4bb12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 21:46:45 +0800 Subject: [PATCH 009/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagePrivate.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 8885d101b..fed52c76d 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -4,6 +4,7 @@ import { Pagination, } from "antd"; import axios from 'axios'; +import moment from 'moment'; import {getImageUrl} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; @@ -99,7 +100,7 @@ class MessagePrivate extends Component{

全部私信 - this.okmodalsType()}>写私信 + this.okmodalsType()}>写私信

@@ -118,10 +119,10 @@ class MessagePrivate extends Component{

- this.smyJump()} className="mr20 private_message_a">{item.target.name} + this.smyJump()} className="mr20 private_message_a">{item.target.name} 与你的私信 [{item.message_count}{"条"}] - {item.send_time} + {moment(item.send_time).fromNow()}

From 34d328bfd7e857786a1673d55af266198d0b109c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 31 Jul 2019 21:48:35 +0800 Subject: [PATCH 010/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/message/js/MessagChat.js | 18 ++---------------- .../src/modules/message/js/MessagePrivate.js | 5 ++++- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index fbe2b7a0a..484eb785d 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -86,21 +86,7 @@ class MessagChat extends Component{ console.log(i); this.props.Modifyur(i); }; - FormatTime=(timestamp)=> { - var datetime = new Date(timestamp.replace(/-/,"/")) - var mistiming = Math.round(new Date() / 1000) - datetime; - var postfix = mistiming > 0 ? '前' : '后' - mistiming = Math.abs(mistiming) - var arrr = ['年', '个月', '星期', '天', '小时', '分钟', '秒']; - var arrn = [31536000, 2592000, 604800, 86400, 3600, 60, 1]; - - for (var i = 0; i < 7; i++) { - var inm = Math.floor(mistiming / arrn[i]) - if (inm != 0) { - return inm + arrr[i] + postfix - } - } - } + render() { let{isSpins,datay}=this.state; return ( @@ -178,7 +164,7 @@ class MessagChat extends Component{ :""} - {(time)=>this.FormatTime(item.send_time)} + {item.send_time}

diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 8885d101b..6009b4705 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -84,6 +84,9 @@ class MessagePrivate extends Component{ console.log("跳转页面"); console.log(i); this.props.Modifyur(i); + }; + myCome=(e)=>{ + window.location.href="/users/innov"; } render() { let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; @@ -118,7 +121,7 @@ class MessagePrivate extends Component{

- this.smyJump()} className="mr20 private_message_a">{item.target.name} + this.myCome(item)} className="mr20 private_message_a">{item.target.name} 与你的私信 [{item.message_count}{"条"}] {item.send_time} From 8cb53af287b2bad7402c5fc319311db84686e29f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 31 Jul 2019 22:18:24 +0800 Subject: [PATCH 011/221] Merge branch 'dev_Ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagePrivate.js --- .../src/modules/message/js/MessagChat.js | 19 ++++++++++++++----- .../src/modules/message/js/MessagePrivate.js | 8 ++++---- .../src/modules/message/js/Messagerouting.js | 19 ++++++++++++++----- .../messagemodal/WriteaprivateletterModal.js | 2 +- 4 files changed, 33 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 484eb785d..b45288e6e 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -3,6 +3,7 @@ import "../css/messagemy.css" import {getImageUrl} from 'educoder'; import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; import axios from 'axios'; +import moment from 'moment'; //私信聊天页面 class MessagChat extends Component{ constructor(props) { @@ -13,6 +14,7 @@ class MessagChat extends Component{ limit:20, page:1, datay:[], + mess:false, } } @@ -87,8 +89,15 @@ class MessagChat extends Component{ this.props.Modifyur(i); }; + // 点击了用户 + Clickedontheuser=(user)=>{ + this.setState({ + myysluser:user, + mess:true, + }) + } render() { - let{isSpins,datay}=this.state; + let{isSpins,datay,myysluser}=this.state; return (

{/*私信对话框*/} @@ -98,7 +107,7 @@ class MessagChat extends Component{

this.smyJump(2)}> - 117llj与你的私信 + {mess===false?(myysluser!==undefined?myysluser.name:""):(myysluser!==undefined?myysluser.name:"")}与你的私信

{/*聊天页面*/}
@@ -112,7 +121,7 @@ class MessagChat extends Component{
hello
- 删除
@@ -153,7 +162,7 @@ class MessagChat extends Component{ "" :datay.map((item,key)=>{ return( -
+
this.Clickedontheuser(item.target)}>
@@ -164,7 +173,7 @@ class MessagChat extends Component{ :""} - {item.send_time} + {moment(item.send_time).fromNow()}

diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 79be7705c..ffd6a72f5 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -81,10 +81,10 @@ class MessagePrivate extends Component{ }) }; // 跳转页面 - smyJump =(i)=>{ + smyJump =(i,item)=>{ console.log("跳转页面"); console.log(i); - this.props.Modifyur(i); + this.props.Modifyur(i,item); }; myCome=(e)=>{ window.location.href="/users/innov"; @@ -97,7 +97,7 @@ class MessagePrivate extends Component{
{ modalsType===true? - this.smyJump(is)} > + this.smyJump(is,item)} > :"" }
@@ -116,7 +116,7 @@ class MessagePrivate extends Component{ :data.map((item,key)=>{ return( -
this.smyJump(3)}> +
this.smyJump(3,item.target)}> diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 56eafec7e..3bad873b0 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -18,6 +18,7 @@ class Messagerouting extends Component{ routing:1, unread_message_count:0, unread_tiding_count:0, + myysluser:undefined, } } @@ -71,12 +72,20 @@ class Messagerouting extends Component{ }; //跳转到链接 - Modifyur=(i)=>{ + Modifyur=(i,item)=>{ console.log("跳转到链接"); console.log(i); - this.setState({ - routing:i, - }) + if(i<3){ + this.setState({ + routing:i, + }) + }else { + this.setState({ + routing:i, + myysluser:item, + }) + } + } render() { let{routing,unread_message_count,unread_tiding_count} =this.state; @@ -117,7 +126,7 @@ class Messagerouting extends Component{ {routing===2?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}> :""} {/*私信聊天页面*/} - {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""} + {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""}
diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index bb23b4f25..3e349ef2c 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -69,7 +69,7 @@ class WriteaprivateletterModal extends Component { floatingboxdisplays:false, Pleaseselectthesender:false, }); - this.props.smyJump(3); + this.props.smyJump(3,this.state.users); console.log(result); }).catch((error) => { console.log(error) From 41d9948ac7f5381cd12c204a7315c7db34340168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 22:18:57 +0800 Subject: [PATCH 012/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/css/messagemy.css | 4 ++++ .../src/modules/message/js/MessagChat.js | 23 ++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css index 0da203568..17618cfbe 100644 --- a/public/react/src/modules/message/css/messagemy.css +++ b/public/react/src/modules/message/css/messagemy.css @@ -67,3 +67,7 @@ z-index: 2; -webkit-line-clamp: 2; } +.msheight30{ + height: 30px; +} + diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index fbe2b7a0a..6077ec508 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -3,10 +3,13 @@ import "../css/messagemy.css" import {getImageUrl} from 'educoder'; import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; import axios from 'axios'; +import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; + //私信聊天页面 class MessagChat extends Component{ constructor(props) { super(props); + this.messageRef = React.createRef(); this.state={ isSpin:false, isSpins:false, @@ -101,8 +104,11 @@ class MessagChat extends Component{ } } } + + render() { let{isSpins,datay}=this.state; + //this.newquestioMDMdRef.current.getValue().trim(); return (
{/*私信对话框*/} @@ -147,8 +153,19 @@ class MessagChat extends Component{ {/*回复*/}
- - + + +
+ 在问题反馈时，请同时发送问题发生页的网址链接，以便我们高效的为您服务 + 回复 +
@@ -160,7 +177,7 @@ class MessagChat extends Component{ {/*右边头部*/}

私信列表

-
+
{/*列表数据*/} { datay===undefined? From 04eb6cdb653a933e52be3ffb685bca9cfe944154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 22:22:50 +0800 Subject: [PATCH 013/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagChat.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 42d42bb8c..018546cc8 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -99,10 +99,13 @@ class MessagChat extends Component{ mess:true, }) } + + setreplyfun=()=>{ + console.log(this.messageRef.current.getValue().trim()) + } render() { - let{isSpins,datay,myysluser}=this.state; - let{isSpins,datay}=this.state; - //this.newquestioMDMdRef.current.getValue().trim(); + let{isSpins,datay,myysluser,mess}=this.state; + // return (
{/*私信对话框*/} From 54df6c0e869a163e2dbf4d3428b258d412e4cd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 22:54:33 +0800 Subject: [PATCH 014/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 2 +- .../src/modules/message/js/MessagChat.js | 31 +++++++++++++++++-- public/stylesheets/educoder/edu-all.css | 2 +- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 6bc9d30fc..d13fc151f 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -577,7 +577,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;} .recently_name{float: left;line-height: 48px;display: block} .recently_item:hover{background-color: #F9F9F9;} /*私信对话框*/ -.private-list{min-height: 660px;max-height: 810px;overflow-y: auto} +.private-list{min-height: 660px;max-height: 835px;overflow-y: auto} .private-list .private-part{padding-left:20px;cursor: pointer} .private-part:hover{background-color: #F5F5F5;} .private-part.active{background-color: #F5F5F5;} diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 018546cc8..7d915d440 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -101,8 +101,27 @@ class MessagChat extends Component{ } setreplyfun=()=>{ - console.log(this.messageRef.current.getValue().trim()) + let contents=this.messageRef.current.getValue().trim(); + let target_ids=""; + let url = `/users/${this.props.current_user.user_id}/private_messages.json`; + + axios.post(url, { + target_id: target_ids, + content: contents + }) + .then((response) => { + if (response.data.status == '0') { + this.setState({ modulationModalVisible: false }) + this.props.showNotification('调分成功') + this.fetchList() + } + }) + .catch(function (error) { + console.log(error); + }); } + + render() { let{isSpins,datay,myysluser,mess}=this.state; // @@ -124,7 +143,7 @@ class MessagChat extends Component{

2019/07/20

{/*右边*/}
- 1?1558048024 + 头像
hello
@@ -149,7 +168,13 @@ class MessagChat extends Component{ {/*回复*/}
- + Date: Thu, 1 Aug 2019 00:02:24 +0800 Subject: [PATCH 015/221] Merge branch 'dev_Ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagePrivate.js --- .../src/modules/message/js/MessagChat.js | 31 +++++-- .../src/modules/message/js/MessagePrivate.js | 8 +- .../src/modules/message/js/Messagerouting.js | 92 +++++++++++++++---- .../messagemodal/WriteaprivateletterModal.js | 5 +- 4 files changed, 103 insertions(+), 33 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 018546cc8..82d2ba2d7 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -18,13 +18,18 @@ class MessagChat extends Component{ page:1, datay:[], mess:false, + } } componentDidMount(){ this.getdata(1); - console.log("MessagChat"); - console.log(this.props); + console.log("MessagChat111111"); + console.log(this.props); + console.log(this.state); + this.setState({ + myyslusers:this.props.myysluser + }) } // 滑动刷新 contentViewScrolledit=(e)=>{ @@ -73,7 +78,7 @@ class MessagChat extends Component{ this.setState({ page:page, isSpins:false, - datay, + datay:this.state.datay, data:result.data.private_messages===null?undefined:result.data.private_messages===undefined?undefined:result.data.private_messages===[]?undefined:result.data.private_messages==="[]"?undefined:result.data.private_messages.length===0?undefined:result.data.private_messages, }); // console.log(this.state.datay); @@ -87,15 +92,17 @@ class MessagChat extends Component{ }; // 跳转页面 smyJump =(i)=>{ - console.log("跳转页面"); - console.log(i); + // console.log("跳转页面"); + // console.log(i); this.props.Modifyur(i); }; // 点击了用户 Clickedontheuser=(user)=>{ + console.log("点击了用户"); + console.log(user); this.setState({ - myysluser:user, + myyslusers:user, mess:true, }) } @@ -104,8 +111,12 @@ class MessagChat extends Component{ console.log(this.messageRef.current.getValue().trim()) } render() { - let{isSpins,datay,myysluser,mess}=this.state; - // + let{isSpins,datay,myyslusers,mess}=this.state; + // console.log(mess); + // console.log(myyslusers); + // console.log("MessagChat"); + // console.log(this.state); + // console.log("112"); return (
{/*私信对话框*/} @@ -115,7 +126,7 @@ class MessagChat extends Component{

this.smyJump(2)}> - {mess===false?(myysluser!==undefined?myysluser.name:""):(myysluser!==undefined?myysluser.name:"")}与你的私信 + {myyslusers!==undefined?myyslusers.name:""}与你的私信

{/*聊天页面*/}
@@ -181,7 +192,7 @@ class MessagChat extends Component{ "" :datay.map((item,key)=>{ return( -
this.Clickedontheuser(item.target)}> +
this.Clickedontheuser(item.target)}>
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index ffd6a72f5..1e21b2d76 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -87,7 +87,7 @@ class MessagePrivate extends Component{ this.props.Modifyur(i,item); }; myCome=(e)=>{ - window.location.href="/users/innov"; + window.location.href="/users/"+e.target.login; } render() { let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; @@ -117,12 +117,12 @@ class MessagePrivate extends Component{ return(
this.smyJump(3,item.target)}> - - + this.myCome(item)}> + this.myCome(item)} src={item.target.image_url} className="radius myimgw48 myimgh48"/>

- this.myCome(item)} className="mr20 private_message_a">{item.target.name} + this.myCome(item)} className="mr20 private_message_a">{item.target.name} 与你的私信 [{item.message_count}{"条"}] {moment(item.send_time).fromNow()} diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 3bad873b0..70f04589a 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -1,16 +1,30 @@ import React, { Component } from 'react'; -import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {Input,Pagination,Tooltip} from 'antd'; import {TPMIndexHOC} from "../../../modules/tpm/TPMIndexHOC"; -import {Link,NavLink} from 'react-router-dom'; import { WordsBtn ,ActionBtn,SnackbarHOC,markdownToHTML,getImageUrl} from 'educoder'; import axios from 'axios'; -import MessagSub from "./MessagSub"; -import MessagePrivate from "./MessagePrivate"; -import MessagChat from "./MessagChat"; import "../css/messagemy.css" +import { Redirect } from 'react-router'; +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; +import Loading from '../../../Loading' +import Loadable from 'react-loadable'; + // MessagSub 消息自路由 // MessagePrivate 私信 +const MessagSub = Loadable({ + loader: () => import('./MessagSub'), + loading: Loading, +}) + +const MessagePrivate = Loadable({ + loader: () => import('./MessagePrivate'), + loading: Loading, +}) + +const MessagChat = Loadable({ + loader: () => import('./MessagChat'), + loading: Loading, +}) class Messagerouting extends Component{ constructor(props) { super(props); @@ -23,7 +37,8 @@ class Messagerouting extends Component{ } componentDidMount(){ - + console.log("Messagerouting"); + console.log(this.props); } componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -58,6 +73,14 @@ class Messagerouting extends Component{ routing:value, }); this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); + if(value===1){ + this.props.history.replace(`/message/info/${this.props.current_user.user_id}`); + return + } + if(value===2){ + this.props.history.replace(`/message/letter/${this.props.current_user.user_id}`); + return; + } }; @@ -73,23 +96,35 @@ class Messagerouting extends Component{ //跳转到链接 Modifyur=(i,item)=>{ - console.log("跳转到链接"); + console.log("跳转到链接1"); console.log(i); + console.log(item); + console.log("跳转到链接2"); if(i<3){ this.setState({ routing:i, - }) + }); + if(i===1){ + this.props.history.replace(`/message/info/${this.props.current_user.user_id}`); + } + if(i===2){ + this.props.history.replace(`/message/letter/${this.props.current_user.user_id}`); + } + }else { this.setState({ routing:i, myysluser:item, - }) + }); + console.log("22222222222"); + this.props.history.replace(`/message/letters/${this.props.current_user.user_id}`); } - } + }; render() { let{routing,unread_message_count,unread_tiding_count} =this.state; console.log(this.props); + console.log(routing); return (

@@ -97,7 +132,7 @@ class Messagerouting extends Component{
{/*头像*/}
- +

{this.props.current_user&&this.props.current_user.username}

@@ -119,14 +154,37 @@ class Messagerouting extends Component{ {/*右边*/}
- {/*消息自路由*/} - {routing===1?this.Message2()}> :""} + {/*/!*消息自路由*!/*/} + {/*{routing===1?this.Message2()}> :""}*/} + + {/*/!*私信*!/*/} + {/*{routing===2?this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)}> :""}*/} + + {/*/!*私信聊天页面*!/*/} + {/*{routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""}*/} + + + {/*/!*消息自路由*!/*/} + (this.Message2()}>) + } + > + {/*/!*私信*!/*/} + (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)}> ) + } + > + {/*/!*私信聊天页面*!/*/} + (this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>) + } + > - {/*私信*/} - {routing===2?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}> :""} + - {/*私信聊天页面*/} - {routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""}
diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index 3e349ef2c..a22c9c2b3 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -43,7 +43,7 @@ class WriteaprivateletterModal extends Component { this.setState({ users:result.data.users, Recentcontacts:false, - floatingboxdisplay:true, + floatingboxdisplay:false, isSpin:false }) }).catch((error) => { @@ -248,8 +248,9 @@ class WriteaprivateletterModal extends Component { render() { - // console.log(this.props) + let{Pleaseselectthesender,inputvulue,inputvulues,floatingboxdisplay,users,floatingboxdisplays,Recentcontacts,isSpin}=this.state; + console.log(floatingboxdisplay); return( Date: Thu, 1 Aug 2019 00:24:16 +0800 Subject: [PATCH 016/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/Messagerouting.js | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 70f04589a..1a37f861d 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -38,7 +38,28 @@ class Messagerouting extends Component{ componentDidMount(){ console.log("Messagerouting"); - console.log(this.props); + console.log(this.props); + let courstype=this.props.location.search; + // // courstype=courstype.splice('/'); + // // courstype=courstype[3]; + // // console.log("45"); + console.log(courstype); + if(courstype==="?tag=1"){ + this.setState({ + routing:1, + }); + } + if(courstype==="?tag=2"){ + this.setState({ + routing:2, + }); + + } + if(courstype==="?tag=3"){ + this.setState({ + routing:3, + }); + } } componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -74,11 +95,11 @@ class Messagerouting extends Component{ }); this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); if(value===1){ - this.props.history.replace(`/message/info/${this.props.current_user.user_id}`); + this.props.history.replace(`/message/info/${this.props.current_user.user_id}?tag=1`); return } if(value===2){ - this.props.history.replace(`/message/letter/${this.props.current_user.user_id}`); + this.props.history.replace(`/message/letter/${this.props.current_user.user_id}?tag=2`); return; } }; @@ -105,10 +126,10 @@ class Messagerouting extends Component{ routing:i, }); if(i===1){ - this.props.history.replace(`/message/info/${this.props.current_user.user_id}`); + this.props.history.replace(`/message/info/${this.props.current_user.user_id}?tag=1`); } if(i===2){ - this.props.history.replace(`/message/letter/${this.props.current_user.user_id}`); + this.props.history.replace(`/message/letter/${this.props.current_user.user_id}?tag=2`); } }else { @@ -117,7 +138,7 @@ class Messagerouting extends Component{ myysluser:item, }); console.log("22222222222"); - this.props.history.replace(`/message/letters/${this.props.current_user.user_id}`); + this.props.history.replace(`/message/letters/${this.props.current_user.user_id}?tag=3`); } }; From 81a57c9cdb1ad4d9ee92f5d82534946ec70aa89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 08:54:55 +0800 Subject: [PATCH 017/221] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=9A=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E9=80=A0=E6=88=90=E7=9A=84=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.css | 114 +++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/public/react/src/App.css b/public/react/src/App.css index 9d06bfc94..3f78ea26e 100644 --- a/public/react/src/App.css +++ b/public/react/src/App.css @@ -1,57 +1,57 @@ -.App { - text-align: center; -} - -.App-logo { - animation: App-logo-spin infinite 20s linear; - height: 80px; -} - -.App-header { - background-color: #222; - height: 150px; - padding: 20px; - color: white; -} - -.App-title { - font-size: 1.5em; -} - -.App-intro { - font-size: large; -} - -@keyframes App-logo-spin { - from { transform: rotate(0deg); } - to { transform: rotate(360deg); } -} - - - -/* 控制md编辑器列行的宽度 - 见 codermirror maybeUpdateLineNumberWidth方法 -*/ -.editormd .CodeMirror-linenumbers { - padding: 0; -} -.editormd-html-preview hr, .editormd-preview-container hr { - /* 颜色加深 */ - border-top: 1px solid #ccc; -} - -/* 重置掉antd的一些样式 */ -html, body { - -webkit-font-smoothing: auto !important; -} - -.ant-progress-textyes { - color: #52c41a; -} -.ant-progress-textno{ - color: #f5222d; -} -/* md多空格 */ -.markdown-body { - white-space: pre; -} \ No newline at end of file +.App { + text-align: center; +} + +.App-logo { + animation: App-logo-spin infinite 20s linear; + height: 80px; +} + +.App-header { + background-color: #222; + height: 150px; + padding: 20px; + color: white; +} + +.App-title { + font-size: 1.5em; +} + +.App-intro { + font-size: large; +} + +@keyframes App-logo-spin { + from { transform: rotate(0deg); } + to { transform: rotate(360deg); } +} + + + +/* 控制md编辑器列行的宽度 + 见 codermirror maybeUpdateLineNumberWidth方法 +*/ +.editormd .CodeMirror-linenumbers { + padding: 0; +} +.editormd-html-preview hr, .editormd-preview-container hr { + /* 颜色加深 */ + border-top: 1px solid #ccc; +} + +/* 重置掉antd的一些样式 */ +html, body { + -webkit-font-smoothing: auto !important; +} + +.ant-progress-textyes { + color: #52c41a; +} +.ant-progress-textno{ + color: #f5222d; +} +/* md多空格 */ +/*.markdown-body {*/ + /*white-space: pre;*/ +/*}*/ \ No newline at end of file From 281342598cdb6de5776ebc31ef63f1196ff27542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 08:56:53 +0800 Subject: [PATCH 018/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/App.css b/public/react/src/App.css index 3f78ea26e..adf6935f4 100644 --- a/public/react/src/App.css +++ b/public/react/src/App.css @@ -52,6 +52,6 @@ html, body { color: #f5222d; } /* md多空格 */ -/*.markdown-body {*/ - /*white-space: pre;*/ -/*}*/ \ No newline at end of file +.markdown-body { + white-space: pre; +} \ No newline at end of file From cccbe3ef7374b2fcd0e3464d98b80cde6448bae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 09:45:58 +0800 Subject: [PATCH 019/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 2 +- .../src/modules/message/js/MessagChat.js | 1 - .../src/modules/message/js/Messagerouting.js | 29 ++++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index a0c275f33..c3d35e4dc 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -233,7 +233,7 @@ const ProjectPackages=Loadable({ const Messagerouting= Loadable({ loader: () => import('./modules/message/js/Messagerouting'), loading: Loading, -}) +}); class App extends Component { constructor(props) { super(props) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 010116073..e32ccd353 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -26,7 +26,6 @@ class MessagChat extends Component{ this.getdata(1); console.log("MessagChat111111"); console.log(this.props); - console.log(this.state); this.setState({ myyslusers:this.props.myysluser }) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 1a37f861d..0eab00a8a 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -95,11 +95,11 @@ class Messagerouting extends Component{ }); this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); if(value===1){ - this.props.history.replace(`/message/info/${this.props.current_user.user_id}?tag=1`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); return } if(value===2){ - this.props.history.replace(`/message/letter/${this.props.current_user.user_id}?tag=2`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); return; } }; @@ -126,10 +126,10 @@ class Messagerouting extends Component{ routing:i, }); if(i===1){ - this.props.history.replace(`/message/info/${this.props.current_user.user_id}?tag=1`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); } if(i===2){ - this.props.history.replace(`/message/letter/${this.props.current_user.user_id}?tag=2`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); } }else { @@ -138,7 +138,7 @@ class Messagerouting extends Component{ myysluser:item, }); console.log("22222222222"); - this.props.history.replace(`/message/letters/${this.props.current_user.user_id}?tag=3`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail`); } }; @@ -185,25 +185,26 @@ class Messagerouting extends Component{ {/*{routing===3?this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>:""}*/} - {/*/!*消息自路由*!/*/} - (this.Message2()}>) + (props) => (this.Message2()}>) } > - {/*/!*私信*!/*/} - (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)}> ) + (props) => (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)}> ) } > - {/*/!*私信聊天页面*!/*/} - (this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>) + (props) => (this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>) } > +
From 468933f6cbac03c7e1e9360ac2e1c29f512df121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 09:52:37 +0800 Subject: [PATCH 020/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 2 +- .../src/modules/message/css/messagemy.css | 18 ++++++++++++++++++ public/stylesheets/educoder/edu-all.css | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index d13fc151f..8b215fa03 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -577,7 +577,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;} .recently_name{float: left;line-height: 48px;display: block} .recently_item:hover{background-color: #F9F9F9;} /*私信对话框*/ -.private-list{min-height: 660px;max-height: 835px;overflow-y: auto} +.private-list{min-height: 660px;max-height: 831px;overflow-y: auto} .private-list .private-part{padding-left:20px;cursor: pointer} .private-part:hover{background-color: #F5F5F5;} .private-part.active{background-color: #F5F5F5;} diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css index 17618cfbe..2da7a9c6b 100644 --- a/public/react/src/modules/message/css/messagemy.css +++ b/public/react/src/modules/message/css/messagemy.css @@ -71,3 +71,21 @@ z-index: 2; height: 30px; } +/*滚动条*/ +.private-list::-webkit-scrollbar { + width: 8px; + height: 8px; +} + + +.private-list::-webkit-scrollbar-thumb { + background-color: #E3EBF4; + box-shadow: 0px 0px black; +} + + +.private-list::-webkit-scrollbar-track { + border-radius:3px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0); + background-color: white; +} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index dec965911..da1f52ed4 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -580,7 +580,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;} .recently_name{float: left;line-height: 48px;display: block} .recently_item:hover{background-color: #F9F9F9;} /*私信对话框*/ -.private-list{min-height: 660px;max-height: 835px;overflow-y: auto} +.private-list{min-height: 660px;max-height: 831px;overflow-y: auto} .private-list .private-part{padding-left:20px;cursor: pointer} .private-part:hover{background-color: #F5F5F5;} .private-part.active{background-color: #F5F5F5;} From a6271f616d728780c98d83cdf5ffdaef47a1e025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 09:58:08 +0800 Subject: [PATCH 021/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagChat.js | 2 +- public/react/src/modules/message/js/MessagSub.js | 2 +- public/react/src/modules/message/js/MessagePrivate.js | 2 +- public/react/src/modules/message/js/Messagerouting.js | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index e32ccd353..a9e0cf05b 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -218,7 +218,7 @@ class MessagChat extends Component{ return(
this.Clickedontheuser(item.target)}>
- +

diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index bf61fc3ff..d53369c1f 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -119,7 +119,7 @@ class MessagSub extends Component{ return(

- +

{item.trigger_user.name} diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 1e21b2d76..9d13050e7 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -118,7 +118,7 @@ class MessagePrivate extends Component{

this.smyJump(3,item.target)}> this.myCome(item)}> - this.myCome(item)} src={item.target.image_url} className="radius myimgw48 myimgh48"/> + this.myCome(item)} src={getImageUrl("/images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/>

diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 0eab00a8a..e00f44607 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -154,7 +154,12 @@ class Messagerouting extends Component{ {/*头像*/}

- + { + this.props.current_user!== undefined? + + :"" + } +

{this.props.current_user&&this.props.current_user.username}

{this.props.current_user&&this.props.current_user.user_identity}

From 21005a8c668f7a21853056c7890591f561807fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 10:08:39 +0800 Subject: [PATCH 022/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagePrivate.js | 15 ++++++++++++--- .../messagemodal/WriteaprivateletterModal.js | 9 +++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 9d13050e7..ef808ba8d 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -25,16 +25,25 @@ class MessagePrivate extends Component{ } componentDidMount(){ - this.getdata(1); + // this.getdata(1); }; - + componentDidUpdate(prevProps) { + // console.log("11111111111"); + // console.log(prevProps); + // console.log("22222222222"); + // console.log(this.props); + // console.log("33333333333"); + if(prevProps.current_user !== this.props.current_user){ + this.getdata(1); + } + } //获取数据地方 getdata=(page)=>{ this.setState({ isSpin:true, }); let{limit}=this.state; - let url = `/users/${this.props.current_user.user_id}/private_messages.json`; + let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`; // let url = `/users/71519/private_messages.json`; axios.get((url),{params:{ page:page, diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index a22c9c2b3..5940f0640 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -2,6 +2,7 @@ import React, { Component } from 'react'; import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; import axios from 'axios'; // import '../../modules/user/common.css'; +import {getImageUrl} from 'educoder'; //完善个人资料 class WriteaprivateletterModal extends Component { @@ -282,7 +283,7 @@ class WriteaprivateletterModal extends Component { onFocus={this.myonFocus} onChange={this.setdatafunsval} suffix={ - this.search_message_person()}/> + this.search_message_person()}/> } />
@@ -295,7 +296,7 @@ class WriteaprivateletterModal extends Component { users.map((item,key)=>{ return(

this.Getuserinformation(item)}> - 1?1558048024 {item.name}

@@ -337,8 +338,8 @@ class WriteaprivateletterModal extends Component { } {/*确认事件*/}

- this.HideModal()} className="pop_close task-btn mr30">取消 - this.OKModal()} id="submit_send_letter">确定 + this.HideModal()} className="pop_close task-btn mr30">取消 + this.OKModal()} id="submit_send_letter">确定

{/*
*/} {/*

完善您的资料，将获得更多的使用权限

*/} From b45b2a4d7a9bebbcde61f9d973db8e23f4571cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 10:13:12 +0800 Subject: [PATCH 023/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 6 +++++- public/react/src/modules/message/js/MessagChat.js | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 1b0b2b8b2..ead9f930a 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -360,7 +360,11 @@ class App extends Component { - + () + } + > diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index a9e0cf05b..7b240d2c1 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -107,7 +107,10 @@ class MessagChat extends Component{ } setreplyfun=()=>{ + let contents=this.messageRef.current.getValue().trim(); + + console.log(this.props) let target_ids=""; let url = `/users/${this.props.current_user.user_id}/private_messages.json`; From b85a0fd0f441a264087a83db5daf253ec1926680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 10:13:46 +0800 Subject: [PATCH 024/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 2 +- .../modules/message/messagemodal/WriteaprivateletterModal.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 1b0b2b8b2..e82673b37 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -233,7 +233,7 @@ const ProjectPackages=Loadable({ const Messagerouting= Loadable({ loader: () => import('./modules/message/js/Messagerouting'), loading: Loading, -}); +}) class App extends Component { constructor(props) { super(props) diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index 5940f0640..06e42b29a 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -295,7 +295,7 @@ class WriteaprivateletterModal extends Component { { users.map((item,key)=>{ return( -

this.Getuserinformation(item)}> +

this.Getuserinformation(item)}> 1?1558048024 {item.name} From 4476d177ad35e887becc87cffd1ea72522444afa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 10:19:41 +0800 Subject: [PATCH 025/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/message/js/MessagChat.js | 18 ++++++------------ .../src/modules/message/js/Messagerouting.js | 8 +++----- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 7b240d2c1..d7bf6a932 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -98,32 +98,26 @@ class MessagChat extends Component{ // 点击了用户 Clickedontheuser=(user)=>{ - console.log("点击了用户"); - console.log(user); + // console.log("点击了用户"); + // console.log(user); this.setState({ myyslusers:user, mess:true, }) + this.props.history.replace(`/message/${user}/user_tidings`); + } setreplyfun=()=>{ - let contents=this.messageRef.current.getValue().trim(); - - console.log(this.props) - let target_ids=""; + let target_ids=this.props.match.params.userid; let url = `/users/${this.props.current_user.user_id}/private_messages.json`; - axios.post(url, { target_id: target_ids, content: contents }) .then((response) => { - if (response.data.status == '0') { - this.setState({ modulationModalVisible: false }) - this.props.showNotification('调分成功') - this.fetchList() - } + console.log(response); }) .catch(function (error) { console.log(error); diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index e00f44607..a40a799c4 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -37,8 +37,8 @@ class Messagerouting extends Component{ } componentDidMount(){ - console.log("Messagerouting"); - console.log(this.props); + // console.log("Messagerouting"); + // console.log(this.props); let courstype=this.props.location.search; // // courstype=courstype.splice('/'); // // courstype=courstype[3]; @@ -96,11 +96,9 @@ class Messagerouting extends Component{ this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); if(value===1){ this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); - return } if(value===2){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); - return; + this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);; } }; From b66721de759bb717f4733b1a972d4e0e06afb2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 10:20:32 +0800 Subject: [PATCH 026/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagePrivate.js | 22 +++++++++---------- .../src/modules/message/js/Messagerouting.js | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index ef808ba8d..9689f64fe 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -25,18 +25,18 @@ class MessagePrivate extends Component{ } componentDidMount(){ - // this.getdata(1); + this.getdata(1); }; - componentDidUpdate(prevProps) { - // console.log("11111111111"); - // console.log(prevProps); - // console.log("22222222222"); - // console.log(this.props); - // console.log("33333333333"); - if(prevProps.current_user !== this.props.current_user){ - this.getdata(1); - } - } + // componentDidUpdate(prevProps) { + // // console.log("11111111111"); + // // console.log(prevProps); + // // console.log("22222222222"); + // // console.log(this.props); + // // console.log("33333333333"); + // if(prevProps.current_user !== this.props.current_user){ + // this.getdata(1); + // } + // } //获取数据地方 getdata=(page)=>{ this.setState({ diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index e00f44607..f4a31d0fc 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -144,8 +144,8 @@ class Messagerouting extends Component{ }; render() { let{routing,unread_message_count,unread_tiding_count} =this.state; + console.log("Messagerouting2222"); console.log(this.props); - console.log(routing); return (

From 32bad947bac597a711c0d6e163dc06dcfaa19b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 10:26:13 +0800 Subject: [PATCH 027/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 9 ++--- .../react/src/modules/message/js/MessagSub.js | 3 +- .../src/modules/message/js/MessagePrivate.js | 10 +++--- .../src/modules/message/js/Messagerouting.js | 24 ++++++------- .../messagemodal/WriteaprivateletterModal.js | 34 +++++++++---------- 5 files changed, 41 insertions(+), 39 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index d7bf6a932..9ac4992c8 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -24,8 +24,8 @@ class MessagChat extends Component{ componentDidMount(){ this.getdata(1); - console.log("MessagChat111111"); - console.log(this.props); + // console.log("MessagChat111111"); + // console.log(this.props); this.setState({ myyslusers:this.props.myysluser }) @@ -35,7 +35,7 @@ class MessagChat extends Component{ //滑动到底判断 if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){ - console.log("滑动到底判断"); + // console.log("滑动到底判断"); let {page}=this.state; let newpage=page+1 this.getdata(newpage); @@ -98,6 +98,7 @@ class MessagChat extends Component{ // 点击了用户 Clickedontheuser=(user)=>{ + debugger // console.log("点击了用户"); // console.log(user); this.setState({ @@ -117,7 +118,7 @@ class MessagChat extends Component{ content: contents }) .then((response) => { - console.log(response); + // console.log(response); }) .catch(function (error) { console.log(error); diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index d53369c1f..7b645b217 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -80,7 +80,7 @@ class MessagSub extends Component{ render() { let{page,limit,typeysl,count,isSpin,data}=this.state; // console.log("6868686868"); - // console.log(data); + console.log(data); return (
{/*头部筛选数据*/} @@ -116,6 +116,7 @@ class MessagSub extends Component{

暂无数据哦~

:data.map((item,key)=>{ + console.log(data) return(
diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index ef808ba8d..503799669 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -20,12 +20,12 @@ class MessagePrivate extends Component{ isSpin:false, modalsType:false, }; - console.log("MessagePrivate"); - console.log(this.props); + // console.log("MessagePrivate"); + // console.log(this.props); } componentDidMount(){ - // this.getdata(1); + this.getdata(1); }; componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -91,8 +91,8 @@ class MessagePrivate extends Component{ }; // 跳转页面 smyJump =(i,item)=>{ - console.log("跳转页面"); - console.log(i); + // console.log("跳转页面"); + // console.log(i); this.props.Modifyur(i,item); }; myCome=(e)=>{ diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index a40a799c4..16cb1b9c8 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -43,7 +43,7 @@ class Messagerouting extends Component{ // // courstype=courstype.splice('/'); // // courstype=courstype[3]; // // console.log("45"); - console.log(courstype); + // console.log(courstype); if(courstype==="?tag=1"){ this.setState({ routing:1, @@ -78,8 +78,8 @@ class Messagerouting extends Component{ if(result===undefined){ return } - console.log("消息未读1"); - console.log(result); + // console.log("消息未读1"); + // console.log(result); this.setState({ unread_message_count:result.data.unread_message_count, unread_tiding_count:result.data.unread_tiding_count, @@ -105,8 +105,8 @@ class Messagerouting extends Component{ Message2=(data)=>{ - console.log("64"); - console.log(data); + // console.log("64"); + // console.log(data); this.setState({ unread_message_count:data.unread_message_count, unread_tiding_count:data.unread_tiding_count, @@ -115,10 +115,10 @@ class Messagerouting extends Component{ //跳转到链接 Modifyur=(i,item)=>{ - console.log("跳转到链接1"); - console.log(i); - console.log(item); - console.log("跳转到链接2"); + // console.log("跳转到链接1"); + // console.log(i); + // console.log(item); + // console.log("跳转到链接2"); if(i<3){ this.setState({ routing:i, @@ -135,15 +135,15 @@ class Messagerouting extends Component{ routing:i, myysluser:item, }); - console.log("22222222222"); + // console.log("22222222222"); this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail`); } }; render() { let{routing,unread_message_count,unread_tiding_count} =this.state; - console.log(this.props); - console.log(routing); + // console.log(this.props); + // console.log(routing); return (
diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index 5940f0640..9335f2ce9 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -26,7 +26,7 @@ class WriteaprivateletterModal extends Component { } componentDidMount() { //用户id - console.log(this.props.current_user.user_id); + //console.log(this.props.current_user.user_id); this.Recentcontacts(); } @@ -40,7 +40,7 @@ class WriteaprivateletterModal extends Component { if(result===undefined){ return } - console.log(result); + //console.log(result); this.setState({ users:result.data.users, Recentcontacts:false, @@ -48,7 +48,7 @@ class WriteaprivateletterModal extends Component { isSpin:false }) }).catch((error) => { - console.log(error) + //console.log(error) this.setState({ isSpin:false }) @@ -71,9 +71,9 @@ class WriteaprivateletterModal extends Component { Pleaseselectthesender:false, }); this.props.smyJump(3,this.state.users); - console.log(result); + //console.log(result); }).catch((error) => { - console.log(error) + //console.log(error) }) }; @@ -95,9 +95,9 @@ class WriteaprivateletterModal extends Component { floatingboxdisplay:true, isSpin:false }) - console.log(result); + //console.log(result); }).catch((error) => { - console.log(error) + //console.log(error) this.setState({ isSpin:false }) @@ -124,7 +124,7 @@ class WriteaprivateletterModal extends Component { // 搜索 search_message_person=()=>{ - console.log("点击搜索按钮"); + //console.log("点击搜索按钮"); if(this.state.inputvulue.length===0){ this.Recentcontacts(); }else { @@ -174,7 +174,7 @@ class WriteaprivateletterModal extends Component { // 回车事件 Myοnkeydοwn=()=>{ - console.log("点击了回车事件"); + //console.log("点击了回车事件"); if(this.state.inputvulue.length===0){ this.Recentcontacts(); }else { @@ -185,7 +185,7 @@ class WriteaprivateletterModal extends Component { //判断点击的键盘的keyCode是否为13，是就调用上面的搜索函数 handleEnterKey = (e) => { - console.log(""); + //console.log(""); if(e.nativeEvent.keyCode === 13){ //e.nativeEvent获取原生的事件对像 this.Myοnkeydοwn() } @@ -208,11 +208,11 @@ class WriteaprivateletterModal extends Component { }); } - console.log(e.target.value); + //console.log(e.target.value); }; // 输入内容 setdatafunsvals=(e)=>{ - console.log(e.target.value); + //console.log(e.target.value); this.setState({ inputvulues:e.target.value, Pleaseselectthesenders:false, @@ -222,7 +222,7 @@ class WriteaprivateletterModal extends Component { } //失去焦点 myonBlur=(e)=>{ - console.log("失去焦点了"); + //console.log("失去焦点了"); e.preventDefault(); this.setState({ // floatingboxdisplay:false, @@ -230,7 +230,7 @@ class WriteaprivateletterModal extends Component { }; //获取焦点 myonFocus=(e)=>{ - console.log("获取到焦点了"); + //console.log("获取到焦点了"); this.setState({ floatingboxdisplay:true, }) @@ -238,8 +238,8 @@ class WriteaprivateletterModal extends Component { //获取用户信息 Getuserinformation=(item)=>{ - console.log("获取到了用户信息"); - console.log(item.id); + //console.log("获取到了用户信息"); + //console.log(item.id); this.setState({ Personalid:item.id===undefined?undefined:item.id===null?undefined:item.id, inputvulue:item.name, @@ -251,7 +251,7 @@ class WriteaprivateletterModal extends Component { render() { let{Pleaseselectthesender,inputvulue,inputvulues,floatingboxdisplay,users,floatingboxdisplays,Recentcontacts,isSpin}=this.state; - console.log(floatingboxdisplay); + //console.log(floatingboxdisplay); return( Date: Thu, 1 Aug 2019 10:26:28 +0800 Subject: [PATCH 028/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/user/usersInfo/Infos.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js index 5286c5797..31fef9070 100644 --- a/public/react/src/modules/user/usersInfo/Infos.js +++ b/public/react/src/modules/user/usersInfo/Infos.js @@ -384,11 +384,11 @@ class Infos extends Component{ to={`/users/${username}/projects`}>项目 -
  • - this.setState({moduleName: 'package'})} - to={`/users/${username}/package`}>众包 -
    • + {/*
  • */} + {/* this.setState({moduleName: 'package'})}*/} + {/*to={`/users/${username}/package`}>众包*/} + {/*
    • */} {/*{ data && data.identity!="学生" &&
  • 题库
    • }*/} @@ -404,11 +404,11 @@ class Infos extends Component{ {/* 众包 */} {/* http://localhost:3007/courses/1309/homework/9300/setting */} - () - } - > + {/* ()*/} + {/*}*/} + {/*>*/} {/* 课堂 */} {/* http://localhost:3007/courses/1309/homework/9300/setting */} From 82bda37ee1ad897626fe083b35b5b25498a254cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 10:47:07 +0800 Subject: [PATCH 029/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 59 +++++++++++++++---- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 9ac4992c8..1a11a5eb7 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -24,8 +24,9 @@ class MessagChat extends Component{ componentDidMount(){ this.getdata(1); + this.getChatList(1) // console.log("MessagChat111111"); - // console.log(this.props); + console.log(this.props.myysluser); this.setState({ myyslusers:this.props.myysluser }) @@ -42,13 +43,49 @@ class MessagChat extends Component{ } }; - //获取数据地方 - getdata=(page)=>{ + + getChatList=(page)=>{ this.setState({ isSpins:true, }); + let target_ids=this.props.match.params.userid; + let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_message_details.json`; + + axios.get((url),{params:{ + target_id:target_ids, + page: page, + per_page:20, + }}).then((result) => { + if (result) { + + if(result.data.message!==undefined){ + return; + } + + if(result.data!==null){ + console.log(result) + this.setState({ + private_messages:result.data.private_messages + }) + } + + this.setState({ + isSpins:false, + }); + + } + }).catch((error) => { + console.log(error); + this.setState({ + isSpins:false, + }) + }) + } + //获取数据地方 + getdata=(page)=>{ + let{limit}=this.state; - let url = `/users/${this.props.current_user.user_id}/private_messages.json`; + let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`; // let url = `/users/71519/private_messages.json`; axios.get((url),{params:{ page:page, @@ -98,21 +135,21 @@ class MessagChat extends Component{ // 点击了用户 Clickedontheuser=(user)=>{ - debugger + // debugger // console.log("点击了用户"); // console.log(user); - this.setState({ - myyslusers:user, - mess:true, - }) - this.props.history.replace(`/message/${user}/user_tidings`); + // this.setState({ + // myyslusers:user, + // mess:true, + // }) + this.props.history.replace(`/message/${user.id}/message_detail`); } setreplyfun=()=>{ let contents=this.messageRef.current.getValue().trim(); let target_ids=this.props.match.params.userid; - let url = `/users/${this.props.current_user.user_id}/private_messages.json`; + let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`; axios.post(url, { target_id: target_ids, content: contents From 24b88267a5c410c4efcb81e5093976e6821b7520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 10:53:38 +0800 Subject: [PATCH 030/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 5 ++ .../react/src/modules/message/js/MessagSub.js | 14 +++-- .../src/modules/message/js/MessagePrivate.js | 7 +++ .../src/modules/message/js/Messagerouting.js | 52 +++++++++++-------- 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 9ac4992c8..5767c7d0b 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -29,6 +29,11 @@ class MessagChat extends Component{ this.setState({ myyslusers:this.props.myysluser }) + try { + this.props.Mtab(3); + }catch (e) { + + } } // 滑动刷新 contentViewScrolledit=(e)=>{ diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 7b645b217..479401681 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -21,9 +21,15 @@ class MessagSub extends Component{ } // 初始化数据 componentDidMount(){ - console.log("初始化数据了"); - this.getdata("",this.state.page); + console.log("初始化数据了MessagSub"); + console.log(this.props); + this.getdata("",this.state.page); // this.Messageprivatemessageunreadmessage(); + try { + this.props.Mtab(1); + }catch (e) { + + } } //塞选页数 @@ -120,10 +126,10 @@ class MessagSub extends Component{ return(
    - + this.myCome(item)} src={getImageUrl("/images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>

    - {item.trigger_user.name} + this.myCome(item)}>{item.trigger_user.name} {item.time} {this.state.typeysl==="apply"?( item.status===0? diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index badeba23a..95712f720 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -25,7 +25,14 @@ class MessagePrivate extends Component{ } componentDidMount(){ + console.log("初始化数据了MessagePrivate"); + console.log(this.props); this.getdata(1); + try { + this.props.Mtab(2); + }catch (e) { + + } }; componentDidUpdate(prevProps) { // console.log("11111111111"); diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index a40a799c4..890350507 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -37,29 +37,15 @@ class Messagerouting extends Component{ } componentDidMount(){ - // console.log("Messagerouting"); - // console.log(this.props); - let courstype=this.props.location.search; + console.log("Messagerouting"); + console.log(this.props); + // let courstype=this.props.location.search; // // courstype=courstype.splice('/'); // // courstype=courstype[3]; // // console.log("45"); - console.log(courstype); - if(courstype==="?tag=1"){ - this.setState({ - routing:1, - }); - } - if(courstype==="?tag=2"){ - this.setState({ - routing:2, - }); + // console.log(courstype); + - } - if(courstype==="?tag=3"){ - this.setState({ - routing:3, - }); - } } componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -140,6 +126,28 @@ class Messagerouting extends Component{ } }; + myCome=(e)=>{ + window.location.href="/users/"+e.target.login; + } + + myxiaoxisixintab=(i)=>{ + if(i===1){ + this.setState({ + routing:1, + }); + } + if(i===2){ + this.setState({ + routing:2, + }); + + } + if(i===3){ + this.setState({ + routing:3, + }); + } + } render() { let{routing,unread_message_count,unread_tiding_count} =this.state; console.log(this.props); @@ -191,19 +199,19 @@ class Messagerouting extends Component{ {/*/!*消息自路由*! name 是 /message/info/:userid/*/} (this.Message2()}>) + (props) => (this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } > {/*/!*私信*! name 是letter/*/} (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)}> ) + (props) => (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}> ) } > {/*/!*私信聊天页面*! letters/*/} (this.Message2()} Modifyur={(i)=>this.Modifyur(i)}>) + (props) => (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } > From 75ca8925e1a86042bf8cc279c16ed24f8cc3d51a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 11:30:25 +0800 Subject: [PATCH 031/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/Messagerouting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 890350507..949da308d 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -150,8 +150,8 @@ class Messagerouting extends Component{ } render() { let{routing,unread_message_count,unread_tiding_count} =this.state; - console.log(this.props); - console.log(routing); + // console.log(this.props); + // console.log(routing); return (

    From 6664485ba2683c00263ae7ec9febb4a889f29aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 15:06:18 +0800 Subject: [PATCH 032/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/Leftdialogue.js | 57 +++++ .../src/modules/message/js/MessagChat.js | 205 +++++++++++++----- .../src/modules/message/js/MessagePrivate.js | 7 +- .../src/modules/message/js/Messagerouting.js | 4 +- .../src/modules/message/js/Rightdialogue.js | 58 +++++ 5 files changed, 276 insertions(+), 55 deletions(-) create mode 100644 public/react/src/modules/message/js/Leftdialogue.js create mode 100644 public/react/src/modules/message/js/Rightdialogue.js diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js new file mode 100644 index 000000000..95ef00188 --- /dev/null +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -0,0 +1,57 @@ +import React, { Component } from 'react'; +import { + Spin, + Pagination, +} from "antd"; +import axios from 'axios'; +import moment from 'moment'; +import {getImageUrl} from 'educoder'; +import "../css/messagemy.css" +import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; +//私信页面 +class Leftdialogue extends Component{ + constructor(props) { + super(props); + this.state={ + }; + + } + + componentDidMount(){ + console.log("Leftdialogue"); + console.log(this.props); + }; + componentDidUpdate(prevProps) { + // console.log("11111111111"); + // console.log(prevProps); + // console.log("22222222222"); + // console.log(this.props); + // console.log("33333333333"); + // if(prevProps.current_user !== this.props.current_user){ + // this.getdata(1); + // } + } + //获取数据地方 + + // 跳转页面 + + render() { + let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; + + return ( +
    + 71519?1564061748 +
    + +
    你好
    +
    + 删除 +
    +
    + 22:21 +
    + ) + } +} +export default Leftdialogue; +// onClick="delete_confirm_box('/users/innov/delete_message?mess_id=25148', '确定要删除该条记录吗？')" \ No newline at end of file diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index c390a5ec0..9bc97cb43 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -4,8 +4,9 @@ import {getImageUrl} from 'educoder'; import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; import axios from 'axios'; import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; - import moment from 'moment'; +import Rightdialogue from './Rightdialogue' +import Leftdialogue from './Leftdialogue' //私信聊天页面 class MessagChat extends Component{ constructor(props) { @@ -17,14 +18,20 @@ class MessagChat extends Component{ limit:20, page:1, datay:[], + limits:20, mess:false, + myuserl:[], + pages:1, + mypagey:20, + messages:[], + objc:[], } } - componentDidMount(){ this.getdata(1); - this.getChatList(1) + let target_ids=this.props.match.params.private; + this.getChatList(1,this.state.limit,target_ids); // console.log("MessagChat111111"); console.log(this.props.myysluser); this.setState({ @@ -35,6 +42,10 @@ class MessagChat extends Component{ }catch (e) { } + console.log("MessagChat111111"); + console.log(this.props); + console.log(this.props.match.params.userid); + } // 滑动刷新 contentViewScrolledit=(e)=>{ @@ -45,32 +56,43 @@ class MessagChat extends Component{ let {page}=this.state; let newpage=page+1 this.getdata(newpage); + let ls=newpage*20 + this.setState({ + limits:ls, + }) } }; - getChatList=(page)=>{ + getChatList=(page,listl,target_ids)=>{ this.setState({ isSpins:true, }); - let target_ids=this.props.match.params.userid; - let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_message_details.json`; - + let url = `/users/${this.props.match.params.userid}/private_message_details.json`; axios.get((url),{params:{ target_id:target_ids, page: page, - per_page:20, + per_page:listl, }}).then((result) => { if (result) { if(result.data.message!==undefined){ return; } + var datas=[] + var datay=result.data.messages; + for (var i=0;i{ + this.setState({ + isSpins:true, + }); + let url = `/users/${this.props.match.params.userid}/private_message_details.json`; + axios.get((url),{params:{ + target_id:target_ids, + page: pages, + per_page:listls, + }}).then((result) => { + if (result) { + + if(result.data.message!==undefined){ + return; + } + + if(result.data!==null){ + console.log(result) + this.setState({ + messages:result.data.messages, + myuserl:result.data.target, + }); + this.getdatatwo(this.state.page); + } + + this.setState({ + isSpins:false, + }); + + } + }).catch((error) => { + console.log(error); + this.setState({ + isSpins:false, + }); + this.getdatatwo(this.state.page); + }) + }; //获取数据地方 getdata=(page)=>{ let{limit}=this.state; - let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`; + let url = `/users/${this.props.match&&this.props.match.params.userid}/private_messages.json`; // let url = `/users/71519/private_messages.json`; axios.get((url),{params:{ page:page, @@ -131,6 +191,50 @@ class MessagChat extends Component{ }) }) }; + //获取数据地方 + getdatatwo=(page)=>{ + + let{limits}=this.state; + let url = `/users/${this.props.match&&this.props.match.params.userid}/private_messages.json`; + // let url = `/users/71519/private_messages.json`; + axios.get((url),{params:{ + page:page, + per_page:limits, + }}).then((result) => { + if (result) { + // console.log(types); + // console.log(result); + if(result.data.message!==undefined){ + // console.log("5151515151"); + return; + } + // console.log("调用了消失的方法"); + // console.log("5454545454"); + + // + // if(result.data!==null){ + // if(result.data.private_messages!==null){ + // if(result.data.private_messages.length>0){ + // for (var i=0;i { + console.log(error); + this.setState({ + isSpins:false, + }) + }) + }; // 跳转页面 smyJump =(i)=>{ // console.log("跳转页面"); @@ -147,14 +251,17 @@ class MessagChat extends Component{ // myyslusers:user, // mess:true, // }) - this.props.history.replace(`/message/${user.id}/message_detail`); + + this.props.history.replace(`/message/${this.props.current_user.user_id}/${user.id}/message_detail`); + // this.getdatatwo(this.state.page); + this.getChatListtwo(this.state.pages,this.state.mypagey,user.id); } setreplyfun=()=>{ let contents=this.messageRef.current.getValue().trim(); - let target_ids=this.props.match.params.userid; - let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`; + let target_ids=this.props.match.params.private + let url = `/users/${this.props.match.params.userid}/private_messages.json`; axios.post(url, { target_id: target_ids, content: contents @@ -169,12 +276,15 @@ class MessagChat extends Component{ render() { - let{isSpins,datay,myyslusers,mess}=this.state; + let{isSpins,datay,myyslusers,mess,limits,myuserl,messages}=this.state; // console.log(mess); // console.log(myyslusers); // console.log("MessagChat"); // console.log(this.state); // console.log("112"); + console.log(limits); + console.log(myuserl); + console.log(messages); return (
    {/*私信对话框*/} @@ -184,36 +294,44 @@ class MessagChat extends Component{

    this.smyJump(2)}> - {myyslusers!==undefined?myyslusers.name:""}与你的私信 + {myuserl!==undefined?myuserl.name:""}与你的私信

    {/*聊天页面*/}
    -

    2019/07/20

    - {/*右边*/} -
    - 头像 -
    - -
    hello
    -
    - 删除 -
    -
    - 22:20 -
    + { + messages===undefined? + "" + :messages.map((item,key)=>{ + console.log("-----------------================-=-==-=="); + console.log(item.sender_id); + console.log(this.props.match.params.userid); + return( +
    + +

    2019/07/20

    + { + parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? + + {/*自己的*/} + + + + : + {/*他人的*/} + + + + } + +
    + ) + }) + }
    - - - - - - -
    {/*回复*/} @@ -304,16 +422,3 @@ export default MessagChat; // onClick="delete_confirm_box('/users/innov/delete_message?mess_id=25137', '确定要删除该条记录吗？')" // // {/*左边*/} -//
    -// 71519?1564061748 -//
    -// -//
    你好
    -//
    -// 删除 -//
    -//
    -// 22:21 -//
    \ No newline at end of file diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 95712f720..8b2cd5048 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -25,14 +25,15 @@ class MessagePrivate extends Component{ } componentDidMount(){ - console.log("初始化数据了MessagePrivate"); - console.log(this.props); this.getdata(1); try { this.props.Mtab(2); }catch (e) { } + console.log("MessagePrivate"); + console.log(this.props); + console.log(this.props.match.params.userid); }; componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -50,7 +51,7 @@ class MessagePrivate extends Component{ isSpin:true, }); let{limit}=this.state; - let url = `/users/${this.props.current_user&&this.props.current_user.user_id}/private_messages.json`; + let url = `/users/${this.props.match&&this.props.match.params.userid}/private_messages.json`; // let url = `/users/71519/private_messages.json`; axios.get((url),{params:{ page:page, diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 890350507..779a3fb0d 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -122,7 +122,7 @@ class Messagerouting extends Component{ myysluser:item, }); console.log("22222222222"); - this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/${item.id}/message_detail`); } }; @@ -209,7 +209,7 @@ class Messagerouting extends Component{ } > {/*/!*私信聊天页面*! letters/*/} - (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js new file mode 100644 index 000000000..6d8852a6d --- /dev/null +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -0,0 +1,58 @@ +import React, { Component } from 'react'; +import { + Spin, + Pagination, +} from "antd"; +import axios from 'axios'; +import moment from 'moment'; +import {getImageUrl} from 'educoder'; +import "../css/messagemy.css" +import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; +//私信页面 +class Rightdialogue extends Component{ + constructor(props) { + super(props); + this.state={ + }; + + } + + componentDidMount(){ + console.log("Rightdialogue"); + console.log(this.props); + + }; + componentDidUpdate(prevProps) { + // console.log("11111111111"); + // console.log(prevProps); + // console.log("22222222222"); + // console.log(this.props); + // console.log("33333333333"); + // if(prevProps.current_user !== this.props.current_user){ + // this.getdata(1); + // } + } + //获取数据地方 + + // 跳转页面 + + render() { + let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; + + return ( +
    + 头像 +
    + +
    hello
    +
    + 删除 +
    +
    + 22:20 +
    + ) + } +} +export default Rightdialogue; \ No newline at end of file From 4cba20f0c06fb2c02bcf068aa024dec3d3ca54d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 15:20:15 +0800 Subject: [PATCH 033/221] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/home/home.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/home/home.css b/public/react/src/modules/home/home.css index 0739376de..1e97d5ecf 100644 --- a/public/react/src/modules/home/home.css +++ b/public/react/src/modules/home/home.css @@ -11,10 +11,10 @@ } .user_navlist{ - margin-left: 40px; + /*margin-left: 40px;*/ } .next-slick-list{ - margin-left: 12px; + /*margin-left: 12px;*/ } .black_nav_span{ @@ -58,7 +58,7 @@ } .educontentSlider{ - width: 1282px !important; + /*width: 1282px !important;*/ } .user_navlist_white{ max-height:350px !important; @@ -72,4 +72,8 @@ .iconfontshixundaibeijing{ font-size: 18px !important; line-height: 24px; +} + +.next-slick.next-slick-horizontal.next-slick-outer{ + padding:0px !important; } \ No newline at end of file From a51e3140de2e6e4d2c436836811368aa245eac6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 15:20:45 +0800 Subject: [PATCH 034/221] =?UTF-8?q?banner=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/home/home.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/home/home.css b/public/react/src/modules/home/home.css index 0739376de..1e97d5ecf 100644 --- a/public/react/src/modules/home/home.css +++ b/public/react/src/modules/home/home.css @@ -11,10 +11,10 @@ } .user_navlist{ - margin-left: 40px; + /*margin-left: 40px;*/ } .next-slick-list{ - margin-left: 12px; + /*margin-left: 12px;*/ } .black_nav_span{ @@ -58,7 +58,7 @@ } .educontentSlider{ - width: 1282px !important; + /*width: 1282px !important;*/ } .user_navlist_white{ max-height:350px !important; @@ -72,4 +72,8 @@ .iconfontshixundaibeijing{ font-size: 18px !important; line-height: 24px; +} + +.next-slick.next-slick-horizontal.next-slick-outer{ + padding:0px !important; } \ No newline at end of file From 857e1a171c7a6f79beb2fe7078f427768f776749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 15:21:34 +0800 Subject: [PATCH 035/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 9bc97cb43..da4a5a8e9 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -81,17 +81,26 @@ class MessagChat extends Component{ } var datas=[] var datay=result.data.messages; - for (var i=0;i {/*聊天页面*/}
    -
    +
    { messages===undefined? @@ -309,8 +318,10 @@ class MessagChat extends Component{ console.log(this.props.match.params.userid); return(
    - -

    2019/07/20

    + { + item.send_day===undefined?"":item.send_day===null?"":item.send_day===""?"": +

    {item.send_day}

    + } { parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? From 942db5018d73383818ae07edf407ea4559923539 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 1 Aug 2019 15:25:43 +0800 Subject: [PATCH 036/221] =?UTF-8?q?mp3=E3=80=81mp4=E7=B1=BB=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=E7=9A=84=E5=88=B6=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/picture_display.json.jbuilder | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder index 770f0d71b..2bc88fdf4 100644 --- a/app/views/games/picture_display.json.jbuilder +++ b/app/views/games/picture_display.json.jbuilder @@ -25,28 +25,28 @@ elsif @type == "txt" elsif @type =="qrcode" json.qrcode_str @qrcode_str elsif @type == "mp3" || @type == "mp4" - # if @type == "mp4" - # json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] - # json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] - # json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] - # else - # json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] - # json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] - # json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] - # end - json.orignal_file do - json.array! @orignal_picture do |file| - json.file_url attachment_show_users_path(:file_name => file, :path => @original_path) - end - end - json.user_file do - json.array! @user_picture do |file| - json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) - end - end - json.answer_file do - json.array! @answer_picture do |file| - json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path) - end + if @type == "mp4" + json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] + json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] + else + json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] end + # json.orignal_file do + # json.array! @orignal_picture do |file| + # json.file_url attachment_show_users_path(:file_name => file, :path => @original_path) + # end + # end + # json.user_file do + # json.array! @user_picture do |file| + # json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) + # end + # end + # json.answer_file do + # json.array! @answer_picture do |file| + # json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path) + # end + # end end \ No newline at end of file From fed8142ea913251395d1c4060da74cafddb2bf34 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 1 Aug 2019 15:38:29 +0800 Subject: [PATCH 037/221] =?UTF-8?q?mp3mp4=E7=9A=84=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/picture_display.json.jbuilder | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder index 2bc88fdf4..8b5271ec5 100644 --- a/app/views/games/picture_display.json.jbuilder +++ b/app/views/games/picture_display.json.jbuilder @@ -26,13 +26,13 @@ elsif @type =="qrcode" json.qrcode_str @qrcode_str elsif @type == "mp3" || @type == "mp4" if @type == "mp4" - json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] - json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] + json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172"}] + json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173"}] else - json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] - json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175"}] + json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175"}] end # json.orignal_file do # json.array! @orignal_picture do |file| From f109f7aaeb1a501481bdbdefc145706bd61bf655 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 1 Aug 2019 15:41:46 +0800 Subject: [PATCH 038/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 17 ++++++++--------- app/views/memos/reply.json.jbuilder | 2 ++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 app/views/memos/reply.json.jbuilder diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 66adcc46b..d950fe1c8 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -147,16 +147,15 @@ class MemosController < ApplicationController ActiveRecord::Base.transaction do begin memo = Memo.find_by!(id: params[:parent_id]) - reply = Memo.new - reply.content = params[:content] - reply.author = current_user - reply.forum_id = memo.forum_id - reply.subject = memo.subject - reply.root_id = memo.root_id || memo.id - memo.children << reply - m = Memo.find_by!(id: reply.root_id) + @reply = Memo.new + @reply.content = params[:content] + @reply.author = current_user + @reply.forum_id = memo.forum_id + @reply.subject = memo.subject + @reply.root_id = memo.root_id || memo.id + memo.children << @reply + m = Memo.find_by!(id: @reply.root_id) m.increment!(:all_replies_count) - normal_status("回复成功") rescue Exception => e tip_exception("回复失败，原因：#{e}") raise ActiveRecord::Rollback diff --git a/app/views/memos/reply.json.jbuilder b/app/views/memos/reply.json.jbuilder new file mode 100644 index 000000000..c117d2d24 --- /dev/null +++ b/app/views/memos/reply.json.jbuilder @@ -0,0 +1,2 @@ +json.(@reply, :id, :subject, :content, :hidden, :forum_id, :author_id, :all_replies_count, :is_md, :parent_id, :root_id, + :reward, :sticky, :updated_at, :created_at, :viewed_count) \ No newline at end of file From d74d5d8c1bdc20415a31d26b6af668eba20c02d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 15:42:29 +0800 Subject: [PATCH 039/221] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/css/messagemy.css | 18 ++++++++++++++++++ .../src/modules/message/js/Leftdialogue.js | 2 +- .../react/src/modules/message/js/MessagChat.js | 8 ++++---- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css index 2da7a9c6b..9f6736ec3 100644 --- a/public/react/src/modules/message/css/messagemy.css +++ b/public/react/src/modules/message/css/messagemy.css @@ -89,3 +89,21 @@ z-index: 2; -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0); background-color: white; } +/*滚动条*/ +.dialogPanel::-webkit-scrollbar { + width: 8px; + height: 8px; +} + + +.dialogPanel::-webkit-scrollbar-thumb { + background-color: #E3EBF4; + box-shadow: 0px 0px black; +} + + +.dialogPanel::-webkit-scrollbar-track { + border-radius:3px; + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0); + background-color: white; +} diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index 95ef00188..6744be6cc 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -40,7 +40,7 @@ class Leftdialogue extends Component{ return (
    - 71519?1564061748 + 头像
    你好
    diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index da4a5a8e9..4b54cce11 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -56,10 +56,10 @@ class MessagChat extends Component{ let {page}=this.state; let newpage=page+1 this.getdata(newpage); - let ls=newpage*20 - this.setState({ - limits:ls, - }) + // let ls=newpage*20 + // this.setState({ + // limits:ls, + // }) } }; From f8ad640971f951508d52ac150530eb0700598ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 15:47:06 +0800 Subject: [PATCH 040/221] b --- public/react/src/modules/tpm/challengesnew/TPMevaluation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js index 6cd0b9977..2eea2b8e4 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js +++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js @@ -981,7 +981,7 @@ export default class TPMevaluation extends Component { {pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6?
    -

    待处理图片路径

    +

    待处理文件路径

    -

    标准答案图片路径

    +

    学员答案文件路径

    Date: Thu, 1 Aug 2019 15:49:59 +0800 Subject: [PATCH 041/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index da4a5a8e9..5caf7069f 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -66,7 +66,7 @@ class MessagChat extends Component{ getChatList=(page,listl,target_ids)=>{ this.setState({ - isSpins:true, + isSpin:true, }); let url = `/users/${this.props.match.params.userid}/private_message_details.json`; axios.get((url),{params:{ @@ -106,20 +106,20 @@ class MessagChat extends Component{ } this.setState({ - isSpins:false, + isSpin:false, }); } }).catch((error) => { console.log(error); this.setState({ - isSpins:false, + isSpin:false, }) }) }; getChatListtwo=(pages,listls,target_ids)=>{ this.setState({ - isSpins:true, + isSpin:true, }); let url = `/users/${this.props.match.params.userid}/private_message_details.json`; axios.get((url),{params:{ @@ -132,27 +132,43 @@ class MessagChat extends Component{ if(result.data.message!==undefined){ return; } + var datas=[] + var datay=result.data.messages; + var obj={}; + for (var i=0;i { console.log(error); this.setState({ - isSpins:false, + isSpin:false, }); - this.getdatatwo(this.state.page); + // this.getdatatwo(this.state.page); }) }; //获取数据地方 @@ -285,7 +301,7 @@ class MessagChat extends Component{ render() { - let{isSpins,datay,myyslusers,mess,limits,myuserl,messages}=this.state; + let{isSpins,datay,myyslusers,mess,limits,myuserl,messages,isSpin}=this.state; // console.log(mess); // console.log(myyslusers); // console.log("MessagChat"); @@ -308,14 +324,15 @@ class MessagChat extends Component{ {/*聊天页面*/}
    +
    { messages===undefined? "" :messages.map((item,key)=>{ - console.log("-----------------================-=-==-=="); - console.log(item.sender_id); - console.log(this.props.match.params.userid); + // console.log("-----------------================-=-==-=="); + // console.log(item.sender_id); + // console.log(this.props.match.params.userid); return(
    { @@ -342,6 +359,7 @@ class MessagChat extends Component{ }
    +
    From 32bbb573fcde0b3ed0e77327a17565e7c21a04e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 15:52:57 +0800 Subject: [PATCH 042/221] b --- public/react/src/modules/tpm/challengesnew/TPMevaluation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js index 2eea2b8e4..16c7cfedf 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js +++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js @@ -1003,7 +1003,7 @@ export default class TPMevaluation extends Component { {pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6?
    -

    学员答案文件路径

    +

    标准答案文件路径

    Date: Thu, 1 Aug 2019 15:57:48 +0800 Subject: [PATCH 043/221] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20190801075337_add_praises_count_to_memos.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 db/migrate/20190801075337_add_praises_count_to_memos.rb diff --git a/db/migrate/20190801075337_add_praises_count_to_memos.rb b/db/migrate/20190801075337_add_praises_count_to_memos.rb new file mode 100644 index 000000000..0cc2259e2 --- /dev/null +++ b/db/migrate/20190801075337_add_praises_count_to_memos.rb @@ -0,0 +1,12 @@ +class AddPraisesCountToMemos < ActiveRecord::Migration[5.2] + def change + add_column :memos, :praises_count, :integer, :default => 0 + + memos = Memo.includes(:praise_treads).all + memos.find_each do |m| + puts("####{m.id}") + praises_count = m.praise_treads.select{|pt| pt.praise_or_tread == 1}.count + m.update_column(:praises_count, praises_count) + end + end +end From a317a857bc4260398528cd7d3d347c7acda07a1d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 1 Aug 2019 16:04:35 +0800 Subject: [PATCH 044/221] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=BD=AC=E5=8F=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes.rb b/config/routes.rb index 79542817f..b8db3afa6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,7 @@ Rails.application.routes.draw do mount Sidekiq::Web => '/sidekiq', :constraints => AdminConstraint.new get 'attachments/download/:id', to: 'attachments#show' + get 'attachments/download/:id/:filename', to: 'attachments#show' resources :edu_settings scope '/api' do From 041b5217d00182b2c940da4e371c5adf9847a285 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 1 Aug 2019 16:08:32 +0800 Subject: [PATCH 045/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index d950fe1c8..0475eb0da 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -85,7 +85,7 @@ class MemosController < ApplicationController params[:tags].each do |tag| MemoTagRepertoire.create!(memo_id: @memo.id, tag_repertoire_id: tag) end - normal_status("帖子创建成功") + render :json => {memo_id: @memo.id, status: 0, message: "帖子创建成功"} rescue Exception => e tip_exception("帖子创建失败，原因：#{e}") raise ActiveRecord::Rollback From 4549535f0f93f48af03903354bbbff291761e44e Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 1 Aug 2019 16:13:15 +0800 Subject: [PATCH 046/221] =?UTF-8?q?=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_memo.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/memos/_memo.json.jbuilder b/app/views/memos/_memo.json.jbuilder index bc3744d1f..a33de2492 100644 --- a/app/views/memos/_memo.json.jbuilder +++ b/app/views/memos/_memo.json.jbuilder @@ -9,6 +9,6 @@ json.memo do json.tag memo.tag_repertoires.map(&:name) json.time memo.created_at json.replies_count memo.all_replies_count - json.user_praise memo.praise_treads.user_liker(@user.try(:id)) ? true : false + json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 1 ? true : false json.memo_praise_count memo.praise_treads.liker.count end From 85861a339681da0d2d66cd0c9b8e40d43a751a8a Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 1 Aug 2019 16:16:03 +0800 Subject: [PATCH 047/221] =?UTF-8?q?detail=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 8 ++- public/react/src/modules/forums/MemoDetail.js | 43 ++++++++------- .../src/modules/forums/MemoDetailMDEditor.js | 2 +- public/react/src/modules/forums/MemoNew.js | 53 +++++++++++-------- 4 files changed, 64 insertions(+), 42 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 895016ff7..6e7ba3330 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -349,8 +349,12 @@ class App extends Component { {/*课堂*/} - {/* - */} + () + } + > + diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index d340a5014..f950037f4 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -90,6 +90,8 @@ class MemoDetail extends Component { comments: memo_replies }) delete response.data.memo_replies; + // reset + response.data.memo.praise_count = response.data.memo.memo_praise_count this.props.initForumState(response.data) // const user = response.data.current_user; // user.tidding_count = response.data.tidding_count; @@ -116,7 +118,7 @@ class MemoDetail extends Component { $('body>#root').off('onMemoDelete') } onMemoDelete(memo) { - const deleteUrl = `/api/v1/memos/${memo.id}`; + const deleteUrl = `/memos/${memo.id}.json`; // 获取memo list axios.delete(deleteUrl, { // withCredentials: true, @@ -158,14 +160,14 @@ class MemoDetail extends Component { clickPraise(){ const { memo } = this.props; - const url = `/api/v1/discusses/${memo.id}/plus`; + const url = `/discusses/${memo.id}/plus.json`; console.log(url) axios.post(url, { container_type: 'Memo', type: 1 // "踩0；赞1" }, { - withCredentials: true + // withCredentials: true } ).then((response) => { console.log(response); @@ -223,7 +225,8 @@ class MemoDetail extends Component { this.createNewComment(commentContent, id, editor); return; } - const url = `/memos/${id}/reply.json`; + // /${id} + const url = `/memos/reply.json`; const { comments } = this.state; const user = this._getUser(); /* @@ -235,12 +238,14 @@ class MemoDetail extends Component { commentContent = commentContent.replace(/(\n

    \n\t
    \n<\/p>)*$/g,''); } axios.post(url, { + parent_id: id, content: commentContent }, { - withCredentials: true + // withCredentials: true } ).then((response) => { + response.data.memo = response.data if (response.data.memo) { let newDiscuss = response.data.memo; @@ -303,12 +308,12 @@ class MemoDetail extends Component { if (childCommentId) { deleteCommentId = childCommentId; } - const url = `/api/v1/memos/${deleteCommentId}` + const url = `/memos/${deleteCommentId}.json` let comments = this.state.comments; axios.delete(url, { - withCredentials: true + // withCredentials: true } ).then((response) => { // TODO 删除成功或失败 @@ -346,7 +351,7 @@ class MemoDetail extends Component { const { comments } = this.state; const commentIndex = this._findById(discussId, comments); - const url = `/api/v1/discusses/${discussId}/plus` + const url = `/discusses/${discussId}/plus.json` axios.post(url, { // id: discussId, // container_id: challenge.id, @@ -354,7 +359,7 @@ class MemoDetail extends Component { type: comments[commentIndex].user_praise === true ? 0 : 1, // "踩0；赞1" }, { - withCredentials: true + // withCredentials: true } ).then((response) => { if (response.data.praise_count === 0 || response.data.praise_count) { @@ -379,7 +384,7 @@ class MemoDetail extends Component { handleComment = childComment; } let handleCommentId = handleComment.id; - const url = `/api/v1/discusses/${handleCommentId}/reward_code` + const url = `/discusses/${handleCommentId}/reward_code.json` axios.post(url, { id: handleCommentId, @@ -389,7 +394,7 @@ class MemoDetail extends Component { user_id: handleComment.user_id }, { - withCredentials: true + // withCredentials: true } ).then((response) => { if (response.data && response.data.code) { @@ -423,7 +428,7 @@ class MemoDetail extends Component { const id = item.id const { showSnackbar } = this.props; const user = this._getUser(); - const url = `/api/v1/memos/${id}/hidden` + const url = `/memos/${id}/hidden.json` const { comments } = this.state; const commentIndex = this._findById(id, comments); @@ -432,7 +437,7 @@ class MemoDetail extends Component { hidden: !comment.hidden ? "1" : "0" }, { - withCredentials: true + // withCredentials: true } ).then((response) => { if (response.data.status === -1) { @@ -473,10 +478,12 @@ class MemoDetail extends Component { return; } } - const url = `/memos/${memo.id}/reply.json`; + // /${memo.id} + const url = `/memos/reply.json`; let { comments } = this.state; const user = this._getUser(); axios.post(url, { + parent_id: memo.id, content: content }, { @@ -488,6 +495,7 @@ class MemoDetail extends Component { return; } if (response.data) { + response.data.memo = response.data const newMemo = response.data.memo; // ke editor.html && editor.html(''); @@ -536,12 +544,12 @@ class MemoDetail extends Component { let { comments, pageCount } = this.state; let { memo } = this.props; const user = this._getUser(); - const url = `/api/v1/memos/${memo.id}/more_reply?page=${pageCount}`; + const url = `/memos/${memo.id}/more_reply.json?page=${pageCount}`; axios.get(url, { }, { - withCredentials: true + // withCredentials: true } ).then((response) => { if (response.data.status === -1) { @@ -608,9 +616,8 @@ class MemoDetail extends Component { const { memo, author_info } = this.props; const newMemo = Object.assign({}, memo); const _reward = parseInt(inputVal) - const newMemoUrl = `/api/v1/memos/${memo.id}/update` - const url = `/api/v1/discusses/${memo.id}/reward_code` + const url = `/discusses/${memo.id}/reward_code.json` axios.post(url, { id: memo.id, diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js index f15a19e20..00a87274d 100644 --- a/public/react/src/modules/forums/MemoDetailMDEditor.js +++ b/public/react/src/modules/forums/MemoDetailMDEditor.js @@ -42,7 +42,7 @@ class MemoDetailMDEditor extends Component { window.__tt = 400; setTimeout(() => { var commentMDEditor = window.create_editorMD_4comment("memo_comment_editorMd", '', this.props.height || 240, placeholder, imageUrl, () => { - commentMDEditor.focus() + // commentMDEditor.focus() this.isMDInited = true this.initDrag() diff --git a/public/react/src/modules/forums/MemoNew.js b/public/react/src/modules/forums/MemoNew.js index 3e7464dc1..98d95ddce 100644 --- a/public/react/src/modules/forums/MemoNew.js +++ b/public/react/src/modules/forums/MemoNew.js @@ -15,6 +15,7 @@ import Upload from 'rc-upload'; import axios from 'axios' import 'antd/lib/select/style/index.css' +import TPMMDEditor from '../tpm/challengesnew/TPMMDEditor' import { getUrl } from 'educoder' const Option = Select.Option; @@ -130,6 +131,7 @@ const languageSeparator = '/' class MemoNew extends Component { constructor(props) { super(props) + this.mdRef = React.createRef(); // https://testbdweb.trustie.net/uploads.js?attachment_id=1&filename=jqui.js // https://ant.design/components/upload-cn/ @@ -179,7 +181,7 @@ class MemoNew extends Component { } let mdVal; try { - mdVal = this.taskpass_editormd.getValue() + mdVal = this.mdRef.current.getValue() } catch (e) { showSnackbar('编辑器还未加载完毕，请稍后') @@ -205,6 +207,7 @@ class MemoNew extends Component { // collect attachments const $ = window.$; const attachmentsMap = {}; + const attachmentIds = [] $('#attachments_fields .attachment').each(( index, item ) => { const filename = $(item).find('.upload_filename').val(); // $($('#attachments_fields .attachment')[0]).find('input:nth-child(6)').val() @@ -215,13 +218,14 @@ class MemoNew extends Component { token, attachment_id } + attachmentIds.push(attachment_id) }) if (currentMemoId) { - this.updateMemo(attachmentsMap) + this.updateMemo(attachmentIds) } else { - this.newMemo(attachmentsMap) + this.newMemo(attachmentIds) } } onCancel() { @@ -235,20 +239,20 @@ class MemoNew extends Component { } updateMemo(attachmentsMap) { const { memoSubject, memoRepertoire, memoLanguage, memoType, currentMemoId, content } = this.state; - const mdVal = this.taskpass_editormd.getValue() + const mdVal = this.mdRef.current.getValue() console.log('isContentEdit: ', mdVal === content); - const newMemoUrl = `/api/v1/memos/${currentMemoId}/update` - axios.post(newMemoUrl, { + const newMemoUrl = `/memos/${currentMemoId}.json` + axios.put(newMemoUrl, { content_changed: this.contentChanged, tags: memoLanguage, - memo:{ + // memo:{ subject: memoSubject , content: mdVal, forum_id: memoType, repertoire_name: memoRepertoire, // language: memoLanguage.join(languageSeparator), // - }, + // }, attachments: attachmentsMap }, { // withCredentials: true, @@ -267,18 +271,18 @@ class MemoNew extends Component { } newMemo(attachmentsMap) { const { memoSubject, memoRepertoire, memoLanguage, memoType } = this.state; - const mdVal = this.taskpass_editormd.getValue() + const mdVal = this.mdRef.current.getValue() - const newMemoUrl = `/api/v1/memos/create` + const newMemoUrl = `/memos.json` axios.post(newMemoUrl, { tags: memoLanguage, - memo:{ + // memo:{ subject: memoSubject , content: mdVal, forum_id: memoType, - repertoire_name: memoRepertoire, + // repertoire_name: memoRepertoire, - }, + // }, attachments: attachmentsMap }, { // withCredentials: true, @@ -296,7 +300,7 @@ class MemoNew extends Component { }) } componentDidMount() { - const newMemoUrl = `/api/v1/memos/new` + const newMemoUrl = `/memos/new.json` axios.get(newMemoUrl,{ // withCredentials: true, }) @@ -336,7 +340,7 @@ class MemoNew extends Component { const { match } = this.props const memoId = match.params.memoId; if (memoId) { - const memoUrl = `/api/v1/memos/${match.params.memoId}/edit`; + const memoUrl = `/memos/${match.params.memoId}/edit.json`; axios.get(memoUrl,{ // withCredentials: true, }) @@ -344,10 +348,12 @@ class MemoNew extends Component { const tag_list = response.data.tag_list if (tag_list) { // this.setState({...response.data}) - const { content, forum_id, id, tag, repertoire_name, subject, - current_user, tag_list, attachments_url } = response.data; + const { content, forum_id, id, repertoire_name, subject, + current_user, tag_list, attachments_url, memo_tags } = response.data; this.initMD(content); // this.onRepertoiresChange(repertoire_name) + // tag -> memo_tags + const tag = memo_tags; let memoLanguage = [] if (tag) { memoLanguage = tag.map((item, index) => { @@ -355,7 +361,7 @@ class MemoNew extends Component { }) } this.setState({ - currentMemoId: id, + currentMemoId: memoId, memoSubject: subject, memoType: forum_id, memoRepertoire: repertoire_name, @@ -377,7 +383,7 @@ class MemoNew extends Component { window.$("html,body").animate({"scrollTop":0}) this.props.initForumState({ - current_user, + // current_user, tag_list }) } @@ -394,6 +400,8 @@ class MemoNew extends Component { } initMD(initValue) { + return; + this.contentChanged = false; const placeholder = ""; // amp; @@ -566,9 +574,12 @@ class MemoNew extends Component {

    *
    -
    + + + {/*
    -
    +
    */}

    From 25036be1e075f1a1c1bd4c1f0fc413f509097c70 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 1 Aug 2019 16:27:17 +0800 Subject: [PATCH 048/221] 2 --- public/react/src/modules/forums/MemoDetail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index f950037f4..15e412981 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -44,7 +44,7 @@ class MemoDetail extends Component { this.state = { memoLoading: true, hasMoreComments: false, - pageCount: 1, + pageCount: 2, goldRewardDialogOpen: false } @@ -86,7 +86,7 @@ class MemoDetail extends Component { } this.setState({ hasMoreComments, - pageCount: 1, + pageCount: 2, comments: memo_replies }) delete response.data.memo_replies; From 25a627df2f2b017c894f6c65c8d269d2fcf8280b Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 1 Aug 2019 16:48:16 +0800 Subject: [PATCH 049/221] add praises count to library --- app/models/library.rb | 2 ++ .../20190801084533_add_praises_count_to_libraries.rb | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 db/migrate/20190801084533_add_praises_count_to_libraries.rb diff --git a/app/models/library.rb b/app/models/library.rb index 894dcdac0..13a5c3243 100644 --- a/app/models/library.rb +++ b/app/models/library.rb @@ -10,6 +10,8 @@ class Library < ApplicationRecord has_many :attachments, as: :container has_one :praise_tread_cache, foreign_key: :object_id + has_many :praise_treads, as: :praise_tread_object, dependent: :destroy + validates :uuid, presence: true, uniqueness: true diff --git a/db/migrate/20190801084533_add_praises_count_to_libraries.rb b/db/migrate/20190801084533_add_praises_count_to_libraries.rb new file mode 100644 index 000000000..6a619104d --- /dev/null +++ b/db/migrate/20190801084533_add_praises_count_to_libraries.rb @@ -0,0 +1,10 @@ +class AddPraisesCountToLibraries < ActiveRecord::Migration[5.2] + def change + add_column :libraries, :praises_count, :integer, :default => 0 + + Library.find_each do |library| + praises_count = library.praise_treads.count + library.update_column(:praises_count, praises_count) + end + end +end From 51214b085145bc141dd9e8561575b1d0f3352362 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 1 Aug 2019 16:53:32 +0800 Subject: [PATCH 050/221] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/picture_display.json.jbuilder | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder index 8b5271ec5..2bc88fdf4 100644 --- a/app/views/games/picture_display.json.jbuilder +++ b/app/views/games/picture_display.json.jbuilder @@ -26,13 +26,13 @@ elsif @type =="qrcode" json.qrcode_str @qrcode_str elsif @type == "mp3" || @type == "mp4" if @type == "mp4" - json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171"}] - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172"}] - json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173"}] + json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] + json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] else - json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174"}] - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175"}] - json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175"}] + json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] end # json.orignal_file do # json.array! @orignal_picture do |file| From 7d206418c770902a20da4acb9d20d0dc67965eca Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 1 Aug 2019 16:55:56 +0800 Subject: [PATCH 051/221] modify library praises count --- app/controllers/libraries_controller.rb | 2 +- app/views/libraries/index.json.jbuilder | 2 +- app/views/libraries/show.json.jbuilder | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/libraries_controller.rb b/app/controllers/libraries_controller.rb index 55894aaa6..c7c6029da 100644 --- a/app/controllers/libraries_controller.rb +++ b/app/controllers/libraries_controller.rb @@ -22,7 +22,7 @@ class LibrariesController < ApplicationController end @count = libraries.count - @libraries = paginate libraries.includes(:library_tags, :praise_tread_cache, user: :user_extension) + @libraries = paginate libraries.includes(:library_tags, user: :user_extension) ids = @libraries.map(&:id) @download_count_map = Attachment.where(container_type: 'Library', container_id: ids) diff --git a/app/views/libraries/index.json.jbuilder b/app/views/libraries/index.json.jbuilder index c58d390b0..13ab8d77b 100644 --- a/app/views/libraries/index.json.jbuilder +++ b/app/views/libraries/index.json.jbuilder @@ -5,7 +5,7 @@ json.libraries do json.cover_url library.cover_id.present? ? download_url(library.cover) : nil - json.praise_count library.praise_tread_cache&.praise_num || 0 + json.praise_count library.praises_count json.download_count @download_count_map.fetch(library.id, 0) json.published_at library.display_published_at diff --git a/app/views/libraries/show.json.jbuilder b/app/views/libraries/show.json.jbuilder index 0f4b6ea17..e1fc7d781 100644 --- a/app/views/libraries/show.json.jbuilder +++ b/app/views/libraries/show.json.jbuilder @@ -2,7 +2,7 @@ library = current_library json.extract! library, :id, :uuid, :title, :content, :author_name, :author_school_name, :status, :visited_count -json.praise_count library.praise_tread_cache&.praise_num || 0 +json.praise_count library.praises_count json.published_at library.display_published_at json.created_at library.display_created_at From 6a91a4ecb751403beb55a2b21baa70c24f3bba61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 16:56:24 +0800 Subject: [PATCH 052/221] b --- .../PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js | 2 +- public/react/src/modules/user/common.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index 493152def..51cd8c8f6 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -189,7 +189,7 @@ class PackageIndexNEIBannerConcent extends Component { //短信验证 SMSverification = () => { let {contact_phone,code}=this.state; - var url = `/account/get_verification_code.json`; + var url = `/accounts/get_verification_code.json`; axios.get((url), { params: { value: contact_phone, diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css index d23412d07..6d696a676 100644 --- a/public/react/src/modules/user/common.css +++ b/public/react/src/modules/user/common.css @@ -264,5 +264,5 @@ margin: 0 auto; } .ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix { - background: #ffffff!important; + background: transparent !important; } \ No newline at end of file From 987a935faee035c578a56b4f7a2a8b71a28358ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 17:01:34 +0800 Subject: [PATCH 053/221] =?UTF-8?q?=20=E4=BC=97=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index 51cd8c8f6..ae4983b33 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -192,7 +192,7 @@ class PackageIndexNEIBannerConcent extends Component { var url = `/accounts/get_verification_code.json`; axios.get((url), { params: { - value: contact_phone, + login: contact_phone, type: 5, } }).then((result) => { From c97d9b2acd4eafc0e4b72d6846bae409790912b7 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Thu, 1 Aug 2019 17:23:03 +0800 Subject: [PATCH 054/221] fix VerificationCode --- app/services/project_packages/save_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/project_packages/save_service.rb b/app/services/project_packages/save_service.rb index a876f56b3..8385ac5dd 100644 --- a/app/services/project_packages/save_service.rb +++ b/app/services/project_packages/save_service.rb @@ -54,7 +54,7 @@ class ProjectPackages::SaveService < ApplicationService raise Error, '验证码不能为空' if params[:code].blank? code = VerificationCode.where(phone: params[:contact_phone], code_type: 9, code: params[:code]).last - raise Error, '无效的验证码' if code.blank? || !code.valid_code? + raise Error, '无效的验证码' if code.blank? || !code.effective? end def deal_attachments From 533b01a8a549cdee6beea1e8bd72a75256b21c5f Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Thu, 1 Aug 2019 17:30:10 +0800 Subject: [PATCH 055/221] p3 p4 --- .../src/common/components/media/Clappr.js | 49 +++++++++++++------ .../context/EvaluateSuccessEffectDisplay.js | 20 +++++--- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/public/react/src/common/components/media/Clappr.js b/public/react/src/common/components/media/Clappr.js index 7814c391a..995200574 100644 --- a/public/react/src/common/components/media/Clappr.js +++ b/public/react/src/common/components/media/Clappr.js @@ -10,33 +10,50 @@ class Clappr extends Component{ this.state={ } } + componentWillUnmount() { + this['player'+this.props.id] && this['player'+this.props.id].destroy() + } + componentDidMount() { const source = this.props.source || "http://your.video/here.mp4" - const { id } = this.props + const { id, type } = this.props const _id = `#_player${id}` - if (window['Clappr']) { - const player = new window.Clappr.Player({ + if (!window['Clappr'] && window['ClapprLoading'] == true) { + setTimeout(() => { + this.componentDidMount() + }, 300) + return; + } + // && window['clappr-playback-rate-plugin'] + if (window['Clappr'] ) { + // http://clappr.github.io/classes/Player.html#method_mute + this['player'+id] = new window.Clappr.Player({ source: source, parentId: _id, - plugins: { - 'core': [window.Clappr.MediaControl, window.Clappr.Playback] - } + height: type == 'mp3' ? 60 : 360, + hideMediaControl: type == 'mp3' ? false : true, + // plugins: { + // 'core': [window.Clappr.MediaControl, window['clappr-playback-rate-plugin'].default] + // } }); } else { + window['ClapprLoading'] = true; $.getScript( `${_url_origin}/javascripts/media/clappr.min.js`, (data, textStatus, jqxhr) => { window.clappr = window.Clappr - $.getScript( - `${_url_origin}/javascripts/media/clappr-playback-rate-plugin.min.js`, - (data, textStatus, jqxhr) => { - const player = new window.Clappr.Player({ + // $.getScript( + // `${_url_origin}/javascripts/media/clappr-playback-rate-plugin.min.js`, + // (data, textStatus, jqxhr) => { + this['player'+id] = new window.Clappr.Player({ source: source, parentId: _id, - plugins: { - 'core': [window.Clappr.MediaControl, window['clappr-playback-rate-plugin'].default] - } + height: type == 'mp3' ? 60 : 360, + hideMediaControl: type == 'mp3' ? false : true, + // plugins: { + // 'core': [window.Clappr.MediaControl, window['clappr-playback-rate-plugin'].default] + // } }); - }) + // }) }); @@ -62,7 +79,7 @@ class Clappr extends Component{ render(){ - let { source, id, className } = this.props; + let { source, id, className, type } = this.props; const _id = `_player${id}` return( @@ -71,7 +88,7 @@ class Clappr extends Component{ margin-right: 16px; } `} -
    +
    ) } diff --git a/public/react/src/context/EvaluateSuccessEffectDisplay.js b/public/react/src/context/EvaluateSuccessEffectDisplay.js index 2697079d1..ec34db31f 100644 --- a/public/react/src/context/EvaluateSuccessEffectDisplay.js +++ b/public/react/src/context/EvaluateSuccessEffectDisplay.js @@ -1,4 +1,6 @@ import React, { Component } from 'react'; +import ReactDOM from 'react-dom'; + import { Redirect } from 'react-router'; import PropTypes from 'prop-types'; @@ -29,7 +31,11 @@ class EvaluateSuccessEffectDisplay extends Component { } } hidepicture = () => { - window.$('#picture_display').hide(); + const dom = document.getElementById('picture_display'); + ReactDOM.unmountComponentAtNode(dom) + // window.$('#picture_display').hide(); + + window.$('.data-tip-right').hide() } renderContent = () => { // qrcode @@ -107,11 +113,11 @@ class EvaluateSuccessEffectDisplay extends Component { : null } + ? : null } content2={ user_file[0] && user_file[0].file_url - ? : null } + ? : null } content3={ answer_file[0] && answer_file[0].file_url - ? : null } + ? : null } > ) } else if (type == 'mp4') { @@ -119,11 +125,11 @@ class EvaluateSuccessEffectDisplay extends Component { : null } + ? : null } content2={ user_file[0] && user_file[0].file_url - ? : null } + ? : null } content3={ answer_file[0] && answer_file[0].file_url - ? : null } + ? : null } > ) } From 540a1ccd43e3657d1d1c5202491bbe6b5008293f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 17:43:07 +0800 Subject: [PATCH 056/221] =?UTF-8?q?=20=E4=BC=97=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndexNEITaskDetails.js | 2 +- .../modules/user/usersInfo/InfosPackage.js | 6 +- .../src/modules/user/usersInfo/usersInfo.css | 190 +++++++++--------- 3 files changed, 101 insertions(+), 97 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index a1e016853..5179964a5 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -313,7 +313,7 @@ class PackageIndexNEITaskDetails extends Component {
    -
    +
    {data&&data.min_price===null?"":￥{data&&data.min_price}} {data&&data.max_price===null||data&&data.min_price===null?"":~} {data&&data.max_price===null?"":￥{data&&data.max_price}} diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index f2716a064..2cafa1de4 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -176,7 +176,7 @@ class InfosPackage extends Component{
    -
    +
    {item.min_price===null?"":￥{item.min_price}} {item.max_price===null||item.min_price===null?"":~} {item.max_price===null?"":￥{item.max_price}} @@ -199,9 +199,9 @@ class InfosPackage extends Component{ {item.bidding_users_count}人竞标
    -
    + {item.published_at===null?"":
    发布于：{moment(item.published_at).format("YYYY-MM-DD HH:mm")} -
    +
    }
    diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 0be9837bf..3c4f80b0f 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -1,93 +1,97 @@ -.navInfo{ - border:none!important; - position: absolute; - width: 100%; - bottom: -8px; -} -.navInfo li { - float: left; - margin: 0px 40px; - padding:0px; - height: 45px; - line-height: 40px; - font-size: 16px; - position: relative; -} -.navInfo li.active::after{ - position: absolute; - left: 0px; - height: 2px; - width: 100%; - content: ''; - bottom: 0px; - background: #05101A!important; - color: #666!important; -} -.navInfo li,.navInfo li.ant-menu-item-active{ - border-bottom: none!important; - color: #666!important; -} -.navInfo li.ant-menu-item-selected{ - border-bottom: 2px solid #05101A!important; - color: #05101A!important; -} -.navInfo ul.ant-menu{float: left!important;border:none!important;} - -.substancenenew{ - width: 236px; - height: 206px; - background: rgba(248,248,248,1); - border: 2px dotted rgba(225,225,225,1); - opacity: 1; - border-radius: 4px; - padding-top: 50px; - position: inherit; -} - -.substancepad{ - padding: 20px 20px 0px 20px; - border-bottom: 1px solid transparent; -} -.substancefont{ - height:24px; - font-size:18px; - font-family:Microsoft YaHei; - font-weight:400; - line-height:21px; - color:rgba(153,153,153,1); - opacity:1; - margin-top: -8px; -} -.topten{ - width: 1px; - height: 100px; - border: 2px soild rgba(225,225,225,1); - background: rgba(225,225,225,1); - border: 1px solid rgba(225,225,225,1); - margin: 0 auto; -} -.leftten{ - width: 100px; - height: 1px; - background: rgba(225,225,225,1); - border: 1px solid rgba(225,225,225,1); - margin: 0px auto; - position: absolute; - top: 120px; - left: 88px; -} -.squarebox{ - position: absolute; - top: 0px; - left: 0px; -} - -/*题库的标签--和资源标签样式相似*/ -.bankTag{max-height: 82px;overflow-y: auto} -.bankTag #sourceTag li{margin-left: 0px;margin-right: 5px;} -.bank_list_Tag{cursor: default} -/*资源标签*/ -#sourceTag li,.bank_list_Tag{font-size: 12px;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px; margin-left: 5px;display: inline-block;cursor: pointer;margin-bottom: 5px;} -#sourceTag li a{color: #4e7a9b!important;} -#sourceTag li.active{background-color: #4CACFF;color: #fff;} -#sourceTag li.active a{background-color: #4CACFF;color: #fff!important;} \ No newline at end of file +.navInfo{ + border:none!important; + position: absolute; + width: 100%; + bottom: -8px; +} +.navInfo li { + float: left; + margin: 0px 40px; + padding:0px; + height: 45px; + line-height: 40px; + font-size: 16px; + position: relative; +} +.navInfo li.active::after{ + position: absolute; + left: 0px; + height: 2px; + width: 100%; + content: ''; + bottom: 0px; + background: #05101A!important; + color: #666!important; +} +.navInfo li,.navInfo li.ant-menu-item-active{ + border-bottom: none!important; + color: #666!important; +} +.navInfo li.ant-menu-item-selected{ + border-bottom: 2px solid #05101A!important; + color: #05101A!important; +} +.navInfo ul.ant-menu{float: left!important;border:none!important;} + +.substancenenew{ + width: 236px; + height: 206px; + background: rgba(248,248,248,1); + border: 2px dotted rgba(225,225,225,1); + opacity: 1; + border-radius: 4px; + padding-top: 50px; + position: inherit; +} + +.substancepad{ + padding: 20px 20px 0px 20px; + border-bottom: 1px solid transparent; +} +.substancefont{ + height:24px; + font-size:18px; + font-family:Microsoft YaHei; + font-weight:400; + line-height:21px; + color:rgba(153,153,153,1); + opacity:1; + margin-top: -8px; +} +.topten{ + width: 1px; + height: 100px; + border: 2px soild rgba(225,225,225,1); + background: rgba(225,225,225,1); + border: 1px solid rgba(225,225,225,1); + margin: 0 auto; +} +.leftten{ + width: 100px; + height: 1px; + background: rgba(225,225,225,1); + border: 1px solid rgba(225,225,225,1); + margin: 0px auto; + position: absolute; + top: 120px; + left: 88px; +} +.squarebox{ + position: absolute; + top: 0px; + left: 0px; +} + +/*题库的标签--和资源标签样式相似*/ +.bankTag{max-height: 82px;overflow-y: auto} +.bankTag #sourceTag li{margin-left: 0px;margin-right: 5px;} +.bank_list_Tag{cursor: default} +/*资源标签*/ +#sourceTag li,.bank_list_Tag{font-size: 12px;color: #4E7A9B;background-color: #E5F3FF;padding: 0px 4px;height: 20px;line-height: 20px; margin-left: 5px;display: inline-block;cursor: pointer;margin-bottom: 5px;} +#sourceTag li a{color: #4e7a9b!important;} +#sourceTag li.active{background-color: #4CACFF;color: #fff;} +#sourceTag li.active a{background-color: #4CACFF;color: #fff!important;} + +.mtf10{ + margin-top:-10px; +} \ No newline at end of file From 4f69eaa15e9ef5eb2c6a17d1bbb6a21869107e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 17:51:29 +0800 Subject: [PATCH 057/221] b --- public/react/src/modules/user/usersInfo/InfosPackage.js | 9 +++++---- public/react/src/modules/user/usersInfo/usersInfo.css | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 2cafa1de4..bef2bf366 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -176,7 +176,7 @@ class InfosPackage extends Component{
    -
    +
    {item.min_price===null?"":￥{item.min_price}} {item.max_price===null||item.min_price===null?"":~} {item.max_price===null?"":￥{item.max_price}} @@ -199,9 +199,10 @@ class InfosPackage extends Component{ {item.bidding_users_count}人竞标
    - {item.published_at===null?"":
    - 发布于：{moment(item.published_at).format("YYYY-MM-DD HH:mm")} -
    } +
    + {item.published_at===null?更新于：{moment(item.updated_at).format("YYYY-MM-DD HH:mm")} : + 发布于：{moment(item.published_at).format("YYYY-MM-DD HH:mm")} } +
    diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 3c4f80b0f..3485f6d16 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -92,6 +92,6 @@ #sourceTag li.active{background-color: #4CACFF;color: #fff;} #sourceTag li.active a{background-color: #4CACFF;color: #fff!important;} -.mtf10{ - margin-top:-10px; +.mtf15{ + margin-top:-15px; } \ No newline at end of file From fa0d432553626cd0ae6cf2b103d1edaa2de518b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 17:58:17 +0800 Subject: [PATCH 058/221] b --- .../modules/projectPackages/PackageIndex/PackageConcent.js | 2 +- public/react/src/modules/projectPackages/packageconcnet.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index e7a44a3b8..e74612687 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -294,7 +294,7 @@ class PackageConcent extends Component {
    -
    +
    {item.min_price===null?"":￥{item.min_price}} {item.max_price===null||item.min_price===null?"":~} {item.max_price===null?"":￥{item.max_price}} diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index db2decfdd..cf489a8ff 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -362,4 +362,8 @@ *, *::before, *::after { -webkit-box-sizing: border-box; box-sizing: border-box; +} + +.mtf11{ + margin-top: -11px; } \ No newline at end of file From ba9f9f2c24cee8416b625f6102fccd615c658c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 18:01:56 +0800 Subject: [PATCH 059/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/projectPackages/PackageIndex/PackageConcent.js | 2 +- public/react/src/modules/projectPackages/packageconcnet.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index e74612687..6f7dd3f6e 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -294,7 +294,7 @@ class PackageConcent extends Component {
    -
    +
    {item.min_price===null?"":￥{item.min_price}} {item.max_price===null||item.min_price===null?"":~} {item.max_price===null?"":￥{item.max_price}} diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index cf489a8ff..2fc8a8ebb 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -364,6 +364,6 @@ box-sizing: border-box; } -.mtf11{ - margin-top: -11px; +.mtf12{ + margin-top: -12px; } \ No newline at end of file From d06b30f0ef4992a4af1fd1c31f67153d0b06a578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 19:27:18 +0800 Subject: [PATCH 060/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/Leftdialogue.js | 26 ++-- .../src/modules/message/js/MessagChat.js | 145 +++++++++++++----- .../src/modules/message/js/MessagePrivate.js | 2 +- .../src/modules/message/js/Messagerouting.js | 4 +- .../src/modules/message/js/Rightdialogue.js | 25 +-- 5 files changed, 143 insertions(+), 59 deletions(-) diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index 6744be6cc..2e586aa40 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl} from 'educoder'; +import {getImageUrl,markdownToHTML} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -31,24 +31,32 @@ class Leftdialogue extends Component{ // this.getdata(1); // } } - //获取数据地方 - - // 跳转页面 + mydelete=(user_id,id)=>{ + this.props.DELETEsetreplyfun(user_id,id); + } + myCome=(e)=>{ + window.location.href="/users/"+e.login; + } render() { - let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; return (
    - 头像 + this.myCome(this.props.objeysl.sender)}> + { + this.props.objeysl&&this.props.objeysl.sender.image_url ? + 头像:"" + } + - 22:21 + {moment(this.props.objeysl.send_time).hour()}:{moment(this.props.objeysl.send_time).minute()<10?"0"+moment(this.props.objeysl.send_time).minute():moment(this.props.objeysl.send_time).minute()}
    ) } diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 948ea938b..abb67dec8 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -18,7 +18,7 @@ class MessagChat extends Component{ limit:20, page:1, datay:[], - limits:20, + limits:40, mess:false, myuserl:[], pages:1, @@ -31,7 +31,7 @@ class MessagChat extends Component{ componentDidMount(){ this.getdata(1); let target_ids=this.props.match.params.private; - this.getChatList(1,this.state.limit,target_ids); + this.getChatList(1,this.state.limits,target_ids); // console.log("MessagChat111111"); console.log(this.props.myysluser); this.setState({ @@ -45,7 +45,15 @@ class MessagChat extends Component{ console.log("MessagChat111111"); console.log(this.props); console.log(this.props.match.params.userid); + this.scrollToBottom(); + } + + componentDidUpdate() { + this.scrollToBottom(); + } + scrollToBottom() { + this.el.scrollIntoView({ behavior: 'smooth' }); } // 滑动刷新 contentViewScrolledit=(e)=>{ @@ -61,6 +69,19 @@ class MessagChat extends Component{ // limits:ls, // }) } + //滑动到顶部 + console.log("滑动到顶部判断"); + console.log(e.currentTarget.clientHeight); + console.log(e.currentTarget.scrollTop); + console.log(e.currentTarget.scrollHeight); + // if(e.currentTarget.scrollHeight+e.currentTarget.scrollTop===e.currentTarget.clientHeight){ + // console.log("滑动到顶部判断"); + // + // // let ls=newpage*20 + // // this.setState({ + // // limits:ls, + // // }) + // } }; @@ -79,26 +100,29 @@ class MessagChat extends Component{ if(result.data.message!==undefined){ return; } - var datas=[] - var datay=result.data.messages; - var obj={}; - for (var i=0;i{ let contents=this.messageRef.current.getValue().trim(); let target_ids=this.props.match.params.private @@ -297,9 +325,50 @@ class MessagChat extends Component{ .catch(function (error) { console.log(error); }); + }; + //删除 + DELETEsetreplyfun=(user_id,id)=>{ + //user_id不用 + console.log("311"); + this.setState({ + isSpin:true, + }); + let url = `/users/${this.props.match.params.userid}/private_messages/${id}.json`; + axios.delete(url) + .then((response) => { + if(response){ + if(response.data.status===0){ + if(this.state.messages.length>0){ + for(var i=0;i{ + // + // }, 200); + this.setState({ + messages:this.state.messages, + isSpin:false, + }) + } + } + } + }) + .catch(function (error) { + console.log(error); + this.setState({ + isSpin:false, + }) + }); } + + + + + render() { let{isSpins,datay,myyslusers,mess,limits,myuserl,messages,isSpin}=this.state; // console.log(mess); @@ -325,7 +394,7 @@ class MessagChat extends Component{
    -
    +
    { this.el = el; }}> { messages===undefined? "" @@ -341,12 +410,12 @@ class MessagChat extends Component{ } { parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? - + this.DELETEsetreplyfun(user_id,id)}> {/*自己的*/} - : + :this.DELETEsetreplyfun(user_id,id)}> {/*他人的*/} diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 8b2cd5048..b0a137042 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -133,7 +133,7 @@ class MessagePrivate extends Component{ :data.map((item,key)=>{ return( -
    this.smyJump(3,item.target)}> +
    this.smyJump(3,item.target)}> this.myCome(item)}> this.myCome(item)} src={getImageUrl("/images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/> diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 3a6b4d1b1..d7348ef85 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -174,11 +174,11 @@ class Messagerouting extends Component{
    diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index 6d8852a6d..a28325b3f 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl} from 'educoder'; +import {getImageUrl,markdownToHTML} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -32,25 +32,32 @@ class Rightdialogue extends Component{ // this.getdata(1); // } } - //获取数据地方 - - // 跳转页面 + mydelete=(user_id,id)=>{ + this.props.DELETEsetreplyfun(user_id,id); + } + myCome=(e)=>{ + window.location.href="/users/"+e.login; + } render() { - let{page,limit,typeysl,count,isSpin,data,modalsType}=this.state; return (
    - 头像 + this.myCome(this.props.objeysl.sender)}> + {this.props.objeysl&&this.props.objeysl.sender.image_url ? + 头像:"" + } + - 22:20 + {moment(this.props.objeysl.send_time).hour()}:{moment(this.props.objeysl.send_time).minute()<10?"0"+moment(this.props.objeysl.send_time).minute():moment(this.props.objeysl.send_time).minute()}
    ) } From d3a18bdc7652b80a0a3cadaa7320fb3ecd884526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 20:12:39 +0800 Subject: [PATCH 061/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 216 +++++++++--------- .../react/src/modules/message/js/MessagSub.js | 25 +- .../src/modules/message/js/MessagePrivate.js | 20 +- 3 files changed, 131 insertions(+), 130 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index abb67dec8..8cfef4731 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -52,9 +52,6 @@ class MessagChat extends Component{ this.scrollToBottom(); } - scrollToBottom() { - this.el.scrollIntoView({ behavior: 'smooth' }); - } // 滑动刷新 contentViewScrolledit=(e)=>{ @@ -96,43 +93,40 @@ class MessagChat extends Component{ per_page:listl, }}).then((result) => { if (result) { + // if (result.data.status === 0) { + if (result.data !== null) { + var datas = [] + var datay = result.data.messages; + datay = datay.reverse(); + var obj = {}; + for (var i = 0; i < datay.length; i++) { + if (i === 0) { + obj = datay[i]; + datas.push(datay[i]); + } else { + + if (moment(obj.send_day).isSame(datay[i].send_day)) { + datay[i].send_day = ""; + } else { + obj = datay[i]; + } - if(result.data.message!==undefined){ - return; - } - - if(result.data!==null){ - var datas=[] - var datay=result.data.messages; - var obj={}; - for (var i=0;i { console.log(error); @@ -152,44 +146,41 @@ class MessagChat extends Component{ per_page:listls, }}).then((result) => { if (result) { + // if (result.data.status === 0) { + if (result.data !== null) { + var datas = [] + var datay = result.data.messages; + datay = datay.reverse(); + var obj = {}; + for (var i = 0; i < datay.length; i++) { + if (i === 0) { + obj = datay[i]; + datas.push(datay[i]); + } else { + + if (moment(obj.send_day).isSame(datay[i].send_day)) { + datay[i].send_day = ""; + } else { + obj = datay[i]; + } - if(result.data.message!==undefined){ - return; - } - - if(result.data!==null){ - var datas=[] - var datay=result.data.messages; - var obj={}; - for (var i=0;i { console.log(error); @@ -212,31 +203,29 @@ class MessagChat extends Component{ if (result) { // console.log(types); // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } // console.log("调用了消失的方法"); // console.log("5454545454"); + // if(result.data.status===0) { - if(result.data!==null){ - if(result.data.private_messages!==null){ - if(result.data.private_messages.length>0){ - for (var i=0;i 0) { + for (var i = 0; i < result.data.private_messages.length; i++) { + this.state.datay.push(result.data.private_messages[i]); + } + } } - } } + this.setState({ + page: page, + isSpins: false, + datay: this.state.datay, + data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages, + }); } - this.setState({ - page:page, - isSpins:false, - datay:this.state.datay, - data:result.data.private_messages===null?undefined:result.data.private_messages===undefined?undefined:result.data.private_messages===[]?undefined:result.data.private_messages==="[]"?undefined:result.data.private_messages.length===0?undefined:result.data.private_messages, - }); // console.log(this.state.datay); - } + // } }).catch((error) => { console.log(error); this.setState({ @@ -255,30 +244,14 @@ class MessagChat extends Component{ per_page:limits, }}).then((result) => { if (result) { - // console.log(types); - // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } - // console.log("调用了消失的方法"); - // console.log("5454545454"); - - // - // if(result.data!==null){ - // if(result.data.private_messages!==null){ - // if(result.data.private_messages.length>0){ - // for (var i=0;i { @@ -320,7 +293,36 @@ class MessagChat extends Component{ content: contents }) .then((response) => { - // console.log(response); + if(response===undefined){ + return + } + // if(response.data.status===0){ + // + // } + console.log("回复成功"); + console.log(response); + var datas=[]; + var dataso=this.state.messages; + var datays=result.data.private_message; + var obj={}; + for (var i=0;i { + this.messagesEnd.scrollIntoView({ behavior: "auto" }); + } + @@ -394,7 +400,7 @@ class MessagChat extends Component{
    -
    { this.el = el; }}> +
    {this.messagesEnd = el}}> { messages===undefined? "" diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 479401681..c32ebeb37 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -53,21 +53,16 @@ class MessagSub extends Component{ per_page:limit, }}).then((result) => { if (result) { - // console.log(types); - // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } - // console.log("调用了消失的方法"); - // console.log("5454545454"); - this.setState({ - page:page, - count:result.data.count, - typeysl:types, - isSpin:false, - data:result.data.tidings===null?undefined:result.data.tidings===undefined?undefined:result.data.tidings===[]?undefined:result.data.tidings==="[]"?undefined:result.data.tidings.length===0?undefined:result.data.tidings, - }) + // if (result.data.status === 0) { + + this.setState({ + page: page, + count: result.data.count, + typeysl: types, + isSpin: false, + data: result.data.tidings === null ? undefined : result.data.tidings === undefined ? undefined : result.data.tidings === [] ? undefined : result.data.tidings === "[]" ? undefined : result.data.tidings.length === 0 ? undefined : result.data.tidings, + }) + // } } }).catch((error) => { console.log(error); diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index b0a137042..faa3c327b 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -60,18 +60,18 @@ class MessagePrivate extends Component{ if (result) { // console.log(types); // console.log(result); - if(result.data.message!==undefined){ - // console.log("5151515151"); - return; - } + // console.log("调用了消失的方法"); // console.log("5454545454"); - this.setState({ - page:page, - count:result.data.count, - isSpin:false, - data:result.data.private_messages===null?undefined:result.data.private_messages===undefined?undefined:result.data.private_messages===[]?undefined:result.data.private_messages==="[]"?undefined:result.data.private_messages.length===0?undefined:result.data.private_messages, - }) + // if (result.data.status === 0) { + + this.setState({ + page: page, + count: result.data.count, + isSpin: false, + data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages, + }) + // } } }).catch((error) => { console.log(error); From 54099dd77608bf299189fb5073a47b86e2e89e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 21:04:59 +0800 Subject: [PATCH 062/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 32 +++++++++---------- .../react/src/modules/message/js/MessagSub.js | 6 ++-- .../src/modules/message/js/MessagePrivate.js | 14 ++++---- .../src/modules/message/js/Messagerouting.js | 20 ++++++------ .../src/modules/message/js/Rightdialogue.js | 4 +-- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 8cfef4731..641dabce3 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -18,7 +18,7 @@ class MessagChat extends Component{ limit:20, page:1, datay:[], - limits:40, + limits:20, mess:false, myuserl:[], pages:1, @@ -33,7 +33,7 @@ class MessagChat extends Component{ let target_ids=this.props.match.params.private; this.getChatList(1,this.state.limits,target_ids); // console.log("MessagChat111111"); - console.log(this.props.myysluser); + // console.log(this.props.myysluser); this.setState({ myyslusers:this.props.myysluser }) @@ -42,9 +42,9 @@ class MessagChat extends Component{ }catch (e) { } - console.log("MessagChat111111"); - console.log(this.props); - console.log(this.props.match.params.userid); + // console.log("MessagChat111111"); + // console.log(this.props); + // console.log(this.props.match.params.userid); this.scrollToBottom(); } @@ -296,14 +296,12 @@ class MessagChat extends Component{ if(response===undefined){ return } - // if(response.data.status===0){ - // - // } - console.log("回复成功"); - console.log(response); + if(response.data.status===0){ + // console.log("回复成功"); + // console.log(response); var datas=[]; var dataso=this.state.messages; - var datays=result.data.private_message; + var datays=response.data.private_message; var obj={}; for (var i=0;i{ //user_id不用 - console.log("311"); + // console.log("311"); this.setState({ isSpin:true, }); @@ -382,9 +382,9 @@ class MessagChat extends Component{ // console.log("MessagChat"); // console.log(this.state); // console.log("112"); - console.log(limits); - console.log(myuserl); - console.log(messages); + // console.log(limits); + // console.log(myuserl); + // console.log(messages); return (
    {/*私信对话框*/} @@ -458,7 +458,7 @@ class MessagChat extends Component{
    在问题反馈时，请同时发送问题发生页的网址链接，以便我们高效的为您服务 - 回复 + this.setreplyfun()}>回复
    diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index c32ebeb37..8c99d785e 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -21,8 +21,8 @@ class MessagSub extends Component{ } // 初始化数据 componentDidMount(){ - console.log("初始化数据了MessagSub"); - console.log(this.props); + // console.log("初始化数据了MessagSub"); + // console.log(this.props); this.getdata("",this.state.page); // this.Messageprivatemessageunreadmessage(); try { @@ -81,7 +81,7 @@ class MessagSub extends Component{ render() { let{page,limit,typeysl,count,isSpin,data}=this.state; // console.log("6868686868"); - console.log(data); + // console.log(data); return (
    {/*头部筛选数据*/} diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index faa3c327b..3f52343a2 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -20,8 +20,8 @@ class MessagePrivate extends Component{ isSpin:false, modalsType:false, }; - console.log("MessagePrivate"); - console.log(this.props); + // console.log("MessagePrivate"); + // console.log(this.props); } componentDidMount(){ @@ -31,9 +31,9 @@ class MessagePrivate extends Component{ }catch (e) { } - console.log("MessagePrivate"); - console.log(this.props); - console.log(this.props.match.params.userid); + // console.log("MessagePrivate"); + // console.log(this.props); + // console.log(this.props.match.params.userid); }; componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -99,8 +99,8 @@ class MessagePrivate extends Component{ }; // 跳转页面 smyJump =(i,item)=>{ - console.log("跳转页面"); - console.log(i); + // console.log("跳转页面"); + // console.log(i); this.props.Modifyur(i,item); }; myCome=(e)=>{ diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index d7348ef85..619e1b838 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -37,8 +37,8 @@ class Messagerouting extends Component{ } componentDidMount(){ - console.log("Messagerouting"); - console.log(this.props); + // console.log("Messagerouting"); + // console.log(this.props); // let courstype=this.props.location.search; // // courstype=courstype.splice('/'); // // courstype=courstype[3]; @@ -64,8 +64,8 @@ class Messagerouting extends Component{ if(result===undefined){ return } - console.log("消息未读1"); - console.log(result); + // console.log("消息未读1"); + // console.log(result); this.setState({ unread_message_count:result.data.unread_message_count, unread_tiding_count:result.data.unread_tiding_count, @@ -91,8 +91,8 @@ class Messagerouting extends Component{ Message2=(data)=>{ - console.log("64"); - console.log(data); + // console.log("64"); + // console.log(data); this.setState({ unread_message_count:data.unread_message_count, unread_tiding_count:data.unread_tiding_count, @@ -101,10 +101,10 @@ class Messagerouting extends Component{ //跳转到链接 Modifyur=(i,item)=>{ - console.log("跳转到链接1"); - console.log(i); - console.log(item); - console.log("跳转到链接2"); + // console.log("跳转到链接1"); + // console.log(i); + // console.log(item); + // console.log("跳转到链接2"); if(i<3){ this.setState({ routing:i, diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index a28325b3f..d177e7c4f 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -18,8 +18,8 @@ class Rightdialogue extends Component{ } componentDidMount(){ - console.log("Rightdialogue"); - console.log(this.props); + // console.log("Rightdialogue"); + // console.log(this.props); }; componentDidUpdate(prevProps) { From 65dce68b929cccba465b9f4b5d1928cf0cd98254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 21:05:40 +0800 Subject: [PATCH 063/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index abb67dec8..666ba535d 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -11,7 +11,7 @@ import Leftdialogue from './Leftdialogue' class MessagChat extends Component{ constructor(props) { super(props); - this.messageRef = React.createRef(); + this.state={ isSpin:false, isSpins:false, @@ -53,8 +53,12 @@ class MessagChat extends Component{ } scrollToBottom() { - this.el.scrollIntoView({ behavior: 'smooth' }); + const scrollHeight = this.messageList.scrollHeight; + const height = this.messageList.clientHeight; + const maxScrollTop = scrollHeight - height; + this.messageList.scrollTop = maxScrollTop > 0 ? maxScrollTop : 0; } + // 滑动刷新 contentViewScrolledit=(e)=>{ @@ -351,6 +355,8 @@ class MessagChat extends Component{ messages:this.state.messages, isSpin:false, }) + + this.scrollToBottom() } } } @@ -391,10 +397,13 @@ class MessagChat extends Component{ {myuserl!==undefined?myuserl.name:""}与你的私信

    {/*聊天页面*/} -
    +
    { + this.messageList = div; + }}>
    -
    { this.el = el; }}> +
    { messages===undefined? "" @@ -477,12 +486,12 @@ class MessagChat extends Component{

    - - {item.target.name} - {item.unread === true? - - :""} - + + {item.target.name} + {item.unread === true? + + :""} + {moment(item.send_time).fromNow()}

    From 040e2843a2e64a9618c7399b12325eac3a236758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 21:23:23 +0800 Subject: [PATCH 064/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index f652ea81a..c412a88ff 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -11,7 +11,7 @@ import Leftdialogue from './Leftdialogue' class MessagChat extends Component{ constructor(props) { super(props); - + this.messageRef = React.createRef(); this.state={ isSpin:false, isSpins:false, @@ -25,7 +25,6 @@ class MessagChat extends Component{ mypagey:20, messages:[], objc:[], - } } componentDidMount(){ @@ -59,6 +58,15 @@ class MessagChat extends Component{ this.messageList.scrollTop = maxScrollTop > 0 ? maxScrollTop : 0; } + + + contentViewScrolltop=(e)=>{ + + if(e.currentTarget.scrollHeight===0){ + + + } + } // 滑动刷新 contentViewScrolledit=(e)=>{ @@ -74,10 +82,10 @@ class MessagChat extends Component{ // }) } //滑动到顶部 - console.log("滑动到顶部判断"); - console.log(e.currentTarget.clientHeight); - console.log(e.currentTarget.scrollTop); - console.log(e.currentTarget.scrollHeight); + // console.log("滑动到顶部判断"); + // console.log(e.currentTarget.clientHeight); + // console.log(e.currentTarget.scrollTop); + // console.log(e.currentTarget.scrollHeight); // if(e.currentTarget.scrollHeight+e.currentTarget.scrollTop===e.currentTarget.clientHeight){ // console.log("滑动到顶部判断"); // @@ -325,10 +333,11 @@ class MessagChat extends Component{ } datas.push(datays); //颠倒数组 - console.log(datas); this.setState({ messages: datas, + }) + this.messageRef.current.setValue('') } }) .catch(function (error) { @@ -405,6 +414,7 @@ class MessagChat extends Component{

    {/*聊天页面*/}
    { this.messageList = div; }}> @@ -460,7 +470,7 @@ class MessagChat extends Component{ Date: Thu, 1 Aug 2019 22:32:08 +0800 Subject: [PATCH 065/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 57 +++++++++++++------ .../src/modules/message/js/MessagePrivate.js | 4 +- .../src/modules/message/js/Messagerouting.js | 6 +- .../messagemodal/WriteaprivateletterModal.js | 2 +- 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index c412a88ff..d57b4a7a1 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -300,6 +300,9 @@ class MessagChat extends Component{ } //回复 setreplyfun=()=>{ + this.setState({ + isSpin:true, + }); let contents=this.messageRef.current.getValue().trim(); let target_ids=this.props.match.params.private let url = `/users/${this.props.match.params.userid}/private_messages.json`; @@ -308,6 +311,9 @@ class MessagChat extends Component{ content: contents }) .then((response) => { + this.setState({ + isSpin:false, + }); if(response===undefined){ return } @@ -317,31 +323,50 @@ class MessagChat extends Component{ var datas=[]; var dataso=this.state.messages; var datays=response.data.private_message; - var obj={}; - for (var i=0;i{ + smyJump =(i,id)=>{ // console.log("跳转页面"); // console.log(i); - this.props.Modifyur(i,item); + this.props.Modifyur(i,id); }; myCome=(e)=>{ window.location.href="/users/"+e.target.login; diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 619e1b838..ee0034a4f 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -32,7 +32,6 @@ class Messagerouting extends Component{ routing:1, unread_message_count:0, unread_tiding_count:0, - myysluser:undefined, } } @@ -100,7 +99,7 @@ class Messagerouting extends Component{ }; //跳转到链接 - Modifyur=(i,item)=>{ + Modifyur=(i,id)=>{ // console.log("跳转到链接1"); // console.log(i); // console.log(item); @@ -119,10 +118,9 @@ class Messagerouting extends Component{ }else { this.setState({ routing:i, - myysluser:item, }); console.log("22222222222"); - this.props.history.replace(`/message/${this.props.current_user.user_id}/${item.id}/message_detail`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/${id}/message_detail`); } }; diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index 1234b1fe1..a89614745 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -70,7 +70,7 @@ class WriteaprivateletterModal extends Component { floatingboxdisplays:false, Pleaseselectthesender:false, }); - this.props.smyJump(3,this.state.users); + this.props.smyJump(3,result.data.private_message.receiver_id); //console.log(result); }).catch((error) => { //console.log(error) From 1125d3babc35d9c91e6e1c14a717dec7bc9a6158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 22:36:07 +0800 Subject: [PATCH 066/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index d57b4a7a1..8e84dd9fd 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -63,7 +63,8 @@ class MessagChat extends Component{ contentViewScrolltop=(e)=>{ if(e.currentTarget.scrollHeight===0){ - + let {pages}=this.state; + let newpage=pages+1 } } @@ -110,7 +111,7 @@ class MessagChat extends Component{ if (result) { // if (result.data.status === 0) { if (result.data !== null) { - var datas = [] + var datas = []; var datay = result.data.messages; datay = datay.reverse(); var obj = {}; @@ -119,30 +120,26 @@ class MessagChat extends Component{ obj = datay[i]; datas.push(datay[i]); } else { - if (moment(obj.send_day).isSame(datay[i].send_day)) { datay[i].send_day = ""; } else { obj = datay[i]; } - datas.push(datay[i]); } - } //颠倒数组 - this.setState({ messages: datas, myuserl: result.data.target, }) // } - this.setState({ - isSpin: false, - }); } } + this.setState({ + isSpin: false, + }); }).catch((error) => { console.log(error); this.setState({ @@ -191,12 +188,13 @@ class MessagChat extends Component{ // this.getdatatwo(this.state.page); // } - this.setState({ - isSpin: false, - }); + } } + this.setState({ + isSpin: false, + }); }).catch((error) => { console.log(error); this.setState({ From 9cb00a694a8f1ea771689c561b2aba7fb66e2670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 22:51:57 +0800 Subject: [PATCH 067/221] =?UTF-8?q?=E8=B0=83=E6=95=B4url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 19 +++++++++++-------- .../src/modules/message/js/Messagerouting.js | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index c412a88ff..2d43f400c 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -29,11 +29,13 @@ class MessagChat extends Component{ } componentDidMount(){ this.getdata(1); - let target_ids=this.props.match.params.private; - this.getChatList(1,this.state.limits,target_ids); - // console.log("MessagChat111111"); - // console.log(this.props.myysluser); - this.setState({ + + const query = this.props.location.search; + let target_ids = query.split('?target_ids='); + this.getChatList(1,this.state.limits,target_ids[1]); + // console.log("MessagChat111111"); + // console.log(this.props.myysluser); + this.setState({ myyslusers:this.props.myysluser }) try { @@ -293,7 +295,7 @@ class MessagChat extends Component{ // mess:true, // }) - this.props.history.replace(`/message/${this.props.current_user.user_id}/${user.id}/message_detail`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${user.id}`); // this.getdatatwo(this.state.page); this.getChatListtwo(this.state.pages,this.state.mypagey,user.id); @@ -301,10 +303,11 @@ class MessagChat extends Component{ //回复 setreplyfun=()=>{ let contents=this.messageRef.current.getValue().trim(); - let target_ids=this.props.match.params.private + const query = this.props.location.search; + let target_ids = query.split('?target_ids='); let url = `/users/${this.props.match.params.userid}/private_messages.json`; axios.post(url, { - target_id: target_ids, + target_id: target_ids[1], content: contents }) .then((response) => { diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 619e1b838..db61376b2 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -122,7 +122,7 @@ class Messagerouting extends Component{ myysluser:item, }); console.log("22222222222"); - this.props.history.replace(`/message/${this.props.current_user.user_id}/${item.id}/message_detail`); + this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${item.id}`); } }; @@ -209,7 +209,7 @@ class Messagerouting extends Component{ } > {/*/!*私信聊天页面*! letters/*/} - (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } From 7d3da42c366bfabcfab6f23ae925e79139a43169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 1 Aug 2019 23:00:56 +0800 Subject: [PATCH 068/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/forums/UserSection.js | 124 +++++++++--------- .../src/modules/modals/DownloadMessage.js | 2 +- .../src/modules/modals/DownloadMessageysl.js | 2 +- .../PackageIndexNEITaskDetails.js | 6 +- .../react/src/modules/user/usersInfo/Infos.js | 2 +- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/public/react/src/modules/forums/UserSection.js b/public/react/src/modules/forums/UserSection.js index 8ea9bad2a..4610c2441 100644 --- a/public/react/src/modules/forums/UserSection.js +++ b/public/react/src/modules/forums/UserSection.js @@ -1,62 +1,62 @@ -import React, { Component } from 'react'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import PropTypes from 'prop-types'; - -import classNames from 'classnames' - -import axios from 'axios' - -class UserSection extends Component { - constructor(props) { - super(props) - - this.state = { - - } - } - /*点击关注或者取消关注*/ - AboutFocus(){ - const { author_info } = this.props - /*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/ - - const focusUrl = `/api/v1/users/${author_info.user_id}/${this.props.author_info.watched ? 'unwatch' : 'watch'}?object_id=${author_info.user_id}&object_type=user` - - axios.get(focusUrl,{ - }) - .then((response) => { - const status = response.data.status; - console.log(status); - if(status == 1){ - const new_author_info = Object.assign({}, this.props.author_info) - new_author_info.watched = !new_author_info.watched - this.props.initForumState({author_info: new_author_info}) - } - }).catch((error) => { - console.log(error) - }) - } - - - render() { - const { match, history, author_info , current_user } = this.props - if (!author_info) { - return
    - } - return ( -
    - -

    {author_info.username}

    -

    {author_info.identity}

    - { author_info.user_id !== current_user.user_id && -

    - {this.AboutFocus()}}>{ author_info.watched == true ? "取消关注" : "关注" } - 私信 -

    } -
    - ); - } -} - -export default UserSection; +import React, { Component } from 'react'; + +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; + +import PropTypes from 'prop-types'; + +import classNames from 'classnames' + +import axios from 'axios' + +class UserSection extends Component { + constructor(props) { + super(props) + + this.state = { + + } + } + /*点击关注或者取消关注*/ + AboutFocus(){ + const { author_info } = this.props + /*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/ + + const focusUrl = `/api/v1/users/${author_info.user_id}/${this.props.author_info.watched ? 'unwatch' : 'watch'}?object_id=${author_info.user_id}&object_type=user` + + axios.get(focusUrl,{ + }) + .then((response) => { + const status = response.data.status; + console.log(status); + if(status == 1){ + const new_author_info = Object.assign({}, this.props.author_info) + new_author_info.watched = !new_author_info.watched + this.props.initForumState({author_info: new_author_info}) + } + }).catch((error) => { + console.log(error) + }) + } + + + render() { + const { match, history, author_info , current_user } = this.props + if (!author_info) { + return
    + } + return ( +
    + +

    {author_info.username}

    +

    {author_info.identity}

    + { author_info.user_id !== current_user.user_id && +

    + {this.AboutFocus()}}>{ author_info.watched == true ? "取消关注" : "关注" } + 私信 +

    } +
    + ); + } +} + +export default UserSection; diff --git a/public/react/src/modules/modals/DownloadMessage.js b/public/react/src/modules/modals/DownloadMessage.js index b7796316c..0e975be09 100644 --- a/public/react/src/modules/modals/DownloadMessage.js +++ b/public/react/src/modules/modals/DownloadMessage.js @@ -18,7 +18,7 @@ class DownloadMessage extends Component { setDownload=()=>{ this.modalCancel(); - window.open(`/users/${this.props.user.login}/message_detail?user_id=1`) + window.open(`/message/${this.props.user.login}/message_detail?target_ids=1`) } modalCancel = () => { this.setState({ diff --git a/public/react/src/modules/modals/DownloadMessageysl.js b/public/react/src/modules/modals/DownloadMessageysl.js index b5c23960a..db715297f 100644 --- a/public/react/src/modules/modals/DownloadMessageysl.js +++ b/public/react/src/modules/modals/DownloadMessageysl.js @@ -11,7 +11,7 @@ class DownloadMessageysl extends Component { setDownload=()=>{ this.props.modalCancel(); - window.open(`/users/${this.props.user.login}/message_detail?user_id=1`) + window.open(`/message/${this.props.user.login}/message_detail?target_ids=1`) } render() { diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 5179964a5..13bec2dd9 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -293,8 +293,8 @@ class PackageIndexNEITaskDetails extends Component { onMouseOver={this.setover} onMouseOut={this.setout} > - {overtype===false? 头像联系TA: - 头像 头像联系TA: + 头像联系TA}
    }
    @@ -407,7 +407,7 @@ class PackageIndexNEITaskDetails extends Component { {item.status==="bidding_won"?:""}

    {item.name}

    - {this.props.current_user&&this.props.current_user.login!=item.login? + {this.props.current_user&&this.props.current_user.login!=item.login? 头像联系TA :""}
    diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js index 31fef9070..df376e4e5 100644 --- a/public/react/src/modules/user/usersInfo/Infos.js +++ b/public/react/src/modules/user/usersInfo/Infos.js @@ -357,7 +357,7 @@ class Infos extends Component{ : }
    From 3409d25de3305cc8d6bb86db2870dbe5f025e9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 23:06:49 +0800 Subject: [PATCH 069/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 37 +++++++++++++------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 8e84dd9fd..61ba5b33c 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -61,11 +61,12 @@ class MessagChat extends Component{ contentViewScrolltop=(e)=>{ - - if(e.currentTarget.scrollHeight===0){ + if(e.currentTarget.scrollTop===0){ + console.log("调用了方法1111111") let {pages}=this.state; let newpage=pages+1 - + let target_ids=this.props.match.params.private; + this.getChatList(newpage,this.state.limits,target_ids); } } // 滑动刷新 @@ -120,10 +121,17 @@ class MessagChat extends Component{ obj = datay[i]; datas.push(datay[i]); } else { - if (moment(obj.send_day).isSame(datay[i].send_day)) { - datay[i].send_day = ""; - } else { - obj = datay[i]; + try { + var timeone=obj.send_time.slice(0,10); + var timetwo=datay[i].send_time.slice(0,10); + if (moment(timeone).isSame(timetwo)) { + datay[i].send_day = ""; + } else { + datay[i].send_day = timetwo; + obj = datay[i]; + } + }catch (e) { + } datas.push(datay[i]); } @@ -169,13 +177,18 @@ class MessagChat extends Component{ obj = datay[i]; datas.push(datay[i]); } else { + try { + var timeone=obj.send_time.slice(0,10); + var timetwo=datay[i].send_time.slice(0,10); + if (moment(timeone).isSame(timetwo)) { + datay[i].send_day = ""; + } else { + datay[i].send_day = timetwo; + obj = datay[i]; + } + }catch (e) { - if (moment(obj.send_day).isSame(datay[i].send_day)) { - datay[i].send_day = ""; - } else { - obj = datay[i]; } - datas.push(datay[i]); } From 70f822db5fa4427f7ec59cb6ac7eea04752f908a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 1 Aug 2019 23:09:22 +0800 Subject: [PATCH 070/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagePrivate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 63e238f3a..fa5531c80 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -133,7 +133,7 @@ class MessagePrivate extends Component{ :data.map((item,key)=>{ return( -
    this.smyJump(3,item.target)}> +
    this.smyJump(3,item.target.id)}> this.myCome(item)}> this.myCome(item)} src={getImageUrl("/images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/> From 3cdf8b70bdb064a120a7133376f2861ceec77388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 00:06:53 +0800 Subject: [PATCH 071/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 179 ++++++++++++++---- 1 file changed, 139 insertions(+), 40 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index e556e918f..424eb683f 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -25,6 +25,7 @@ class MessagChat extends Component{ mypagey:20, messages:[], objc:[], + datanull:1, } } componentDidMount(){ @@ -50,7 +51,7 @@ class MessagChat extends Component{ } componentDidUpdate() { - this.scrollToBottom(); + // this.scrollToBottom(); } scrollToBottom() { @@ -64,11 +65,19 @@ class MessagChat extends Component{ contentViewScrolltop=(e)=>{ if(e.currentTarget.scrollTop===0){ - console.log("调用了方法1111111") + + if(this.state.datanull===0){ + return + } + console.log("调用了方法1111111"); let {pages}=this.state; let newpage=pages+1 - let target_ids=this.props.match.params.private; - this.getChatList(newpage,this.state.limits,target_ids); + const query = this.props.location.search; + let target_ids = query.split('?target_ids='); + this.shuaxingetChatList(newpage,this.state.limits,target_ids[1],true); + this.messageList.scrollTop=50; + + } } // 滑动刷新 @@ -100,7 +109,77 @@ class MessagChat extends Component{ // } }; + shuaxingetChatList=(page,listl,target_ids,bool)=>{ + this.setState({ + isSpin:true, + }); + let url = `/users/${this.props.match.params.userid}/private_message_details.json`; + axios.get((url),{params:{ + target_id:target_ids, + page: page, + per_page:listl, + }}).then((result) => { + this.setState({ + isSpin: false, + }); + if (result) { + // if (result.data.status === 0) { + if (result.data !== null) { + if(result.data.messages.length===0){ + console.log("没有数据了"); + this.setState({ + datanull:0, + }) + return + } + var laoshuju=this.state.messages; + var datas = []; + var datay = result.data.messages; + datay = datay.reverse(); + datay=datay.concat(laoshuju); + var obj = {}; + for (var i = 0; i < datay.length; i++) { + if (i === 0) { + var timetwoy=datay[i].send_time.slice(0,10); + datay[i].send_day = timetwoy; + obj = datay[i]; + datas.push(datay[i]); + } else { + try { + var timeone=obj.send_time.slice(0,10); + var timetwo=datay[i].send_time.slice(0,10); + if (moment(timeone).isSame(timetwo)) { + datay[i].send_day = ""; + } else { + datay[i].send_day = timetwo; + obj = datay[i]; + } + }catch (e) { + + } + datas.push(datay[i]); + } + } + console.log("新数组+++++++++++++++++++++++++++++++++++++"); + console.log(datas) + //颠倒数组 + this.setState({ + messages: datas, + myuserl: result.data.target, + pages:page, + }) + // } + } + } + + }).catch((error) => { + console.log(error); + this.setState({ + isSpin:false, + }) + }) + }; getChatList=(page,listl,target_ids)=>{ this.setState({ isSpin:true, @@ -120,6 +199,8 @@ class MessagChat extends Component{ var obj = {}; for (var i = 0; i < datay.length; i++) { if (i === 0) { + var timetwoy=datay[i].send_time.slice(0,10); + datay[i].send_day = timetwoy; obj = datay[i]; datas.push(datay[i]); } else { @@ -142,6 +223,7 @@ class MessagChat extends Component{ this.setState({ messages: datas, myuserl: result.data.target, + pages:page, }) // } @@ -169,13 +251,17 @@ class MessagChat extends Component{ }}).then((result) => { if (result) { // if (result.data.status === 0) { + if (result) { + // if (result.data.status === 0) { if (result.data !== null) { - var datas = [] + var datas = []; var datay = result.data.messages; datay = datay.reverse(); var obj = {}; for (var i = 0; i < datay.length; i++) { if (i === 0) { + var timetwoy=datay[i].send_time.slice(0,10); + datay[i].send_day = timetwoy; obj = datay[i]; datas.push(datay[i]); } else { @@ -189,22 +275,24 @@ class MessagChat extends Component{ obj = datay[i]; } }catch (e) { - + console.log("271271271271"); + console.log(e); } datas.push(datay[i]); } - } + //颠倒数组 this.setState({ messages: datas, myuserl: result.data.target, - }); - // this.getdatatwo(this.state.page); - // } - - + pages:pages, + datanull:1 + }) + this.scrollToBottom(); + // } + } } } this.setState({ @@ -305,10 +393,13 @@ class MessagChat extends Component{ // myyslusers:user, // mess:true, // }) + this.setState({ + myuserl:user, + }) this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${user.id}`); // this.getdatatwo(this.state.page); - this.getChatListtwo(this.state.pages,this.state.mypagey,user.id); + this.getChatListtwo(1,this.state.mypagey,user.id); } //回复 @@ -334,9 +425,9 @@ class MessagChat extends Component{ if(response.data.status===0){ // console.log("回复成功"); // console.log(response); - var datas=[]; - var dataso=this.state.messages; - var datays=response.data.private_message; + // var datas=[]; + // var dataso=this.state.messages; + // var datays=response.data.private_message; // var obj={}; // for (var i=0;i
    + { + datanull===0? +

    没有信息了～～

    + :"" + }
    { messages===undefined? From 55db9b16512a8898bdaede3b3d391577f64134a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 00:20:33 +0800 Subject: [PATCH 072/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagChat.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 424eb683f..377f3cd3a 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -226,6 +226,7 @@ class MessagChat extends Component{ pages:page, }) // } + this.scrollToBottom(); } } From 37f1a7fae6d6ab53df3866162049975a7043215e Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 08:33:20 +0800 Subject: [PATCH 073/221] add send day to create private message apig --- app/views/users/private_messages/create.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/users/private_messages/create.json.jbuilder b/app/views/users/private_messages/create.json.jbuilder index 888cfeff6..2d5b4e7bf 100644 --- a/app/views/users/private_messages/create.json.jbuilder +++ b/app/views/users/private_messages/create.json.jbuilder @@ -3,6 +3,7 @@ json.message 'success' json.private_message do json.extract! @message, :id, :user_id, :receiver_id, :sender_id, :content + json.send_day @message.send_time.strftime('%Y-%m-%d') json.send_time @message.display_send_time json.sender do json.partial! 'users/user_simple', user: @message.sender From 114fc618e4b75f5cc58f28cbe2af321746c8af54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 09:05:24 +0800 Subject: [PATCH 074/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index c2b5539fd..910799be9 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -934,7 +934,7 @@ submittojoinclass=(value)=>{
    { user===undefined?"":user.login===""?"": From 17eeeae8963f4d966df7bb97c31ea9cfd5ad082f Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 09:07:37 +0800 Subject: [PATCH 075/221] c --- public/react/src/common/components/media/Clappr.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/common/components/media/Clappr.js b/public/react/src/common/components/media/Clappr.js index 995200574..673a7b4ff 100644 --- a/public/react/src/common/components/media/Clappr.js +++ b/public/react/src/common/components/media/Clappr.js @@ -26,6 +26,7 @@ class Clappr extends Component{ } // && window['clappr-playback-rate-plugin'] if (window['Clappr'] ) { + // https://github.com/clappr/clappr/issues/1839 // http://clappr.github.io/classes/Player.html#method_mute this['player'+id] = new window.Clappr.Player({ source: source, parentId: _id, From 0f8a31e1b2cb914573460511afa17e4ca18d836d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 09:17:02 +0800 Subject: [PATCH 076/221] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E7=88=B6=E7=9B=AE=E5=BD=95=E6=98=BE=E7=A4=BA=E5=AD=90?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=9A=84=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 4 ++-- app/helpers/courses_helper.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index d090ae253..2cfa61cc9 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -17,8 +17,8 @@ class FilesController < ApplicationController sort_type = params[:sort_type] || 'created_on' # created_on：时间排序， downloads：下载次数排序; quotes: 引用次数排序 course_second_category_id = params[:course_second_category_id] || 0 # 0: 为主目录， 其他为次目录id @user = current_user - @attachments = @course.attachments.by_course_second_category_id(course_second_category_id) - .includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members]) + @attachments = course_second_category_id.to_i == 0 ? @course.attachments : @course.attachments.by_course_second_category_id(course_second_category_id) + @attachments = @attachments.includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members]) .ordered(sort: sort.to_i, sort_type: sort_type.strip) get_category(@course, course_second_category_id) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 8c2aeb479..f14159cc2 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -194,7 +194,7 @@ module CoursesHelper # 获取课堂的资源数 def get_attachment_count(course, category_id) - course.attachments.where(course_second_category_id: category_id).size + category_id.to_i == 0 ? course.attachments.size : course.attachments.where(course_second_category_id: category_id).size end # 获取课堂的作业数 From b78093fea2aadc76148f5aa70b2375345d161086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 09:19:20 +0800 Subject: [PATCH 077/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagSub.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 8c99d785e..88e339b20 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -126,11 +126,11 @@ class MessagSub extends Component{

    this.myCome(item)}>{item.trigger_user.name} {item.time} - {this.state.typeysl==="apply"?( + {item.tiding_type==="Apply"?( item.status===0? 待处理:"" ):""} - {this.state.typeysl==="apply"?( + {item.tiding_type==="Apply"?( item.status===1? 已处理:"" ):""} From 58451911fad1835ffaff96408eeb4237d32fc44b Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 09:22:29 +0800 Subject: [PATCH 078/221] modify win bidding apig --- app/controllers/bidding_users_controller.rb | 3 +-- app/services/project_packages/win_bidding_service.rb | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/bidding_users_controller.rb b/app/controllers/bidding_users_controller.rb index ad0de6587..5fbecd885 100644 --- a/app/controllers/bidding_users_controller.rb +++ b/app/controllers/bidding_users_controller.rb @@ -9,8 +9,7 @@ class BiddingUsersController < ApplicationController end def win - package = current_user.project_packages.find(params[:project_package_id]) - ProjectPackages::WinBiddingService.call(package, params) + ProjectPackages::WinBiddingService.call(current_package, current_user, params) render_ok rescue ProjectPackages::WinBiddingService::Error => ex render_error(ex.message) diff --git a/app/services/project_packages/win_bidding_service.rb b/app/services/project_packages/win_bidding_service.rb index 831c29449..54cb1e883 100644 --- a/app/services/project_packages/win_bidding_service.rb +++ b/app/services/project_packages/win_bidding_service.rb @@ -1,14 +1,16 @@ class ProjectPackages::WinBiddingService < ApplicationService Error = Class.new(StandardError) - attr_reader :package, :params + attr_reader :package, :user, :params - def initialize(package, params) + def initialize(package, user, params) @package = package + @user = user @params = params end def call + raise Error, '没有权限' unless package.creator_id == user.id || user.admin_or_business? raise Error, '竞标报名还未结束' unless package.bidding_end? raise Error, '该状态下不能选择中标者' unless package.may_finish_bidding? From fa6c29efd33b9ca1418e8bb60c2a837a1ee07d6a Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 09:30:40 +0800 Subject: [PATCH 079/221] player --- public/javascripts/media/clappr.js | 38289 ++++++++++++++++ public/react/package.json | 1 + .../src/common/components/media/Clappr.js | 12 +- .../react/src/context/EffectDisplayContent.js | 8 +- .../src/modules/page/MainContentContainer.js | 23 +- 5 files changed, 38317 insertions(+), 16 deletions(-) create mode 100644 public/javascripts/media/clappr.js diff --git a/public/javascripts/media/clappr.js b/public/javascripts/media/clappr.js new file mode 100644 index 000000000..d16774aa2 --- /dev/null +++ b/public/javascripts/media/clappr.js @@ -0,0 +1,38289 @@ +(function webpackUniversalModuleDefinition(root, factory) { + if(typeof exports === 'object' && typeof module === 'object') + module.exports = factory(); + else if(typeof define === 'function' && define.amd) + define([], factory); + else if(typeof exports === 'object') + exports["Clappr"] = factory(); + else + root["Clappr"] = factory(); +})(window, function() { +return /******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = "dist/"; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = "./src/main.js"); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ "./node_modules/babel-runtime/core-js/array/from.js": +/*!**********************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/array/from.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/array/from */ "./node_modules/core-js/library/fn/array/from.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/get-iterator.js": +/*!************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/get-iterator.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/get-iterator */ "./node_modules/core-js/library/fn/get-iterator.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/json/stringify.js": +/*!**************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/json/stringify.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/json/stringify */ "./node_modules/core-js/library/fn/json/stringify.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/object/assign.js": +/*!*************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/object/assign.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/object/assign */ "./node_modules/core-js/library/fn/object/assign.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/object/create.js": +/*!*************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/object/create.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/object/create */ "./node_modules/core-js/library/fn/object/create.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/object/define-property.js": +/*!**********************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/object/define-property.js ***! + \**********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/object/define-property */ "./node_modules/core-js/library/fn/object/define-property.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/object/get-own-property-descriptor.js": +/*!**********************************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/object/get-own-property-descriptor.js ***! + \**********************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/object/get-own-property-descriptor */ "./node_modules/core-js/library/fn/object/get-own-property-descriptor.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/object/keys.js": +/*!***********************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/object/keys.js ***! + \***********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/object/keys */ "./node_modules/core-js/library/fn/object/keys.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/object/set-prototype-of.js": +/*!***********************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/object/set-prototype-of.js ***! + \***********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/object/set-prototype-of */ "./node_modules/core-js/library/fn/object/set-prototype-of.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/symbol.js": +/*!******************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/symbol.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/symbol */ "./node_modules/core-js/library/fn/symbol/index.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/core-js/symbol/iterator.js": +/*!***************************************************************!*\ + !*** ./node_modules/babel-runtime/core-js/symbol/iterator.js ***! + \***************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(/*! core-js/library/fn/symbol/iterator */ "./node_modules/core-js/library/fn/symbol/iterator.js"), __esModule: true }; + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/classCallCheck.js": +/*!**************************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/classCallCheck.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +exports.default = function (instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } +}; + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/createClass.js": +/*!***********************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/createClass.js ***! + \***********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _defineProperty = __webpack_require__(/*! ../core-js/object/define-property */ "./node_modules/babel-runtime/core-js/object/define-property.js"); + +var _defineProperty2 = _interopRequireDefault(_defineProperty); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function () { + function defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + (0, _defineProperty2.default)(target, descriptor.key, descriptor); + } + } + + return function (Constructor, protoProps, staticProps) { + if (protoProps) defineProperties(Constructor.prototype, protoProps); + if (staticProps) defineProperties(Constructor, staticProps); + return Constructor; + }; +}(); + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/extends.js": +/*!*******************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/extends.js ***! + \*******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _assign = __webpack_require__(/*! ../core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _assign2.default || function (target) { + for (var i = 1; i < arguments.length; i++) { + var source = arguments[i]; + + for (var key in source) { + if (Object.prototype.hasOwnProperty.call(source, key)) { + target[key] = source[key]; + } + } + } + + return target; +}; + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/inherits.js": +/*!********************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/inherits.js ***! + \********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _setPrototypeOf = __webpack_require__(/*! ../core-js/object/set-prototype-of */ "./node_modules/babel-runtime/core-js/object/set-prototype-of.js"); + +var _setPrototypeOf2 = _interopRequireDefault(_setPrototypeOf); + +var _create = __webpack_require__(/*! ../core-js/object/create */ "./node_modules/babel-runtime/core-js/object/create.js"); + +var _create2 = _interopRequireDefault(_create); + +var _typeof2 = __webpack_require__(/*! ../helpers/typeof */ "./node_modules/babel-runtime/helpers/typeof.js"); + +var _typeof3 = _interopRequireDefault(_typeof2); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function (subClass, superClass) { + if (typeof superClass !== "function" && superClass !== null) { + throw new TypeError("Super expression must either be null or a function, not " + (typeof superClass === "undefined" ? "undefined" : (0, _typeof3.default)(superClass))); + } + + subClass.prototype = (0, _create2.default)(superClass && superClass.prototype, { + constructor: { + value: subClass, + enumerable: false, + writable: true, + configurable: true + } + }); + if (superClass) _setPrototypeOf2.default ? (0, _setPrototypeOf2.default)(subClass, superClass) : subClass.__proto__ = superClass; +}; + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js": +/*!*************************************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/possibleConstructorReturn.js ***! + \*************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _typeof2 = __webpack_require__(/*! ../helpers/typeof */ "./node_modules/babel-runtime/helpers/typeof.js"); + +var _typeof3 = _interopRequireDefault(_typeof2); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function (self, call) { + if (!self) { + throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); + } + + return call && ((typeof call === "undefined" ? "undefined" : (0, _typeof3.default)(call)) === "object" || typeof call === "function") ? call : self; +}; + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/toConsumableArray.js": +/*!*****************************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/toConsumableArray.js ***! + \*****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _from = __webpack_require__(/*! ../core-js/array/from */ "./node_modules/babel-runtime/core-js/array/from.js"); + +var _from2 = _interopRequireDefault(_from); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = function (arr) { + if (Array.isArray(arr)) { + for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { + arr2[i] = arr[i]; + } + + return arr2; + } else { + return (0, _from2.default)(arr); + } +}; + +/***/ }), + +/***/ "./node_modules/babel-runtime/helpers/typeof.js": +/*!******************************************************!*\ + !*** ./node_modules/babel-runtime/helpers/typeof.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +exports.__esModule = true; + +var _iterator = __webpack_require__(/*! ../core-js/symbol/iterator */ "./node_modules/babel-runtime/core-js/symbol/iterator.js"); + +var _iterator2 = _interopRequireDefault(_iterator); + +var _symbol = __webpack_require__(/*! ../core-js/symbol */ "./node_modules/babel-runtime/core-js/symbol.js"); + +var _symbol2 = _interopRequireDefault(_symbol); + +var _typeof = typeof _symbol2.default === "function" && typeof _iterator2.default === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj; }; + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = typeof _symbol2.default === "function" && _typeof(_iterator2.default) === "symbol" ? function (obj) { + return typeof obj === "undefined" ? "undefined" : _typeof(obj); +} : function (obj) { + return obj && typeof _symbol2.default === "function" && obj.constructor === _symbol2.default && obj !== _symbol2.default.prototype ? "symbol" : typeof obj === "undefined" ? "undefined" : _typeof(obj); +}; + +/***/ }), + +/***/ "./node_modules/clappr-zepto/zepto.js": +/*!********************************************!*\ + !*** ./node_modules/clappr-zepto/zepto.js ***! + \********************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +/* Zepto v1.2.0 - zepto ajax callbacks deferred event ie selector - zeptojs.com/license */ + + +var Zepto = (function() { + var undefined, key, $, classList, emptyArray = [], concat = emptyArray.concat, filter = emptyArray.filter, slice = emptyArray.slice, + document = window.document, + elementDisplay = {}, classCache = {}, + cssNumber = { 'column-count': 1, 'columns': 1, 'font-weight': 1, 'line-height': 1,'opacity': 1, 'z-index': 1, 'zoom': 1 }, + fragmentRE = /^\s*<(\w+|!)[^>]*>/, + singleTagRE = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, + tagExpanderRE = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig, + rootNodeRE = /^(?:body|html)$/i, + capitalRE = /([A-Z])/g, + + // special attributes that should be get/set via method calls + methodAttributes = ['val', 'css', 'html', 'text', 'data', 'width', 'height', 'offset'], + + adjacencyOperators = [ 'after', 'prepend', 'before', 'append' ], + table = document.createElement('table'), + tableRow = document.createElement('tr'), + containers = { + 'tr': document.createElement('tbody'), + 'tbody': table, 'thead': table, 'tfoot': table, + 'td': tableRow, 'th': tableRow, + '*': document.createElement('div') + }, + readyRE = /complete|loaded|interactive/, + simpleSelectorRE = /^[\w-]*$/, + class2type = {}, + toString = class2type.toString, + zepto = {}, + camelize, uniq, + tempParent = document.createElement('div'), + propMap = { + 'tabindex': 'tabIndex', + 'readonly': 'readOnly', + 'for': 'htmlFor', + 'class': 'className', + 'maxlength': 'maxLength', + 'cellspacing': 'cellSpacing', + 'cellpadding': 'cellPadding', + 'rowspan': 'rowSpan', + 'colspan': 'colSpan', + 'usemap': 'useMap', + 'frameborder': 'frameBorder', + 'contenteditable': 'contentEditable' + }, + isArray = Array.isArray || + function(object){ return object instanceof Array } + + zepto.matches = function(element, selector) { + if (!selector || !element || element.nodeType !== 1) return false + var matchesSelector = element.matches || element.webkitMatchesSelector || + element.mozMatchesSelector || element.oMatchesSelector || + element.matchesSelector + if (matchesSelector) return matchesSelector.call(element, selector) + // fall back to performing a selector: + var match, parent = element.parentNode, temp = !parent + if (temp) (parent = tempParent).appendChild(element) + match = ~zepto.qsa(parent, selector).indexOf(element) + temp && tempParent.removeChild(element) + return match + } + + function type(obj) { + return obj == null ? String(obj) : + class2type[toString.call(obj)] || "object" + } + + function isFunction(value) { return type(value) == "function" } + function isWindow(obj) { return obj != null && obj == obj.window } + function isDocument(obj) { return obj != null && obj.nodeType == obj.DOCUMENT_NODE } + function isObject(obj) { return type(obj) == "object" } + function isPlainObject(obj) { + return isObject(obj) && !isWindow(obj) && Object.getPrototypeOf(obj) == Object.prototype + } + + function likeArray(obj) { + var length = !!obj && 'length' in obj && obj.length, + type = $.type(obj) + + return 'function' != type && !isWindow(obj) && ( + 'array' == type || length === 0 || + (typeof length == 'number' && length > 0 && (length - 1) in obj) + ) + } + + function compact(array) { return filter.call(array, function(item){ return item != null }) } + function flatten(array) { return array.length > 0 ? $.fn.concat.apply([], array) : array } + camelize = function(str){ return str.replace(/-+(.)?/g, function(match, chr){ return chr ? chr.toUpperCase() : '' }) } + function dasherize(str) { + return str.replace(/::/g, '/') + .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2') + .replace(/([a-z\d])([A-Z])/g, '$1_$2') + .replace(/_/g, '-') + .toLowerCase() + } + uniq = function(array){ return filter.call(array, function(item, idx){ return array.indexOf(item) == idx }) } + + function classRE(name) { + return name in classCache ? + classCache[name] : (classCache[name] = new RegExp('(^|\\s)' + name + '(\\s|$)')) + } + + function maybeAddPx(name, value) { + return (typeof value == "number" && !cssNumber[dasherize(name)]) ? value + "px" : value + } + + function defaultDisplay(nodeName) { + var element, display + if (!elementDisplay[nodeName]) { + element = document.createElement(nodeName) + document.body.appendChild(element) + display = getComputedStyle(element, '').getPropertyValue("display") + element.parentNode.removeChild(element) + display == "none" && (display = "block") + elementDisplay[nodeName] = display + } + return elementDisplay[nodeName] + } + + function children(element) { + return 'children' in element ? + slice.call(element.children) : + $.map(element.childNodes, function(node){ if (node.nodeType == 1) return node }) + } + + function Z(dom, selector) { + var i, len = dom ? dom.length : 0 + for (i = 0; i < len; i++) this[i] = dom[i] + this.length = len + this.selector = selector || '' + } + + // `$.zepto.fragment` takes a html string and an optional tag name + // to generate DOM nodes from the given html string. + // The generated DOM nodes are returned as an array. + // This function can be overridden in plugins for example to make + // it compatible with browsers that don't support the DOM fully. + zepto.fragment = function(html, name, properties) { + var dom, nodes, container + + // A special case optimization for a single tag + if (singleTagRE.test(html)) dom = $(document.createElement(RegExp.$1)) + + if (!dom) { + if (html.replace) html = html.replace(tagExpanderRE, "<$1>") + if (name === undefined) name = fragmentRE.test(html) && RegExp.$1 + if (!(name in containers)) name = '*' + + container = containers[name] + container.innerHTML = '' + html + dom = $.each(slice.call(container.childNodes), function(){ + container.removeChild(this) + }) + } + + if (isPlainObject(properties)) { + nodes = $(dom) + $.each(properties, function(key, value) { + if (methodAttributes.indexOf(key) > -1) nodes[key](value) + else nodes.attr(key, value) + }) + } + + return dom + } + + // `$.zepto.Z` swaps out the prototype of the given `dom` array + // of nodes with `$.fn` and thus supplying all the Zepto functions + // to the array. This method can be overridden in plugins. + zepto.Z = function(dom, selector) { + return new Z(dom, selector) + } + + // `$.zepto.isZ` should return `true` if the given object is a Zepto + // collection. This method can be overridden in plugins. + zepto.isZ = function(object) { + return object instanceof zepto.Z + } + + // `$.zepto.init` is Zepto's counterpart to jQuery's `$.fn.init` and + // takes a CSS selector and an optional context (and handles various + // special cases). + // This method can be overridden in plugins. + zepto.init = function(selector, context) { + var dom + // If nothing given, return an empty Zepto collection + if (!selector) return zepto.Z() + // Optimize for string selectors + else if (typeof selector == 'string') { + selector = selector.trim() + // If it's a html fragment, create nodes from it + // Note: In both Chrome 21 and Firefox 15, DOM error 12 + // is thrown if the fragment doesn't begin with < + if (selector[0] == '<' && fragmentRE.test(selector)) + dom = zepto.fragment(selector, RegExp.$1, context), selector = null + // If there's a context, create a collection on that context first, and select + // nodes from there + else if (context !== undefined) return $(context).find(selector) + // If it's a CSS selector, use it to select nodes. + else dom = zepto.qsa(document, selector) + } + // If a function is given, call it when the DOM is ready + else if (isFunction(selector)) return $(document).ready(selector) + // If a Zepto collection is given, just return it + else if (zepto.isZ(selector)) return selector + else { + // normalize array if an array of nodes is given + if (isArray(selector)) dom = compact(selector) + // Wrap DOM nodes. + else if (isObject(selector)) + dom = [selector], selector = null + // If it's a html fragment, create nodes from it + else if (fragmentRE.test(selector)) + dom = zepto.fragment(selector.trim(), RegExp.$1, context), selector = null + // If there's a context, create a collection on that context first, and select + // nodes from there + else if (context !== undefined) return $(context).find(selector) + // And last but no least, if it's a CSS selector, use it to select nodes. + else dom = zepto.qsa(document, selector) + } + // create a new Zepto collection from the nodes found + return zepto.Z(dom, selector) + } + + // `$` will be the base `Zepto` object. When calling this + // function just call `$.zepto.init, which makes the implementation + // details of selecting nodes and creating Zepto collections + // patchable in plugins. + $ = function(selector, context){ + return zepto.init(selector, context) + } + + function extend(target, source, deep) { + for (key in source) + if (deep && (isPlainObject(source[key]) || isArray(source[key]))) { + if (isPlainObject(source[key]) && !isPlainObject(target[key])) + target[key] = {} + if (isArray(source[key]) && !isArray(target[key])) + target[key] = [] + extend(target[key], source[key], deep) + } + else if (source[key] !== undefined) target[key] = source[key] + } + + // Copy all but undefined properties from one or more + // objects to the `target` object. + $.extend = function(target){ + var deep, args = slice.call(arguments, 1) + if (typeof target == 'boolean') { + deep = target + target = args.shift() + } + args.forEach(function(arg){ extend(target, arg, deep) }) + return target + } + + // `$.zepto.qsa` is Zepto's CSS selector implementation which + // uses `document.querySelectorAll` and optimizes for some special cases, like `#id`. + // This method can be overridden in plugins. + zepto.qsa = function(element, selector){ + var found, + maybeID = selector[0] == '#', + maybeClass = !maybeID && selector[0] == '.', + nameOnly = maybeID || maybeClass ? selector.slice(1) : selector, // Ensure that a 1 char tag name still gets checked + isSimple = simpleSelectorRE.test(nameOnly) + return (element.getElementById && isSimple && maybeID) ? // Safari DocumentFragment doesn't have getElementById + ( (found = element.getElementById(nameOnly)) ? [found] : [] ) : + (element.nodeType !== 1 && element.nodeType !== 9 && element.nodeType !== 11) ? [] : + slice.call( + isSimple && !maybeID && element.getElementsByClassName ? // DocumentFragment doesn't have getElementsByClassName/TagName + maybeClass ? element.getElementsByClassName(nameOnly) : // If it's simple, it could be a class + element.getElementsByTagName(selector) : // Or a tag + element.querySelectorAll(selector) // Or it's not simple, and we need to query all + ) + } + + function filtered(nodes, selector) { + return selector == null ? $(nodes) : $(nodes).filter(selector) + } + + $.contains = document.documentElement.contains ? + function(parent, node) { + return parent !== node && parent.contains(node) + } : + function(parent, node) { + while (node && (node = node.parentNode)) + if (node === parent) return true + return false + } + + function funcArg(context, arg, idx, payload) { + return isFunction(arg) ? arg.call(context, idx, payload) : arg + } + + function setAttribute(node, name, value) { + value == null ? node.removeAttribute(name) : node.setAttribute(name, value) + } + + // access className property while respecting SVGAnimatedString + function className(node, value){ + var klass = node.className || '', + svg = klass && klass.baseVal !== undefined + + if (value === undefined) return svg ? klass.baseVal : klass + svg ? (klass.baseVal = value) : (node.className = value) + } + + // "true" => true + // "false" => false + // "null" => null + // "42" => 42 + // "42.5" => 42.5 + // "08" => "08" + // JSON => parse if valid + // String => self + function deserializeValue(value) { + try { + return value ? + value == "true" || + ( value == "false" ? false : + value == "null" ? null : + +value + "" == value ? +value : + /^[\[\{]/.test(value) ? $.parseJSON(value) : + value ) + : value + } catch(e) { + return value + } + } + + $.type = type + $.isFunction = isFunction + $.isWindow = isWindow + $.isArray = isArray + $.isPlainObject = isPlainObject + + $.isEmptyObject = function(obj) { + var name + for (name in obj) return false + return true + } + + $.isNumeric = function(val) { + var num = Number(val), type = typeof val + return val != null && type != 'boolean' && + (type != 'string' || val.length) && + !isNaN(num) && isFinite(num) || false + } + + $.inArray = function(elem, array, i){ + return emptyArray.indexOf.call(array, elem, i) + } + + $.camelCase = camelize + $.trim = function(str) { + return str == null ? "" : String.prototype.trim.call(str) + } + + // plugin compatibility + $.uuid = 0 + $.support = { } + $.expr = { } + $.noop = function() {} + + $.map = function(elements, callback){ + var value, values = [], i, key + if (likeArray(elements)) + for (i = 0; i < elements.length; i++) { + value = callback(elements[i], i) + if (value != null) values.push(value) + } + else + for (key in elements) { + value = callback(elements[key], key) + if (value != null) values.push(value) + } + return flatten(values) + } + + $.each = function(elements, callback){ + var i, key + if (likeArray(elements)) { + for (i = 0; i < elements.length; i++) + if (callback.call(elements[i], i, elements[i]) === false) return elements + } else { + for (key in elements) + if (callback.call(elements[key], key, elements[key]) === false) return elements + } + + return elements + } + + $.grep = function(elements, callback){ + return filter.call(elements, callback) + } + + if (window.JSON) $.parseJSON = JSON.parse + + // Populate the class2type map + $.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase() + }) + + // Define methods that will be available on all + // Zepto collections + $.fn = { + constructor: zepto.Z, + length: 0, + + // Because a collection acts like an array + // copy over these useful array functions. + forEach: emptyArray.forEach, + reduce: emptyArray.reduce, + push: emptyArray.push, + sort: emptyArray.sort, + splice: emptyArray.splice, + indexOf: emptyArray.indexOf, + concat: function(){ + var i, value, args = [] + for (i = 0; i < arguments.length; i++) { + value = arguments[i] + args[i] = zepto.isZ(value) ? value.toArray() : value + } + return concat.apply(zepto.isZ(this) ? this.toArray() : this, args) + }, + + // `map` and `slice` in the jQuery API work differently + // from their array counterparts + map: function(fn){ + return $($.map(this, function(el, i){ return fn.call(el, i, el) })) + }, + slice: function(){ + return $(slice.apply(this, arguments)) + }, + + ready: function(callback){ + // need to check if document.body exists for IE as that browser reports + // document ready when it hasn't yet created the body element + if (readyRE.test(document.readyState) && document.body) callback($) + else document.addEventListener('DOMContentLoaded', function(){ callback($) }, false) + return this + }, + get: function(idx){ + return idx === undefined ? slice.call(this) : this[idx >= 0 ? idx : idx + this.length] + }, + toArray: function(){ return this.get() }, + size: function(){ + return this.length + }, + remove: function(){ + return this.each(function(){ + if (this.parentNode != null) + this.parentNode.removeChild(this) + }) + }, + each: function(callback){ + emptyArray.every.call(this, function(el, idx){ + return callback.call(el, idx, el) !== false + }) + return this + }, + filter: function(selector){ + if (isFunction(selector)) return this.not(this.not(selector)) + return $(filter.call(this, function(element){ + return zepto.matches(element, selector) + })) + }, + add: function(selector,context){ + return $(uniq(this.concat($(selector,context)))) + }, + is: function(selector){ + return this.length > 0 && zepto.matches(this[0], selector) + }, + not: function(selector){ + var nodes=[] + if (isFunction(selector) && selector.call !== undefined) + this.each(function(idx){ + if (!selector.call(this,idx)) nodes.push(this) + }) + else { + var excludes = typeof selector == 'string' ? this.filter(selector) : + (likeArray(selector) && isFunction(selector.item)) ? slice.call(selector) : $(selector) + this.forEach(function(el){ + if (excludes.indexOf(el) < 0) nodes.push(el) + }) + } + return $(nodes) + }, + has: function(selector){ + return this.filter(function(){ + return isObject(selector) ? + $.contains(this, selector) : + $(this).find(selector).size() + }) + }, + eq: function(idx){ + return idx === -1 ? this.slice(idx) : this.slice(idx, + idx + 1) + }, + first: function(){ + var el = this[0] + return el && !isObject(el) ? el : $(el) + }, + last: function(){ + var el = this[this.length - 1] + return el && !isObject(el) ? el : $(el) + }, + find: function(selector){ + var result, $this = this + if (!selector) result = $() + else if (typeof selector == 'object') + result = $(selector).filter(function(){ + var node = this + return emptyArray.some.call($this, function(parent){ + return $.contains(parent, node) + }) + }) + else if (this.length == 1) result = $(zepto.qsa(this[0], selector)) + else result = this.map(function(){ return zepto.qsa(this, selector) }) + return result + }, + closest: function(selector, context){ + var nodes = [], collection = typeof selector == 'object' && $(selector) + this.each(function(_, node){ + while (node && !(collection ? collection.indexOf(node) >= 0 : zepto.matches(node, selector))) + node = node !== context && !isDocument(node) && node.parentNode + if (node && nodes.indexOf(node) < 0) nodes.push(node) + }) + return $(nodes) + }, + parents: function(selector){ + var ancestors = [], nodes = this + while (nodes.length > 0) + nodes = $.map(nodes, function(node){ + if ((node = node.parentNode) && !isDocument(node) && ancestors.indexOf(node) < 0) { + ancestors.push(node) + return node + } + }) + return filtered(ancestors, selector) + }, + parent: function(selector){ + return filtered(uniq(this.pluck('parentNode')), selector) + }, + children: function(selector){ + return filtered(this.map(function(){ return children(this) }), selector) + }, + contents: function() { + return this.map(function() { return this.contentDocument || slice.call(this.childNodes) }) + }, + siblings: function(selector){ + return filtered(this.map(function(i, el){ + return filter.call(children(el.parentNode), function(child){ return child!==el }) + }), selector) + }, + empty: function(){ + return this.each(function(){ this.innerHTML = '' }) + }, + // `pluck` is borrowed from Prototype.js + pluck: function(property){ + return $.map(this, function(el){ return el[property] }) + }, + show: function(){ + return this.each(function(){ + this.style.display == "none" && (this.style.display = '') + if (getComputedStyle(this, '').getPropertyValue("display") == "none") + this.style.display = defaultDisplay(this.nodeName) + }) + }, + replaceWith: function(newContent){ + return this.before(newContent).remove() + }, + wrap: function(structure){ + var func = isFunction(structure) + if (this[0] && !func) + var dom = $(structure).get(0), + clone = dom.parentNode || this.length > 1 + + return this.each(function(index){ + $(this).wrapAll( + func ? structure.call(this, index) : + clone ? dom.cloneNode(true) : dom + ) + }) + }, + wrapAll: function(structure){ + if (this[0]) { + $(this[0]).before(structure = $(structure)) + var children + // drill down to the inmost element + while ((children = structure.children()).length) structure = children.first() + $(structure).append(this) + } + return this + }, + wrapInner: function(structure){ + var func = isFunction(structure) + return this.each(function(index){ + var self = $(this), contents = self.contents(), + dom = func ? structure.call(this, index) : structure + contents.length ? contents.wrapAll(dom) : self.append(dom) + }) + }, + unwrap: function(){ + this.parent().each(function(){ + $(this).replaceWith($(this).children()) + }) + return this + }, + clone: function(){ + return this.map(function(){ return this.cloneNode(true) }) + }, + hide: function(){ + return this.css("display", "none") + }, + toggle: function(setting){ + return this.each(function(){ + var el = $(this) + ;(setting === undefined ? el.css("display") == "none" : setting) ? el.show() : el.hide() + }) + }, + prev: function(selector){ return $(this.pluck('previousElementSibling')).filter(selector || '*') }, + next: function(selector){ return $(this.pluck('nextElementSibling')).filter(selector || '*') }, + html: function(html){ + return 0 in arguments ? + this.each(function(idx){ + var originHtml = this.innerHTML + $(this).empty().append( funcArg(this, html, idx, originHtml) ) + }) : + (0 in this ? this[0].innerHTML : null) + }, + text: function(text){ + return 0 in arguments ? + this.each(function(idx){ + var newText = funcArg(this, text, idx, this.textContent) + this.textContent = newText == null ? '' : ''+newText + }) : + (0 in this ? this.pluck('textContent').join("") : null) + }, + attr: function(name, value){ + var result + return (typeof name == 'string' && !(1 in arguments)) ? + (0 in this && this[0].nodeType == 1 && (result = this[0].getAttribute(name)) != null ? result : undefined) : + this.each(function(idx){ + if (this.nodeType !== 1) return + if (isObject(name)) for (key in name) setAttribute(this, key, name[key]) + else setAttribute(this, name, funcArg(this, value, idx, this.getAttribute(name))) + }) + }, + removeAttr: function(name){ + return this.each(function(){ this.nodeType === 1 && name.split(' ').forEach(function(attribute){ + setAttribute(this, attribute) + }, this)}) + }, + prop: function(name, value){ + name = propMap[name] || name + return (1 in arguments) ? + this.each(function(idx){ + this[name] = funcArg(this, value, idx, this[name]) + }) : + (this[0] && this[0][name]) + }, + removeProp: function(name){ + name = propMap[name] || name + return this.each(function(){ delete this[name] }) + }, + data: function(name, value){ + var attrName = 'data-' + name.replace(capitalRE, '-$1').toLowerCase() + + var data = (1 in arguments) ? + this.attr(attrName, value) : + this.attr(attrName) + + return data !== null ? deserializeValue(data) : undefined + }, + val: function(value){ + if (0 in arguments) { + if (value == null) value = "" + return this.each(function(idx){ + this.value = funcArg(this, value, idx, this.value) + }) + } else { + return this[0] && (this[0].multiple ? + $(this[0]).find('option').filter(function(){ return this.selected }).pluck('value') : + this[0].value) + } + }, + offset: function(coordinates){ + if (coordinates) return this.each(function(index){ + var $this = $(this), + coords = funcArg(this, coordinates, index, $this.offset()), + parentOffset = $this.offsetParent().offset(), + props = { + top: coords.top - parentOffset.top, + left: coords.left - parentOffset.left + } + + if ($this.css('position') == 'static') props['position'] = 'relative' + $this.css(props) + }) + if (!this.length) return null + if (document.documentElement !== this[0] && !$.contains(document.documentElement, this[0])) + return {top: 0, left: 0} + var obj = this[0].getBoundingClientRect() + return { + left: obj.left + window.pageXOffset, + top: obj.top + window.pageYOffset, + width: Math.round(obj.width), + height: Math.round(obj.height) + } + }, + css: function(property, value){ + if (arguments.length < 2) { + var element = this[0] + if (typeof property == 'string') { + if (!element) return + return element.style[camelize(property)] || getComputedStyle(element, '').getPropertyValue(property) + } else if (isArray(property)) { + if (!element) return + var props = {} + var computedStyle = getComputedStyle(element, '') + $.each(property, function(_, prop){ + props[prop] = (element.style[camelize(prop)] || computedStyle.getPropertyValue(prop)) + }) + return props + } + } + + var css = '' + if (type(property) == 'string') { + if (!value && value !== 0) + this.each(function(){ this.style.removeProperty(dasherize(property)) }) + else + css = dasherize(property) + ":" + maybeAddPx(property, value) + } else { + for (key in property) + if (!property[key] && property[key] !== 0) + this.each(function(){ this.style.removeProperty(dasherize(key)) }) + else + css += dasherize(key) + ':' + maybeAddPx(key, property[key]) + ';' + } + + return this.each(function(){ this.style.cssText += ';' + css }) + }, + index: function(element){ + return element ? this.indexOf($(element)[0]) : this.parent().children().indexOf(this[0]) + }, + hasClass: function(name){ + if (!name) return false + return emptyArray.some.call(this, function(el){ + return this.test(className(el)) + }, classRE(name)) + }, + addClass: function(name){ + if (!name) return this + return this.each(function(idx){ + if (!('className' in this)) return + classList = [] + var cls = className(this), newName = funcArg(this, name, idx, cls) + newName.split(/\s+/g).forEach(function(klass){ + if (!$(this).hasClass(klass)) classList.push(klass) + }, this) + classList.length && className(this, cls + (cls ? " " : "") + classList.join(" ")) + }) + }, + removeClass: function(name){ + return this.each(function(idx){ + if (!('className' in this)) return + if (name === undefined) return className(this, '') + classList = className(this) + funcArg(this, name, idx, classList).split(/\s+/g).forEach(function(klass){ + classList = classList.replace(classRE(klass), " ") + }) + className(this, classList.trim()) + }) + }, + toggleClass: function(name, when){ + if (!name) return this + return this.each(function(idx){ + var $this = $(this), names = funcArg(this, name, idx, className(this)) + names.split(/\s+/g).forEach(function(klass){ + (when === undefined ? !$this.hasClass(klass) : when) ? + $this.addClass(klass) : $this.removeClass(klass) + }) + }) + }, + scrollTop: function(value){ + if (!this.length) return + var hasScrollTop = 'scrollTop' in this[0] + if (value === undefined) return hasScrollTop ? this[0].scrollTop : this[0].pageYOffset + return this.each(hasScrollTop ? + function(){ this.scrollTop = value } : + function(){ this.scrollTo(this.scrollX, value) }) + }, + scrollLeft: function(value){ + if (!this.length) return + var hasScrollLeft = 'scrollLeft' in this[0] + if (value === undefined) return hasScrollLeft ? this[0].scrollLeft : this[0].pageXOffset + return this.each(hasScrollLeft ? + function(){ this.scrollLeft = value } : + function(){ this.scrollTo(value, this.scrollY) }) + }, + position: function() { + if (!this.length) return + + var elem = this[0], + // Get *real* offsetParent + offsetParent = this.offsetParent(), + // Get correct offsets + offset = this.offset(), + parentOffset = rootNodeRE.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset() + + // Subtract element margins + // note: when an element has margin: auto the offsetLeft and marginLeft + // are the same in Safari causing offset.left to incorrectly be 0 + offset.top -= parseFloat( $(elem).css('margin-top') ) || 0 + offset.left -= parseFloat( $(elem).css('margin-left') ) || 0 + + // Add offsetParent borders + parentOffset.top += parseFloat( $(offsetParent[0]).css('border-top-width') ) || 0 + parentOffset.left += parseFloat( $(offsetParent[0]).css('border-left-width') ) || 0 + + // Subtract the two offsets + return { + top: offset.top - parentOffset.top, + left: offset.left - parentOffset.left + } + }, + offsetParent: function() { + return this.map(function(){ + var parent = this.offsetParent || document.body + while (parent && !rootNodeRE.test(parent.nodeName) && $(parent).css("position") == "static") + parent = parent.offsetParent + return parent + }) + } + } + + // for now + $.fn.detach = $.fn.remove + + // Generate the `width` and `height` functions + ;['width', 'height'].forEach(function(dimension){ + var dimensionProperty = + dimension.replace(/./, function(m){ return m[0].toUpperCase() }) + + $.fn[dimension] = function(value){ + var offset, el = this[0] + if (value === undefined) return isWindow(el) ? el['inner' + dimensionProperty] : + isDocument(el) ? el.documentElement['scroll' + dimensionProperty] : + (offset = this.offset()) && offset[dimension] + else return this.each(function(idx){ + el = $(this) + el.css(dimension, funcArg(this, value, idx, el[dimension]())) + }) + } + }) + + function traverseNode(node, fun) { + fun(node) + for (var i = 0, len = node.childNodes.length; i < len; i++) + traverseNode(node.childNodes[i], fun) + } + + // Generate the `after`, `prepend`, `before`, `append`, + // `insertAfter`, `insertBefore`, `appendTo`, and `prependTo` methods. + adjacencyOperators.forEach(function(operator, operatorIndex) { + var inside = operatorIndex % 2 //=> prepend, append + + $.fn[operator] = function(){ + // arguments can be nodes, arrays of nodes, Zepto objects and HTML strings + var argType, nodes = $.map(arguments, function(arg) { + var arr = [] + argType = type(arg) + if (argType == "array") { + arg.forEach(function(el) { + if (el.nodeType !== undefined) return arr.push(el) + else if ($.zepto.isZ(el)) return arr = arr.concat(el.get()) + arr = arr.concat(zepto.fragment(el)) + }) + return arr + } + return argType == "object" || arg == null ? + arg : zepto.fragment(arg) + }), + parent, copyByClone = this.length > 1 + if (nodes.length < 1) return this + + return this.each(function(_, target){ + parent = inside ? target : target.parentNode + + // convert all methods to a "before" operation + target = operatorIndex == 0 ? target.nextSibling : + operatorIndex == 1 ? target.firstChild : + operatorIndex == 2 ? target : + null + + var parentInDocument = $.contains(document.documentElement, parent) + + nodes.forEach(function(node){ + if (copyByClone) node = node.cloneNode(true) + else if (!parent) return $(node).remove() + + parent.insertBefore(node, target) + if (parentInDocument) traverseNode(node, function(el){ + if (el.nodeName != null && el.nodeName.toUpperCase() === 'SCRIPT' && + (!el.type || el.type === 'text/javascript') && !el.src){ + var target = el.ownerDocument ? el.ownerDocument.defaultView : window + target['eval'].call(target, el.innerHTML) + } + }) + }) + }) + } + + // after => insertAfter + // prepend => prependTo + // before => insertBefore + // append => appendTo + $.fn[inside ? operator+'To' : 'insert'+(operatorIndex ? 'Before' : 'After')] = function(html){ + $(html)[operator](this) + return this + } + }) + + zepto.Z.prototype = Z.prototype = $.fn + + // Export internal API functions in the `$.zepto` namespace + zepto.uniq = uniq + zepto.deserializeValue = deserializeValue + $.zepto = zepto + + return $ +})() + +window.Zepto = Zepto +window.$ === undefined && (window.$ = Zepto) + +;(function($){ + var jsonpID = +new Date(), + document = window.document, + key, + name, + rscript = /)<[^<]*)*<\/script>/gi, + scriptTypeRE = /^(?:text|application)\/javascript/i, + xmlTypeRE = /^(?:text|application)\/xml/i, + jsonType = 'application/json', + htmlType = 'text/html', + blankRE = /^\s*$/, + originAnchor = document.createElement('a') + + originAnchor.href = window.location.href + + // trigger a custom event and return false if it was cancelled + function triggerAndReturn(context, eventName, data) { + var event = $.Event(eventName) + $(context).trigger(event, data) + return !event.isDefaultPrevented() + } + + // trigger an Ajax "global" event + function triggerGlobal(settings, context, eventName, data) { + if (settings.global) return triggerAndReturn(context || document, eventName, data) + } + + // Number of active Ajax requests + $.active = 0 + + function ajaxStart(settings) { + if (settings.global && $.active++ === 0) triggerGlobal(settings, null, 'ajaxStart') + } + function ajaxStop(settings) { + if (settings.global && !(--$.active)) triggerGlobal(settings, null, 'ajaxStop') + } + + // triggers an extra global event "ajaxBeforeSend" that's like "ajaxSend" but cancelable + function ajaxBeforeSend(xhr, settings) { + var context = settings.context + if (settings.beforeSend.call(context, xhr, settings) === false || + triggerGlobal(settings, context, 'ajaxBeforeSend', [xhr, settings]) === false) + return false + + triggerGlobal(settings, context, 'ajaxSend', [xhr, settings]) + } + function ajaxSuccess(data, xhr, settings, deferred) { + var context = settings.context, status = 'success' + settings.success.call(context, data, status, xhr) + if (deferred) deferred.resolveWith(context, [data, status, xhr]) + triggerGlobal(settings, context, 'ajaxSuccess', [xhr, settings, data]) + ajaxComplete(status, xhr, settings) + } + // type: "timeout", "error", "abort", "parsererror" + function ajaxError(error, type, xhr, settings, deferred) { + var context = settings.context + settings.error.call(context, xhr, type, error) + if (deferred) deferred.rejectWith(context, [xhr, type, error]) + triggerGlobal(settings, context, 'ajaxError', [xhr, settings, error || type]) + ajaxComplete(type, xhr, settings) + } + // status: "success", "notmodified", "error", "timeout", "abort", "parsererror" + function ajaxComplete(status, xhr, settings) { + var context = settings.context + settings.complete.call(context, xhr, status) + triggerGlobal(settings, context, 'ajaxComplete', [xhr, settings]) + ajaxStop(settings) + } + + function ajaxDataFilter(data, type, settings) { + if (settings.dataFilter == empty) return data + var context = settings.context + return settings.dataFilter.call(context, data, type) + } + + // Empty function, used as default callback + function empty() {} + + $.ajaxJSONP = function(options, deferred){ + if (!('type' in options)) return $.ajax(options) + + var _callbackName = options.jsonpCallback, + callbackName = ($.isFunction(_callbackName) ? + _callbackName() : _callbackName) || ('Zepto' + (jsonpID++)), + script = document.createElement('script'), + originalCallback = window[callbackName], + responseData, + abort = function(errorType) { + $(script).triggerHandler('error', errorType || 'abort') + }, + xhr = { abort: abort }, abortTimeout + + if (deferred) deferred.promise(xhr) + + $(script).on('load error', function(e, errorType){ + clearTimeout(abortTimeout) + $(script).off().remove() + + if (e.type == 'error' || !responseData) { + ajaxError(null, errorType || 'error', xhr, options, deferred) + } else { + ajaxSuccess(responseData[0], xhr, options, deferred) + } + + window[callbackName] = originalCallback + if (responseData && $.isFunction(originalCallback)) + originalCallback(responseData[0]) + + originalCallback = responseData = undefined + }) + + if (ajaxBeforeSend(xhr, options) === false) { + abort('abort') + return xhr + } + + window[callbackName] = function(){ + responseData = arguments + } + + script.src = options.url.replace(/\?(.+)=\?/, '?$1=' + callbackName) + document.head.appendChild(script) + + if (options.timeout > 0) abortTimeout = setTimeout(function(){ + abort('timeout') + }, options.timeout) + + return xhr + } + + $.ajaxSettings = { + // Default type of request + type: 'GET', + // Callback that is executed before request + beforeSend: empty, + // Callback that is executed if the request succeeds + success: empty, + // Callback that is executed the the server drops error + error: empty, + // Callback that is executed on request complete (both: error and success) + complete: empty, + // The context for the callbacks + context: null, + // Whether to trigger "global" Ajax events + global: true, + // Transport + xhr: function () { + return new window.XMLHttpRequest() + }, + // MIME types mapping + // IIS returns Javascript as "application/x-javascript" + accepts: { + script: 'text/javascript, application/javascript, application/x-javascript', + json: jsonType, + xml: 'application/xml, text/xml', + html: htmlType, + text: 'text/plain' + }, + // Whether the request is to another domain + crossDomain: false, + // Default timeout + timeout: 0, + // Whether data should be serialized to string + processData: true, + // Whether the browser should be allowed to cache GET responses + cache: true, + //Used to handle the raw response data of XMLHttpRequest. + //This is a pre-filtering function to sanitize the response. + //The sanitized response should be returned + dataFilter: empty + } + + function mimeToDataType(mime) { + if (mime) mime = mime.split(';', 2)[0] + return mime && ( mime == htmlType ? 'html' : + mime == jsonType ? 'json' : + scriptTypeRE.test(mime) ? 'script' : + xmlTypeRE.test(mime) && 'xml' ) || 'text' + } + + function appendQuery(url, query) { + if (query == '') return url + return (url + '&' + query).replace(/[&?]{1,2}/, '?') + } + + // serialize payload and append it to the URL for GET requests + function serializeData(options) { + if (options.processData && options.data && $.type(options.data) != "string") + options.data = $.param(options.data, options.traditional) + if (options.data && (!options.type || options.type.toUpperCase() == 'GET' || 'jsonp' == options.dataType)) + options.url = appendQuery(options.url, options.data), options.data = undefined + } + + $.ajax = function(options){ + var settings = $.extend({}, options || {}), + deferred = $.Deferred && $.Deferred(), + urlAnchor, hashIndex + for (key in $.ajaxSettings) if (settings[key] === undefined) settings[key] = $.ajaxSettings[key] + + ajaxStart(settings) + + if (!settings.crossDomain) { + urlAnchor = document.createElement('a') + urlAnchor.href = settings.url + // cleans up URL for .href (IE only), see https://github.com/madrobby/zepto/pull/1049 + urlAnchor.href = urlAnchor.href + settings.crossDomain = (originAnchor.protocol + '//' + originAnchor.host) !== (urlAnchor.protocol + '//' + urlAnchor.host) + } + + if (!settings.url) settings.url = window.location.toString() + if ((hashIndex = settings.url.indexOf('#')) > -1) settings.url = settings.url.slice(0, hashIndex) + serializeData(settings) + + var dataType = settings.dataType, hasPlaceholder = /\?.+=\?/.test(settings.url) + if (hasPlaceholder) dataType = 'jsonp' + + if (settings.cache === false || ( + (!options || options.cache !== true) && + ('script' == dataType || 'jsonp' == dataType) + )) + settings.url = appendQuery(settings.url, '_=' + Date.now()) + + if ('jsonp' == dataType) { + if (!hasPlaceholder) + settings.url = appendQuery(settings.url, + settings.jsonp ? (settings.jsonp + '=?') : settings.jsonp === false ? '' : 'callback=?') + return $.ajaxJSONP(settings, deferred) + } + + var mime = settings.accepts[dataType], + headers = { }, + setHeader = function(name, value) { headers[name.toLowerCase()] = [name, value] }, + protocol = /^([\w-]+:)\/\//.test(settings.url) ? RegExp.$1 : window.location.protocol, + xhr = settings.xhr(), + nativeSetHeader = xhr.setRequestHeader, + abortTimeout + + if (deferred) deferred.promise(xhr) + + if (!settings.crossDomain) setHeader('X-Requested-With', 'XMLHttpRequest') + setHeader('Accept', mime || '*/*') + if (mime = settings.mimeType || mime) { + if (mime.indexOf(',') > -1) mime = mime.split(',', 2)[0] + xhr.overrideMimeType && xhr.overrideMimeType(mime) + } + if (settings.contentType || (settings.contentType !== false && settings.data && settings.type.toUpperCase() != 'GET')) + setHeader('Content-Type', settings.contentType || 'application/x-www-form-urlencoded') + + if (settings.headers) for (name in settings.headers) setHeader(name, settings.headers[name]) + xhr.setRequestHeader = setHeader + + xhr.onreadystatechange = function(){ + if (xhr.readyState == 4) { + xhr.onreadystatechange = empty + clearTimeout(abortTimeout) + var result, error = false + if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304 || (xhr.status == 0 && protocol == 'file:')) { + dataType = dataType || mimeToDataType(settings.mimeType || xhr.getResponseHeader('content-type')) + + if (xhr.responseType == 'arraybuffer' || xhr.responseType == 'blob') + result = xhr.response + else { + result = xhr.responseText + + try { + // http://perfectionkills.com/global-eval-what-are-the-options/ + // sanitize response accordingly if data filter callback provided + result = ajaxDataFilter(result, dataType, settings) + if (dataType == 'script') (1,eval)(result) + else if (dataType == 'xml') result = xhr.responseXML + else if (dataType == 'json') result = blankRE.test(result) ? null : $.parseJSON(result) + } catch (e) { error = e } + + if (error) return ajaxError(error, 'parsererror', xhr, settings, deferred) + } + + ajaxSuccess(result, xhr, settings, deferred) + } else { + ajaxError(xhr.statusText || null, xhr.status ? 'error' : 'abort', xhr, settings, deferred) + } + } + } + + if (ajaxBeforeSend(xhr, settings) === false) { + xhr.abort() + ajaxError(null, 'abort', xhr, settings, deferred) + return xhr + } + + var async = 'async' in settings ? settings.async : true + xhr.open(settings.type, settings.url, async, settings.username, settings.password) + + if (settings.xhrFields) for (name in settings.xhrFields) xhr[name] = settings.xhrFields[name] + + for (name in headers) nativeSetHeader.apply(xhr, headers[name]) + + if (settings.timeout > 0) abortTimeout = setTimeout(function(){ + xhr.onreadystatechange = empty + xhr.abort() + ajaxError(null, 'timeout', xhr, settings, deferred) + }, settings.timeout) + + // avoid sending empty string (#319) + xhr.send(settings.data ? settings.data : null) + return xhr + } + + // handle optional data/success arguments + function parseArguments(url, data, success, dataType) { + if ($.isFunction(data)) dataType = success, success = data, data = undefined + if (!$.isFunction(success)) dataType = success, success = undefined + return { + url: url + , data: data + , success: success + , dataType: dataType + } + } + + $.get = function(/* url, data, success, dataType */){ + return $.ajax(parseArguments.apply(null, arguments)) + } + + $.post = function(/* url, data, success, dataType */){ + var options = parseArguments.apply(null, arguments) + options.type = 'POST' + return $.ajax(options) + } + + $.getJSON = function(/* url, data, success */){ + var options = parseArguments.apply(null, arguments) + options.dataType = 'json' + return $.ajax(options) + } + + $.fn.load = function(url, data, success){ + if (!this.length) return this + var self = this, parts = url.split(/\s/), selector, + options = parseArguments(url, data, success), + callback = options.success + if (parts.length > 1) options.url = parts[0], selector = parts[1] + options.success = function(response){ + self.html(selector ? + $('

    ').html(response.replace(rscript, "")).find(selector) + : response) + callback && callback.apply(self, arguments) + } + $.ajax(options) + return this + } + + var escape = encodeURIComponent + + function serialize(params, obj, traditional, scope){ + var type, array = $.isArray(obj), hash = $.isPlainObject(obj) + $.each(obj, function(key, value) { + type = $.type(value) + if (scope) key = traditional ? scope : + scope + '[' + (hash || type == 'object' || type == 'array' ? key : '') + ']' + // handle data in serializeArray() format + if (!scope && array) params.add(value.name, value.value) + // recurse into nested objects + else if (type == "array" || (!traditional && type == "object")) + serialize(params, value, traditional, key) + else params.add(key, value) + }) + } + + $.param = function(obj, traditional){ + var params = [] + params.add = function(key, value) { + if ($.isFunction(value)) value = value() + if (value == null) value = "" + this.push(escape(key) + '=' + escape(value)) + } + serialize(params, obj, traditional) + return params.join('&').replace(/%20/g, '+') + } +})(Zepto) + +;(function($){ + // Create a collection of callbacks to be fired in a sequence, with configurable behaviour + // Option flags: + // - once: Callbacks fired at most one time. + // - memory: Remember the most recent context and arguments + // - stopOnFalse: Cease iterating over callback list + // - unique: Permit adding at most one instance of the same callback + $.Callbacks = function(options) { + options = $.extend({}, options) + + var memory, // Last fire value (for non-forgettable lists) + fired, // Flag to know if list was already fired + firing, // Flag to know if list is currently firing + firingStart, // First callback to fire (used internally by add and fireWith) + firingLength, // End of the loop when firing + firingIndex, // Index of currently firing callback (modified by remove if needed) + list = [], // Actual callback list + stack = !options.once && [], // Stack of fire calls for repeatable lists + fire = function(data) { + memory = options.memory && data + fired = true + firingIndex = firingStart || 0 + firingStart = 0 + firingLength = list.length + firing = true + for ( ; list && firingIndex < firingLength ; ++firingIndex ) { + if (list[firingIndex].apply(data[0], data[1]) === false && options.stopOnFalse) { + memory = false + break + } + } + firing = false + if (list) { + if (stack) stack.length && fire(stack.shift()) + else if (memory) list.length = 0 + else Callbacks.disable() + } + }, + + Callbacks = { + add: function() { + if (list) { + var start = list.length, + add = function(args) { + $.each(args, function(_, arg){ + if (typeof arg === "function") { + if (!options.unique || !Callbacks.has(arg)) list.push(arg) + } + else if (arg && arg.length && typeof arg !== 'string') add(arg) + }) + } + add(arguments) + if (firing) firingLength = list.length + else if (memory) { + firingStart = start + fire(memory) + } + } + return this + }, + remove: function() { + if (list) { + $.each(arguments, function(_, arg){ + var index + while ((index = $.inArray(arg, list, index)) > -1) { + list.splice(index, 1) + // Handle firing indexes + if (firing) { + if (index <= firingLength) --firingLength + if (index <= firingIndex) --firingIndex + } + } + }) + } + return this + }, + has: function(fn) { + return !!(list && (fn ? $.inArray(fn, list) > -1 : list.length)) + }, + empty: function() { + firingLength = list.length = 0 + return this + }, + disable: function() { + list = stack = memory = undefined + return this + }, + disabled: function() { + return !list + }, + lock: function() { + stack = undefined + if (!memory) Callbacks.disable() + return this + }, + locked: function() { + return !stack + }, + fireWith: function(context, args) { + if (list && (!fired || stack)) { + args = args || [] + args = [context, args.slice ? args.slice() : args] + if (firing) stack.push(args) + else fire(args) + } + return this + }, + fire: function() { + return Callbacks.fireWith(this, arguments) + }, + fired: function() { + return !!fired + } + } + + return Callbacks + } +})(Zepto) + +;(function($){ + var slice = Array.prototype.slice + + function Deferred(func) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", $.Callbacks({once:1, memory:1}), "resolved" ], + [ "reject", "fail", $.Callbacks({once:1, memory:1}), "rejected" ], + [ "notify", "progress", $.Callbacks({memory:1}) ] + ], + state = "pending", + promise = { + state: function() { + return state + }, + always: function() { + deferred.done(arguments).fail(arguments) + return this + }, + then: function(/* fnDone [, fnFailed [, fnProgress]] */) { + var fns = arguments + return Deferred(function(defer){ + $.each(tuples, function(i, tuple){ + var fn = $.isFunction(fns[i]) && fns[i] + deferred[tuple[1]](function(){ + var returned = fn && fn.apply(this, arguments) + if (returned && $.isFunction(returned.promise)) { + returned.promise() + .done(defer.resolve) + .fail(defer.reject) + .progress(defer.notify) + } else { + var context = this === promise ? defer.promise() : this, + values = fn ? [returned] : arguments + defer[tuple[0] + "With"](context, values) + } + }) + }) + fns = null + }).promise() + }, + + promise: function(obj) { + return obj != null ? $.extend( obj, promise ) : promise + } + }, + deferred = {} + + $.each(tuples, function(i, tuple){ + var list = tuple[2], + stateString = tuple[3] + + promise[tuple[1]] = list.add + + if (stateString) { + list.add(function(){ + state = stateString + }, tuples[i^1][2].disable, tuples[2][2].lock) + } + + deferred[tuple[0]] = function(){ + deferred[tuple[0] + "With"](this === deferred ? promise : this, arguments) + return this + } + deferred[tuple[0] + "With"] = list.fireWith + }) + + promise.promise(deferred) + if (func) func.call(deferred, deferred) + return deferred + } + + $.when = function(sub) { + var resolveValues = slice.call(arguments), + len = resolveValues.length, + i = 0, + remain = len !== 1 || (sub && $.isFunction(sub.promise)) ? len : 0, + deferred = remain === 1 ? sub : Deferred(), + progressValues, progressContexts, resolveContexts, + updateFn = function(i, ctx, val){ + return function(value){ + ctx[i] = this + val[i] = arguments.length > 1 ? slice.call(arguments) : value + if (val === progressValues) { + deferred.notifyWith(ctx, val) + } else if (!(--remain)) { + deferred.resolveWith(ctx, val) + } + } + } + + if (len > 1) { + progressValues = new Array(len) + progressContexts = new Array(len) + resolveContexts = new Array(len) + for ( ; i < len; ++i ) { + if (resolveValues[i] && $.isFunction(resolveValues[i].promise)) { + resolveValues[i].promise() + .done(updateFn(i, resolveContexts, resolveValues)) + .fail(deferred.reject) + .progress(updateFn(i, progressContexts, progressValues)) + } else { + --remain + } + } + } + if (!remain) deferred.resolveWith(resolveContexts, resolveValues) + return deferred.promise() + } + + $.Deferred = Deferred +})(Zepto) + +;(function($){ + var _zid = 1, undefined, + slice = Array.prototype.slice, + isFunction = $.isFunction, + isString = function(obj){ return typeof obj == 'string' }, + handlers = {}, + specialEvents={}, + focusinSupported = 'onfocusin' in window, + focus = { focus: 'focusin', blur: 'focusout' }, + hover = { mouseenter: 'mouseover', mouseleave: 'mouseout' } + + specialEvents.click = specialEvents.mousedown = specialEvents.mouseup = specialEvents.mousemove = 'MouseEvents' + + function zid(element) { + return element._zid || (element._zid = _zid++) + } + function findHandlers(element, event, fn, selector) { + event = parse(event) + if (event.ns) var matcher = matcherFor(event.ns) + return (handlers[zid(element)] || []).filter(function(handler) { + return handler + && (!event.e || handler.e == event.e) + && (!event.ns || matcher.test(handler.ns)) + && (!fn || zid(handler.fn) === zid(fn)) + && (!selector || handler.sel == selector) + }) + } + function parse(event) { + var parts = ('' + event).split('.') + return {e: parts[0], ns: parts.slice(1).sort().join(' ')} + } + function matcherFor(ns) { + return new RegExp('(?:^| )' + ns.replace(' ', ' .* ?') + '(?: |$)') + } + + function eventCapture(handler, captureSetting) { + return handler.del && + (!focusinSupported && (handler.e in focus)) || + !!captureSetting + } + + function realEvent(type) { + return hover[type] || (focusinSupported && focus[type]) || type + } + + function add(element, events, fn, data, selector, delegator, capture){ + var id = zid(element), set = (handlers[id] || (handlers[id] = [])) + events.split(/\s/).forEach(function(event){ + if (event == 'ready') return $(document).ready(fn) + var handler = parse(event) + handler.fn = fn + handler.sel = selector + // emulate mouseenter, mouseleave + if (handler.e in hover) fn = function(e){ + var related = e.relatedTarget + if (!related || (related !== this && !$.contains(this, related))) + return handler.fn.apply(this, arguments) + } + handler.del = delegator + var callback = delegator || fn + handler.proxy = function(e){ + e = compatible(e) + if (e.isImmediatePropagationStopped()) return + e.data = data + var result = callback.apply(element, e._args == undefined ? [e] : [e].concat(e._args)) + if (result === false) e.preventDefault(), e.stopPropagation() + return result + } + handler.i = set.length + set.push(handler) + if ('addEventListener' in element) + element.addEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture)) + }) + } + function remove(element, events, fn, selector, capture){ + var id = zid(element) + ;(events || '').split(/\s/).forEach(function(event){ + findHandlers(element, event, fn, selector).forEach(function(handler){ + delete handlers[id][handler.i] + if ('removeEventListener' in element) + element.removeEventListener(realEvent(handler.e), handler.proxy, eventCapture(handler, capture)) + }) + }) + } + + $.event = { add: add, remove: remove } + + $.proxy = function(fn, context) { + var args = (2 in arguments) && slice.call(arguments, 2) + if (isFunction(fn)) { + var proxyFn = function(){ return fn.apply(context, args ? args.concat(slice.call(arguments)) : arguments) } + proxyFn._zid = zid(fn) + return proxyFn + } else if (isString(context)) { + if (args) { + args.unshift(fn[context], fn) + return $.proxy.apply(null, args) + } else { + return $.proxy(fn[context], fn) + } + } else { + throw new TypeError("expected function") + } + } + + $.fn.bind = function(event, data, callback){ + return this.on(event, data, callback) + } + $.fn.unbind = function(event, callback){ + return this.off(event, callback) + } + $.fn.one = function(event, selector, data, callback){ + return this.on(event, selector, data, callback, 1) + } + + var returnTrue = function(){return true}, + returnFalse = function(){return false}, + ignoreProperties = /^([A-Z]|returnValue$|layer[XY]$|webkitMovement[XY]$)/, + eventMethods = { + preventDefault: 'isDefaultPrevented', + stopImmediatePropagation: 'isImmediatePropagationStopped', + stopPropagation: 'isPropagationStopped' + } + + function compatible(event, source) { + if (source || !event.isDefaultPrevented) { + source || (source = event) + + $.each(eventMethods, function(name, predicate) { + var sourceMethod = source[name] + event[name] = function(){ + this[predicate] = returnTrue + return sourceMethod && sourceMethod.apply(source, arguments) + } + event[predicate] = returnFalse + }) + + event.timeStamp || (event.timeStamp = Date.now()) + + if (source.defaultPrevented !== undefined ? source.defaultPrevented : + 'returnValue' in source ? source.returnValue === false : + source.getPreventDefault && source.getPreventDefault()) + event.isDefaultPrevented = returnTrue + } + return event + } + + function createProxy(event) { + var key, proxy = { originalEvent: event } + for (key in event) + if (!ignoreProperties.test(key) && event[key] !== undefined) proxy[key] = event[key] + + return compatible(proxy, event) + } + + $.fn.delegate = function(selector, event, callback){ + return this.on(event, selector, callback) + } + $.fn.undelegate = function(selector, event, callback){ + return this.off(event, selector, callback) + } + + $.fn.live = function(event, callback){ + $(document.body).delegate(this.selector, event, callback) + return this + } + $.fn.die = function(event, callback){ + $(document.body).undelegate(this.selector, event, callback) + return this + } + + $.fn.on = function(event, selector, data, callback, one){ + var autoRemove, delegator, $this = this + if (event && !isString(event)) { + $.each(event, function(type, fn){ + $this.on(type, selector, data, fn, one) + }) + return $this + } + + if (!isString(selector) && !isFunction(callback) && callback !== false) + callback = data, data = selector, selector = undefined + if (callback === undefined || data === false) + callback = data, data = undefined + + if (callback === false) callback = returnFalse + + return $this.each(function(_, element){ + if (one) autoRemove = function(e){ + remove(element, e.type, callback) + return callback.apply(this, arguments) + } + + if (selector) delegator = function(e){ + var evt, match = $(e.target).closest(selector, element).get(0) + if (match && match !== element) { + evt = $.extend(createProxy(e), {currentTarget: match, liveFired: element}) + return (autoRemove || callback).apply(match, [evt].concat(slice.call(arguments, 1))) + } + } + + add(element, event, callback, data, selector, delegator || autoRemove) + }) + } + $.fn.off = function(event, selector, callback){ + var $this = this + if (event && !isString(event)) { + $.each(event, function(type, fn){ + $this.off(type, selector, fn) + }) + return $this + } + + if (!isString(selector) && !isFunction(callback) && callback !== false) + callback = selector, selector = undefined + + if (callback === false) callback = returnFalse + + return $this.each(function(){ + remove(this, event, callback, selector) + }) + } + + $.fn.trigger = function(event, args){ + event = (isString(event) || $.isPlainObject(event)) ? $.Event(event) : compatible(event) + event._args = args + return this.each(function(){ + // handle focus(), blur() by calling them directly + if (event.type in focus && typeof this[event.type] == "function") this[event.type]() + // items in the collection might not be DOM elements + else if ('dispatchEvent' in this) this.dispatchEvent(event) + else $(this).triggerHandler(event, args) + }) + } + + // triggers event handlers on current element just as if an event occurred, + // doesn't trigger an actual event, doesn't bubble + $.fn.triggerHandler = function(event, args){ + var e, result + this.each(function(i, element){ + e = createProxy(isString(event) ? $.Event(event) : event) + e._args = args + e.target = element + $.each(findHandlers(element, event.type || event), function(i, handler){ + result = handler.proxy(e) + if (e.isImmediatePropagationStopped()) return false + }) + }) + return result + } + + // shortcut methods for `.bind(event, fn)` for each event type + ;('focusin focusout focus blur load resize scroll unload click dblclick '+ + 'mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave '+ + 'change select keydown keypress keyup error').split(' ').forEach(function(event) { + $.fn[event] = function(callback) { + return (0 in arguments) ? + this.bind(event, callback) : + this.trigger(event) + } + }) + + $.Event = function(type, props) { + if (!isString(type)) props = type, type = props.type + var event = document.createEvent(specialEvents[type] || 'Events'), bubbles = true + if (props) for (var name in props) (name == 'bubbles') ? (bubbles = !!props[name]) : (event[name] = props[name]) + event.initEvent(type, bubbles, true) + return compatible(event) + } + +})(Zepto) + +;(function(){ + // getComputedStyle shouldn't freak out when called + // without a valid element as argument + try { + getComputedStyle(undefined) + } catch(e) { + var nativeGetComputedStyle = getComputedStyle + window.getComputedStyle = function(element, pseudoElement){ + try { + return nativeGetComputedStyle(element, pseudoElement) + } catch(e) { + return null + } + } + } +})() + +;(function($){ + var zepto = $.zepto, oldQsa = zepto.qsa, oldMatches = zepto.matches + + function visible(elem){ + elem = $(elem) + return !!(elem.width() || elem.height()) && elem.css("display") !== "none" + } + + // Implements a subset from: + // http://api.jquery.com/category/selectors/jquery-selector-extensions/ + // + // Each filter function receives the current index, all nodes in the + // considered set, and a value if there were parentheses. The value + // of `this` is the node currently being considered. The function returns the + // resulting node(s), null, or undefined. + // + // Complex selectors are not supported: + // li:has(label:contains("foo")) + li:has(label:contains("bar")) + // ul.inner:first > li + var filters = $.expr[':'] = { + visible: function(){ if (visible(this)) return this }, + hidden: function(){ if (!visible(this)) return this }, + selected: function(){ if (this.selected) return this }, + checked: function(){ if (this.checked) return this }, + parent: function(){ return this.parentNode }, + first: function(idx){ if (idx === 0) return this }, + last: function(idx, nodes){ if (idx === nodes.length - 1) return this }, + eq: function(idx, _, value){ if (idx === value) return this }, + contains: function(idx, _, text){ if ($(this).text().indexOf(text) > -1) return this }, + has: function(idx, _, sel){ if (zepto.qsa(this, sel).length) return this } + } + + var filterRe = new RegExp('(.*):(\\w+)(?:\\(([^)]+)\\))?$\\s*'), + childRe = /^\s*>/, + classTag = 'Zepto' + (+new Date()) + + function process(sel, fn) { + // quote the hash in `a[href^=#]` expression + sel = sel.replace(/=#\]/g, '="#"]') + var filter, arg, match = filterRe.exec(sel) + if (match && match[2] in filters) { + filter = filters[match[2]], arg = match[3] + sel = match[1] + if (arg) { + var num = Number(arg) + if (isNaN(num)) arg = arg.replace(/^["']|["']$/g, '') + else arg = num + } + } + return fn(sel, filter, arg) + } + + zepto.qsa = function(node, selector) { + return process(selector, function(sel, filter, arg){ + try { + var taggedParent + if (!sel && filter) sel = '*' + else if (childRe.test(sel)) + // support "> *" child queries by tagging the parent node with a + // unique class and prepending that classname onto the selector + taggedParent = $(node).addClass(classTag), sel = '.'+classTag+' '+sel + + var nodes = oldQsa(node, sel) + } catch(e) { + console.error('error performing selector: %o', selector) + throw e + } finally { + if (taggedParent) taggedParent.removeClass(classTag) + } + return !filter ? nodes : + zepto.uniq($.map(nodes, function(n, i){ return filter.call(n, i, nodes, arg) })) + }) + } + + zepto.matches = function(node, selector){ + return process(selector, function(sel, filter, arg){ + return (!sel || oldMatches(node, sel)) && + (!filter || filter.call(node, null, arg) === node) + }) + } +})(Zepto) +module.exports = Zepto + + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/array/from.js": +/*!*******************************************************!*\ + !*** ./node_modules/core-js/library/fn/array/from.js ***! + \*******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.string.iterator */ "./node_modules/core-js/library/modules/es6.string.iterator.js"); +__webpack_require__(/*! ../../modules/es6.array.from */ "./node_modules/core-js/library/modules/es6.array.from.js"); +module.exports = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Array.from; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/get-iterator.js": +/*!*********************************************************!*\ + !*** ./node_modules/core-js/library/fn/get-iterator.js ***! + \*********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../modules/web.dom.iterable */ "./node_modules/core-js/library/modules/web.dom.iterable.js"); +__webpack_require__(/*! ../modules/es6.string.iterator */ "./node_modules/core-js/library/modules/es6.string.iterator.js"); +module.exports = __webpack_require__(/*! ../modules/core.get-iterator */ "./node_modules/core-js/library/modules/core.get-iterator.js"); + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/json/stringify.js": +/*!***********************************************************!*\ + !*** ./node_modules/core-js/library/fn/json/stringify.js ***! + \***********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var core = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js") + , $JSON = core.JSON || (core.JSON = {stringify: JSON.stringify}); +module.exports = function stringify(it){ // eslint-disable-line no-unused-vars + return $JSON.stringify.apply($JSON, arguments); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/object/assign.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/fn/object/assign.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.object.assign */ "./node_modules/core-js/library/modules/es6.object.assign.js"); +module.exports = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Object.assign; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/object/create.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/fn/object/create.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.object.create */ "./node_modules/core-js/library/modules/es6.object.create.js"); +var $Object = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Object; +module.exports = function create(P, D){ + return $Object.create(P, D); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/object/define-property.js": +/*!*******************************************************************!*\ + !*** ./node_modules/core-js/library/fn/object/define-property.js ***! + \*******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.object.define-property */ "./node_modules/core-js/library/modules/es6.object.define-property.js"); +var $Object = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Object; +module.exports = function defineProperty(it, key, desc){ + return $Object.defineProperty(it, key, desc); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/object/get-own-property-descriptor.js": +/*!*******************************************************************************!*\ + !*** ./node_modules/core-js/library/fn/object/get-own-property-descriptor.js ***! + \*******************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.object.get-own-property-descriptor */ "./node_modules/core-js/library/modules/es6.object.get-own-property-descriptor.js"); +var $Object = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Object; +module.exports = function getOwnPropertyDescriptor(it, key){ + return $Object.getOwnPropertyDescriptor(it, key); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/object/keys.js": +/*!********************************************************!*\ + !*** ./node_modules/core-js/library/fn/object/keys.js ***! + \********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.object.keys */ "./node_modules/core-js/library/modules/es6.object.keys.js"); +module.exports = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Object.keys; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/object/set-prototype-of.js": +/*!********************************************************************!*\ + !*** ./node_modules/core-js/library/fn/object/set-prototype-of.js ***! + \********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.object.set-prototype-of */ "./node_modules/core-js/library/modules/es6.object.set-prototype-of.js"); +module.exports = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Object.setPrototypeOf; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/symbol/index.js": +/*!*********************************************************!*\ + !*** ./node_modules/core-js/library/fn/symbol/index.js ***! + \*********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.symbol */ "./node_modules/core-js/library/modules/es6.symbol.js"); +__webpack_require__(/*! ../../modules/es6.object.to-string */ "./node_modules/core-js/library/modules/es6.object.to-string.js"); +__webpack_require__(/*! ../../modules/es7.symbol.async-iterator */ "./node_modules/core-js/library/modules/es7.symbol.async-iterator.js"); +__webpack_require__(/*! ../../modules/es7.symbol.observable */ "./node_modules/core-js/library/modules/es7.symbol.observable.js"); +module.exports = __webpack_require__(/*! ../../modules/_core */ "./node_modules/core-js/library/modules/_core.js").Symbol; + +/***/ }), + +/***/ "./node_modules/core-js/library/fn/symbol/iterator.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/fn/symbol/iterator.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ../../modules/es6.string.iterator */ "./node_modules/core-js/library/modules/es6.string.iterator.js"); +__webpack_require__(/*! ../../modules/web.dom.iterable */ "./node_modules/core-js/library/modules/web.dom.iterable.js"); +module.exports = __webpack_require__(/*! ../../modules/_wks-ext */ "./node_modules/core-js/library/modules/_wks-ext.js").f('iterator'); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_a-function.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_a-function.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(it){ + if(typeof it != 'function')throw TypeError(it + ' is not a function!'); + return it; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_add-to-unscopables.js": +/*!*********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_add-to-unscopables.js ***! + \*********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(){ /* empty */ }; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_an-object.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_an-object.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var isObject = __webpack_require__(/*! ./_is-object */ "./node_modules/core-js/library/modules/_is-object.js"); +module.exports = function(it){ + if(!isObject(it))throw TypeError(it + ' is not an object!'); + return it; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_array-includes.js": +/*!*****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_array-includes.js ***! + \*****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// false -> Array#indexOf +// true -> Array#includes +var toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js") + , toLength = __webpack_require__(/*! ./_to-length */ "./node_modules/core-js/library/modules/_to-length.js") + , toIndex = __webpack_require__(/*! ./_to-index */ "./node_modules/core-js/library/modules/_to-index.js"); +module.exports = function(IS_INCLUDES){ + return function($this, el, fromIndex){ + var O = toIObject($this) + , length = toLength(O.length) + , index = toIndex(fromIndex, length) + , value; + // Array#includes uses SameValueZero equality algorithm + if(IS_INCLUDES && el != el)while(length > index){ + value = O[index++]; + if(value != value)return true; + // Array#toIndex ignores holes, Array#includes - not + } else for(;length > index; index++)if(IS_INCLUDES || index in O){ + if(O[index] === el)return IS_INCLUDES || index || 0; + } return !IS_INCLUDES && -1; + }; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_classof.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_classof.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// getting tag from 19.1.3.6 Object.prototype.toString() +var cof = __webpack_require__(/*! ./_cof */ "./node_modules/core-js/library/modules/_cof.js") + , TAG = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('toStringTag') + // ES3 wrong here + , ARG = cof(function(){ return arguments; }()) == 'Arguments'; + +// fallback for IE11 Script Access Denied error +var tryGet = function(it, key){ + try { + return it[key]; + } catch(e){ /* empty */ } +}; + +module.exports = function(it){ + var O, T, B; + return it === undefined ? 'Undefined' : it === null ? 'Null' + // @@toStringTag case + : typeof (T = tryGet(O = Object(it), TAG)) == 'string' ? T + // builtinTag case + : ARG ? cof(O) + // ES3 arguments fallback + : (B = cof(O)) == 'Object' && typeof O.callee == 'function' ? 'Arguments' : B; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_cof.js": +/*!******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_cof.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +var toString = {}.toString; + +module.exports = function(it){ + return toString.call(it).slice(8, -1); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_core.js": +/*!*******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_core.js ***! + \*******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +var core = module.exports = {version: '2.4.0'}; +if(typeof __e == 'number')__e = core; // eslint-disable-line no-undef + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_create-property.js": +/*!******************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_create-property.js ***! + \******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var $defineProperty = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js") + , createDesc = __webpack_require__(/*! ./_property-desc */ "./node_modules/core-js/library/modules/_property-desc.js"); + +module.exports = function(object, index, value){ + if(index in object)$defineProperty.f(object, index, createDesc(0, value)); + else object[index] = value; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_ctx.js": +/*!******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_ctx.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// optional / simple context binding +var aFunction = __webpack_require__(/*! ./_a-function */ "./node_modules/core-js/library/modules/_a-function.js"); +module.exports = function(fn, that, length){ + aFunction(fn); + if(that === undefined)return fn; + switch(length){ + case 1: return function(a){ + return fn.call(that, a); + }; + case 2: return function(a, b){ + return fn.call(that, a, b); + }; + case 3: return function(a, b, c){ + return fn.call(that, a, b, c); + }; + } + return function(/* ...args */){ + return fn.apply(that, arguments); + }; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_defined.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_defined.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +// 7.2.1 RequireObjectCoercible(argument) +module.exports = function(it){ + if(it == undefined)throw TypeError("Can't call method on " + it); + return it; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_descriptors.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_descriptors.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// Thank's IE8 for his funny defineProperty +module.exports = !__webpack_require__(/*! ./_fails */ "./node_modules/core-js/library/modules/_fails.js")(function(){ + return Object.defineProperty({}, 'a', {get: function(){ return 7; }}).a != 7; +}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_dom-create.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_dom-create.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var isObject = __webpack_require__(/*! ./_is-object */ "./node_modules/core-js/library/modules/_is-object.js") + , document = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js").document + // in old IE typeof document.createElement is 'object' + , is = isObject(document) && isObject(document.createElement); +module.exports = function(it){ + return is ? document.createElement(it) : {}; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_enum-bug-keys.js": +/*!****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_enum-bug-keys.js ***! + \****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +// IE 8- don't enum bug keys +module.exports = ( + 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf' +).split(','); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_enum-keys.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_enum-keys.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// all enumerable object keys, includes symbols +var getKeys = __webpack_require__(/*! ./_object-keys */ "./node_modules/core-js/library/modules/_object-keys.js") + , gOPS = __webpack_require__(/*! ./_object-gops */ "./node_modules/core-js/library/modules/_object-gops.js") + , pIE = __webpack_require__(/*! ./_object-pie */ "./node_modules/core-js/library/modules/_object-pie.js"); +module.exports = function(it){ + var result = getKeys(it) + , getSymbols = gOPS.f; + if(getSymbols){ + var symbols = getSymbols(it) + , isEnum = pIE.f + , i = 0 + , key; + while(symbols.length > i)if(isEnum.call(it, key = symbols[i++]))result.push(key); + } return result; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_export.js": +/*!*********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_export.js ***! + \*********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var global = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js") + , core = __webpack_require__(/*! ./_core */ "./node_modules/core-js/library/modules/_core.js") + , ctx = __webpack_require__(/*! ./_ctx */ "./node_modules/core-js/library/modules/_ctx.js") + , hide = __webpack_require__(/*! ./_hide */ "./node_modules/core-js/library/modules/_hide.js") + , PROTOTYPE = 'prototype'; + +var $export = function(type, name, source){ + var IS_FORCED = type & $export.F + , IS_GLOBAL = type & $export.G + , IS_STATIC = type & $export.S + , IS_PROTO = type & $export.P + , IS_BIND = type & $export.B + , IS_WRAP = type & $export.W + , exports = IS_GLOBAL ? core : core[name] || (core[name] = {}) + , expProto = exports[PROTOTYPE] + , target = IS_GLOBAL ? global : IS_STATIC ? global[name] : (global[name] || {})[PROTOTYPE] + , key, own, out; + if(IS_GLOBAL)source = name; + for(key in source){ + // contains in native + own = !IS_FORCED && target && target[key] !== undefined; + if(own && key in exports)continue; + // export native or passed + out = own ? target[key] : source[key]; + // prevent global pollution for namespaces + exports[key] = IS_GLOBAL && typeof target[key] != 'function' ? source[key] + // bind timers to global for call from export context + : IS_BIND && own ? ctx(out, global) + // wrap global constructors for prevent change them in library + : IS_WRAP && target[key] == out ? (function(C){ + var F = function(a, b, c){ + if(this instanceof C){ + switch(arguments.length){ + case 0: return new C; + case 1: return new C(a); + case 2: return new C(a, b); + } return new C(a, b, c); + } return C.apply(this, arguments); + }; + F[PROTOTYPE] = C[PROTOTYPE]; + return F; + // make static versions for prototype methods + })(out) : IS_PROTO && typeof out == 'function' ? ctx(Function.call, out) : out; + // export proto methods to core.%CONSTRUCTOR%.methods.%NAME% + if(IS_PROTO){ + (exports.virtual || (exports.virtual = {}))[key] = out; + // export proto methods to core.%CONSTRUCTOR%.prototype.%NAME% + if(type & $export.R && expProto && !expProto[key])hide(expProto, key, out); + } + } +}; +// type bitmap +$export.F = 1; // forced +$export.G = 2; // global +$export.S = 4; // static +$export.P = 8; // proto +$export.B = 16; // bind +$export.W = 32; // wrap +$export.U = 64; // safe +$export.R = 128; // real proto method for `library` +module.exports = $export; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_fails.js": +/*!********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_fails.js ***! + \********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(exec){ + try { + return !!exec(); + } catch(e){ + return true; + } +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_global.js": +/*!*********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_global.js ***! + \*********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +// https://github.com/zloirock/core-js/issues/86#issuecomment-115759028 +var global = module.exports = typeof window != 'undefined' && window.Math == Math + ? window : typeof self != 'undefined' && self.Math == Math ? self : Function('return this')(); +if(typeof __g == 'number')__g = global; // eslint-disable-line no-undef + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_has.js": +/*!******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_has.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +var hasOwnProperty = {}.hasOwnProperty; +module.exports = function(it, key){ + return hasOwnProperty.call(it, key); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_hide.js": +/*!*******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_hide.js ***! + \*******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var dP = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js") + , createDesc = __webpack_require__(/*! ./_property-desc */ "./node_modules/core-js/library/modules/_property-desc.js"); +module.exports = __webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js") ? function(object, key, value){ + return dP.f(object, key, createDesc(1, value)); +} : function(object, key, value){ + object[key] = value; + return object; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_html.js": +/*!*******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_html.js ***! + \*******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js").document && document.documentElement; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_ie8-dom-define.js": +/*!*****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_ie8-dom-define.js ***! + \*****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = !__webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js") && !__webpack_require__(/*! ./_fails */ "./node_modules/core-js/library/modules/_fails.js")(function(){ + return Object.defineProperty(__webpack_require__(/*! ./_dom-create */ "./node_modules/core-js/library/modules/_dom-create.js")('div'), 'a', {get: function(){ return 7; }}).a != 7; +}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iobject.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iobject.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// fallback for non-array-like ES3 and non-enumerable old V8 strings +var cof = __webpack_require__(/*! ./_cof */ "./node_modules/core-js/library/modules/_cof.js"); +module.exports = Object('z').propertyIsEnumerable(0) ? Object : function(it){ + return cof(it) == 'String' ? it.split('') : Object(it); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_is-array-iter.js": +/*!****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_is-array-iter.js ***! + \****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// check on default Array iterator +var Iterators = __webpack_require__(/*! ./_iterators */ "./node_modules/core-js/library/modules/_iterators.js") + , ITERATOR = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('iterator') + , ArrayProto = Array.prototype; + +module.exports = function(it){ + return it !== undefined && (Iterators.Array === it || ArrayProto[ITERATOR] === it); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_is-array.js": +/*!***********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_is-array.js ***! + \***********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 7.2.2 IsArray(argument) +var cof = __webpack_require__(/*! ./_cof */ "./node_modules/core-js/library/modules/_cof.js"); +module.exports = Array.isArray || function isArray(arg){ + return cof(arg) == 'Array'; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_is-object.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_is-object.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(it){ + return typeof it === 'object' ? it !== null : typeof it === 'function'; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iter-call.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iter-call.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// call something on iterator step with safe closing on error +var anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js"); +module.exports = function(iterator, fn, value, entries){ + try { + return entries ? fn(anObject(value)[0], value[1]) : fn(value); + // 7.4.6 IteratorClose(iterator, completion) + } catch(e){ + var ret = iterator['return']; + if(ret !== undefined)anObject(ret.call(iterator)); + throw e; + } +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iter-create.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iter-create.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var create = __webpack_require__(/*! ./_object-create */ "./node_modules/core-js/library/modules/_object-create.js") + , descriptor = __webpack_require__(/*! ./_property-desc */ "./node_modules/core-js/library/modules/_property-desc.js") + , setToStringTag = __webpack_require__(/*! ./_set-to-string-tag */ "./node_modules/core-js/library/modules/_set-to-string-tag.js") + , IteratorPrototype = {}; + +// 25.1.2.1.1 %IteratorPrototype%[@@iterator]() +__webpack_require__(/*! ./_hide */ "./node_modules/core-js/library/modules/_hide.js")(IteratorPrototype, __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('iterator'), function(){ return this; }); + +module.exports = function(Constructor, NAME, next){ + Constructor.prototype = create(IteratorPrototype, {next: descriptor(1, next)}); + setToStringTag(Constructor, NAME + ' Iterator'); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iter-define.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iter-define.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var LIBRARY = __webpack_require__(/*! ./_library */ "./node_modules/core-js/library/modules/_library.js") + , $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js") + , redefine = __webpack_require__(/*! ./_redefine */ "./node_modules/core-js/library/modules/_redefine.js") + , hide = __webpack_require__(/*! ./_hide */ "./node_modules/core-js/library/modules/_hide.js") + , has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , Iterators = __webpack_require__(/*! ./_iterators */ "./node_modules/core-js/library/modules/_iterators.js") + , $iterCreate = __webpack_require__(/*! ./_iter-create */ "./node_modules/core-js/library/modules/_iter-create.js") + , setToStringTag = __webpack_require__(/*! ./_set-to-string-tag */ "./node_modules/core-js/library/modules/_set-to-string-tag.js") + , getPrototypeOf = __webpack_require__(/*! ./_object-gpo */ "./node_modules/core-js/library/modules/_object-gpo.js") + , ITERATOR = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('iterator') + , BUGGY = !([].keys && 'next' in [].keys()) // Safari has buggy iterators w/o `next` + , FF_ITERATOR = '@@iterator' + , KEYS = 'keys' + , VALUES = 'values'; + +var returnThis = function(){ return this; }; + +module.exports = function(Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCED){ + $iterCreate(Constructor, NAME, next); + var getMethod = function(kind){ + if(!BUGGY && kind in proto)return proto[kind]; + switch(kind){ + case KEYS: return function keys(){ return new Constructor(this, kind); }; + case VALUES: return function values(){ return new Constructor(this, kind); }; + } return function entries(){ return new Constructor(this, kind); }; + }; + var TAG = NAME + ' Iterator' + , DEF_VALUES = DEFAULT == VALUES + , VALUES_BUG = false + , proto = Base.prototype + , $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT] + , $default = $native || getMethod(DEFAULT) + , $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined + , $anyNative = NAME == 'Array' ? proto.entries || $native : $native + , methods, key, IteratorPrototype; + // Fix native + if($anyNative){ + IteratorPrototype = getPrototypeOf($anyNative.call(new Base)); + if(IteratorPrototype !== Object.prototype){ + // Set @@toStringTag to native iterators + setToStringTag(IteratorPrototype, TAG, true); + // fix for some old engines + if(!LIBRARY && !has(IteratorPrototype, ITERATOR))hide(IteratorPrototype, ITERATOR, returnThis); + } + } + // fix Array#{values, @@iterator}.name in V8 / FF + if(DEF_VALUES && $native && $native.name !== VALUES){ + VALUES_BUG = true; + $default = function values(){ return $native.call(this); }; + } + // Define iterator + if((!LIBRARY || FORCED) && (BUGGY || VALUES_BUG || !proto[ITERATOR])){ + hide(proto, ITERATOR, $default); + } + // Plug for library + Iterators[NAME] = $default; + Iterators[TAG] = returnThis; + if(DEFAULT){ + methods = { + values: DEF_VALUES ? $default : getMethod(VALUES), + keys: IS_SET ? $default : getMethod(KEYS), + entries: $entries + }; + if(FORCED)for(key in methods){ + if(!(key in proto))redefine(proto, key, methods[key]); + } else $export($export.P + $export.F * (BUGGY || VALUES_BUG), NAME, methods); + } + return methods; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iter-detect.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iter-detect.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var ITERATOR = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('iterator') + , SAFE_CLOSING = false; + +try { + var riter = [7][ITERATOR](); + riter['return'] = function(){ SAFE_CLOSING = true; }; + Array.from(riter, function(){ throw 2; }); +} catch(e){ /* empty */ } + +module.exports = function(exec, skipClosing){ + if(!skipClosing && !SAFE_CLOSING)return false; + var safe = false; + try { + var arr = [7] + , iter = arr[ITERATOR](); + iter.next = function(){ return {done: safe = true}; }; + arr[ITERATOR] = function(){ return iter; }; + exec(arr); + } catch(e){ /* empty */ } + return safe; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iter-step.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iter-step.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(done, value){ + return {value: value, done: !!done}; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_iterators.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_iterators.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = {}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_keyof.js": +/*!********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_keyof.js ***! + \********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var getKeys = __webpack_require__(/*! ./_object-keys */ "./node_modules/core-js/library/modules/_object-keys.js") + , toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js"); +module.exports = function(object, el){ + var O = toIObject(object) + , keys = getKeys(O) + , length = keys.length + , index = 0 + , key; + while(length > index)if(O[key = keys[index++]] === el)return key; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_library.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_library.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = true; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_meta.js": +/*!*******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_meta.js ***! + \*******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var META = __webpack_require__(/*! ./_uid */ "./node_modules/core-js/library/modules/_uid.js")('meta') + , isObject = __webpack_require__(/*! ./_is-object */ "./node_modules/core-js/library/modules/_is-object.js") + , has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , setDesc = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js").f + , id = 0; +var isExtensible = Object.isExtensible || function(){ + return true; +}; +var FREEZE = !__webpack_require__(/*! ./_fails */ "./node_modules/core-js/library/modules/_fails.js")(function(){ + return isExtensible(Object.preventExtensions({})); +}); +var setMeta = function(it){ + setDesc(it, META, {value: { + i: 'O' + ++id, // object ID + w: {} // weak collections IDs + }}); +}; +var fastKey = function(it, create){ + // return primitive with prefix + if(!isObject(it))return typeof it == 'symbol' ? it : (typeof it == 'string' ? 'S' : 'P') + it; + if(!has(it, META)){ + // can't set metadata to uncaught frozen object + if(!isExtensible(it))return 'F'; + // not necessary to add metadata + if(!create)return 'E'; + // add missing metadata + setMeta(it); + // return object ID + } return it[META].i; +}; +var getWeak = function(it, create){ + if(!has(it, META)){ + // can't set metadata to uncaught frozen object + if(!isExtensible(it))return true; + // not necessary to add metadata + if(!create)return false; + // add missing metadata + setMeta(it); + // return hash weak collections IDs + } return it[META].w; +}; +// add metadata on freeze-family methods calling +var onFreeze = function(it){ + if(FREEZE && meta.NEED && isExtensible(it) && !has(it, META))setMeta(it); + return it; +}; +var meta = module.exports = { + KEY: META, + NEED: false, + fastKey: fastKey, + getWeak: getWeak, + onFreeze: onFreeze +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-assign.js": +/*!****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-assign.js ***! + \****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +// 19.1.2.1 Object.assign(target, source, ...) +var getKeys = __webpack_require__(/*! ./_object-keys */ "./node_modules/core-js/library/modules/_object-keys.js") + , gOPS = __webpack_require__(/*! ./_object-gops */ "./node_modules/core-js/library/modules/_object-gops.js") + , pIE = __webpack_require__(/*! ./_object-pie */ "./node_modules/core-js/library/modules/_object-pie.js") + , toObject = __webpack_require__(/*! ./_to-object */ "./node_modules/core-js/library/modules/_to-object.js") + , IObject = __webpack_require__(/*! ./_iobject */ "./node_modules/core-js/library/modules/_iobject.js") + , $assign = Object.assign; + +// should work with symbols and should have deterministic property order (V8 bug) +module.exports = !$assign || __webpack_require__(/*! ./_fails */ "./node_modules/core-js/library/modules/_fails.js")(function(){ + var A = {} + , B = {} + , S = Symbol() + , K = 'abcdefghijklmnopqrst'; + A[S] = 7; + K.split('').forEach(function(k){ B[k] = k; }); + return $assign({}, A)[S] != 7 || Object.keys($assign({}, B)).join('') != K; +}) ? function assign(target, source){ // eslint-disable-line no-unused-vars + var T = toObject(target) + , aLen = arguments.length + , index = 1 + , getSymbols = gOPS.f + , isEnum = pIE.f; + while(aLen > index){ + var S = IObject(arguments[index++]) + , keys = getSymbols ? getKeys(S).concat(getSymbols(S)) : getKeys(S) + , length = keys.length + , j = 0 + , key; + while(length > j)if(isEnum.call(S, key = keys[j++]))T[key] = S[key]; + } return T; +} : $assign; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-create.js": +/*!****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-create.js ***! + \****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) +var anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js") + , dPs = __webpack_require__(/*! ./_object-dps */ "./node_modules/core-js/library/modules/_object-dps.js") + , enumBugKeys = __webpack_require__(/*! ./_enum-bug-keys */ "./node_modules/core-js/library/modules/_enum-bug-keys.js") + , IE_PROTO = __webpack_require__(/*! ./_shared-key */ "./node_modules/core-js/library/modules/_shared-key.js")('IE_PROTO') + , Empty = function(){ /* empty */ } + , PROTOTYPE = 'prototype'; + +// Create object with fake `null` prototype: use iframe Object with cleared prototype +var createDict = function(){ + // Thrash, waste and sodomy: IE GC bug + var iframe = __webpack_require__(/*! ./_dom-create */ "./node_modules/core-js/library/modules/_dom-create.js")('iframe') + , i = enumBugKeys.length + , lt = '<' + , gt = '>' + , iframeDocument; + iframe.style.display = 'none'; + __webpack_require__(/*! ./_html */ "./node_modules/core-js/library/modules/_html.js").appendChild(iframe); + iframe.src = 'javascript:'; // eslint-disable-line no-script-url + // createDict = iframe.contentWindow.Object; + // html.removeChild(iframe); + iframeDocument = iframe.contentWindow.document; + iframeDocument.open(); + iframeDocument.write(lt + 'script' + gt + 'document.F=Object' + lt + '/script' + gt); + iframeDocument.close(); + createDict = iframeDocument.F; + while(i--)delete createDict[PROTOTYPE][enumBugKeys[i]]; + return createDict(); +}; + +module.exports = Object.create || function create(O, Properties){ + var result; + if(O !== null){ + Empty[PROTOTYPE] = anObject(O); + result = new Empty; + Empty[PROTOTYPE] = null; + // add "__proto__" for Object.getPrototypeOf polyfill + result[IE_PROTO] = O; + } else result = createDict(); + return Properties === undefined ? result : dPs(result, Properties); +}; + + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-dp.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-dp.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js") + , IE8_DOM_DEFINE = __webpack_require__(/*! ./_ie8-dom-define */ "./node_modules/core-js/library/modules/_ie8-dom-define.js") + , toPrimitive = __webpack_require__(/*! ./_to-primitive */ "./node_modules/core-js/library/modules/_to-primitive.js") + , dP = Object.defineProperty; + +exports.f = __webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js") ? Object.defineProperty : function defineProperty(O, P, Attributes){ + anObject(O); + P = toPrimitive(P, true); + anObject(Attributes); + if(IE8_DOM_DEFINE)try { + return dP(O, P, Attributes); + } catch(e){ /* empty */ } + if('get' in Attributes || 'set' in Attributes)throw TypeError('Accessors not supported!'); + if('value' in Attributes)O[P] = Attributes.value; + return O; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-dps.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-dps.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var dP = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js") + , anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js") + , getKeys = __webpack_require__(/*! ./_object-keys */ "./node_modules/core-js/library/modules/_object-keys.js"); + +module.exports = __webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js") ? Object.defineProperties : function defineProperties(O, Properties){ + anObject(O); + var keys = getKeys(Properties) + , length = keys.length + , i = 0 + , P; + while(length > i)dP.f(O, P = keys[i++], Properties[P]); + return O; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-gopd.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-gopd.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var pIE = __webpack_require__(/*! ./_object-pie */ "./node_modules/core-js/library/modules/_object-pie.js") + , createDesc = __webpack_require__(/*! ./_property-desc */ "./node_modules/core-js/library/modules/_property-desc.js") + , toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js") + , toPrimitive = __webpack_require__(/*! ./_to-primitive */ "./node_modules/core-js/library/modules/_to-primitive.js") + , has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , IE8_DOM_DEFINE = __webpack_require__(/*! ./_ie8-dom-define */ "./node_modules/core-js/library/modules/_ie8-dom-define.js") + , gOPD = Object.getOwnPropertyDescriptor; + +exports.f = __webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js") ? gOPD : function getOwnPropertyDescriptor(O, P){ + O = toIObject(O); + P = toPrimitive(P, true); + if(IE8_DOM_DEFINE)try { + return gOPD(O, P); + } catch(e){ /* empty */ } + if(has(O, P))return createDesc(!pIE.f.call(O, P), O[P]); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-gopn-ext.js": +/*!******************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-gopn-ext.js ***! + \******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// fallback for IE11 buggy Object.getOwnPropertyNames with iframe and window +var toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js") + , gOPN = __webpack_require__(/*! ./_object-gopn */ "./node_modules/core-js/library/modules/_object-gopn.js").f + , toString = {}.toString; + +var windowNames = typeof window == 'object' && window && Object.getOwnPropertyNames + ? Object.getOwnPropertyNames(window) : []; + +var getWindowNames = function(it){ + try { + return gOPN(it); + } catch(e){ + return windowNames.slice(); + } +}; + +module.exports.f = function getOwnPropertyNames(it){ + return windowNames && toString.call(it) == '[object Window]' ? getWindowNames(it) : gOPN(toIObject(it)); +}; + + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-gopn.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-gopn.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.7 / 15.2.3.4 Object.getOwnPropertyNames(O) +var $keys = __webpack_require__(/*! ./_object-keys-internal */ "./node_modules/core-js/library/modules/_object-keys-internal.js") + , hiddenKeys = __webpack_require__(/*! ./_enum-bug-keys */ "./node_modules/core-js/library/modules/_enum-bug-keys.js").concat('length', 'prototype'); + +exports.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O){ + return $keys(O, hiddenKeys); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-gops.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-gops.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +exports.f = Object.getOwnPropertySymbols; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-gpo.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-gpo.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.9 / 15.2.3.2 Object.getPrototypeOf(O) +var has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , toObject = __webpack_require__(/*! ./_to-object */ "./node_modules/core-js/library/modules/_to-object.js") + , IE_PROTO = __webpack_require__(/*! ./_shared-key */ "./node_modules/core-js/library/modules/_shared-key.js")('IE_PROTO') + , ObjectProto = Object.prototype; + +module.exports = Object.getPrototypeOf || function(O){ + O = toObject(O); + if(has(O, IE_PROTO))return O[IE_PROTO]; + if(typeof O.constructor == 'function' && O instanceof O.constructor){ + return O.constructor.prototype; + } return O instanceof Object ? ObjectProto : null; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-keys-internal.js": +/*!***********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-keys-internal.js ***! + \***********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js") + , arrayIndexOf = __webpack_require__(/*! ./_array-includes */ "./node_modules/core-js/library/modules/_array-includes.js")(false) + , IE_PROTO = __webpack_require__(/*! ./_shared-key */ "./node_modules/core-js/library/modules/_shared-key.js")('IE_PROTO'); + +module.exports = function(object, names){ + var O = toIObject(object) + , i = 0 + , result = [] + , key; + for(key in O)if(key != IE_PROTO)has(O, key) && result.push(key); + // Don't enum bug & hidden keys + while(names.length > i)if(has(O, key = names[i++])){ + ~arrayIndexOf(result, key) || result.push(key); + } + return result; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-keys.js": +/*!**************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-keys.js ***! + \**************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.14 / 15.2.3.14 Object.keys(O) +var $keys = __webpack_require__(/*! ./_object-keys-internal */ "./node_modules/core-js/library/modules/_object-keys-internal.js") + , enumBugKeys = __webpack_require__(/*! ./_enum-bug-keys */ "./node_modules/core-js/library/modules/_enum-bug-keys.js"); + +module.exports = Object.keys || function keys(O){ + return $keys(O, enumBugKeys); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-pie.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-pie.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +exports.f = {}.propertyIsEnumerable; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_object-sap.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_object-sap.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// most Object methods by ES6 should accept primitives +var $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js") + , core = __webpack_require__(/*! ./_core */ "./node_modules/core-js/library/modules/_core.js") + , fails = __webpack_require__(/*! ./_fails */ "./node_modules/core-js/library/modules/_fails.js"); +module.exports = function(KEY, exec){ + var fn = (core.Object || {})[KEY] || Object[KEY] + , exp = {}; + exp[KEY] = exec(fn); + $export($export.S + $export.F * fails(function(){ fn(1); }), 'Object', exp); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_property-desc.js": +/*!****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_property-desc.js ***! + \****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function(bitmap, value){ + return { + enumerable : !(bitmap & 1), + configurable: !(bitmap & 2), + writable : !(bitmap & 4), + value : value + }; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_redefine.js": +/*!***********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_redefine.js ***! + \***********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(/*! ./_hide */ "./node_modules/core-js/library/modules/_hide.js"); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_set-proto.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_set-proto.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// Works with __proto__ only. Old v8 can't work with null proto objects. +/* eslint-disable no-proto */ +var isObject = __webpack_require__(/*! ./_is-object */ "./node_modules/core-js/library/modules/_is-object.js") + , anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js"); +var check = function(O, proto){ + anObject(O); + if(!isObject(proto) && proto !== null)throw TypeError(proto + ": can't set as prototype!"); +}; +module.exports = { + set: Object.setPrototypeOf || ('__proto__' in {} ? // eslint-disable-line + function(test, buggy, set){ + try { + set = __webpack_require__(/*! ./_ctx */ "./node_modules/core-js/library/modules/_ctx.js")(Function.call, __webpack_require__(/*! ./_object-gopd */ "./node_modules/core-js/library/modules/_object-gopd.js").f(Object.prototype, '__proto__').set, 2); + set(test, []); + buggy = !(test instanceof Array); + } catch(e){ buggy = true; } + return function setPrototypeOf(O, proto){ + check(O, proto); + if(buggy)O.__proto__ = proto; + else set(O, proto); + return O; + }; + }({}, false) : undefined), + check: check +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_set-to-string-tag.js": +/*!********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_set-to-string-tag.js ***! + \********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var def = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js").f + , has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , TAG = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('toStringTag'); + +module.exports = function(it, tag, stat){ + if(it && !has(it = stat ? it : it.prototype, TAG))def(it, TAG, {configurable: true, value: tag}); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_shared-key.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_shared-key.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var shared = __webpack_require__(/*! ./_shared */ "./node_modules/core-js/library/modules/_shared.js")('keys') + , uid = __webpack_require__(/*! ./_uid */ "./node_modules/core-js/library/modules/_uid.js"); +module.exports = function(key){ + return shared[key] || (shared[key] = uid(key)); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_shared.js": +/*!*********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_shared.js ***! + \*********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var global = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js") + , SHARED = '__core-js_shared__' + , store = global[SHARED] || (global[SHARED] = {}); +module.exports = function(key){ + return store[key] || (store[key] = {}); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_string-at.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_string-at.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var toInteger = __webpack_require__(/*! ./_to-integer */ "./node_modules/core-js/library/modules/_to-integer.js") + , defined = __webpack_require__(/*! ./_defined */ "./node_modules/core-js/library/modules/_defined.js"); +// true -> String#at +// false -> String#codePointAt +module.exports = function(TO_STRING){ + return function(that, pos){ + var s = String(defined(that)) + , i = toInteger(pos) + , l = s.length + , a, b; + if(i < 0 || i >= l)return TO_STRING ? '' : undefined; + a = s.charCodeAt(i); + return a < 0xd800 || a > 0xdbff || i + 1 === l || (b = s.charCodeAt(i + 1)) < 0xdc00 || b > 0xdfff + ? TO_STRING ? s.charAt(i) : a + : TO_STRING ? s.slice(i, i + 2) : (a - 0xd800 << 10) + (b - 0xdc00) + 0x10000; + }; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_to-index.js": +/*!***********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_to-index.js ***! + \***********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var toInteger = __webpack_require__(/*! ./_to-integer */ "./node_modules/core-js/library/modules/_to-integer.js") + , max = Math.max + , min = Math.min; +module.exports = function(index, length){ + index = toInteger(index); + return index < 0 ? max(index + length, 0) : min(index, length); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_to-integer.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_to-integer.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +// 7.1.4 ToInteger +var ceil = Math.ceil + , floor = Math.floor; +module.exports = function(it){ + return isNaN(it = +it) ? 0 : (it > 0 ? floor : ceil)(it); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_to-iobject.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_to-iobject.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// to indexed object, toObject with fallback for non-array-like ES3 strings +var IObject = __webpack_require__(/*! ./_iobject */ "./node_modules/core-js/library/modules/_iobject.js") + , defined = __webpack_require__(/*! ./_defined */ "./node_modules/core-js/library/modules/_defined.js"); +module.exports = function(it){ + return IObject(defined(it)); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_to-length.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_to-length.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 7.1.15 ToLength +var toInteger = __webpack_require__(/*! ./_to-integer */ "./node_modules/core-js/library/modules/_to-integer.js") + , min = Math.min; +module.exports = function(it){ + return it > 0 ? min(toInteger(it), 0x1fffffffffffff) : 0; // pow(2, 53) - 1 == 9007199254740991 +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_to-object.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_to-object.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 7.1.13 ToObject(argument) +var defined = __webpack_require__(/*! ./_defined */ "./node_modules/core-js/library/modules/_defined.js"); +module.exports = function(it){ + return Object(defined(it)); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_to-primitive.js": +/*!***************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_to-primitive.js ***! + \***************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 7.1.1 ToPrimitive(input [, PreferredType]) +var isObject = __webpack_require__(/*! ./_is-object */ "./node_modules/core-js/library/modules/_is-object.js"); +// instead of the ES6 spec version, we didn't implement @@toPrimitive case +// and the second argument - flag - preferred type is a string +module.exports = function(it, S){ + if(!isObject(it))return it; + var fn, val; + if(S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it)))return val; + if(typeof (fn = it.valueOf) == 'function' && !isObject(val = fn.call(it)))return val; + if(!S && typeof (fn = it.toString) == 'function' && !isObject(val = fn.call(it)))return val; + throw TypeError("Can't convert object to primitive value"); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_uid.js": +/*!******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_uid.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +var id = 0 + , px = Math.random(); +module.exports = function(key){ + return 'Symbol('.concat(key === undefined ? '' : key, ')_', (++id + px).toString(36)); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_wks-define.js": +/*!*************************************************************!*\ + !*** ./node_modules/core-js/library/modules/_wks-define.js ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var global = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js") + , core = __webpack_require__(/*! ./_core */ "./node_modules/core-js/library/modules/_core.js") + , LIBRARY = __webpack_require__(/*! ./_library */ "./node_modules/core-js/library/modules/_library.js") + , wksExt = __webpack_require__(/*! ./_wks-ext */ "./node_modules/core-js/library/modules/_wks-ext.js") + , defineProperty = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js").f; +module.exports = function(name){ + var $Symbol = core.Symbol || (core.Symbol = LIBRARY ? {} : global.Symbol || {}); + if(name.charAt(0) != '_' && !(name in $Symbol))defineProperty($Symbol, name, {value: wksExt.f(name)}); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_wks-ext.js": +/*!**********************************************************!*\ + !*** ./node_modules/core-js/library/modules/_wks-ext.js ***! + \**********************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports.f = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js"); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/_wks.js": +/*!******************************************************!*\ + !*** ./node_modules/core-js/library/modules/_wks.js ***! + \******************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var store = __webpack_require__(/*! ./_shared */ "./node_modules/core-js/library/modules/_shared.js")('wks') + , uid = __webpack_require__(/*! ./_uid */ "./node_modules/core-js/library/modules/_uid.js") + , Symbol = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js").Symbol + , USE_SYMBOL = typeof Symbol == 'function'; + +var $exports = module.exports = function(name){ + return store[name] || (store[name] = + USE_SYMBOL && Symbol[name] || (USE_SYMBOL ? Symbol : uid)('Symbol.' + name)); +}; + +$exports.store = store; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/core.get-iterator-method.js": +/*!**************************************************************************!*\ + !*** ./node_modules/core-js/library/modules/core.get-iterator-method.js ***! + \**************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var classof = __webpack_require__(/*! ./_classof */ "./node_modules/core-js/library/modules/_classof.js") + , ITERATOR = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('iterator') + , Iterators = __webpack_require__(/*! ./_iterators */ "./node_modules/core-js/library/modules/_iterators.js"); +module.exports = __webpack_require__(/*! ./_core */ "./node_modules/core-js/library/modules/_core.js").getIteratorMethod = function(it){ + if(it != undefined)return it[ITERATOR] + || it['@@iterator'] + || Iterators[classof(it)]; +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/core.get-iterator.js": +/*!*******************************************************************!*\ + !*** ./node_modules/core-js/library/modules/core.get-iterator.js ***! + \*******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js") + , get = __webpack_require__(/*! ./core.get-iterator-method */ "./node_modules/core-js/library/modules/core.get-iterator-method.js"); +module.exports = __webpack_require__(/*! ./_core */ "./node_modules/core-js/library/modules/_core.js").getIterator = function(it){ + var iterFn = get(it); + if(typeof iterFn != 'function')throw TypeError(it + ' is not iterable!'); + return anObject(iterFn.call(it)); +}; + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.array.from.js": +/*!****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.array.from.js ***! + \****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var ctx = __webpack_require__(/*! ./_ctx */ "./node_modules/core-js/library/modules/_ctx.js") + , $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js") + , toObject = __webpack_require__(/*! ./_to-object */ "./node_modules/core-js/library/modules/_to-object.js") + , call = __webpack_require__(/*! ./_iter-call */ "./node_modules/core-js/library/modules/_iter-call.js") + , isArrayIter = __webpack_require__(/*! ./_is-array-iter */ "./node_modules/core-js/library/modules/_is-array-iter.js") + , toLength = __webpack_require__(/*! ./_to-length */ "./node_modules/core-js/library/modules/_to-length.js") + , createProperty = __webpack_require__(/*! ./_create-property */ "./node_modules/core-js/library/modules/_create-property.js") + , getIterFn = __webpack_require__(/*! ./core.get-iterator-method */ "./node_modules/core-js/library/modules/core.get-iterator-method.js"); + +$export($export.S + $export.F * !__webpack_require__(/*! ./_iter-detect */ "./node_modules/core-js/library/modules/_iter-detect.js")(function(iter){ Array.from(iter); }), 'Array', { + // 22.1.2.1 Array.from(arrayLike, mapfn = undefined, thisArg = undefined) + from: function from(arrayLike/*, mapfn = undefined, thisArg = undefined*/){ + var O = toObject(arrayLike) + , C = typeof this == 'function' ? this : Array + , aLen = arguments.length + , mapfn = aLen > 1 ? arguments[1] : undefined + , mapping = mapfn !== undefined + , index = 0 + , iterFn = getIterFn(O) + , length, result, step, iterator; + if(mapping)mapfn = ctx(mapfn, aLen > 2 ? arguments[2] : undefined, 2); + // if object isn't iterable or it's array with default iterator - use simple case + if(iterFn != undefined && !(C == Array && isArrayIter(iterFn))){ + for(iterator = iterFn.call(O), result = new C; !(step = iterator.next()).done; index++){ + createProperty(result, index, mapping ? call(iterator, mapfn, [step.value, index], true) : step.value); + } + } else { + length = toLength(O.length); + for(result = new C(length); length > index; index++){ + createProperty(result, index, mapping ? mapfn(O[index], index) : O[index]); + } + } + result.length = index; + return result; + } +}); + + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.array.iterator.js": +/*!********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.array.iterator.js ***! + \********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var addToUnscopables = __webpack_require__(/*! ./_add-to-unscopables */ "./node_modules/core-js/library/modules/_add-to-unscopables.js") + , step = __webpack_require__(/*! ./_iter-step */ "./node_modules/core-js/library/modules/_iter-step.js") + , Iterators = __webpack_require__(/*! ./_iterators */ "./node_modules/core-js/library/modules/_iterators.js") + , toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js"); + +// 22.1.3.4 Array.prototype.entries() +// 22.1.3.13 Array.prototype.keys() +// 22.1.3.29 Array.prototype.values() +// 22.1.3.30 Array.prototype[@@iterator]() +module.exports = __webpack_require__(/*! ./_iter-define */ "./node_modules/core-js/library/modules/_iter-define.js")(Array, 'Array', function(iterated, kind){ + this._t = toIObject(iterated); // target + this._i = 0; // next index + this._k = kind; // kind +// 22.1.5.2.1 %ArrayIteratorPrototype%.next() +}, function(){ + var O = this._t + , kind = this._k + , index = this._i++; + if(!O || index >= O.length){ + this._t = undefined; + return step(1); + } + if(kind == 'keys' )return step(0, index); + if(kind == 'values')return step(0, O[index]); + return step(0, [index, O[index]]); +}, 'values'); + +// argumentsList[@@iterator] is %ArrayProto_values% (9.4.4.6, 9.4.4.7) +Iterators.Arguments = Iterators.Array; + +addToUnscopables('keys'); +addToUnscopables('values'); +addToUnscopables('entries'); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.assign.js": +/*!*******************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.assign.js ***! + \*******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.3.1 Object.assign(target, source) +var $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js"); + +$export($export.S + $export.F, 'Object', {assign: __webpack_require__(/*! ./_object-assign */ "./node_modules/core-js/library/modules/_object-assign.js")}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.create.js": +/*!*******************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.create.js ***! + \*******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js") +// 19.1.2.2 / 15.2.3.5 Object.create(O [, Properties]) +$export($export.S, 'Object', {create: __webpack_require__(/*! ./_object-create */ "./node_modules/core-js/library/modules/_object-create.js")}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.define-property.js": +/*!****************************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.define-property.js ***! + \****************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js"); +// 19.1.2.4 / 15.2.3.6 Object.defineProperty(O, P, Attributes) +$export($export.S + $export.F * !__webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js"), 'Object', {defineProperty: __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js").f}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.get-own-property-descriptor.js": +/*!****************************************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.get-own-property-descriptor.js ***! + \****************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.6 Object.getOwnPropertyDescriptor(O, P) +var toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js") + , $getOwnPropertyDescriptor = __webpack_require__(/*! ./_object-gopd */ "./node_modules/core-js/library/modules/_object-gopd.js").f; + +__webpack_require__(/*! ./_object-sap */ "./node_modules/core-js/library/modules/_object-sap.js")('getOwnPropertyDescriptor', function(){ + return function getOwnPropertyDescriptor(it, key){ + return $getOwnPropertyDescriptor(toIObject(it), key); + }; +}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.keys.js": +/*!*****************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.keys.js ***! + \*****************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.2.14 Object.keys(O) +var toObject = __webpack_require__(/*! ./_to-object */ "./node_modules/core-js/library/modules/_to-object.js") + , $keys = __webpack_require__(/*! ./_object-keys */ "./node_modules/core-js/library/modules/_object-keys.js"); + +__webpack_require__(/*! ./_object-sap */ "./node_modules/core-js/library/modules/_object-sap.js")('keys', function(){ + return function keys(it){ + return $keys(toObject(it)); + }; +}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.set-prototype-of.js": +/*!*****************************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.set-prototype-of.js ***! + \*****************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +// 19.1.3.19 Object.setPrototypeOf(O, proto) +var $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js"); +$export($export.S, 'Object', {setPrototypeOf: __webpack_require__(/*! ./_set-proto */ "./node_modules/core-js/library/modules/_set-proto.js").set}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.object.to-string.js": +/*!**********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.object.to-string.js ***! + \**********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + + + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.string.iterator.js": +/*!*********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.string.iterator.js ***! + \*********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var $at = __webpack_require__(/*! ./_string-at */ "./node_modules/core-js/library/modules/_string-at.js")(true); + +// 21.1.3.27 String.prototype[@@iterator]() +__webpack_require__(/*! ./_iter-define */ "./node_modules/core-js/library/modules/_iter-define.js")(String, 'String', function(iterated){ + this._t = String(iterated); // target + this._i = 0; // next index +// 21.1.5.2.1 %StringIteratorPrototype%.next() +}, function(){ + var O = this._t + , index = this._i + , point; + if(index >= O.length)return {value: undefined, done: true}; + point = $at(O, index); + this._i += point.length; + return {value: point, done: false}; +}); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es6.symbol.js": +/*!************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es6.symbol.js ***! + \************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +// ECMAScript 6 symbols shim +var global = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js") + , has = __webpack_require__(/*! ./_has */ "./node_modules/core-js/library/modules/_has.js") + , DESCRIPTORS = __webpack_require__(/*! ./_descriptors */ "./node_modules/core-js/library/modules/_descriptors.js") + , $export = __webpack_require__(/*! ./_export */ "./node_modules/core-js/library/modules/_export.js") + , redefine = __webpack_require__(/*! ./_redefine */ "./node_modules/core-js/library/modules/_redefine.js") + , META = __webpack_require__(/*! ./_meta */ "./node_modules/core-js/library/modules/_meta.js").KEY + , $fails = __webpack_require__(/*! ./_fails */ "./node_modules/core-js/library/modules/_fails.js") + , shared = __webpack_require__(/*! ./_shared */ "./node_modules/core-js/library/modules/_shared.js") + , setToStringTag = __webpack_require__(/*! ./_set-to-string-tag */ "./node_modules/core-js/library/modules/_set-to-string-tag.js") + , uid = __webpack_require__(/*! ./_uid */ "./node_modules/core-js/library/modules/_uid.js") + , wks = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js") + , wksExt = __webpack_require__(/*! ./_wks-ext */ "./node_modules/core-js/library/modules/_wks-ext.js") + , wksDefine = __webpack_require__(/*! ./_wks-define */ "./node_modules/core-js/library/modules/_wks-define.js") + , keyOf = __webpack_require__(/*! ./_keyof */ "./node_modules/core-js/library/modules/_keyof.js") + , enumKeys = __webpack_require__(/*! ./_enum-keys */ "./node_modules/core-js/library/modules/_enum-keys.js") + , isArray = __webpack_require__(/*! ./_is-array */ "./node_modules/core-js/library/modules/_is-array.js") + , anObject = __webpack_require__(/*! ./_an-object */ "./node_modules/core-js/library/modules/_an-object.js") + , toIObject = __webpack_require__(/*! ./_to-iobject */ "./node_modules/core-js/library/modules/_to-iobject.js") + , toPrimitive = __webpack_require__(/*! ./_to-primitive */ "./node_modules/core-js/library/modules/_to-primitive.js") + , createDesc = __webpack_require__(/*! ./_property-desc */ "./node_modules/core-js/library/modules/_property-desc.js") + , _create = __webpack_require__(/*! ./_object-create */ "./node_modules/core-js/library/modules/_object-create.js") + , gOPNExt = __webpack_require__(/*! ./_object-gopn-ext */ "./node_modules/core-js/library/modules/_object-gopn-ext.js") + , $GOPD = __webpack_require__(/*! ./_object-gopd */ "./node_modules/core-js/library/modules/_object-gopd.js") + , $DP = __webpack_require__(/*! ./_object-dp */ "./node_modules/core-js/library/modules/_object-dp.js") + , $keys = __webpack_require__(/*! ./_object-keys */ "./node_modules/core-js/library/modules/_object-keys.js") + , gOPD = $GOPD.f + , dP = $DP.f + , gOPN = gOPNExt.f + , $Symbol = global.Symbol + , $JSON = global.JSON + , _stringify = $JSON && $JSON.stringify + , PROTOTYPE = 'prototype' + , HIDDEN = wks('_hidden') + , TO_PRIMITIVE = wks('toPrimitive') + , isEnum = {}.propertyIsEnumerable + , SymbolRegistry = shared('symbol-registry') + , AllSymbols = shared('symbols') + , OPSymbols = shared('op-symbols') + , ObjectProto = Object[PROTOTYPE] + , USE_NATIVE = typeof $Symbol == 'function' + , QObject = global.QObject; +// Don't use setters in Qt Script, https://github.com/zloirock/core-js/issues/173 +var setter = !QObject || !QObject[PROTOTYPE] || !QObject[PROTOTYPE].findChild; + +// fallback for old Android, https://code.google.com/p/v8/issues/detail?id=687 +var setSymbolDesc = DESCRIPTORS && $fails(function(){ + return _create(dP({}, 'a', { + get: function(){ return dP(this, 'a', {value: 7}).a; } + })).a != 7; +}) ? function(it, key, D){ + var protoDesc = gOPD(ObjectProto, key); + if(protoDesc)delete ObjectProto[key]; + dP(it, key, D); + if(protoDesc && it !== ObjectProto)dP(ObjectProto, key, protoDesc); +} : dP; + +var wrap = function(tag){ + var sym = AllSymbols[tag] = _create($Symbol[PROTOTYPE]); + sym._k = tag; + return sym; +}; + +var isSymbol = USE_NATIVE && typeof $Symbol.iterator == 'symbol' ? function(it){ + return typeof it == 'symbol'; +} : function(it){ + return it instanceof $Symbol; +}; + +var $defineProperty = function defineProperty(it, key, D){ + if(it === ObjectProto)$defineProperty(OPSymbols, key, D); + anObject(it); + key = toPrimitive(key, true); + anObject(D); + if(has(AllSymbols, key)){ + if(!D.enumerable){ + if(!has(it, HIDDEN))dP(it, HIDDEN, createDesc(1, {})); + it[HIDDEN][key] = true; + } else { + if(has(it, HIDDEN) && it[HIDDEN][key])it[HIDDEN][key] = false; + D = _create(D, {enumerable: createDesc(0, false)}); + } return setSymbolDesc(it, key, D); + } return dP(it, key, D); +}; +var $defineProperties = function defineProperties(it, P){ + anObject(it); + var keys = enumKeys(P = toIObject(P)) + , i = 0 + , l = keys.length + , key; + while(l > i)$defineProperty(it, key = keys[i++], P[key]); + return it; +}; +var $create = function create(it, P){ + return P === undefined ? _create(it) : $defineProperties(_create(it), P); +}; +var $propertyIsEnumerable = function propertyIsEnumerable(key){ + var E = isEnum.call(this, key = toPrimitive(key, true)); + if(this === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key))return false; + return E || !has(this, key) || !has(AllSymbols, key) || has(this, HIDDEN) && this[HIDDEN][key] ? E : true; +}; +var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(it, key){ + it = toIObject(it); + key = toPrimitive(key, true); + if(it === ObjectProto && has(AllSymbols, key) && !has(OPSymbols, key))return; + var D = gOPD(it, key); + if(D && has(AllSymbols, key) && !(has(it, HIDDEN) && it[HIDDEN][key]))D.enumerable = true; + return D; +}; +var $getOwnPropertyNames = function getOwnPropertyNames(it){ + var names = gOPN(toIObject(it)) + , result = [] + , i = 0 + , key; + while(names.length > i){ + if(!has(AllSymbols, key = names[i++]) && key != HIDDEN && key != META)result.push(key); + } return result; +}; +var $getOwnPropertySymbols = function getOwnPropertySymbols(it){ + var IS_OP = it === ObjectProto + , names = gOPN(IS_OP ? OPSymbols : toIObject(it)) + , result = [] + , i = 0 + , key; + while(names.length > i){ + if(has(AllSymbols, key = names[i++]) && (IS_OP ? has(ObjectProto, key) : true))result.push(AllSymbols[key]); + } return result; +}; + +// 19.4.1.1 Symbol([description]) +if(!USE_NATIVE){ + $Symbol = function Symbol(){ + if(this instanceof $Symbol)throw TypeError('Symbol is not a constructor!'); + var tag = uid(arguments.length > 0 ? arguments[0] : undefined); + var $set = function(value){ + if(this === ObjectProto)$set.call(OPSymbols, value); + if(has(this, HIDDEN) && has(this[HIDDEN], tag))this[HIDDEN][tag] = false; + setSymbolDesc(this, tag, createDesc(1, value)); + }; + if(DESCRIPTORS && setter)setSymbolDesc(ObjectProto, tag, {configurable: true, set: $set}); + return wrap(tag); + }; + redefine($Symbol[PROTOTYPE], 'toString', function toString(){ + return this._k; + }); + + $GOPD.f = $getOwnPropertyDescriptor; + $DP.f = $defineProperty; + __webpack_require__(/*! ./_object-gopn */ "./node_modules/core-js/library/modules/_object-gopn.js").f = gOPNExt.f = $getOwnPropertyNames; + __webpack_require__(/*! ./_object-pie */ "./node_modules/core-js/library/modules/_object-pie.js").f = $propertyIsEnumerable; + __webpack_require__(/*! ./_object-gops */ "./node_modules/core-js/library/modules/_object-gops.js").f = $getOwnPropertySymbols; + + if(DESCRIPTORS && !__webpack_require__(/*! ./_library */ "./node_modules/core-js/library/modules/_library.js")){ + redefine(ObjectProto, 'propertyIsEnumerable', $propertyIsEnumerable, true); + } + + wksExt.f = function(name){ + return wrap(wks(name)); + } +} + +$export($export.G + $export.W + $export.F * !USE_NATIVE, {Symbol: $Symbol}); + +for(var symbols = ( + // 19.4.2.2, 19.4.2.3, 19.4.2.4, 19.4.2.6, 19.4.2.8, 19.4.2.9, 19.4.2.10, 19.4.2.11, 19.4.2.12, 19.4.2.13, 19.4.2.14 + 'hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables' +).split(','), i = 0; symbols.length > i; )wks(symbols[i++]); + +for(var symbols = $keys(wks.store), i = 0; symbols.length > i; )wksDefine(symbols[i++]); + +$export($export.S + $export.F * !USE_NATIVE, 'Symbol', { + // 19.4.2.1 Symbol.for(key) + 'for': function(key){ + return has(SymbolRegistry, key += '') + ? SymbolRegistry[key] + : SymbolRegistry[key] = $Symbol(key); + }, + // 19.4.2.5 Symbol.keyFor(sym) + keyFor: function keyFor(key){ + if(isSymbol(key))return keyOf(SymbolRegistry, key); + throw TypeError(key + ' is not a symbol!'); + }, + useSetter: function(){ setter = true; }, + useSimple: function(){ setter = false; } +}); + +$export($export.S + $export.F * !USE_NATIVE, 'Object', { + // 19.1.2.2 Object.create(O [, Properties]) + create: $create, + // 19.1.2.4 Object.defineProperty(O, P, Attributes) + defineProperty: $defineProperty, + // 19.1.2.3 Object.defineProperties(O, Properties) + defineProperties: $defineProperties, + // 19.1.2.6 Object.getOwnPropertyDescriptor(O, P) + getOwnPropertyDescriptor: $getOwnPropertyDescriptor, + // 19.1.2.7 Object.getOwnPropertyNames(O) + getOwnPropertyNames: $getOwnPropertyNames, + // 19.1.2.8 Object.getOwnPropertySymbols(O) + getOwnPropertySymbols: $getOwnPropertySymbols +}); + +// 24.3.2 JSON.stringify(value [, replacer [, space]]) +$JSON && $export($export.S + $export.F * (!USE_NATIVE || $fails(function(){ + var S = $Symbol(); + // MS Edge converts symbol values to JSON as {} + // WebKit converts symbol values to JSON as null + // V8 throws on boxed symbols + return _stringify([S]) != '[null]' || _stringify({a: S}) != '{}' || _stringify(Object(S)) != '{}'; +})), 'JSON', { + stringify: function stringify(it){ + if(it === undefined || isSymbol(it))return; // IE8 returns string on undefined + var args = [it] + , i = 1 + , replacer, $replacer; + while(arguments.length > i)args.push(arguments[i++]); + replacer = args[1]; + if(typeof replacer == 'function')$replacer = replacer; + if($replacer || !isArray(replacer))replacer = function(key, value){ + if($replacer)value = $replacer.call(this, key, value); + if(!isSymbol(value))return value; + }; + args[1] = replacer; + return _stringify.apply($JSON, args); + } +}); + +// 19.4.3.4 Symbol.prototype[@@toPrimitive](hint) +$Symbol[PROTOTYPE][TO_PRIMITIVE] || __webpack_require__(/*! ./_hide */ "./node_modules/core-js/library/modules/_hide.js")($Symbol[PROTOTYPE], TO_PRIMITIVE, $Symbol[PROTOTYPE].valueOf); +// 19.4.3.5 Symbol.prototype[@@toStringTag] +setToStringTag($Symbol, 'Symbol'); +// 20.2.1.9 Math[@@toStringTag] +setToStringTag(Math, 'Math', true); +// 24.3.3 JSON[@@toStringTag] +setToStringTag(global.JSON, 'JSON', true); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es7.symbol.async-iterator.js": +/*!***************************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es7.symbol.async-iterator.js ***! + \***************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ./_wks-define */ "./node_modules/core-js/library/modules/_wks-define.js")('asyncIterator'); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/es7.symbol.observable.js": +/*!***********************************************************************!*\ + !*** ./node_modules/core-js/library/modules/es7.symbol.observable.js ***! + \***********************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ./_wks-define */ "./node_modules/core-js/library/modules/_wks-define.js")('observable'); + +/***/ }), + +/***/ "./node_modules/core-js/library/modules/web.dom.iterable.js": +/*!******************************************************************!*\ + !*** ./node_modules/core-js/library/modules/web.dom.iterable.js ***! + \******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(/*! ./es6.array.iterator */ "./node_modules/core-js/library/modules/es6.array.iterator.js"); +var global = __webpack_require__(/*! ./_global */ "./node_modules/core-js/library/modules/_global.js") + , hide = __webpack_require__(/*! ./_hide */ "./node_modules/core-js/library/modules/_hide.js") + , Iterators = __webpack_require__(/*! ./_iterators */ "./node_modules/core-js/library/modules/_iterators.js") + , TO_STRING_TAG = __webpack_require__(/*! ./_wks */ "./node_modules/core-js/library/modules/_wks.js")('toStringTag'); + +for(var collections = ['NodeList', 'DOMTokenList', 'MediaList', 'StyleSheetList', 'CSSRuleList'], i = 0; i < 5; i++){ + var NAME = collections[i] + , Collection = global[NAME] + , proto = Collection && Collection.prototype; + if(proto && !proto[TO_STRING_TAG])hide(proto, TO_STRING_TAG, NAME); + Iterators[NAME] = Iterators.Array; +} + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/components/container/public/style.scss": +/*!***************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/components/container/public/style.scss ***! + \***************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".container[data-container] {\n position: absolute;\n background-color: black;\n height: 100%;\n width: 100%; }\n .container[data-container] .chromeless {\n cursor: default; }\n\n[data-player]:not(.nocursor) .container[data-container]:not(.chromeless).pointer-enabled {\n cursor: pointer; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/components/core/public/style.scss": +/*!**********************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/components/core/public/style.scss ***! + \**********************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, "[data-player] {\n -webkit-touch-callout: none;\n -webkit-user-select: none;\n -moz-user-select: none;\n -ms-user-select: none;\n -o-user-select: none;\n user-select: none;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n -webkit-transform: translate3d(0, 0, 0);\n transform: translate3d(0, 0, 0);\n position: relative;\n margin: 0;\n padding: 0;\n border: 0;\n font-style: normal;\n font-weight: normal;\n text-align: center;\n overflow: hidden;\n font-size: 100%;\n font-family: \"Roboto\", \"Open Sans\", Arial, sans-serif;\n text-shadow: 0 0 0;\n box-sizing: border-box; }\n [data-player] div, [data-player] span, [data-player] applet, [data-player] object, [data-player] iframe,\n [data-player] h1, [data-player] h2, [data-player] h3, [data-player] h4, [data-player] h5, [data-player] h6, [data-player] p, [data-player] blockquote, [data-player] pre,\n [data-player] a, [data-player] abbr, [data-player] acronym, [data-player] address, [data-player] big, [data-player] cite, [data-player] code,\n [data-player] del, [data-player] dfn, [data-player] em, [data-player] img, [data-player] ins, [data-player] kbd, [data-player] q, [data-player] s, [data-player] samp,\n [data-player] small, [data-player] strike, [data-player] strong, [data-player] sub, [data-player] sup, [data-player] tt, [data-player] var,\n [data-player] b, [data-player] u, [data-player] i, [data-player] center,\n [data-player] dl, [data-player] dt, [data-player] dd, [data-player] ol, [data-player] ul, [data-player] li,\n [data-player] fieldset, [data-player] form, [data-player] label, [data-player] legend,\n [data-player] table, [data-player] caption, [data-player] tbody, [data-player] tfoot, [data-player] thead, [data-player] tr, [data-player] th, [data-player] td,\n [data-player] article, [data-player] aside, [data-player] canvas, [data-player] details, [data-player] embed,\n [data-player] figure, [data-player] figcaption, [data-player] footer, [data-player] header, [data-player] hgroup,\n [data-player] menu, [data-player] nav, [data-player] output, [data-player] ruby, [data-player] section, [data-player] summary,\n [data-player] time, [data-player] mark, [data-player] audio, [data-player] video {\n margin: 0;\n padding: 0;\n border: 0;\n font: inherit;\n font-size: 100%;\n vertical-align: baseline; }\n [data-player] table {\n border-collapse: collapse;\n border-spacing: 0; }\n [data-player] caption, [data-player] th, [data-player] td {\n text-align: left;\n font-weight: normal;\n vertical-align: middle; }\n [data-player] q, [data-player] blockquote {\n quotes: none; }\n [data-player] q:before, [data-player] q:after, [data-player] blockquote:before, [data-player] blockquote:after {\n content: \"\";\n content: none; }\n [data-player] a img {\n border: none; }\n [data-player]:focus {\n outline: 0; }\n [data-player] * {\n max-width: none;\n box-sizing: inherit;\n float: none; }\n [data-player] div {\n display: block; }\n [data-player].fullscreen {\n width: 100% !important;\n height: 100% !important;\n top: 0;\n left: 0; }\n [data-player].nocursor {\n cursor: none; }\n\n.clappr-style {\n display: none !important; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/base_flash_playback/public/flash.scss": +/*!************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/base_flash_playback/public/flash.scss ***! + \************************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".clappr-flash-playback[data-flash-playback] {\n display: block;\n position: absolute;\n top: 0;\n left: 0;\n height: 100%;\n width: 100%;\n pointer-events: none; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/html5_video/public/style.scss": +/*!****************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/html5_video/public/style.scss ***! + \****************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, "[data-html5-video] {\n position: absolute;\n height: 100%;\n width: 100%;\n display: block; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/html_img/public/style.scss": +/*!*************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/html_img/public/style.scss ***! + \*************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, "[data-html-img] {\n max-width: 100%;\n max-height: 100%; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/no_op/public/style.scss": +/*!**********************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/no_op/public/style.scss ***! + \**********************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, "[data-no-op] {\n position: absolute;\n height: 100%;\n width: 100%;\n text-align: center; }\n\n[data-no-op] p[data-no-op-msg] {\n position: absolute;\n text-align: center;\n font-size: 25px;\n left: 0;\n right: 0;\n color: white;\n padding: 10px;\n /* center vertically */\n top: 50%;\n -webkit-transform: translateY(-50%);\n transform: translateY(-50%);\n max-height: 100%;\n overflow: auto; }\n\n[data-no-op] canvas[data-no-op-canvas] {\n background-color: #777;\n height: 100%;\n width: 100%; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/closed_captions/public/closed_captions.scss": +/*!****************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/closed_captions/public/closed_captions.scss ***! + \****************************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".cc-controls[data-cc-controls] {\n float: right;\n position: relative;\n display: none; }\n .cc-controls[data-cc-controls].available {\n display: block; }\n .cc-controls[data-cc-controls] .cc-button {\n padding: 6px !important; }\n .cc-controls[data-cc-controls] .cc-button.enabled {\n display: block;\n opacity: 1.0; }\n .cc-controls[data-cc-controls] .cc-button.enabled:hover {\n opacity: 1.0;\n text-shadow: none; }\n .cc-controls[data-cc-controls] > ul {\n list-style-type: none;\n position: absolute;\n bottom: 25px;\n border: 1px solid black;\n display: none;\n background-color: #e6e6e6; }\n .cc-controls[data-cc-controls] li {\n font-size: 10px; }\n .cc-controls[data-cc-controls] li[data-title] {\n background-color: #c3c2c2;\n padding: 5px; }\n .cc-controls[data-cc-controls] li a {\n color: #444;\n padding: 2px 10px;\n display: block;\n text-decoration: none; }\n .cc-controls[data-cc-controls] li a:hover {\n background-color: #555;\n color: white; }\n .cc-controls[data-cc-controls] li a:hover a {\n color: white;\n text-decoration: none; }\n .cc-controls[data-cc-controls] li.current a {\n color: #f00; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/dvr_controls/public/dvr_controls.scss": +/*!**********************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/dvr_controls/public/dvr_controls.scss ***! + \**********************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".dvr-controls[data-dvr-controls] {\n display: inline-block;\n float: left;\n color: #fff;\n line-height: 32px;\n font-size: 10px;\n font-weight: bold;\n margin-left: 6px; }\n .dvr-controls[data-dvr-controls] .live-info {\n cursor: default;\n font-family: \"Roboto\", \"Open Sans\", Arial, sans-serif;\n text-transform: uppercase; }\n .dvr-controls[data-dvr-controls] .live-info:before {\n content: \"\";\n display: inline-block;\n position: relative;\n width: 7px;\n height: 7px;\n border-radius: 3.5px;\n margin-right: 3.5px;\n background-color: #ff0101; }\n .dvr-controls[data-dvr-controls] .live-info.disabled {\n opacity: 0.3; }\n .dvr-controls[data-dvr-controls] .live-info.disabled:before {\n background-color: #fff; }\n .dvr-controls[data-dvr-controls] .live-button {\n cursor: pointer;\n outline: none;\n display: none;\n border: 0;\n color: #fff;\n background-color: transparent;\n height: 32px;\n padding: 0;\n opacity: 0.7;\n font-family: \"Roboto\", \"Open Sans\", Arial, sans-serif;\n text-transform: uppercase;\n transition: all 0.1s ease; }\n .dvr-controls[data-dvr-controls] .live-button:before {\n content: \"\";\n display: inline-block;\n position: relative;\n width: 7px;\n height: 7px;\n border-radius: 3.5px;\n margin-right: 3.5px;\n background-color: #fff; }\n .dvr-controls[data-dvr-controls] .live-button:hover {\n opacity: 1;\n text-shadow: rgba(255, 255, 255, 0.75) 0 0 5px; }\n\n.dvr .dvr-controls[data-dvr-controls] .live-info {\n display: none; }\n\n.dvr .dvr-controls[data-dvr-controls] .live-button {\n display: block; }\n\n.dvr.media-control.live[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-background[data-seekbar] .bar-fill-2[data-seekbar] {\n background-color: #005aff; }\n\n.media-control.live[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-background[data-seekbar] .bar-fill-2[data-seekbar] {\n background-color: #ff0101; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/error_screen/public/error_screen.scss": +/*!**********************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/error_screen/public/error_screen.scss ***! + \**********************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, "div.player-error-screen {\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n color: #CCCACA;\n position: absolute;\n top: 0;\n height: 100%;\n width: 100%;\n background-color: rgba(0, 0, 0, 0.7);\n z-index: 2000;\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n -webkit-box-orient: vertical;\n -webkit-box-direction: normal;\n -ms-flex-direction: column;\n flex-direction: column;\n -webkit-box-pack: center;\n -ms-flex-pack: center;\n justify-content: center; }\n div.player-error-screen__content[data-error-screen] {\n font-size: 14px;\n color: #CCCACA;\n margin-top: 45px; }\n div.player-error-screen__title[data-error-screen] {\n font-weight: bold;\n line-height: 30px;\n font-size: 18px; }\n div.player-error-screen__message[data-error-screen] {\n width: 90%;\n margin: 0 auto; }\n div.player-error-screen__code[data-error-screen] {\n font-size: 13px;\n margin-top: 15px; }\n div.player-error-screen__reload {\n cursor: pointer;\n width: 30px;\n margin: 15px auto 0; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/media_control/public/media-control.scss": +/*!************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/media_control/public/media-control.scss ***! + \************************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var escape = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/url/escape.js */ "./node_modules/css-loader/lib/url/escape.js"); +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".media-control-notransition {\n transition: none !important; }\n\n.media-control[data-media-control] {\n position: absolute;\n width: 100%;\n height: 100%;\n z-index: 9999;\n pointer-events: none; }\n .media-control[data-media-control].dragging {\n pointer-events: auto;\n cursor: -webkit-grabbing !important;\n cursor: grabbing !important;\n cursor: url(" + escape(__webpack_require__(/*! ./closed-hand.cur */ "./src/plugins/media_control/public/closed-hand.cur")) + "), move; }\n .media-control[data-media-control].dragging * {\n cursor: -webkit-grabbing !important;\n cursor: grabbing !important;\n cursor: url(" + escape(__webpack_require__(/*! ./closed-hand.cur */ "./src/plugins/media_control/public/closed-hand.cur")) + "), move; }\n .media-control[data-media-control] .media-control-background[data-background] {\n position: absolute;\n height: 40%;\n width: 100%;\n bottom: 0;\n background: linear-gradient(transparent, rgba(0, 0, 0, 0.9));\n transition: opacity 0.6s ease-out; }\n .media-control[data-media-control] .media-control-icon {\n line-height: 0;\n letter-spacing: 0;\n speak: none;\n color: #fff;\n opacity: 0.5;\n vertical-align: middle;\n text-align: left;\n transition: all 0.1s ease; }\n .media-control[data-media-control] .media-control-icon:hover {\n color: white;\n opacity: 0.75;\n text-shadow: rgba(255, 255, 255, 0.8) 0 0 5px; }\n .media-control[data-media-control].media-control-hide .media-control-background[data-background] {\n opacity: 0; }\n .media-control[data-media-control].media-control-hide .media-control-layer[data-controls] {\n bottom: -50px; }\n .media-control[data-media-control].media-control-hide .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-scrubber[data-seekbar] {\n opacity: 0; }\n .media-control[data-media-control] .media-control-layer[data-controls] {\n position: absolute;\n bottom: 7px;\n width: 100%;\n height: 32px;\n font-size: 0;\n vertical-align: middle;\n pointer-events: auto;\n transition: bottom 0.4s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-left-panel[data-media-control] {\n position: absolute;\n top: 0;\n left: 4px;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-center-panel[data-media-control] {\n height: 100%;\n text-align: center;\n line-height: 32px; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-right-panel[data-media-control] {\n position: absolute;\n top: 0;\n right: 4px;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button {\n background-color: transparent;\n border: 0;\n margin: 0 6px;\n padding: 0;\n cursor: pointer;\n display: inline-block;\n width: 32px;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button svg {\n width: 100%;\n height: 22px; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button svg path {\n fill: white; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button:focus {\n outline: none; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-play] {\n float: left;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-pause] {\n float: left;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-stop] {\n float: left;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-fullscreen] {\n float: right;\n background-color: transparent;\n border: 0;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-hd-indicator] {\n background-color: transparent;\n border: 0;\n cursor: default;\n display: none;\n float: right;\n height: 100%; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-hd-indicator].enabled {\n display: block;\n opacity: 1.0; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-hd-indicator].enabled:hover {\n opacity: 1.0;\n text-shadow: none; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-playpause] {\n float: left; }\n .media-control[data-media-control] .media-control-layer[data-controls] button.media-control-button[data-playstop] {\n float: left; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-indicator[data-position], .media-control[data-media-control] .media-control-layer[data-controls] .media-control-indicator[data-duration] {\n display: inline-block;\n font-size: 10px;\n color: white;\n cursor: default;\n line-height: 32px;\n position: relative; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-indicator[data-position] {\n margin: 0 6px 0 7px; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-indicator[data-duration] {\n color: rgba(255, 255, 255, 0.5);\n margin-right: 6px; }\n .media-control[data-media-control] .media-control-layer[data-controls] .media-control-indicator[data-duration]:before {\n content: \"|\";\n margin-right: 7px; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] {\n position: absolute;\n top: -20px;\n left: 0;\n display: inline-block;\n vertical-align: middle;\n width: 100%;\n height: 25px;\n cursor: pointer; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-background[data-seekbar] {\n width: 100%;\n height: 1px;\n position: relative;\n top: 12px;\n background-color: #666666; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-background[data-seekbar] .bar-fill-1[data-seekbar] {\n position: absolute;\n top: 0;\n left: 0;\n width: 0;\n height: 100%;\n background-color: #c2c2c2;\n transition: all 0.1s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-background[data-seekbar] .bar-fill-2[data-seekbar] {\n position: absolute;\n top: 0;\n left: 0;\n width: 0;\n height: 100%;\n background-color: #005aff;\n transition: all 0.1s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-background[data-seekbar] .bar-hover[data-seekbar] {\n opacity: 0;\n position: absolute;\n top: -3px;\n width: 5px;\n height: 7px;\n background-color: rgba(255, 255, 255, 0.5);\n transition: opacity 0.1s ease; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar]:hover .bar-background[data-seekbar] .bar-hover[data-seekbar] {\n opacity: 1; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar].seek-disabled {\n cursor: default; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar].seek-disabled:hover .bar-background[data-seekbar] .bar-hover[data-seekbar] {\n opacity: 0; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-scrubber[data-seekbar] {\n position: absolute;\n -webkit-transform: translateX(-50%);\n transform: translateX(-50%);\n top: 2px;\n left: 0;\n width: 20px;\n height: 20px;\n opacity: 1;\n transition: all 0.1s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .bar-container[data-seekbar] .bar-scrubber[data-seekbar] .bar-scrubber-icon[data-seekbar] {\n position: absolute;\n left: 6px;\n top: 6px;\n width: 8px;\n height: 8px;\n border-radius: 10px;\n box-shadow: 0 0 0 6px rgba(255, 255, 255, 0.2);\n background-color: white; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] {\n float: right;\n display: inline-block;\n height: 32px;\n cursor: pointer;\n margin: 0 6px;\n box-sizing: border-box; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .drawer-icon-container[data-volume] {\n float: left;\n bottom: 0; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .drawer-icon-container[data-volume] .drawer-icon[data-volume] {\n background-color: transparent;\n border: 0;\n box-sizing: content-box;\n width: 32px;\n height: 32px;\n opacity: 0.5; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .drawer-icon-container[data-volume] .drawer-icon[data-volume]:hover {\n opacity: 0.75; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .drawer-icon-container[data-volume] .drawer-icon[data-volume] svg {\n height: 24px;\n position: relative;\n top: 3px; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .drawer-icon-container[data-volume] .drawer-icon[data-volume] svg path {\n fill: white; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .drawer-icon-container[data-volume] .drawer-icon[data-volume].muted svg {\n margin-left: 2px; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] {\n float: left;\n position: relative;\n overflow: hidden;\n top: 6px;\n width: 42px;\n height: 18px;\n padding: 3px 0;\n transition: width .2s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .bar-background[data-volume] {\n height: 1px;\n position: relative;\n top: 7px;\n margin: 0 3px;\n background-color: #666666; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .bar-background[data-volume] .bar-fill-1[data-volume] {\n position: absolute;\n top: 0;\n left: 0;\n width: 0;\n height: 100%;\n background-color: #c2c2c2;\n transition: all 0.1s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .bar-background[data-volume] .bar-fill-2[data-volume] {\n position: absolute;\n top: 0;\n left: 0;\n width: 0;\n height: 100%;\n background-color: #005aff;\n transition: all 0.1s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .bar-background[data-volume] .bar-hover[data-volume] {\n opacity: 0;\n position: absolute;\n top: -3px;\n width: 5px;\n height: 7px;\n background-color: rgba(255, 255, 255, 0.5);\n transition: opacity 0.1s ease; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .bar-scrubber[data-volume] {\n position: absolute;\n -webkit-transform: translateX(-50%);\n transform: translateX(-50%);\n top: 0px;\n left: 0;\n width: 20px;\n height: 20px;\n opacity: 1;\n transition: all 0.1s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .bar-scrubber[data-volume] .bar-scrubber-icon[data-volume] {\n position: absolute;\n left: 6px;\n top: 6px;\n width: 8px;\n height: 8px;\n border-radius: 10px;\n box-shadow: 0 0 0 6px rgba(255, 255, 255, 0.2);\n background-color: white; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .segmented-bar-element[data-volume] {\n float: left;\n width: 4px;\n padding-left: 2px;\n height: 12px;\n opacity: 0.5;\n box-shadow: inset 2px 0 0 white;\n transition: -webkit-transform .2s ease-out;\n transition: transform .2s ease-out;\n transition: transform .2s ease-out, -webkit-transform .2s ease-out; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .segmented-bar-element[data-volume].fill {\n box-shadow: inset 2px 0 0 #fff;\n opacity: 1; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .segmented-bar-element[data-volume]:nth-of-type(1) {\n padding-left: 0; }\n .media-control[data-media-control] .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume] .segmented-bar-element[data-volume]:hover {\n -webkit-transform: scaleY(1.5);\n transform: scaleY(1.5); }\n .media-control[data-media-control].w320 .media-control-layer[data-controls] .drawer-container[data-volume] .bar-container[data-volume].volume-bar-hide {\n width: 0;\n height: 12px;\n top: 9px;\n padding: 0; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/poster/public/poster.scss": +/*!**********************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/poster/public/poster.scss ***! + \**********************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".player-poster[data-poster] {\n display: -webkit-box;\n display: -ms-flexbox;\n display: flex;\n -webkit-box-pack: center;\n -ms-flex-pack: center;\n justify-content: center;\n -webkit-box-align: center;\n -ms-flex-align: center;\n align-items: center;\n position: absolute;\n height: 100%;\n width: 100%;\n z-index: 998;\n top: 0;\n left: 0;\n background-color: #000;\n background-size: cover;\n background-repeat: no-repeat;\n background-position: 50% 50%; }\n .player-poster[data-poster].clickable {\n cursor: pointer; }\n .player-poster[data-poster]:hover .play-wrapper[data-poster] {\n opacity: 1; }\n .player-poster[data-poster] .play-wrapper[data-poster] {\n width: 100%;\n height: 25%;\n margin: 0 auto;\n opacity: 0.75;\n transition: opacity 0.1s ease; }\n .player-poster[data-poster] .play-wrapper[data-poster] svg {\n height: 100%; }\n .player-poster[data-poster] .play-wrapper[data-poster] svg path {\n fill: #fff; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/seek_time/public/seek_time.scss": +/*!****************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/seek_time/public/seek_time.scss ***! + \****************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".seek-time[data-seek-time] {\n position: absolute;\n white-space: nowrap;\n height: 20px;\n line-height: 20px;\n font-size: 0;\n left: -100%;\n bottom: 55px;\n background-color: rgba(2, 2, 2, 0.5);\n z-index: 9999;\n transition: opacity 0.1s ease; }\n .seek-time[data-seek-time].hidden[data-seek-time] {\n opacity: 0; }\n .seek-time[data-seek-time] [data-seek-time] {\n display: inline-block;\n color: white;\n font-size: 10px;\n padding-left: 7px;\n padding-right: 7px;\n vertical-align: top; }\n .seek-time[data-seek-time] [data-duration] {\n display: inline-block;\n color: rgba(255, 255, 255, 0.5);\n font-size: 10px;\n padding-right: 7px;\n vertical-align: top; }\n .seek-time[data-seek-time] [data-duration]:before {\n content: \"|\";\n margin-right: 7px; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/spinner_three_bounce/public/spinner.scss": +/*!*************************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/spinner_three_bounce/public/spinner.scss ***! + \*************************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".spinner-three-bounce[data-spinner] {\n position: absolute;\n margin: 0 auto;\n width: 70px;\n text-align: center;\n z-index: 999;\n left: 0;\n right: 0;\n margin-left: auto;\n margin-right: auto;\n /* center vertically */\n top: 50%;\n -webkit-transform: translateY(-50%);\n transform: translateY(-50%); }\n .spinner-three-bounce[data-spinner] > div {\n width: 18px;\n height: 18px;\n background-color: #FFFFFF;\n border-radius: 100%;\n display: inline-block;\n -webkit-animation: bouncedelay 1.4s infinite ease-in-out;\n animation: bouncedelay 1.4s infinite ease-in-out;\n /* Prevent first frame from flickering when animation starts */\n -webkit-animation-fill-mode: both;\n animation-fill-mode: both; }\n .spinner-three-bounce[data-spinner] [data-bounce1] {\n -webkit-animation-delay: -0.32s;\n animation-delay: -0.32s; }\n .spinner-three-bounce[data-spinner] [data-bounce2] {\n -webkit-animation-delay: -0.16s;\n animation-delay: -0.16s; }\n\n@-webkit-keyframes bouncedelay {\n 0%, 80%, 100% {\n -webkit-transform: scale(0);\n transform: scale(0); }\n 40% {\n -webkit-transform: scale(1);\n transform: scale(1); } }\n\n@keyframes bouncedelay {\n 0%, 80%, 100% {\n -webkit-transform: scale(0);\n transform: scale(0); }\n 40% {\n -webkit-transform: scale(1);\n transform: scale(1); } }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/watermark/public/watermark.scss": +/*!****************************************************************************************************************************************************************************************************************************!*\ + !*** ./node_modules/css-loader!./node_modules/postcss-loader/lib!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/plugins/watermark/public/watermark.scss ***! + \****************************************************************************************************************************************************************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, ".clappr-watermark[data-watermark] {\n position: absolute;\n min-width: 70px;\n max-width: 200px;\n width: 12%;\n text-align: center;\n z-index: 10; }\n\n.clappr-watermark[data-watermark] a {\n outline: none;\n cursor: pointer; }\n\n.clappr-watermark[data-watermark] img {\n max-width: 100%; }\n\n.clappr-watermark[data-watermark-bottom-left] {\n bottom: 10px;\n left: 10px; }\n\n.clappr-watermark[data-watermark-bottom-right] {\n bottom: 10px;\n right: 42px; }\n\n.clappr-watermark[data-watermark-top-left] {\n top: 10px;\n left: 10px; }\n\n.clappr-watermark[data-watermark-top-right] {\n top: 10px;\n right: 37px; }\n", ""]); + +// exports + + +/***/ }), + +/***/ "./node_modules/css-loader/lib/css-base.js": +/*!*************************************************!*\ + !*** ./node_modules/css-loader/lib/css-base.js ***! + \*************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ +// css base code, injected by the css-loader +module.exports = function(useSourceMap) { + var list = []; + + // return the list of modules as css string + list.toString = function toString() { + return this.map(function (item) { + var content = cssWithMappingToString(item, useSourceMap); + if(item[2]) { + return "@media " + item[2] + "{" + content + "}"; + } else { + return content; + } + }).join(""); + }; + + // import a list of modules into the list + list.i = function(modules, mediaQuery) { + if(typeof modules === "string") + modules = [[null, modules, ""]]; + var alreadyImportedModules = {}; + for(var i = 0; i < this.length; i++) { + var id = this[i][0]; + if(typeof id === "number") + alreadyImportedModules[id] = true; + } + for(i = 0; i < modules.length; i++) { + var item = modules[i]; + // skip already imported module + // this implementation is not 100% perfect for weird media query combinations + // when a module is imported multiple times with different media queries. + // I hope this will never occur (Hey this way we have smaller bundles) + if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) { + if(mediaQuery && !item[2]) { + item[2] = mediaQuery; + } else if(mediaQuery) { + item[2] = "(" + item[2] + ") and (" + mediaQuery + ")"; + } + list.push(item); + } + } + }; + return list; +}; + +function cssWithMappingToString(item, useSourceMap) { + var content = item[1] || ''; + var cssMapping = item[3]; + if (!cssMapping) { + return content; + } + + if (useSourceMap && typeof btoa === 'function') { + var sourceMapping = toComment(cssMapping); + var sourceURLs = cssMapping.sources.map(function (source) { + return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */' + }); + + return [content].concat(sourceURLs).concat([sourceMapping]).join('\n'); + } + + return [content].join('\n'); +} + +// Adapted from convert-source-map (MIT) +function toComment(sourceMap) { + // eslint-disable-next-line no-undef + var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))); + var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64; + + return '/*# ' + data + ' */'; +} + + +/***/ }), + +/***/ "./node_modules/css-loader/lib/url/escape.js": +/*!***************************************************!*\ + !*** ./node_modules/css-loader/lib/url/escape.js ***! + \***************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = function escape(url) { + if (typeof url !== 'string') { + return url + } + // If url is already wrapped in quotes, remove them + if (/^['"].*['"]$/.test(url)) { + url = url.slice(1, -1); + } + // Should url be wrapped? + // See https://drafts.csswg.org/css-values-3/#urls + if (/["'() \t\n]/.test(url)) { + return '"' + url.replace(/"/g, '\\"').replace(/\n/g, '\\n') + '"' + } + + return url +} + + +/***/ }), + +/***/ "./node_modules/hls.js/dist/hls.js": +/*!*****************************************!*\ + !*** ./node_modules/hls.js/dist/hls.js ***! + \*****************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +typeof window !== "undefined" && +(function webpackUniversalModuleDefinition(root, factory) { + if(true) + module.exports = factory(); + else {} +})(this, function() { +return /******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = "/dist/"; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = "./src/hls.js"); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ "./node_modules/eventemitter3/index.js": +/*!*********************************************!*\ + !*** ./node_modules/eventemitter3/index.js ***! + \*********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var has = Object.prototype.hasOwnProperty + , prefix = '~'; + +/** + * Constructor to create a storage for our `EE` objects. + * An `Events` instance is a plain object whose properties are event names. + * + * @constructor + * @private + */ +function Events() {} + +// +// We try to not inherit from `Object.prototype`. In some engines creating an +// instance in this way is faster than calling `Object.create(null)` directly. +// If `Object.create(null)` is not supported we prefix the event names with a +// character to make sure that the built-in object properties are not +// overridden or used as an attack vector. +// +if (Object.create) { + Events.prototype = Object.create(null); + + // + // This hack is needed because the `__proto__` property is still inherited in + // some old browsers like Android 4, iPhone 5.1, Opera 11 and Safari 5. + // + if (!new Events().__proto__) prefix = false; +} + +/** + * Representation of a single event listener. + * + * @param {Function} fn The listener function. + * @param {*} context The context to invoke the listener with. + * @param {Boolean} [once=false] Specify if the listener is a one-time listener. + * @constructor + * @private + */ +function EE(fn, context, once) { + this.fn = fn; + this.context = context; + this.once = once || false; +} + +/** + * Add a listener for a given event. + * + * @param {EventEmitter} emitter Reference to the `EventEmitter` instance. + * @param {(String|Symbol)} event The event name. + * @param {Function} fn The listener function. + * @param {*} context The context to invoke the listener with. + * @param {Boolean} once Specify if the listener is a one-time listener. + * @returns {EventEmitter} + * @private + */ +function addListener(emitter, event, fn, context, once) { + if (typeof fn !== 'function') { + throw new TypeError('The listener must be a function'); + } + + var listener = new EE(fn, context || emitter, once) + , evt = prefix ? prefix + event : event; + + if (!emitter._events[evt]) emitter._events[evt] = listener, emitter._eventsCount++; + else if (!emitter._events[evt].fn) emitter._events[evt].push(listener); + else emitter._events[evt] = [emitter._events[evt], listener]; + + return emitter; +} + +/** + * Clear event by name. + * + * @param {EventEmitter} emitter Reference to the `EventEmitter` instance. + * @param {(String|Symbol)} evt The Event name. + * @private + */ +function clearEvent(emitter, evt) { + if (--emitter._eventsCount === 0) emitter._events = new Events(); + else delete emitter._events[evt]; +} + +/** + * Minimal `EventEmitter` interface that is molded against the Node.js + * `EventEmitter` interface. + * + * @constructor + * @public + */ +function EventEmitter() { + this._events = new Events(); + this._eventsCount = 0; +} + +/** + * Return an array listing the events for which the emitter has registered + * listeners. + * + * @returns {Array} + * @public + */ +EventEmitter.prototype.eventNames = function eventNames() { + var names = [] + , events + , name; + + if (this._eventsCount === 0) return names; + + for (name in (events = this._events)) { + if (has.call(events, name)) names.push(prefix ? name.slice(1) : name); + } + + if (Object.getOwnPropertySymbols) { + return names.concat(Object.getOwnPropertySymbols(events)); + } + + return names; +}; + +/** + * Return the listeners registered for a given event. + * + * @param {(String|Symbol)} event The event name. + * @returns {Array} The registered listeners. + * @public + */ +EventEmitter.prototype.listeners = function listeners(event) { + var evt = prefix ? prefix + event : event + , handlers = this._events[evt]; + + if (!handlers) return []; + if (handlers.fn) return [handlers.fn]; + + for (var i = 0, l = handlers.length, ee = new Array(l); i < l; i++) { + ee[i] = handlers[i].fn; + } + + return ee; +}; + +/** + * Return the number of listeners listening to a given event. + * + * @param {(String|Symbol)} event The event name. + * @returns {Number} The number of listeners. + * @public + */ +EventEmitter.prototype.listenerCount = function listenerCount(event) { + var evt = prefix ? prefix + event : event + , listeners = this._events[evt]; + + if (!listeners) return 0; + if (listeners.fn) return 1; + return listeners.length; +}; + +/** + * Calls each of the listeners registered for a given event. + * + * @param {(String|Symbol)} event The event name. + * @returns {Boolean} `true` if the event had listeners, else `false`. + * @public + */ +EventEmitter.prototype.emit = function emit(event, a1, a2, a3, a4, a5) { + var evt = prefix ? prefix + event : event; + + if (!this._events[evt]) return false; + + var listeners = this._events[evt] + , len = arguments.length + , args + , i; + + if (listeners.fn) { + if (listeners.once) this.removeListener(event, listeners.fn, undefined, true); + + switch (len) { + case 1: return listeners.fn.call(listeners.context), true; + case 2: return listeners.fn.call(listeners.context, a1), true; + case 3: return listeners.fn.call(listeners.context, a1, a2), true; + case 4: return listeners.fn.call(listeners.context, a1, a2, a3), true; + case 5: return listeners.fn.call(listeners.context, a1, a2, a3, a4), true; + case 6: return listeners.fn.call(listeners.context, a1, a2, a3, a4, a5), true; + } + + for (i = 1, args = new Array(len -1); i < len; i++) { + args[i - 1] = arguments[i]; + } + + listeners.fn.apply(listeners.context, args); + } else { + var length = listeners.length + , j; + + for (i = 0; i < length; i++) { + if (listeners[i].once) this.removeListener(event, listeners[i].fn, undefined, true); + + switch (len) { + case 1: listeners[i].fn.call(listeners[i].context); break; + case 2: listeners[i].fn.call(listeners[i].context, a1); break; + case 3: listeners[i].fn.call(listeners[i].context, a1, a2); break; + case 4: listeners[i].fn.call(listeners[i].context, a1, a2, a3); break; + default: + if (!args) for (j = 1, args = new Array(len -1); j < len; j++) { + args[j - 1] = arguments[j]; + } + + listeners[i].fn.apply(listeners[i].context, args); + } + } + } + + return true; +}; + +/** + * Add a listener for a given event. + * + * @param {(String|Symbol)} event The event name. + * @param {Function} fn The listener function. + * @param {*} [context=this] The context to invoke the listener with. + * @returns {EventEmitter} `this`. + * @public + */ +EventEmitter.prototype.on = function on(event, fn, context) { + return addListener(this, event, fn, context, false); +}; + +/** + * Add a one-time listener for a given event. + * + * @param {(String|Symbol)} event The event name. + * @param {Function} fn The listener function. + * @param {*} [context=this] The context to invoke the listener with. + * @returns {EventEmitter} `this`. + * @public + */ +EventEmitter.prototype.once = function once(event, fn, context) { + return addListener(this, event, fn, context, true); +}; + +/** + * Remove the listeners of a given event. + * + * @param {(String|Symbol)} event The event name. + * @param {Function} fn Only remove the listeners that match this function. + * @param {*} context Only remove the listeners that have this context. + * @param {Boolean} once Only remove one-time listeners. + * @returns {EventEmitter} `this`. + * @public + */ +EventEmitter.prototype.removeListener = function removeListener(event, fn, context, once) { + var evt = prefix ? prefix + event : event; + + if (!this._events[evt]) return this; + if (!fn) { + clearEvent(this, evt); + return this; + } + + var listeners = this._events[evt]; + + if (listeners.fn) { + if ( + listeners.fn === fn && + (!once || listeners.once) && + (!context || listeners.context === context) + ) { + clearEvent(this, evt); + } + } else { + for (var i = 0, events = [], length = listeners.length; i < length; i++) { + if ( + listeners[i].fn !== fn || + (once && !listeners[i].once) || + (context && listeners[i].context !== context) + ) { + events.push(listeners[i]); + } + } + + // + // Reset the array, or remove it completely if we have no more listeners. + // + if (events.length) this._events[evt] = events.length === 1 ? events[0] : events; + else clearEvent(this, evt); + } + + return this; +}; + +/** + * Remove all listeners, or those of the specified event. + * + * @param {(String|Symbol)} [event] The event name. + * @returns {EventEmitter} `this`. + * @public + */ +EventEmitter.prototype.removeAllListeners = function removeAllListeners(event) { + var evt; + + if (event) { + evt = prefix ? prefix + event : event; + if (this._events[evt]) clearEvent(this, evt); + } else { + this._events = new Events(); + this._eventsCount = 0; + } + + return this; +}; + +// +// Alias methods names because people roll like that. +// +EventEmitter.prototype.off = EventEmitter.prototype.removeListener; +EventEmitter.prototype.addListener = EventEmitter.prototype.on; + +// +// Expose the prefix. +// +EventEmitter.prefixed = prefix; + +// +// Allow `EventEmitter` to be imported as module namespace. +// +EventEmitter.EventEmitter = EventEmitter; + +// +// Expose the module. +// +if (true) { + module.exports = EventEmitter; +} + + +/***/ }), + +/***/ "./node_modules/node-libs-browser/node_modules/events/events.js": +/*!**********************************************************************!*\ + !*** ./node_modules/node-libs-browser/node_modules/events/events.js ***! + \**********************************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports) { + +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +function EventEmitter() { + this._events = this._events || {}; + this._maxListeners = this._maxListeners || undefined; +} +module.exports = EventEmitter; + +// Backwards-compat with node 0.10.x +EventEmitter.EventEmitter = EventEmitter; + +EventEmitter.prototype._events = undefined; +EventEmitter.prototype._maxListeners = undefined; + +// By default EventEmitters will print a warning if more than 10 listeners are +// added to it. This is a useful default which helps finding memory leaks. +EventEmitter.defaultMaxListeners = 10; + +// Obviously not all Emitters should be limited to 10. This function allows +// that to be increased. Set to zero for unlimited. +EventEmitter.prototype.setMaxListeners = function(n) { + if (!isNumber(n) || n < 0 || isNaN(n)) + throw TypeError('n must be a positive number'); + this._maxListeners = n; + return this; +}; + +EventEmitter.prototype.emit = function(type) { + var er, handler, len, args, i, listeners; + + if (!this._events) + this._events = {}; + + // If there is no 'error' event listener then throw. + if (type === 'error') { + if (!this._events.error || + (isObject(this._events.error) && !this._events.error.length)) { + er = arguments[1]; + if (er instanceof Error) { + throw er; // Unhandled 'error' event + } else { + // At least give some kind of context to the user + var err = new Error('Uncaught, unspecified "error" event. (' + er + ')'); + err.context = er; + throw err; + } + } + } + + handler = this._events[type]; + + if (isUndefined(handler)) + return false; + + if (isFunction(handler)) { + switch (arguments.length) { + // fast cases + case 1: + handler.call(this); + break; + case 2: + handler.call(this, arguments[1]); + break; + case 3: + handler.call(this, arguments[1], arguments[2]); + break; + // slower + default: + args = Array.prototype.slice.call(arguments, 1); + handler.apply(this, args); + } + } else if (isObject(handler)) { + args = Array.prototype.slice.call(arguments, 1); + listeners = handler.slice(); + len = listeners.length; + for (i = 0; i < len; i++) + listeners[i].apply(this, args); + } + + return true; +}; + +EventEmitter.prototype.addListener = function(type, listener) { + var m; + + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + if (!this._events) + this._events = {}; + + // To avoid recursion in the case that type === "newListener"! Before + // adding it to the listeners, first emit "newListener". + if (this._events.newListener) + this.emit('newListener', type, + isFunction(listener.listener) ? + listener.listener : listener); + + if (!this._events[type]) + // Optimize the case of one listener. Don't need the extra array object. + this._events[type] = listener; + else if (isObject(this._events[type])) + // If we've already got an array, just append. + this._events[type].push(listener); + else + // Adding the second element, need to change to array. + this._events[type] = [this._events[type], listener]; + + // Check for listener leak + if (isObject(this._events[type]) && !this._events[type].warned) { + if (!isUndefined(this._maxListeners)) { + m = this._maxListeners; + } else { + m = EventEmitter.defaultMaxListeners; + } + + if (m && m > 0 && this._events[type].length > m) { + this._events[type].warned = true; + console.error('(node) warning: possible EventEmitter memory ' + + 'leak detected. %d listeners added. ' + + 'Use emitter.setMaxListeners() to increase limit.', + this._events[type].length); + if (typeof console.trace === 'function') { + // not supported in IE 10 + console.trace(); + } + } + } + + return this; +}; + +EventEmitter.prototype.on = EventEmitter.prototype.addListener; + +EventEmitter.prototype.once = function(type, listener) { + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + var fired = false; + + function g() { + this.removeListener(type, g); + + if (!fired) { + fired = true; + listener.apply(this, arguments); + } + } + + g.listener = listener; + this.on(type, g); + + return this; +}; + +// emits a 'removeListener' event iff the listener was removed +EventEmitter.prototype.removeListener = function(type, listener) { + var list, position, length, i; + + if (!isFunction(listener)) + throw TypeError('listener must be a function'); + + if (!this._events || !this._events[type]) + return this; + + list = this._events[type]; + length = list.length; + position = -1; + + if (list === listener || + (isFunction(list.listener) && list.listener === listener)) { + delete this._events[type]; + if (this._events.removeListener) + this.emit('removeListener', type, listener); + + } else if (isObject(list)) { + for (i = length; i-- > 0;) { + if (list[i] === listener || + (list[i].listener && list[i].listener === listener)) { + position = i; + break; + } + } + + if (position < 0) + return this; + + if (list.length === 1) { + list.length = 0; + delete this._events[type]; + } else { + list.splice(position, 1); + } + + if (this._events.removeListener) + this.emit('removeListener', type, listener); + } + + return this; +}; + +EventEmitter.prototype.removeAllListeners = function(type) { + var key, listeners; + + if (!this._events) + return this; + + // not listening for removeListener, no need to emit + if (!this._events.removeListener) { + if (arguments.length === 0) + this._events = {}; + else if (this._events[type]) + delete this._events[type]; + return this; + } + + // emit removeListener for all listeners on all events + if (arguments.length === 0) { + for (key in this._events) { + if (key === 'removeListener') continue; + this.removeAllListeners(key); + } + this.removeAllListeners('removeListener'); + this._events = {}; + return this; + } + + listeners = this._events[type]; + + if (isFunction(listeners)) { + this.removeListener(type, listeners); + } else if (listeners) { + // LIFO order + while (listeners.length) + this.removeListener(type, listeners[listeners.length - 1]); + } + delete this._events[type]; + + return this; +}; + +EventEmitter.prototype.listeners = function(type) { + var ret; + if (!this._events || !this._events[type]) + ret = []; + else if (isFunction(this._events[type])) + ret = [this._events[type]]; + else + ret = this._events[type].slice(); + return ret; +}; + +EventEmitter.prototype.listenerCount = function(type) { + if (this._events) { + var evlistener = this._events[type]; + + if (isFunction(evlistener)) + return 1; + else if (evlistener) + return evlistener.length; + } + return 0; +}; + +EventEmitter.listenerCount = function(emitter, type) { + return emitter.listenerCount(type); +}; + +function isFunction(arg) { + return typeof arg === 'function'; +} + +function isNumber(arg) { + return typeof arg === 'number'; +} + +function isObject(arg) { + return typeof arg === 'object' && arg !== null; +} + +function isUndefined(arg) { + return arg === void 0; +} + + +/***/ }), + +/***/ "./node_modules/url-toolkit/src/url-toolkit.js": +/*!*****************************************************!*\ + !*** ./node_modules/url-toolkit/src/url-toolkit.js ***! + \*****************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +// see https://tools.ietf.org/html/rfc1808 + +/* jshint ignore:start */ +(function(root) { +/* jshint ignore:end */ + + var URL_REGEX = /^((?:[a-zA-Z0-9+\-.]+:)?)(\/\/[^\/?#]*)?((?:[^\/\?#]*\/)*.*?)??(;.*?)?(\?.*?)?(#.*?)?$/; + var FIRST_SEGMENT_REGEX = /^([^\/?#]*)(.*)$/; + var SLASH_DOT_REGEX = /(?:\/|^)\.(?=\/)/g; + var SLASH_DOT_DOT_REGEX = /(?:\/|^)\.\.\/(?!\.\.\/).*?(?=\/)/g; + + var URLToolkit = { // jshint ignore:line + // If opts.alwaysNormalize is true then the path will always be normalized even when it starts with / or // + // E.g + // With opts.alwaysNormalize = false (default, spec compliant) + // http://a.com/b/cd + /e/f/../g => http://a.com/e/f/../g + // With opts.alwaysNormalize = true (not spec compliant) + // http://a.com/b/cd + /e/f/../g => http://a.com/e/g + buildAbsoluteURL: function(baseURL, relativeURL, opts) { + opts = opts || {}; + // remove any remaining space and CRLF + baseURL = baseURL.trim(); + relativeURL = relativeURL.trim(); + if (!relativeURL) { + // 2a) If the embedded URL is entirely empty, it inherits the + // entire base URL (i.e., is set equal to the base URL) + // and we are done. + if (!opts.alwaysNormalize) { + return baseURL; + } + var basePartsForNormalise = URLToolkit.parseURL(baseURL); + if (!basePartsForNormalise) { + throw new Error('Error trying to parse base URL.'); + } + basePartsForNormalise.path = URLToolkit.normalizePath(basePartsForNormalise.path); + return URLToolkit.buildURLFromParts(basePartsForNormalise); + } + var relativeParts = URLToolkit.parseURL(relativeURL); + if (!relativeParts) { + throw new Error('Error trying to parse relative URL.'); + } + if (relativeParts.scheme) { + // 2b) If the embedded URL starts with a scheme name, it is + // interpreted as an absolute URL and we are done. + if (!opts.alwaysNormalize) { + return relativeURL; + } + relativeParts.path = URLToolkit.normalizePath(relativeParts.path); + return URLToolkit.buildURLFromParts(relativeParts); + } + var baseParts = URLToolkit.parseURL(baseURL); + if (!baseParts) { + throw new Error('Error trying to parse base URL.'); + } + if (!baseParts.netLoc && baseParts.path && baseParts.path[0] !== '/') { + // If netLoc missing and path doesn't start with '/', assume everthing before the first '/' is the netLoc + // This causes 'example.com/a' to be handled as '//example.com/a' instead of '/example.com/a' + var pathParts = FIRST_SEGMENT_REGEX.exec(baseParts.path); + baseParts.netLoc = pathParts[1]; + baseParts.path = pathParts[2]; + } + if (baseParts.netLoc && !baseParts.path) { + baseParts.path = '/'; + } + var builtParts = { + // 2c) Otherwise, the embedded URL inherits the scheme of + // the base URL. + scheme: baseParts.scheme, + netLoc: relativeParts.netLoc, + path: null, + params: relativeParts.params, + query: relativeParts.query, + fragment: relativeParts.fragment + }; + if (!relativeParts.netLoc) { + // 3) If the embedded URL's is non-empty, we skip to + // Step 7. Otherwise, the embedded URL inherits the + // (if any) of the base URL. + builtParts.netLoc = baseParts.netLoc; + // 4) If the embedded URL path is preceded by a slash "/", the + // path is not relative and we skip to Step 7. + if (relativeParts.path[0] !== '/') { + if (!relativeParts.path) { + // 5) If the embedded URL path is empty (and not preceded by a + // slash), then the embedded URL inherits the base URL path + builtParts.path = baseParts.path; + // 5a) if the embedded URL's is non-empty, we skip to + // step 7; otherwise, it inherits the of the base + // URL (if any) and + if (!relativeParts.params) { + builtParts.params = baseParts.params; + // 5b) if the embedded URL's is non-empty, we skip to + // step 7; otherwise, it inherits the of the base + // URL (if any) and we skip to step 7. + if (!relativeParts.query) { + builtParts.query = baseParts.query; + } + } + } else { + // 6) The last segment of the base URL's path (anything + // following the rightmost slash "/", or the entire path if no + // slash is present) is removed and the embedded URL's path is + // appended in its place. + var baseURLPath = baseParts.path; + var newPath = baseURLPath.substring(0, baseURLPath.lastIndexOf('/') + 1) + relativeParts.path; + builtParts.path = URLToolkit.normalizePath(newPath); + } + } + } + if (builtParts.path === null) { + builtParts.path = opts.alwaysNormalize ? URLToolkit.normalizePath(relativeParts.path) : relativeParts.path; + } + return URLToolkit.buildURLFromParts(builtParts); + }, + parseURL: function(url) { + var parts = URL_REGEX.exec(url); + if (!parts) { + return null; + } + return { + scheme: parts[1] || '', + netLoc: parts[2] || '', + path: parts[3] || '', + params: parts[4] || '', + query: parts[5] || '', + fragment: parts[6] || '' + }; + }, + normalizePath: function(path) { + // The following operations are + // then applied, in order, to the new path: + // 6a) All occurrences of "./", where "." is a complete path + // segment, are removed. + // 6b) If the path ends with "." as a complete path segment, + // that "." is removed. + path = path.split('').reverse().join('').replace(SLASH_DOT_REGEX, ''); + // 6c) All occurrences of "/../", where is a + // complete path segment not equal to "..", are removed. + // Removal of these path segments is performed iteratively, + // removing the leftmost matching pattern on each iteration, + // until no matching pattern remains. + // 6d) If the path ends with "/..", where is a + // complete path segment not equal to "..", that + // "/.." is removed. + while (path.length !== (path = path.replace(SLASH_DOT_DOT_REGEX, '')).length) {} // jshint ignore:line + return path.split('').reverse().join(''); + }, + buildURLFromParts: function(parts) { + return parts.scheme + parts.netLoc + parts.path + parts.params + parts.query + parts.fragment; + } + }; + +/* jshint ignore:start */ + if(true) + module.exports = URLToolkit; + else {} +})(this); +/* jshint ignore:end */ + + +/***/ }), + +/***/ "./node_modules/webworkify-webpack/index.js": +/*!**************************************************!*\ + !*** ./node_modules/webworkify-webpack/index.js ***! + \**************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +function webpackBootstrapFunc (modules) { +/******/ // The module cache +/******/ var installedModules = {}; + +/******/ // The require function +/******/ function __webpack_require__(moduleId) { + +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; + +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; + +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); + +/******/ // Flag the module as loaded +/******/ module.l = true; + +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } + +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; + +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; + +/******/ // identity function for calling harmony imports with the correct context +/******/ __webpack_require__.i = function(value) { return value; }; + +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { +/******/ configurable: false, +/******/ enumerable: true, +/******/ get: getter +/******/ }); +/******/ } +/******/ }; + +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; + +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; + +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; + +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = "/"; + +/******/ // on error function for async loading +/******/ __webpack_require__.oe = function(err) { console.error(err); throw err; }; + + var f = __webpack_require__(__webpack_require__.s = ENTRY_MODULE) + return f.default || f // try to call default if defined to also support babel esmodule exports +} + +var moduleNameReqExp = '[\\.|\\-|\\+|\\w|\/|@]+' +var dependencyRegExp = '\\((\/\\*.*?\\*\/)?\s?.*?(' + moduleNameReqExp + ').*?\\)' // additional chars when output.pathinfo is true + +// http://stackoverflow.com/a/2593661/130442 +function quoteRegExp (str) { + return (str + '').replace(/[.?*+^$[\]\\(){}|-]/g, '\\$&') +} + +function isNumeric(n) { + return !isNaN(1 * n); // 1 * n converts integers, integers as string ("123"), 1e3 and "1e3" to integers and strings to NaN +} + +function getModuleDependencies (sources, module, queueName) { + var retval = {} + retval[queueName] = [] + + var fnString = module.toString() + var wrapperSignature = fnString.match(/^function\s?\(\w+,\s*\w+,\s*(\w+)\)/) + if (!wrapperSignature) return retval + var webpackRequireName = wrapperSignature[1] + + // main bundle deps + var re = new RegExp('(\\\\n|\\W)' + quoteRegExp(webpackRequireName) + dependencyRegExp, 'g') + var match + while ((match = re.exec(fnString))) { + if (match[3] === 'dll-reference') continue + retval[queueName].push(match[3]) + } + + // dll deps + re = new RegExp('\\(' + quoteRegExp(webpackRequireName) + '\\("(dll-reference\\s(' + moduleNameReqExp + '))"\\)\\)' + dependencyRegExp, 'g') + while ((match = re.exec(fnString))) { + if (!sources[match[2]]) { + retval[queueName].push(match[1]) + sources[match[2]] = __webpack_require__(match[1]).m + } + retval[match[2]] = retval[match[2]] || [] + retval[match[2]].push(match[4]) + } + + // convert 1e3 back to 1000 - this can be important after uglify-js converted 1000 to 1e3 + var keys = Object.keys(retval); + for (var i = 0; i < keys.length; i++) { + for (var j = 0; j < retval[keys[i]].length; j++) { + if (isNumeric(retval[keys[i]][j])) { + retval[keys[i]][j] = 1 * retval[keys[i]][j]; + } + } + } + + return retval +} + +function hasValuesInQueues (queues) { + var keys = Object.keys(queues) + return keys.reduce(function (hasValues, key) { + return hasValues || queues[key].length > 0 + }, false) +} + +function getRequiredModules (sources, moduleId) { + var modulesQueue = { + main: [moduleId] + } + var requiredModules = { + main: [] + } + var seenModules = { + main: {} + } + + while (hasValuesInQueues(modulesQueue)) { + var queues = Object.keys(modulesQueue) + for (var i = 0; i < queues.length; i++) { + var queueName = queues[i] + var queue = modulesQueue[queueName] + var moduleToCheck = queue.pop() + seenModules[queueName] = seenModules[queueName] || {} + if (seenModules[queueName][moduleToCheck] || !sources[queueName][moduleToCheck]) continue + seenModules[queueName][moduleToCheck] = true + requiredModules[queueName] = requiredModules[queueName] || [] + requiredModules[queueName].push(moduleToCheck) + var newModules = getModuleDependencies(sources, sources[queueName][moduleToCheck], queueName) + var newModulesKeys = Object.keys(newModules) + for (var j = 0; j < newModulesKeys.length; j++) { + modulesQueue[newModulesKeys[j]] = modulesQueue[newModulesKeys[j]] || [] + modulesQueue[newModulesKeys[j]] = modulesQueue[newModulesKeys[j]].concat(newModules[newModulesKeys[j]]) + } + } + } + + return requiredModules +} + +module.exports = function (moduleId, options) { + options = options || {} + var sources = { + main: __webpack_require__.m + } + + var requiredModules = options.all ? { main: Object.keys(sources.main) } : getRequiredModules(sources, moduleId) + + var src = '' + + Object.keys(requiredModules).filter(function (m) { return m !== 'main' }).forEach(function (module) { + var entryModule = 0 + while (requiredModules[module][entryModule]) { + entryModule++ + } + requiredModules[module].push(entryModule) + sources[module][entryModule] = '(function(module, exports, __webpack_require__) { module.exports = __webpack_require__; })' + src = src + 'var ' + module + ' = (' + webpackBootstrapFunc.toString().replace('ENTRY_MODULE', JSON.stringify(entryModule)) + ')({' + requiredModules[module].map(function (id) { return '' + JSON.stringify(id) + ': ' + sources[module][id].toString() }).join(',') + '});\n' + }) + + src = src + 'new ((' + webpackBootstrapFunc.toString().replace('ENTRY_MODULE', JSON.stringify(moduleId)) + ')({' + requiredModules.main.map(function (id) { return '' + JSON.stringify(id) + ': ' + sources.main[id].toString() }).join(',') + '}))(self);' + + var blob = new window.Blob([src], { type: 'text/javascript' }) + if (options.bare) { return blob } + + var URL = window.URL || window.webkitURL || window.mozURL || window.msURL + + var workerUrl = URL.createObjectURL(blob) + var worker = new window.Worker(workerUrl) + worker.objectURL = workerUrl + + return worker +} + + +/***/ }), + +/***/ "./src/config.js": +/*!***********************!*\ + !*** ./src/config.js ***! + \***********************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * HLS config + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var abr_controller_1 = __webpack_require__(/*! ./controller/abr-controller */ "./src/controller/abr-controller.js"); +var buffer_controller_1 = __webpack_require__(/*! ./controller/buffer-controller */ "./src/controller/buffer-controller.js"); +var cap_level_controller_1 = __webpack_require__(/*! ./controller/cap-level-controller */ "./src/controller/cap-level-controller.js"); +var fps_controller_1 = __webpack_require__(/*! ./controller/fps-controller */ "./src/controller/fps-controller.js"); +var xhr_loader_1 = __webpack_require__(/*! ./utils/xhr-loader */ "./src/utils/xhr-loader.js"); +// import FetchLoader from './utils/fetch-loader'; +var audio_track_controller_1 = __webpack_require__(/*! ./controller/audio-track-controller */ "./src/controller/audio-track-controller.js"); +var audio_stream_controller_1 = __webpack_require__(/*! ./controller/audio-stream-controller */ "./src/controller/audio-stream-controller.js"); +var Cues = __webpack_require__(/*! ./utils/cues */ "./src/utils/cues.js"); +var timeline_controller_1 = __webpack_require__(/*! ./controller/timeline-controller */ "./src/controller/timeline-controller.js"); +var subtitle_track_controller_1 = __webpack_require__(/*! ./controller/subtitle-track-controller */ "./src/controller/subtitle-track-controller.js"); +var subtitle_stream_controller_1 = __webpack_require__(/*! ./controller/subtitle-stream-controller */ "./src/controller/subtitle-stream-controller.js"); +var eme_controller_1 = __webpack_require__(/*! ./controller/eme-controller */ "./src/controller/eme-controller.js"); +var mediakeys_helper_1 = __webpack_require__(/*! ./utils/mediakeys-helper */ "./src/utils/mediakeys-helper.js"); +exports.hlsDefaultConfig = { + autoStartLoad: true, + startPosition: -1, + defaultAudioCodec: undefined, + debug: false, + capLevelOnFPSDrop: false, + capLevelToPlayerSize: false, + initialLiveManifestSize: 1, + maxBufferLength: 30, + maxBufferSize: 60 * 1000 * 1000, + maxBufferHole: 0.5, + lowBufferWatchdogPeriod: 0.5, + highBufferWatchdogPeriod: 3, + nudgeOffset: 0.1, + nudgeMaxRetry: 3, + maxFragLookUpTolerance: 0.25, + liveSyncDurationCount: 3, + liveMaxLatencyDurationCount: Infinity, + liveSyncDuration: undefined, + liveMaxLatencyDuration: undefined, + liveDurationInfinity: false, + liveBackBufferLength: Infinity, + maxMaxBufferLength: 600, + enableWorker: true, + enableSoftwareAES: true, + manifestLoadingTimeOut: 10000, + manifestLoadingMaxRetry: 1, + manifestLoadingRetryDelay: 1000, + manifestLoadingMaxRetryTimeout: 64000, + startLevel: undefined, + levelLoadingTimeOut: 10000, + levelLoadingMaxRetry: 4, + levelLoadingRetryDelay: 1000, + levelLoadingMaxRetryTimeout: 64000, + fragLoadingTimeOut: 20000, + fragLoadingMaxRetry: 6, + fragLoadingRetryDelay: 1000, + fragLoadingMaxRetryTimeout: 64000, + startFragPrefetch: false, + fpsDroppedMonitoringPeriod: 5000, + fpsDroppedMonitoringThreshold: 0.2, + appendErrorMaxRetry: 3, + loader: xhr_loader_1.default, + // loader: FetchLoader, + fLoader: undefined, + pLoader: undefined, + xhrSetup: undefined, + licenseXhrSetup: undefined, + // fetchSetup: undefined, + abrController: abr_controller_1.default, + bufferController: buffer_controller_1.default, + capLevelController: cap_level_controller_1.default, + fpsController: fps_controller_1.default, + stretchShortVideoTrack: false, + maxAudioFramesDrift: 1, + forceKeyFrameOnDiscontinuity: true, + abrEwmaFastLive: 3, + abrEwmaSlowLive: 9, + abrEwmaFastVoD: 3, + abrEwmaSlowVoD: 9, + abrEwmaDefaultEstimate: 5e5, + abrBandWidthFactor: 0.95, + abrBandWidthUpFactor: 0.7, + abrMaxWithRealBitrate: false, + maxStarvationDelay: 4, + maxLoadingDelay: 4, + minAutoBitrate: 0, + emeEnabled: false, + widevineLicenseUrl: undefined, + requestMediaKeySystemAccessFunc: mediakeys_helper_1.requestMediaKeySystemAccess // used by eme-controller +}; +if (true) { + exports.hlsDefaultConfig.subtitleStreamController = subtitle_stream_controller_1.SubtitleStreamController; + exports.hlsDefaultConfig.subtitleTrackController = subtitle_track_controller_1.default; + exports.hlsDefaultConfig.timelineController = timeline_controller_1.default; + exports.hlsDefaultConfig.cueHandler = Cues; // used by timeline-controller + exports.hlsDefaultConfig.enableCEA708Captions = true; // used by timeline-controller + exports.hlsDefaultConfig.enableWebVTT = true; // used by timeline-controller + exports.hlsDefaultConfig.captionsTextTrack1Label = 'English'; // used by timeline-controller + exports.hlsDefaultConfig.captionsTextTrack1LanguageCode = 'en'; // used by timeline-controller + exports.hlsDefaultConfig.captionsTextTrack2Label = 'Spanish'; // used by timeline-controller + exports.hlsDefaultConfig.captionsTextTrack2LanguageCode = 'es'; // used by timeline-controller +} +if (true) { + exports.hlsDefaultConfig.audioStreamController = audio_stream_controller_1.default; + exports.hlsDefaultConfig.audioTrackController = audio_track_controller_1.default; +} +if (true) { + exports.hlsDefaultConfig.emeController = eme_controller_1.default; +} + + +/***/ }), + +/***/ "./src/controller/abr-controller.js": +/*!******************************************!*\ + !*** ./src/controller/abr-controller.js ***! + \******************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * simple ABR Controller + * - compute next level based on last fragment bw heuristics + * - implement an abandon rules triggered if we have less than 2 frag buffered and if computed bw shows that we risk buffer stalling + */ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var buffer_helper_1 = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var ewma_bandwidth_estimator_1 = __webpack_require__(/*! ../utils/ewma-bandwidth-estimator */ "./src/utils/ewma-bandwidth-estimator.js"); +var performance = window.performance; +var AbrController = /** @class */ (function (_super) { + __extends(AbrController, _super); + function AbrController(hls) { + var _this = _super.call(this, hls, events_1.default.FRAG_LOADING, events_1.default.FRAG_LOADED, events_1.default.FRAG_BUFFERED, events_1.default.ERROR) || this; + _this.lastLoadedFragLevel = 0; + _this._nextAutoLevel = -1; + _this.hls = hls; + _this.timer = null; + _this._bwEstimator = null; + _this.onCheck = _this._abandonRulesCheck.bind(_this); + return _this; + } + AbrController.prototype.destroy = function () { + this.clearTimer(); + event_handler_1.default.prototype.destroy.call(this); + }; + AbrController.prototype.onFragLoading = function (data) { + var frag = data.frag; + if (frag.type === 'main') { + if (!this.timer) { + this.fragCurrent = frag; + this.timer = setInterval(this.onCheck, 100); + } + // lazy init of BwEstimator, rationale is that we use different params for Live/VoD + // so we need to wait for stream manifest / playlist type to instantiate it. + if (!this._bwEstimator) { + var hls_1 = this.hls; + var config = hls_1.config; + var level = frag.level; + var isLive = hls_1.levels[level].details.live; + var ewmaFast = void 0, ewmaSlow = void 0; + if (isLive) { + ewmaFast = config.abrEwmaFastLive; + ewmaSlow = config.abrEwmaSlowLive; + } + else { + ewmaFast = config.abrEwmaFastVoD; + ewmaSlow = config.abrEwmaSlowVoD; + } + this._bwEstimator = new ewma_bandwidth_estimator_1.default(hls_1, ewmaSlow, ewmaFast, config.abrEwmaDefaultEstimate); + } + } + }; + AbrController.prototype._abandonRulesCheck = function () { + /* + monitor fragment retrieval time... + we compute expected time of arrival of the complete fragment. + we compare it to expected time of buffer starvation + */ + var hls = this.hls; + var video = hls.media; + var frag = this.fragCurrent; + if (!frag) { + return; + } + var loader = frag.loader; + var minAutoLevel = hls.minAutoLevel; + // if loader has been destroyed or loading has been aborted, stop timer and return + if (!loader || (loader.stats && loader.stats.aborted)) { + logger_1.logger.warn('frag loader destroy or aborted, disarm abandonRules'); + this.clearTimer(); + // reset forced auto level value so that next level will be selected + this._nextAutoLevel = -1; + return; + } + var stats = loader.stats; + /* only monitor frag retrieval time if + (video not paused OR first fragment being loaded(ready state === HAVE_NOTHING = 0)) AND autoswitching enabled AND not lowest level (=> means that we have several levels) */ + if (video && stats && ((!video.paused && (video.playbackRate !== 0)) || !video.readyState) && frag.autoLevel && frag.level) { + var requestDelay = performance.now() - stats.trequest, playbackRate = Math.abs(video.playbackRate); + // monitor fragment load progress after half of expected fragment duration,to stabilize bitrate + if (requestDelay > (500 * frag.duration / playbackRate)) { + var levels = hls.levels, loadRate = Math.max(1, stats.bw ? stats.bw / 8 : stats.loaded * 1000 / requestDelay), // byte/s; at least 1 byte/s to avoid division by zero + // compute expected fragment length using frag duration and level bitrate. also ensure that expected len is gte than already loaded size + level = levels[frag.level], levelBitrate = level.realBitrate ? Math.max(level.realBitrate, level.bitrate) : level.bitrate, expectedLen = stats.total ? stats.total : Math.max(stats.loaded, Math.round(frag.duration * levelBitrate / 8)), pos = video.currentTime, fragLoadedDelay = (expectedLen - stats.loaded) / loadRate, bufferStarvationDelay = (buffer_helper_1.BufferHelper.bufferInfo(video, pos, hls.config.maxBufferHole).end - pos) / playbackRate; + // consider emergency switch down only if we have less than 2 frag buffered AND + // time to finish loading current fragment is bigger than buffer starvation delay + // ie if we risk buffer starvation if bw does not increase quickly + if ((bufferStarvationDelay < (2 * frag.duration / playbackRate)) && (fragLoadedDelay > bufferStarvationDelay)) { + var fragLevelNextLoadedDelay = void 0, nextLoadLevel = void 0; + // lets iterate through lower level and try to find the biggest one that could avoid rebuffering + // we start from current level - 1 and we step down , until we find a matching level + for (nextLoadLevel = frag.level - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) { + // compute time to load next fragment at lower level + // 0.8 : consider only 80% of current bw to be conservative + // 8 = bits per byte (bps/Bps) + var levelNextBitrate = levels[nextLoadLevel].realBitrate ? Math.max(levels[nextLoadLevel].realBitrate, levels[nextLoadLevel].bitrate) : levels[nextLoadLevel].bitrate; + fragLevelNextLoadedDelay = frag.duration * levelNextBitrate / (8 * 0.8 * loadRate); + if (fragLevelNextLoadedDelay < bufferStarvationDelay) { + // we found a lower level that be rebuffering free with current estimated bw ! + break; + } + } + // only emergency switch down if it takes less time to load new fragment at lowest level instead + // of finishing loading current one ... + if (fragLevelNextLoadedDelay < fragLoadedDelay) { + logger_1.logger.warn("loading too slow, abort fragment loading and switch to level " + nextLoadLevel + ":fragLoadedDelay[" + nextLoadLevel + "]= 0) { + return bestLevel; + } + else { + logger_1.logger.trace('rebuffering expected to happen, lets try to find a quality level minimizing the rebuffering'); + // not possible to get rid of rebuffering ... let's try to find level that will guarantee less than maxStarvationDelay of rebuffering + // if no matching level found, logic will return 0 + var maxStarvationDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxStarvationDelay) : config.maxStarvationDelay, bwFactor = config.abrBandWidthFactor, bwUpFactor = config.abrBandWidthUpFactor; + if (bufferStarvationDelay === 0) { + // in case buffer is empty, let's check if previous fragment was loaded to perform a bitrate test + var bitrateTestDelay = this.bitrateTestDelay; + if (bitrateTestDelay) { + // if it is the case, then we need to adjust our max starvation delay using maxLoadingDelay config value + // max video loading delay used in automatic start level selection : + // in that mode ABR controller will ensure that video loading time (ie the time to fetch the first fragment at lowest quality level + + // the time to fetch the fragment at the appropriate quality level is less than ```maxLoadingDelay``` ) + // cap maxLoadingDelay and ensure it is not bigger 'than bitrate test' frag duration + var maxLoadingDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxLoadingDelay) : config.maxLoadingDelay; + maxStarvationDelay = maxLoadingDelay - bitrateTestDelay; + logger_1.logger.trace("bitrate test took " + Math.round(1000 * bitrateTestDelay) + "ms, set first fragment max fetchDuration to " + Math.round(1000 * maxStarvationDelay) + " ms"); + // don't use conservative factor on bitrate test + bwFactor = bwUpFactor = 1; + } + } + bestLevel = this._findBestLevel(currentLevel, currentFragDuration, avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay + maxStarvationDelay, bwFactor, bwUpFactor, levels); + return Math.max(bestLevel, 0); + } + }, + enumerable: true, + configurable: true + }); + AbrController.prototype._findBestLevel = function (currentLevel, currentFragDuration, currentBw, minAutoLevel, maxAutoLevel, maxFetchDuration, bwFactor, bwUpFactor, levels) { + for (var i = maxAutoLevel; i >= minAutoLevel; i--) { + var levelInfo = levels[i]; + if (!levelInfo) { + continue; + } + var levelDetails = levelInfo.details, avgDuration = levelDetails ? levelDetails.totalduration / levelDetails.fragments.length : currentFragDuration, live = levelDetails ? levelDetails.live : false, adjustedbw = void 0; + // follow algorithm captured from stagefright : + // https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/httplive/LiveSession.cpp + // Pick the highest bandwidth stream below or equal to estimated bandwidth. + // consider only 80% of the available bandwidth, but if we are switching up, + // be even more conservative (70%) to avoid overestimating and immediately + // switching back. + if (i <= currentLevel) { + adjustedbw = bwFactor * currentBw; + } + else { + adjustedbw = bwUpFactor * currentBw; + } + var bitrate = levels[i].realBitrate ? Math.max(levels[i].realBitrate, levels[i].bitrate) : levels[i].bitrate, fetchDuration = bitrate * avgDuration / adjustedbw; + logger_1.logger.trace("level/adjustedbw/bitrate/avgDuration/maxFetchDuration/fetchDuration: " + i + "/" + Math.round(adjustedbw) + "/" + bitrate + "/" + avgDuration + "/" + maxFetchDuration + "/" + fetchDuration); + // if adjusted bw is greater than level bitrate AND + if (adjustedbw > bitrate && + // fragment fetchDuration unknown OR live stream OR fragment fetchDuration less than max allowed fetch duration, then this level matches + // we don't account for max Fetch Duration for live streams, this is to avoid switching down when near the edge of live sliding window ... + // special case to support startLevel = -1 (bitrateTest) on live streams : in that case we should not exit loop so that _findBestLevel will return -1 + (!fetchDuration || (live && !this.bitrateTestDelay) || fetchDuration < maxFetchDuration)) { + // as we are looping from highest to lowest, this will return the best achievable quality level + return i; + } + } + // not enough time budget even with quality level 0 ... rebuffering might happen + return -1; + }; + return AbrController; +}(event_handler_1.default)); +exports.default = AbrController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/audio-stream-controller.js": +/*!***************************************************!*\ + !*** ./src/controller/audio-stream-controller.js ***! + \***************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * Audio Stream Controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var binary_search_1 = __webpack_require__(/*! ../utils/binary-search */ "./src/utils/binary-search.js"); +var buffer_helper_1 = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.js"); +var demuxer_1 = __webpack_require__(/*! ../demux/demuxer */ "./src/demux/demuxer.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var LevelHelper = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.js"); +var time_ranges_1 = __webpack_require__(/*! ../utils/time-ranges */ "./src/utils/time-ranges.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var discontinuities_1 = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.js"); +var fragment_tracker_1 = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.js"); +var fragment_1 = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.js"); +var base_stream_controller_1 = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.js"); +var performance = window.performance; +var TICK_INTERVAL = 100; // how often to tick in ms +var AudioStreamController = /** @class */ (function (_super) { + __extends(AudioStreamController, _super); + function AudioStreamController(hls, fragmentTracker) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHED, events_1.default.MEDIA_DETACHING, events_1.default.AUDIO_TRACKS_UPDATED, events_1.default.AUDIO_TRACK_SWITCHING, events_1.default.AUDIO_TRACK_LOADED, events_1.default.KEY_LOADED, events_1.default.FRAG_LOADED, events_1.default.FRAG_PARSING_INIT_SEGMENT, events_1.default.FRAG_PARSING_DATA, events_1.default.FRAG_PARSED, events_1.default.ERROR, events_1.default.BUFFER_RESET, events_1.default.BUFFER_CREATED, events_1.default.BUFFER_APPENDED, events_1.default.BUFFER_FLUSHED, events_1.default.INIT_PTS_FOUND) || this; + _this.fragmentTracker = fragmentTracker; + _this.config = hls.config; + _this.audioCodecSwap = false; + _this._state = base_stream_controller_1.State.STOPPED; + _this.initPTS = []; + _this.waitingFragment = null; + _this.videoTrackCC = null; + return _this; + } + AudioStreamController.prototype.onHandlerDestroying = function () { + this.stopLoad(); + _super.prototype.onHandlerDestroying.call(this); + }; + AudioStreamController.prototype.onHandlerDestroyed = function () { + this.state = base_stream_controller_1.State.STOPPED; + this.fragmentTracker = null; + _super.prototype.onHandlerDestroyed.call(this); + }; + // Signal that video PTS was found + AudioStreamController.prototype.onInitPtsFound = function (data) { + var demuxerId = data.id, cc = data.frag.cc, initPTS = data.initPTS; + if (demuxerId === 'main') { + // Always update the new INIT PTS + // Can change due level switch + this.initPTS[cc] = initPTS; + this.videoTrackCC = cc; + logger_1.logger.log("InitPTS for cc: " + cc + " found from video track: " + initPTS); + // If we are waiting we need to demux/remux the waiting frag + // With the new initPTS + if (this.state === base_stream_controller_1.State.WAITING_INIT_PTS) { + this.tick(); + } + } + }; + AudioStreamController.prototype.startLoad = function (startPosition) { + if (this.tracks) { + var lastCurrentTime = this.lastCurrentTime; + this.stopLoad(); + this.setInterval(TICK_INTERVAL); + this.fragLoadError = 0; + if (lastCurrentTime > 0 && startPosition === -1) { + logger_1.logger.log("audio:override startPosition with lastCurrentTime @" + lastCurrentTime.toFixed(3)); + this.state = base_stream_controller_1.State.IDLE; + } + else { + this.lastCurrentTime = this.startPosition ? this.startPosition : startPosition; + this.state = base_stream_controller_1.State.STARTING; + } + this.nextLoadPosition = this.startPosition = this.lastCurrentTime; + this.tick(); + } + else { + this.startPosition = startPosition; + this.state = base_stream_controller_1.State.STOPPED; + } + }; + AudioStreamController.prototype.stopLoad = function () { + var frag = this.fragCurrent; + if (frag) { + if (frag.loader) { + frag.loader.abort(); + } + this.fragmentTracker.removeFragment(frag); + this.fragCurrent = null; + } + this.fragPrevious = null; + if (this.demuxer) { + this.demuxer.destroy(); + this.demuxer = null; + } + this.state = base_stream_controller_1.State.STOPPED; + }; + Object.defineProperty(AudioStreamController.prototype, "state", { + get: function () { + return this._state; + }, + set: function (nextState) { + if (this.state !== nextState) { + var previousState = this.state; + this._state = nextState; + logger_1.logger.log("audio stream:" + previousState + "->" + nextState); + } + }, + enumerable: true, + configurable: true + }); + AudioStreamController.prototype.doTick = function () { + var pos, track, trackDetails, hls = this.hls, config = hls.config; + // logger.log('audioStream:' + this.state); + switch (this.state) { + case base_stream_controller_1.State.ERROR: + // don't do anything in error state to avoid breaking further ... + case base_stream_controller_1.State.PAUSED: + // don't do anything in paused state either ... + case base_stream_controller_1.State.BUFFER_FLUSHING: + break; + case base_stream_controller_1.State.STARTING: + this.state = base_stream_controller_1.State.WAITING_TRACK; + this.loadedmetadata = false; + break; + case base_stream_controller_1.State.IDLE: + var tracks = this.tracks; + // audio tracks not received => exit loop + if (!tracks) { + break; + } + // if video not attached AND + // start fragment already requested OR start frag prefetch disable + // exit loop + // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop + if (!this.media && + (this.startFragRequested || !config.startFragPrefetch)) { + break; + } + // determine next candidate fragment to be loaded, based on current position and + // end of buffer position + // if we have not yet loaded any fragment, start loading from start position + if (this.loadedmetadata) { + pos = this.media.currentTime; + } + else { + pos = this.nextLoadPosition; + if (pos === undefined) { + break; + } + } + var media = this.mediaBuffer ? this.mediaBuffer : this.media, videoBuffer = this.videoBuffer ? this.videoBuffer : this.media, bufferInfo = buffer_helper_1.BufferHelper.bufferInfo(media, pos, config.maxBufferHole), mainBufferInfo = buffer_helper_1.BufferHelper.bufferInfo(videoBuffer, pos, config.maxBufferHole), bufferLen = bufferInfo.len, bufferEnd_1 = bufferInfo.end, fragPrevious = this.fragPrevious, + // ensure we buffer at least config.maxBufferLength (default 30s) or config.maxMaxBufferLength (default: 600s) + // whichever is smaller. + // once we reach that threshold, don't buffer more than video (mainBufferInfo.len) + maxConfigBuffer = Math.min(config.maxBufferLength, config.maxMaxBufferLength), maxBufLen = Math.max(maxConfigBuffer, mainBufferInfo.len), audioSwitch = this.audioSwitch, trackId = this.trackId; + // if buffer length is less than maxBufLen try to load a new fragment + if ((bufferLen < maxBufLen || audioSwitch) && trackId < tracks.length) { + trackDetails = tracks[trackId].details; + // if track info not retrieved yet, switch state and wait for track retrieval + if (typeof trackDetails === 'undefined') { + this.state = base_stream_controller_1.State.WAITING_TRACK; + break; + } + if (!audioSwitch && this._streamEnded(bufferInfo, trackDetails)) { + this.hls.trigger(events_1.default.BUFFER_EOS, { type: 'audio' }); + this.state = base_stream_controller_1.State.ENDED; + return; + } + // find fragment index, contiguous with end of buffer position + var fragments = trackDetails.fragments, fragLen = fragments.length, start = fragments[0].start, end = fragments[fragLen - 1].start + fragments[fragLen - 1].duration, frag = void 0; + // When switching audio track, reload audio as close as possible to currentTime + if (audioSwitch) { + if (trackDetails.live && !trackDetails.PTSKnown) { + logger_1.logger.log('switching audiotrack, live stream, unknown PTS,load first fragment'); + bufferEnd_1 = 0; + } + else { + bufferEnd_1 = pos; + // if currentTime (pos) is less than alt audio playlist start time, it means that alt audio is ahead of currentTime + if (trackDetails.PTSKnown && pos < start) { + // if everything is buffered from pos to start or if audio buffer upfront, let's seek to start + if (bufferInfo.end > start || bufferInfo.nextStart) { + logger_1.logger.log('alt audio track ahead of main track, seek to start of alt audio track'); + this.media.currentTime = start + 0.05; + } + else { + return; + } + } + } + } + if (trackDetails.initSegment && !trackDetails.initSegment.data) { + frag = trackDetails.initSegment; + } // eslint-disable-line brace-style + // if bufferEnd before start of playlist, load first fragment + else if (bufferEnd_1 <= start) { + frag = fragments[0]; + if (this.videoTrackCC !== null && frag.cc !== this.videoTrackCC) { + // Ensure we find a fragment which matches the continuity of the video track + frag = discontinuities_1.findFragWithCC(fragments, this.videoTrackCC); + } + if (trackDetails.live && frag.loadIdx && frag.loadIdx === this.fragLoadIdx) { + // we just loaded this first fragment, and we are still lagging behind the start of the live playlist + // let's force seek to start + var nextBuffered = bufferInfo.nextStart ? bufferInfo.nextStart : start; + logger_1.logger.log("no alt audio available @currentTime:" + this.media.currentTime + ", seeking @" + (nextBuffered + 0.05)); + this.media.currentTime = nextBuffered + 0.05; + return; + } + } + else { + var foundFrag = void 0; + var maxFragLookUpTolerance_1 = config.maxFragLookUpTolerance; + var fragNext = fragPrevious ? fragments[fragPrevious.sn - fragments[0].sn + 1] : undefined; + var fragmentWithinToleranceTest = function (candidate) { + // offset should be within fragment boundary - config.maxFragLookUpTolerance + // this is to cope with situations like + // bufferEnd = 9.991 + // frag[Ø] : [0,10] + // frag[1] : [10,20] + // bufferEnd is within frag[0] range ... although what we are expecting is to return frag[1] here + // frag start frag start+duration + // |-----------------------------| + // <---> <---> + // ...--------><-----------------------------><---------.... + // previous frag matching fragment next frag + // return -1 return 0 return 1 + // logger.log(`level/sn/start/end/bufEnd:${level}/${candidate.sn}/${candidate.start}/${(candidate.start+candidate.duration)}/${bufferEnd}`); + // Set the lookup tolerance to be small enough to detect the current segment - ensures we don't skip over very small segments + var candidateLookupTolerance = Math.min(maxFragLookUpTolerance_1, candidate.duration); + if ((candidate.start + candidate.duration - candidateLookupTolerance) <= bufferEnd_1) { + return 1; + } + else if (candidate.start - candidateLookupTolerance > bufferEnd_1 && candidate.start) { + // if maxFragLookUpTolerance will have negative value then don't return -1 for first element + return -1; + } + return 0; + }; + if (bufferEnd_1 < end) { + if (bufferEnd_1 > end - maxFragLookUpTolerance_1) { + maxFragLookUpTolerance_1 = 0; + } + // Prefer the next fragment if it's within tolerance + if (fragNext && !fragmentWithinToleranceTest(fragNext)) { + foundFrag = fragNext; + } + else { + foundFrag = binary_search_1.default.search(fragments, fragmentWithinToleranceTest); + } + } + else { + // reach end of playlist + foundFrag = fragments[fragLen - 1]; + } + if (foundFrag) { + frag = foundFrag; + start = foundFrag.start; + // logger.log('find SN matching with pos:' + bufferEnd + ':' + frag.sn); + if (fragPrevious && frag.level === fragPrevious.level && frag.sn === fragPrevious.sn) { + if (frag.sn < trackDetails.endSN) { + frag = fragments[frag.sn + 1 - trackDetails.startSN]; + logger_1.logger.log("SN just loaded, load next one: " + frag.sn); + } + else { + frag = null; + } + } + } + } + if (frag) { + // logger.log(' loading frag ' + i +',pos/bufEnd:' + pos.toFixed(3) + '/' + bufferEnd.toFixed(3)); + if (frag.encrypted) { + logger_1.logger.log("Loading key for " + frag.sn + " of [" + trackDetails.startSN + " ," + trackDetails.endSN + "],track " + trackId); + this.state = base_stream_controller_1.State.KEY_LOADING; + hls.trigger(events_1.default.KEY_LOADING, { frag: frag }); + } + else { + logger_1.logger.log("Loading " + frag.sn + ", cc: " + frag.cc + " of [" + trackDetails.startSN + " ," + trackDetails.endSN + "],track " + trackId + ", currentTime:" + pos + ",bufferEnd:" + bufferEnd_1.toFixed(3)); + // only load if fragment is not loaded or if in audio switch + // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch + this.fragCurrent = frag; + if (audioSwitch || this.fragmentTracker.getState(frag) === fragment_tracker_1.FragmentState.NOT_LOADED) { + this.startFragRequested = true; + if (Number.isFinite(frag.sn)) { + this.nextLoadPosition = frag.start + frag.duration; + } + hls.trigger(events_1.default.FRAG_LOADING, { frag: frag }); + this.state = base_stream_controller_1.State.FRAG_LOADING; + } + } + } + } + break; + case base_stream_controller_1.State.WAITING_TRACK: + track = this.tracks[this.trackId]; + // check if playlist is already loaded + if (track && track.details) { + this.state = base_stream_controller_1.State.IDLE; + } + break; + case base_stream_controller_1.State.FRAG_LOADING_WAITING_RETRY: + var now = performance.now(); + var retryDate = this.retryDate; + media = this.media; + var isSeeking = media && media.seeking; + // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading + if (!retryDate || (now >= retryDate) || isSeeking) { + logger_1.logger.log('audioStreamController: retryDate reached, switch back to IDLE state'); + this.state = base_stream_controller_1.State.IDLE; + } + break; + case base_stream_controller_1.State.WAITING_INIT_PTS: + var videoTrackCC = this.videoTrackCC; + if (this.initPTS[videoTrackCC] === undefined) { + break; + } + // Ensure we don't get stuck in the WAITING_INIT_PTS state if the waiting frag CC doesn't match any initPTS + var waitingFrag = this.waitingFragment; + if (waitingFrag) { + var waitingFragCC = waitingFrag.frag.cc; + if (videoTrackCC !== waitingFragCC) { + track = this.tracks[this.trackId]; + if (track.details && track.details.live) { + logger_1.logger.warn("Waiting fragment CC (" + waitingFragCC + ") does not match video track CC (" + videoTrackCC + ")"); + this.waitingFragment = null; + this.state = base_stream_controller_1.State.IDLE; + } + } + else { + this.state = base_stream_controller_1.State.FRAG_LOADING; + this.onFragLoaded(this.waitingFragment); + this.waitingFragment = null; + } + } + else { + this.state = base_stream_controller_1.State.IDLE; + } + break; + case base_stream_controller_1.State.STOPPED: + case base_stream_controller_1.State.FRAG_LOADING: + case base_stream_controller_1.State.PARSING: + case base_stream_controller_1.State.PARSED: + case base_stream_controller_1.State.ENDED: + break; + default: + break; + } + }; + AudioStreamController.prototype.onMediaAttached = function (data) { + var media = this.media = this.mediaBuffer = data.media; + this.onvseeking = this.onMediaSeeking.bind(this); + this.onvended = this.onMediaEnded.bind(this); + media.addEventListener('seeking', this.onvseeking); + media.addEventListener('ended', this.onvended); + var config = this.config; + if (this.tracks && config.autoStartLoad) { + this.startLoad(config.startPosition); + } + }; + AudioStreamController.prototype.onMediaDetaching = function () { + var media = this.media; + if (media && media.ended) { + logger_1.logger.log('MSE detaching and video ended, reset startPosition'); + this.startPosition = this.lastCurrentTime = 0; + } + // remove video listeners + if (media) { + media.removeEventListener('seeking', this.onvseeking); + media.removeEventListener('ended', this.onvended); + this.onvseeking = this.onvseeked = this.onvended = null; + } + this.media = this.mediaBuffer = this.videoBuffer = null; + this.loadedmetadata = false; + this.stopLoad(); + }; + AudioStreamController.prototype.onAudioTracksUpdated = function (data) { + logger_1.logger.log('audio tracks updated'); + this.tracks = data.audioTracks; + }; + AudioStreamController.prototype.onAudioTrackSwitching = function (data) { + // if any URL found on new audio track, it is an alternate audio track + var altAudio = !!data.url; + this.trackId = data.id; + this.fragCurrent = null; + this.state = base_stream_controller_1.State.PAUSED; + this.waitingFragment = null; + // destroy useless demuxer when switching audio to main + if (!altAudio) { + if (this.demuxer) { + this.demuxer.destroy(); + this.demuxer = null; + } + } + else { + // switching to audio track, start timer if not already started + this.setInterval(TICK_INTERVAL); + } + // should we switch tracks ? + if (altAudio) { + this.audioSwitch = true; + // main audio track are handled by stream-controller, just do something if switching to alt audio track + this.state = base_stream_controller_1.State.IDLE; + } + this.tick(); + }; + AudioStreamController.prototype.onAudioTrackLoaded = function (data) { + var newDetails = data.details, trackId = data.id, track = this.tracks[trackId], duration = newDetails.totalduration, sliding = 0; + logger_1.logger.log("track " + trackId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "],duration:" + duration); + if (newDetails.live) { + var curDetails = track.details; + if (curDetails && newDetails.fragments.length > 0) { + // we already have details for that level, merge them + LevelHelper.mergeDetails(curDetails, newDetails); + sliding = newDetails.fragments[0].start; + // TODO + // this.liveSyncPosition = this.computeLivePosition(sliding, curDetails); + if (newDetails.PTSKnown) { + logger_1.logger.log("live audio playlist sliding:" + sliding.toFixed(3)); + } + else { + logger_1.logger.log('live audio playlist - outdated PTS, unknown sliding'); + } + } + else { + newDetails.PTSKnown = false; + logger_1.logger.log('live audio playlist - first load, unknown sliding'); + } + } + else { + newDetails.PTSKnown = false; + } + track.details = newDetails; + // compute start position + if (!this.startFragRequested) { + // compute start position if set to -1. use it straight away if value is defined + if (this.startPosition === -1) { + // first, check if start time offset has been set in playlist, if yes, use this value + var startTimeOffset = newDetails.startTimeOffset; + if (Number.isFinite(startTimeOffset)) { + logger_1.logger.log("start time offset found in playlist, adjust startPosition to " + startTimeOffset); + this.startPosition = startTimeOffset; + } + else { + this.startPosition = 0; + } + } + this.nextLoadPosition = this.startPosition; + } + // only switch batck to IDLE state if we were waiting for track to start downloading a new fragment + if (this.state === base_stream_controller_1.State.WAITING_TRACK) { + this.state = base_stream_controller_1.State.IDLE; + } + // trigger handler right now + this.tick(); + }; + AudioStreamController.prototype.onKeyLoaded = function () { + if (this.state === base_stream_controller_1.State.KEY_LOADING) { + this.state = base_stream_controller_1.State.IDLE; + this.tick(); + } + }; + AudioStreamController.prototype.onFragLoaded = function (data) { + var fragCurrent = this.fragCurrent, fragLoaded = data.frag; + if (this.state === base_stream_controller_1.State.FRAG_LOADING && + fragCurrent && + fragLoaded.type === 'audio' && + fragLoaded.level === fragCurrent.level && + fragLoaded.sn === fragCurrent.sn) { + var track = this.tracks[this.trackId], details = track.details, duration = details.totalduration, trackId = fragCurrent.level, sn = fragCurrent.sn, cc = fragCurrent.cc, audioCodec = this.config.defaultAudioCodec || track.audioCodec || 'mp4a.40.2', stats = this.stats = data.stats; + if (sn === 'initSegment') { + this.state = base_stream_controller_1.State.IDLE; + stats.tparsed = stats.tbuffered = performance.now(); + details.initSegment.data = data.payload; + this.hls.trigger(events_1.default.FRAG_BUFFERED, { stats: stats, frag: fragCurrent, id: 'audio' }); + this.tick(); + } + else { + this.state = base_stream_controller_1.State.PARSING; + // transmux the MPEG-TS data to ISO-BMFF segments + this.appended = false; + if (!this.demuxer) { + this.demuxer = new demuxer_1.default(this.hls, 'audio'); + } + // Check if we have video initPTS + // If not we need to wait for it + var initPTS = this.initPTS[cc]; + var initSegmentData = details.initSegment ? details.initSegment.data : []; + if (details.initSegment || initPTS !== undefined) { + this.pendingBuffering = true; + logger_1.logger.log("Demuxing " + sn + " of [" + details.startSN + " ," + details.endSN + "],track " + trackId); + // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live) + var accurateTimeOffset = false; // details.PTSKnown || !details.live; + this.demuxer.push(data.payload, initSegmentData, audioCodec, null, fragCurrent, duration, accurateTimeOffset, initPTS); + } + else { + logger_1.logger.log("unknown video PTS for continuity counter " + cc + ", waiting for video PTS before demuxing audio frag " + sn + " of [" + details.startSN + " ," + details.endSN + "],track " + trackId); + this.waitingFragment = data; + this.state = base_stream_controller_1.State.WAITING_INIT_PTS; + } + } + } + this.fragLoadError = 0; + }; + AudioStreamController.prototype.onFragParsingInitSegment = function (data) { + var fragCurrent = this.fragCurrent; + var fragNew = data.frag; + if (fragCurrent && + data.id === 'audio' && + fragNew.sn === fragCurrent.sn && + fragNew.level === fragCurrent.level && + this.state === base_stream_controller_1.State.PARSING) { + var tracks = data.tracks, track = void 0; + // delete any video track found on audio demuxer + if (tracks.video) { + delete tracks.video; + } + // include levelCodec in audio and video tracks + track = tracks.audio; + if (track) { + track.levelCodec = track.codec; + track.id = data.id; + this.hls.trigger(events_1.default.BUFFER_CODECS, tracks); + logger_1.logger.log("audio track:audio,container:" + track.container + ",codecs[level/parsed]=[" + track.levelCodec + "/" + track.codec + "]"); + var initSegment = track.initSegment; + if (initSegment) { + var appendObj = { type: 'audio', data: initSegment, parent: 'audio', content: 'initSegment' }; + if (this.audioSwitch) { + this.pendingData = [appendObj]; + } + else { + this.appended = true; + // arm pending Buffering flag before appending a segment + this.pendingBuffering = true; + this.hls.trigger(events_1.default.BUFFER_APPENDING, appendObj); + } + } + // trigger handler right now + this.tick(); + } + } + }; + AudioStreamController.prototype.onFragParsingData = function (data) { + var _this = this; + var fragCurrent = this.fragCurrent; + var fragNew = data.frag; + if (fragCurrent && + data.id === 'audio' && + data.type === 'audio' && + fragNew.sn === fragCurrent.sn && + fragNew.level === fragCurrent.level && + this.state === base_stream_controller_1.State.PARSING) { + var trackId = this.trackId, track = this.tracks[trackId], hls_1 = this.hls; + if (!Number.isFinite(data.endPTS)) { + data.endPTS = data.startPTS + fragCurrent.duration; + data.endDTS = data.startDTS + fragCurrent.duration; + } + fragCurrent.addElementaryStream(fragment_1.default.ElementaryStreamTypes.AUDIO); + logger_1.logger.log("parsed " + data.type + ",PTS:[" + data.startPTS.toFixed(3) + "," + data.endPTS.toFixed(3) + "],DTS:[" + data.startDTS.toFixed(3) + "/" + data.endDTS.toFixed(3) + "],nb:" + data.nb); + LevelHelper.updateFragPTSDTS(track.details, fragCurrent, data.startPTS, data.endPTS); + var audioSwitch = this.audioSwitch, media = this.media, appendOnBufferFlush = false; + // Only flush audio from old audio tracks when PTS is known on new audio track + if (audioSwitch && media) { + if (media.readyState) { + var currentTime = media.currentTime; + logger_1.logger.log('switching audio track : currentTime:' + currentTime); + if (currentTime >= data.startPTS) { + logger_1.logger.log('switching audio track : flushing all audio'); + this.state = base_stream_controller_1.State.BUFFER_FLUSHING; + hls_1.trigger(events_1.default.BUFFER_FLUSHING, { startOffset: 0, endOffset: Number.POSITIVE_INFINITY, type: 'audio' }); + appendOnBufferFlush = true; + // Lets announce that the initial audio track switch flush occur + this.audioSwitch = false; + hls_1.trigger(events_1.default.AUDIO_TRACK_SWITCHED, { id: trackId }); + } + } + else { + // Lets announce that the initial audio track switch flush occur + this.audioSwitch = false; + hls_1.trigger(events_1.default.AUDIO_TRACK_SWITCHED, { id: trackId }); + } + } + var pendingData_1 = this.pendingData; + if (!pendingData_1) { + logger_1.logger.warn('Apparently attempt to enqueue media payload without codec initialization data upfront'); + hls_1.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: null, fatal: true }); + return; + } + if (!this.audioSwitch) { + [data.data1, data.data2].forEach(function (buffer) { + if (buffer && buffer.length) { + pendingData_1.push({ type: data.type, data: buffer, parent: 'audio', content: 'data' }); + } + }); + if (!appendOnBufferFlush && pendingData_1.length) { + pendingData_1.forEach(function (appendObj) { + // only append in PARSING state (rationale is that an appending error could happen synchronously on first segment appending) + // in that case it is useless to append following segments + if (_this.state === base_stream_controller_1.State.PARSING) { + // arm pending Buffering flag before appending a segment + _this.pendingBuffering = true; + _this.hls.trigger(events_1.default.BUFFER_APPENDING, appendObj); + } + }); + this.pendingData = []; + this.appended = true; + } + } + // trigger handler right now + this.tick(); + } + }; + AudioStreamController.prototype.onFragParsed = function (data) { + var fragCurrent = this.fragCurrent; + var fragNew = data.frag; + if (fragCurrent && + data.id === 'audio' && + fragNew.sn === fragCurrent.sn && + fragNew.level === fragCurrent.level && + this.state === base_stream_controller_1.State.PARSING) { + this.stats.tparsed = performance.now(); + this.state = base_stream_controller_1.State.PARSED; + this._checkAppendedParsed(); + } + }; + AudioStreamController.prototype.onBufferReset = function () { + // reset reference to sourcebuffers + this.mediaBuffer = this.videoBuffer = null; + this.loadedmetadata = false; + }; + AudioStreamController.prototype.onBufferCreated = function (data) { + var audioTrack = data.tracks.audio; + if (audioTrack) { + this.mediaBuffer = audioTrack.buffer; + this.loadedmetadata = true; + } + if (data.tracks.video) { + this.videoBuffer = data.tracks.video.buffer; + } + }; + AudioStreamController.prototype.onBufferAppended = function (data) { + if (data.parent === 'audio') { + var state = this.state; + if (state === base_stream_controller_1.State.PARSING || state === base_stream_controller_1.State.PARSED) { + // check if all buffers have been appended + this.pendingBuffering = (data.pending > 0); + this._checkAppendedParsed(); + } + } + }; + AudioStreamController.prototype._checkAppendedParsed = function () { + // trigger handler right now + if (this.state === base_stream_controller_1.State.PARSED && (!this.appended || !this.pendingBuffering)) { + var frag = this.fragCurrent, stats = this.stats, hls_2 = this.hls; + if (frag) { + this.fragPrevious = frag; + stats.tbuffered = performance.now(); + hls_2.trigger(events_1.default.FRAG_BUFFERED, { stats: stats, frag: frag, id: 'audio' }); + var media = this.mediaBuffer ? this.mediaBuffer : this.media; + logger_1.logger.log("audio buffered : " + time_ranges_1.default.toString(media.buffered)); + if (this.audioSwitch && this.appended) { + this.audioSwitch = false; + hls_2.trigger(events_1.default.AUDIO_TRACK_SWITCHED, { id: this.trackId }); + } + this.state = base_stream_controller_1.State.IDLE; + } + this.tick(); + } + }; + AudioStreamController.prototype.onError = function (data) { + var frag = data.frag; + // don't handle frag error not related to audio fragment + if (frag && frag.type !== 'audio') { + return; + } + switch (data.details) { + case errors_1.ErrorDetails.FRAG_LOAD_ERROR: + case errors_1.ErrorDetails.FRAG_LOAD_TIMEOUT: + var frag_1 = data.frag; + // don't handle frag error not related to audio fragment + if (frag_1 && frag_1.type !== 'audio') { + break; + } + if (!data.fatal) { + var loadError = this.fragLoadError; + if (loadError) { + loadError++; + } + else { + loadError = 1; + } + var config = this.config; + if (loadError <= config.fragLoadingMaxRetry) { + this.fragLoadError = loadError; + // exponential backoff capped to config.fragLoadingMaxRetryTimeout + var delay = Math.min(Math.pow(2, loadError - 1) * config.fragLoadingRetryDelay, config.fragLoadingMaxRetryTimeout); + logger_1.logger.warn("AudioStreamController: frag loading failed, retry in " + delay + " ms"); + this.retryDate = performance.now() + delay; + // retry loading state + this.state = base_stream_controller_1.State.FRAG_LOADING_WAITING_RETRY; + } + else { + logger_1.logger.error("AudioStreamController: " + data.details + " reaches max retry, redispatch as fatal ..."); + // switch error to fatal + data.fatal = true; + this.state = base_stream_controller_1.State.ERROR; + } + } + break; + case errors_1.ErrorDetails.AUDIO_TRACK_LOAD_ERROR: + case errors_1.ErrorDetails.AUDIO_TRACK_LOAD_TIMEOUT: + case errors_1.ErrorDetails.KEY_LOAD_ERROR: + case errors_1.ErrorDetails.KEY_LOAD_TIMEOUT: + // when in ERROR state, don't switch back to IDLE state in case a non-fatal error is received + if (this.state !== base_stream_controller_1.State.ERROR) { + // if fatal error, stop processing, otherwise move to IDLE to retry loading + this.state = data.fatal ? base_stream_controller_1.State.ERROR : base_stream_controller_1.State.IDLE; + logger_1.logger.warn("AudioStreamController: " + data.details + " while loading frag, now switching to " + this.state + " state ..."); + } + break; + case errors_1.ErrorDetails.BUFFER_FULL_ERROR: + // if in appending state + if (data.parent === 'audio' && (this.state === base_stream_controller_1.State.PARSING || this.state === base_stream_controller_1.State.PARSED)) { + var media = this.mediaBuffer, currentTime = this.media.currentTime, mediaBuffered = media && buffer_helper_1.BufferHelper.isBuffered(media, currentTime) && buffer_helper_1.BufferHelper.isBuffered(media, currentTime + 0.5); + // reduce max buf len if current position is buffered + if (mediaBuffered) { + var config = this.config; + if (config.maxMaxBufferLength >= config.maxBufferLength) { + // reduce max buffer length as it might be too high. we do this to avoid loop flushing ... + config.maxMaxBufferLength /= 2; + logger_1.logger.warn("AudioStreamController: reduce max buffer length to " + config.maxMaxBufferLength + "s"); + } + this.state = base_stream_controller_1.State.IDLE; + } + else { + // current position is not buffered, but browser is still complaining about buffer full error + // this happens on IE/Edge, refer to https://github.com/video-dev/hls.js/pull/708 + // in that case flush the whole audio buffer to recover + logger_1.logger.warn('AudioStreamController: buffer full error also media.currentTime is not buffered, flush audio buffer'); + this.fragCurrent = null; + // flush everything + this.state = base_stream_controller_1.State.BUFFER_FLUSHING; + this.hls.trigger(events_1.default.BUFFER_FLUSHING, { startOffset: 0, endOffset: Number.POSITIVE_INFINITY, type: 'audio' }); + } + } + break; + default: + break; + } + }; + AudioStreamController.prototype.onBufferFlushed = function () { + var _this = this; + var pendingData = this.pendingData; + if (pendingData && pendingData.length) { + logger_1.logger.log('AudioStreamController: appending pending audio data after buffer flushed'); + pendingData.forEach(function (appendObj) { + _this.hls.trigger(events_1.default.BUFFER_APPENDING, appendObj); + }); + this.appended = true; + this.pendingData = []; + this.state = base_stream_controller_1.State.PARSED; + } + else { + // move to IDLE once flush complete. this should trigger new fragment loading + this.state = base_stream_controller_1.State.IDLE; + // reset reference to frag + this.fragPrevious = null; + this.tick(); + } + }; + return AudioStreamController; +}(base_stream_controller_1.default)); +exports.default = AudioStreamController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/audio-track-controller.js": +/*!**************************************************!*\ + !*** ./src/controller/audio-track-controller.js ***! + \**************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var task_loop_1 = __webpack_require__(/*! ../task-loop */ "./src/task-loop.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +/** + * @class AudioTrackController + * @implements {EventHandler} + * + * Handles main manifest and audio-track metadata loaded, + * owns and exposes the selectable audio-tracks data-models. + * + * Exposes internal interface to select available audio-tracks. + * + * Handles errors on loading audio-track playlists. Manages fallback mechanism + * with redundants tracks (group-IDs). + * + * Handles level-loading and group-ID switches for video (fallback on video levels), + * and eventually adapts the audio-track group-ID to match. + * + * @fires AUDIO_TRACK_LOADING + * @fires AUDIO_TRACK_SWITCHING + * @fires AUDIO_TRACKS_UPDATED + * @fires ERROR + * + */ +var AudioTrackController = /** @class */ (function (_super) { + __extends(AudioTrackController, _super); + function AudioTrackController(hls) { + var _this = _super.call(this, hls, events_1.default.MANIFEST_LOADING, events_1.default.MANIFEST_PARSED, events_1.default.AUDIO_TRACK_LOADED, events_1.default.AUDIO_TRACK_SWITCHED, events_1.default.LEVEL_LOADED, events_1.default.ERROR) || this; + /** + * @private + * Currently selected index in `tracks` + * @member {number} trackId + */ + _this._trackId = -1; + /** + * @private + * If should select tracks according to default track attribute + * @member {boolean} _selectDefaultTrack + */ + _this._selectDefaultTrack = true; + /** + * @public + * All tracks available + * @member {AudioTrack[]} + */ + _this.tracks = []; + /** + * @public + * List of blacklisted audio track IDs (that have caused failure) + * @member {number[]} + */ + _this.trackIdBlacklist = Object.create(null); + /** + * @public + * The currently running group ID for audio + * (we grab this on manifest-parsed and new level-loaded) + * @member {string} + */ + _this.audioGroupId = null; + return _this; + } + /** + * Reset audio tracks on new manifest loading. + */ + AudioTrackController.prototype.onManifestLoading = function () { + this.tracks = []; + this._trackId = -1; + this._selectDefaultTrack = true; + }; + /** + * Store tracks data from manifest parsed data. + * + * Trigger AUDIO_TRACKS_UPDATED event. + * + * @param {*} data + */ + AudioTrackController.prototype.onManifestParsed = function (data) { + var tracks = this.tracks = data.audioTracks || []; + this.hls.trigger(events_1.default.AUDIO_TRACKS_UPDATED, { audioTracks: tracks }); + }; + /** + * Store track details of loaded track in our data-model. + * + * Set-up metadata update interval task for live-mode streams. + * + * @param {} data + */ + AudioTrackController.prototype.onAudioTrackLoaded = function (data) { + if (data.id >= this.tracks.length) { + logger_1.logger.warn('Invalid audio track id:', data.id); + return; + } + logger_1.logger.log("audioTrack " + data.id + " loaded"); + this.tracks[data.id].details = data.details; + // check if current playlist is a live playlist + // and if we have already our reload interval setup + if (data.details.live && !this.hasInterval()) { + // if live playlist we will have to reload it periodically + // set reload period to playlist target duration + var updatePeriodMs = data.details.targetduration * 1000; + this.setInterval(updatePeriodMs); + } + if (!data.details.live && this.hasInterval()) { + // playlist is not live and timer is scheduled: cancel it + this.clearInterval(); + } + }; + /** + * Update the internal group ID to any audio-track we may have set manually + * or because of a failure-handling fallback. + * + * Quality-levels should update to that group ID in this case. + * + * @param {*} data + */ + AudioTrackController.prototype.onAudioTrackSwitched = function (data) { + var audioGroupId = this.tracks[data.id].groupId; + if (audioGroupId && (this.audioGroupId !== audioGroupId)) { + this.audioGroupId = audioGroupId; + } + }; + /** + * When a level gets loaded, if it has redundant audioGroupIds (in the same ordinality as it's redundant URLs) + * we are setting our audio-group ID internally to the one set, if it is different from the group ID currently set. + * + * If group-ID got update, we re-select the appropriate audio-track with this group-ID matching the currently + * selected one (based on NAME property). + * + * @param {*} data + */ + AudioTrackController.prototype.onLevelLoaded = function (data) { + // FIXME: crashes because currentLevel is undefined + // const levelInfo = this.hls.levels[this.hls.currentLevel]; + var levelInfo = this.hls.levels[data.level]; + if (!levelInfo.audioGroupIds) { + return; + } + var audioGroupId = levelInfo.audioGroupIds[levelInfo.urlId]; + if (this.audioGroupId !== audioGroupId) { + this.audioGroupId = audioGroupId; + this._selectInitialAudioTrack(); + } + }; + /** + * Handle network errors loading audio track manifests + * and also pausing on any netwok errors. + * + * @param {ErrorEventData} data + */ + AudioTrackController.prototype.onError = function (data) { + // Only handle network errors + if (data.type !== errors_1.ErrorTypes.NETWORK_ERROR) { + return; + } + // If fatal network error, cancel update task + if (data.fatal) { + this.clearInterval(); + } + // If not an audio-track loading error don't handle further + if (data.details !== errors_1.ErrorDetails.AUDIO_TRACK_LOAD_ERROR) { + return; + } + logger_1.logger.warn('Network failure on audio-track id:', data.context.id); + this._handleLoadError(); + }; + Object.defineProperty(AudioTrackController.prototype, "audioTracks", { + /** + * @type {AudioTrack[]} Audio-track list we own + */ + get: function () { + return this.tracks; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(AudioTrackController.prototype, "audioTrack", { + /** + * @type {number} Index into audio-tracks list of currently selected track. + */ + get: function () { + return this._trackId; + }, + /** + * Select current track by index + */ + set: function (newId) { + this._setAudioTrack(newId); + // If audio track is selected from API then don't choose from the manifest default track + this._selectDefaultTrack = false; + }, + enumerable: true, + configurable: true + }); + /** + * @private + * @param {number} newId + */ + AudioTrackController.prototype._setAudioTrack = function (newId) { + // noop on same audio track id as already set + if (this._trackId === newId && this.tracks[this._trackId].details) { + logger_1.logger.debug('Same id as current audio-track passed, and track details available -> no-op'); + return; + } + // check if level idx is valid + if (newId < 0 || newId >= this.tracks.length) { + logger_1.logger.warn('Invalid id passed to audio-track controller'); + return; + } + var audioTrack = this.tracks[newId]; + logger_1.logger.log("Now switching to audio-track index " + newId); + // stopping live reloading timer if any + this.clearInterval(); + this._trackId = newId; + var url = audioTrack.url, type = audioTrack.type, id = audioTrack.id; + this.hls.trigger(events_1.default.AUDIO_TRACK_SWITCHING, { id: id, type: type, url: url }); + this._loadTrackDetailsIfNeeded(audioTrack); + }; + /** + * @override + */ + AudioTrackController.prototype.doTick = function () { + this._updateTrack(this._trackId); + }; + /** + * Select initial track + * @private + */ + AudioTrackController.prototype._selectInitialAudioTrack = function () { + var _this = this; + var tracks = this.tracks; + if (!tracks.length) { + return; + } + var currentAudioTrack = this.tracks[this._trackId]; + var name = null; + if (currentAudioTrack) { + name = currentAudioTrack.name; + } + // Pre-select default tracks if there are any + if (this._selectDefaultTrack) { + var defaultTracks = tracks.filter(function (track) { return track.default; }); + if (defaultTracks.length) { + tracks = defaultTracks; + } + else { + logger_1.logger.warn('No default audio tracks defined'); + } + } + var trackFound = false; + var traverseTracks = function () { + // Select track with right group ID + tracks.forEach(function (track) { + if (trackFound) { + return; + } + // We need to match the (pre-)selected group ID + // and the NAME of the current track. + if ((!_this.audioGroupId || track.groupId === _this.audioGroupId) && + (!name || name === track.name)) { + // If there was a previous track try to stay with the same `NAME`. + // It should be unique across tracks of same group, and consistent through redundant track groups. + _this._setAudioTrack(track.id); + trackFound = true; + } + }); + }; + traverseTracks(); + if (!trackFound) { + name = null; + traverseTracks(); + } + if (!trackFound) { + logger_1.logger.error("No track found for running audio group-ID: " + this.audioGroupId); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.MEDIA_ERROR, + details: errors_1.ErrorDetails.AUDIO_TRACK_LOAD_ERROR, + fatal: true + }); + } + }; + /** + * @private + * @param {AudioTrack} audioTrack + * @returns {boolean} + */ + AudioTrackController.prototype._needsTrackLoading = function (audioTrack) { + var details = audioTrack.details, url = audioTrack.url; + if (!details || details.live) { + // check if we face an audio track embedded in main playlist (audio track without URI attribute) + return !!url; + } + return false; + }; + /** + * @private + * @param {AudioTrack} audioTrack + */ + AudioTrackController.prototype._loadTrackDetailsIfNeeded = function (audioTrack) { + if (this._needsTrackLoading(audioTrack)) { + var url = audioTrack.url, id = audioTrack.id; + // track not retrieved yet, or live playlist we need to (re)load it + logger_1.logger.log("loading audio-track playlist for id: " + id); + this.hls.trigger(events_1.default.AUDIO_TRACK_LOADING, { url: url, id: id }); + } + }; + /** + * @private + * @param {number} newId + */ + AudioTrackController.prototype._updateTrack = function (newId) { + // check if level idx is valid + if (newId < 0 || newId >= this.tracks.length) { + return; + } + // stopping live reloading timer if any + this.clearInterval(); + this._trackId = newId; + logger_1.logger.log("trying to update audio-track " + newId); + var audioTrack = this.tracks[newId]; + this._loadTrackDetailsIfNeeded(audioTrack); + }; + /** + * @private + */ + AudioTrackController.prototype._handleLoadError = function () { + // First, let's black list current track id + this.trackIdBlacklist[this._trackId] = true; + // Let's try to fall back on a functional audio-track with the same group ID + var previousId = this._trackId; + var _a = this.tracks[previousId], name = _a.name, language = _a.language, groupId = _a.groupId; + logger_1.logger.warn("Loading failed on audio track id: " + previousId + ", group-id: " + groupId + ", name/language: \"" + name + "\" / \"" + language + "\""); + // Find a non-blacklisted track ID with the same NAME + // At least a track that is not blacklisted, thus on another group-ID. + var newId = previousId; + for (var i = 0; i < this.tracks.length; i++) { + if (this.trackIdBlacklist[i]) { + continue; + } + var newTrack = this.tracks[i]; + if (newTrack.name === name) { + newId = i; + break; + } + } + if (newId === previousId) { + logger_1.logger.warn("No fallback audio-track found for name/language: \"" + name + "\" / \"" + language + "\""); + return; + } + logger_1.logger.log('Attempting audio-track fallback id:', newId, 'group-id:', this.tracks[newId].groupId); + this._setAudioTrack(newId); + }; + return AudioTrackController; +}(task_loop_1.default)); +exports.default = AudioTrackController; + + +/***/ }), + +/***/ "./src/controller/base-stream-controller.js": +/*!**************************************************!*\ + !*** ./src/controller/base-stream-controller.js ***! + \**************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var task_loop_1 = __webpack_require__(/*! ../task-loop */ "./src/task-loop.js"); +var fragment_tracker_1 = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.js"); +var buffer_helper_1 = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +exports.State = { + STOPPED: 'STOPPED', + STARTING: 'STARTING', + IDLE: 'IDLE', + PAUSED: 'PAUSED', + KEY_LOADING: 'KEY_LOADING', + FRAG_LOADING: 'FRAG_LOADING', + FRAG_LOADING_WAITING_RETRY: 'FRAG_LOADING_WAITING_RETRY', + WAITING_TRACK: 'WAITING_TRACK', + PARSING: 'PARSING', + PARSED: 'PARSED', + BUFFER_FLUSHING: 'BUFFER_FLUSHING', + ENDED: 'ENDED', + ERROR: 'ERROR', + WAITING_INIT_PTS: 'WAITING_INIT_PTS', + WAITING_LEVEL: 'WAITING_LEVEL' +}; +var BaseStreamController = /** @class */ (function (_super) { + __extends(BaseStreamController, _super); + function BaseStreamController() { + return _super !== null && _super.apply(this, arguments) || this; + } + BaseStreamController.prototype.doTick = function () { }; + BaseStreamController.prototype._streamEnded = function (bufferInfo, levelDetails) { + var _a = this, fragCurrent = _a.fragCurrent, fragmentTracker = _a.fragmentTracker; + // we just got done loading the final fragment and there is no other buffered range after ... + // rationale is that in case there are any buffered ranges after, it means that there are unbuffered portion in between + // so we should not switch to ENDED in that case, to be able to buffer them + // dont switch to ENDED if we need to backtrack last fragment + if (!levelDetails.live && fragCurrent && !fragCurrent.backtracked && fragCurrent.sn === levelDetails.endSN && !bufferInfo.nextStart) { + var fragState = fragmentTracker.getState(fragCurrent); + return fragState === fragment_tracker_1.FragmentState.PARTIAL || fragState === fragment_tracker_1.FragmentState.OK; + } + return false; + }; + BaseStreamController.prototype.onMediaSeeking = function () { + var _a = this, config = _a.config, media = _a.media, mediaBuffer = _a.mediaBuffer, state = _a.state; + var currentTime = media ? media.currentTime : null; + var bufferInfo = buffer_helper_1.BufferHelper.bufferInfo(mediaBuffer || media, currentTime, this.config.maxBufferHole); + if (Number.isFinite(currentTime)) { + logger_1.logger.log("media seeking to " + currentTime.toFixed(3)); + } + if (state === exports.State.FRAG_LOADING) { + var fragCurrent = this.fragCurrent; + // check if we are seeking to a unbuffered area AND if frag loading is in progress + if (bufferInfo.len === 0 && fragCurrent) { + var tolerance = config.maxFragLookUpTolerance; + var fragStartOffset = fragCurrent.start - tolerance; + var fragEndOffset = fragCurrent.start + fragCurrent.duration + tolerance; + // check if we seek position will be out of currently loaded frag range : if out cancel frag load, if in, don't do anything + if (currentTime < fragStartOffset || currentTime > fragEndOffset) { + if (fragCurrent.loader) { + logger_1.logger.log('seeking outside of buffer while fragment load in progress, cancel fragment load'); + fragCurrent.loader.abort(); + } + this.fragCurrent = null; + this.fragPrevious = null; + // switch to IDLE state to load new fragment + this.state = exports.State.IDLE; + } + else { + logger_1.logger.log('seeking outside of buffer but within currently loaded fragment range'); + } + } + } + else if (state === exports.State.ENDED) { + // if seeking to unbuffered area, clean up fragPrevious + if (bufferInfo.len === 0) { + this.fragPrevious = null; + this.fragCurrent = null; + } + // switch to IDLE state to check for potential new fragment + this.state = exports.State.IDLE; + } + if (media) { + this.lastCurrentTime = currentTime; + } + // in case seeking occurs although no media buffered, adjust startPosition and nextLoadPosition to seek target + if (!this.loadedmetadata) { + this.nextLoadPosition = this.startPosition = currentTime; + } + // tick to speed up processing + this.tick(); + }; + BaseStreamController.prototype.onMediaEnded = function () { + // reset startPosition and lastCurrentTime to restart playback @ stream beginning + this.startPosition = this.lastCurrentTime = 0; + }; + return BaseStreamController; +}(task_loop_1.default)); +exports.default = BaseStreamController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/buffer-controller.js": +/*!*********************************************!*\ + !*** ./src/controller/buffer-controller.js ***! + \*********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * Buffer Controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var mediasource_helper_1 = __webpack_require__(/*! ../utils/mediasource-helper */ "./src/utils/mediasource-helper.js"); +var MediaSource = mediasource_helper_1.getMediaSource(); +var BufferController = /** @class */ (function (_super) { + __extends(BufferController, _super); + function BufferController(hls) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHING, events_1.default.MEDIA_DETACHING, events_1.default.MANIFEST_PARSED, events_1.default.BUFFER_RESET, events_1.default.BUFFER_APPENDING, events_1.default.BUFFER_CODECS, events_1.default.BUFFER_EOS, events_1.default.BUFFER_FLUSHING, events_1.default.LEVEL_PTS_UPDATED, events_1.default.LEVEL_UPDATED) || this; + // the value that we have set mediasource.duration to + // (the actual duration may be tweaked slighly by the browser) + _this._msDuration = null; + // the value that we want to set mediaSource.duration to + _this._levelDuration = null; + // the target duration of the current media playlist + _this._levelTargetDuration = 10; + // current stream state: true - for live broadcast, false - for VoD content + _this._live = null; + // cache the self generated object url to detect hijack of video tag + _this._objectUrl = null; + // The number of BUFFER_CODEC events received before any sourceBuffers are created + _this.bufferCodecEventsExpected = 0; + // Source Buffer listeners + _this.onsbue = _this.onSBUpdateEnd.bind(_this); + _this.onsbe = _this.onSBUpdateError.bind(_this); + _this.pendingTracks = {}; + _this.tracks = {}; + return _this; + } + BufferController.prototype.destroy = function () { + event_handler_1.default.prototype.destroy.call(this); + }; + BufferController.prototype.onLevelPtsUpdated = function (data) { + var type = data.type; + var audioTrack = this.tracks.audio; + // Adjusting `SourceBuffer.timestampOffset` (desired point in the timeline where the next frames should be appended) + // in Chrome browser when we detect MPEG audio container and time delta between level PTS and `SourceBuffer.timestampOffset` + // is greater than 100ms (this is enough to handle seek for VOD or level change for LIVE videos). At the time of change we issue + // `SourceBuffer.abort()` and adjusting `SourceBuffer.timestampOffset` if `SourceBuffer.updating` is false or awaiting `updateend` + // event if SB is in updating state. + // More info here: https://github.com/video-dev/hls.js/issues/332#issuecomment-257986486 + if (type === 'audio' && audioTrack && audioTrack.container === 'audio/mpeg') { // Chrome audio mp3 track + var audioBuffer = this.sourceBuffer.audio; + var delta = Math.abs(audioBuffer.timestampOffset - data.start); + // adjust timestamp offset if time delta is greater than 100ms + if (delta > 0.1) { + var updating = audioBuffer.updating; + try { + audioBuffer.abort(); + } + catch (err) { + logger_1.logger.warn('can not abort audio buffer: ' + err); + } + if (!updating) { + logger_1.logger.warn('change mpeg audio timestamp offset from ' + audioBuffer.timestampOffset + ' to ' + data.start); + audioBuffer.timestampOffset = data.start; + } + else { + this.audioTimestampOffset = data.start; + } + } + } + }; + BufferController.prototype.onManifestParsed = function (data) { + // in case of alt audio 2 BUFFER_CODECS events will be triggered, one per stream controller + // sourcebuffers will be created all at once when the expected nb of tracks will be reached + // in case alt audio is not used, only one BUFFER_CODEC event will be fired from main stream controller + // it will contain the expected nb of source buffers, no need to compute it + this.bufferCodecEventsExpected = data.altAudio ? 2 : 1; + logger_1.logger.log(this.bufferCodecEventsExpected + " bufferCodec event(s) expected"); + }; + BufferController.prototype.onMediaAttaching = function (data) { + var media = this.media = data.media; + if (media) { + // setup the media source + var ms = this.mediaSource = new MediaSource(); + // Media Source listeners + this.onmso = this.onMediaSourceOpen.bind(this); + this.onmse = this.onMediaSourceEnded.bind(this); + this.onmsc = this.onMediaSourceClose.bind(this); + ms.addEventListener('sourceopen', this.onmso); + ms.addEventListener('sourceended', this.onmse); + ms.addEventListener('sourceclose', this.onmsc); + // link video and media Source + media.src = window.URL.createObjectURL(ms); + // cache the locally generated object url + this._objectUrl = media.src; + } + }; + BufferController.prototype.onMediaDetaching = function () { + logger_1.logger.log('media source detaching'); + var ms = this.mediaSource; + if (ms) { + if (ms.readyState === 'open') { + try { + // endOfStream could trigger exception if any sourcebuffer is in updating state + // we don't really care about checking sourcebuffer state here, + // as we are anyway detaching the MediaSource + // let's just avoid this exception to propagate + ms.endOfStream(); + } + catch (err) { + logger_1.logger.warn("onMediaDetaching:" + err.message + " while calling endOfStream"); + } + } + ms.removeEventListener('sourceopen', this.onmso); + ms.removeEventListener('sourceended', this.onmse); + ms.removeEventListener('sourceclose', this.onmsc); + // Detach properly the MediaSource from the HTMLMediaElement as + // suggested in https://github.com/w3c/media-source/issues/53. + if (this.media) { + window.URL.revokeObjectURL(this._objectUrl); + // clean up video tag src only if it's our own url. some external libraries might + // hijack the video tag and change its 'src' without destroying the Hls instance first + if (this.media.src === this._objectUrl) { + this.media.removeAttribute('src'); + this.media.load(); + } + else { + logger_1.logger.warn('media.src was changed by a third party - skip cleanup'); + } + } + this.mediaSource = null; + this.media = null; + this._objectUrl = null; + this.pendingTracks = {}; + this.tracks = {}; + this.sourceBuffer = {}; + this.flushRange = []; + this.segments = []; + this.appended = 0; + } + this.onmso = this.onmse = this.onmsc = null; + this.hls.trigger(events_1.default.MEDIA_DETACHED); + }; + BufferController.prototype.onMediaSourceOpen = function () { + logger_1.logger.log('media source opened'); + this.hls.trigger(events_1.default.MEDIA_ATTACHED, { media: this.media }); + var mediaSource = this.mediaSource; + if (mediaSource) { + // once received, don't listen anymore to sourceopen event + mediaSource.removeEventListener('sourceopen', this.onmso); + } + this.checkPendingTracks(); + }; + BufferController.prototype.checkPendingTracks = function () { + var _a = this, bufferCodecEventsExpected = _a.bufferCodecEventsExpected, pendingTracks = _a.pendingTracks; + // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once. + // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after + // data has been appended to existing ones. + // 2 tracks is the max (one for audio, one for video). If we've reach this max go ahead and create the buffers. + var pendingTracksCount = Object.keys(pendingTracks).length; + if ((pendingTracksCount && !bufferCodecEventsExpected) || pendingTracksCount === 2) { + // ok, let's create them now ! + this.createSourceBuffers(pendingTracks); + this.pendingTracks = {}; + // append any pending segments now ! + this.doAppending(); + } + }; + BufferController.prototype.onMediaSourceClose = function () { + logger_1.logger.log('media source closed'); + }; + BufferController.prototype.onMediaSourceEnded = function () { + logger_1.logger.log('media source ended'); + }; + BufferController.prototype.onSBUpdateEnd = function () { + // update timestampOffset + if (this.audioTimestampOffset) { + var audioBuffer = this.sourceBuffer.audio; + logger_1.logger.warn("change mpeg audio timestamp offset from " + audioBuffer.timestampOffset + " to " + this.audioTimestampOffset); + audioBuffer.timestampOffset = this.audioTimestampOffset; + delete this.audioTimestampOffset; + } + if (this._needsFlush) { + this.doFlush(); + } + if (this._needsEos) { + this.checkEos(); + } + this.appending = false; + var parent = this.parent; + // count nb of pending segments waiting for appending on this sourcebuffer + var pending = this.segments.reduce(function (counter, segment) { return (segment.parent === parent) ? counter + 1 : counter; }, 0); + // this.sourceBuffer is better to use than media.buffered as it is closer to the PTS data from the fragments + var timeRanges = {}; + var sourceBuffer = this.sourceBuffer; + for (var streamType in sourceBuffer) { + timeRanges[streamType] = sourceBuffer[streamType].buffered; + } + this.hls.trigger(events_1.default.BUFFER_APPENDED, { parent: parent, pending: pending, timeRanges: timeRanges }); + // don't append in flushing mode + if (!this._needsFlush) { + this.doAppending(); + } + this.updateMediaElementDuration(); + // appending goes first + if (pending === 0) { + this.flushLiveBackBuffer(); + } + }; + BufferController.prototype.onSBUpdateError = function (event) { + logger_1.logger.error('sourceBuffer error:', event); + // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error + // this error might not always be fatal (it is fatal if decode error is set, in that case + // it will be followed by a mediaElement error ...) + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.BUFFER_APPENDING_ERROR, fatal: false }); + // we don't need to do more than that, as accordin to the spec, updateend will be fired just after + }; + BufferController.prototype.onBufferReset = function () { + var sourceBuffer = this.sourceBuffer; + for (var type in sourceBuffer) { + var sb = sourceBuffer[type]; + try { + this.mediaSource.removeSourceBuffer(sb); + sb.removeEventListener('updateend', this.onsbue); + sb.removeEventListener('error', this.onsbe); + } + catch (err) { + } + } + this.sourceBuffer = {}; + this.flushRange = []; + this.segments = []; + this.appended = 0; + }; + BufferController.prototype.onBufferCodecs = function (tracks) { + var _this = this; + // if source buffer(s) not created yet, appended buffer tracks in this.pendingTracks + // if sourcebuffers already created, do nothing ... + if (Object.keys(this.sourceBuffer).length) { + return; + } + Object.keys(tracks).forEach(function (trackName) { + _this.pendingTracks[trackName] = tracks[trackName]; + }); + var mediaSource = this.mediaSource; + this.bufferCodecEventsExpected = Math.max(this.bufferCodecEventsExpected - 1, 0); + if (mediaSource && mediaSource.readyState === 'open') { + this.checkPendingTracks(); + } + }; + BufferController.prototype.createSourceBuffers = function (tracks) { + var sourceBuffer = this.sourceBuffer, mediaSource = this.mediaSource; + for (var trackName in tracks) { + if (!sourceBuffer[trackName]) { + var track = tracks[trackName]; + // use levelCodec as first priority + var codec = track.levelCodec || track.codec; + var mimeType = track.container + ";codecs=" + codec; + logger_1.logger.log("creating sourceBuffer(" + mimeType + ")"); + try { + var sb = sourceBuffer[trackName] = mediaSource.addSourceBuffer(mimeType); + sb.addEventListener('updateend', this.onsbue); + sb.addEventListener('error', this.onsbe); + this.tracks[trackName] = { codec: codec, container: track.container }; + track.buffer = sb; + } + catch (err) { + logger_1.logger.error("error while trying to add sourceBuffer:" + err.message); + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.BUFFER_ADD_CODEC_ERROR, fatal: false, err: err, mimeType: mimeType }); + } + } + } + this.hls.trigger(events_1.default.BUFFER_CREATED, { tracks: tracks }); + }; + BufferController.prototype.onBufferAppending = function (data) { + if (!this._needsFlush) { + if (!this.segments) { + this.segments = [data]; + } + else { + this.segments.push(data); + } + this.doAppending(); + } + }; + BufferController.prototype.onBufferAppendFail = function (data) { + logger_1.logger.error('sourceBuffer error:', data.event); + // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error + // this error might not always be fatal (it is fatal if decode error is set, in that case + // it will be followed by a mediaElement error ...) + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.BUFFER_APPENDING_ERROR, fatal: false }); + }; + // on BUFFER_EOS mark matching sourcebuffer(s) as ended and trigger checkEos() + BufferController.prototype.onBufferEos = function (data) { + var sb = this.sourceBuffer; + var dataType = data.type; + for (var type in sb) { + if (!dataType || type === dataType) { + if (!sb[type].ended) { + sb[type].ended = true; + logger_1.logger.log(type + " sourceBuffer now EOS"); + } + } + } + this.checkEos(); + }; + // if all source buffers are marked as ended, signal endOfStream() to MediaSource. + BufferController.prototype.checkEos = function () { + var sb = this.sourceBuffer, mediaSource = this.mediaSource; + if (!mediaSource || mediaSource.readyState !== 'open') { + this._needsEos = false; + return; + } + for (var type in sb) { + var sbobj = sb[type]; + if (!sbobj.ended) { + return; + } + if (sbobj.updating) { + this._needsEos = true; + return; + } + } + logger_1.logger.log('all media data are available, signal endOfStream() to MediaSource and stop loading fragment'); + // Notify the media element that it now has all of the media data + try { + mediaSource.endOfStream(); + } + catch (e) { + logger_1.logger.warn('exception while calling mediaSource.endOfStream()'); + } + this._needsEos = false; + }; + BufferController.prototype.onBufferFlushing = function (data) { + this.flushRange.push({ start: data.startOffset, end: data.endOffset, type: data.type }); + // attempt flush immediately + this.flushBufferCounter = 0; + this.doFlush(); + }; + BufferController.prototype.flushLiveBackBuffer = function () { + // clear back buffer for live only + if (!this._live) { + return; + } + var liveBackBufferLength = this.hls.config.liveBackBufferLength; + if (!isFinite(liveBackBufferLength) || liveBackBufferLength < 0) { + return; + } + var currentTime = this.media.currentTime; + var sourceBuffer = this.sourceBuffer; + var bufferTypes = Object.keys(sourceBuffer); + var targetBackBufferPosition = currentTime - Math.max(liveBackBufferLength, this._levelTargetDuration); + for (var index = bufferTypes.length - 1; index >= 0; index--) { + var bufferType = bufferTypes[index], buffered = sourceBuffer[bufferType].buffered; + // when target buffer start exceeds actual buffer start + if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) { + // remove buffer up until current time minus minimum back buffer length (removing buffer too close to current + // time will lead to playback freezing) + // credits for level target duration - https://github.com/videojs/http-streaming/blob/3132933b6aa99ddefab29c10447624efd6fd6e52/src/segment-loader.js#L91 + this.removeBufferRange(bufferType, sourceBuffer[bufferType], 0, targetBackBufferPosition); + } + } + }; + BufferController.prototype.onLevelUpdated = function (_a) { + var details = _a.details; + if (details.fragments.length > 0) { + this._levelDuration = details.totalduration + details.fragments[0].start; + this._levelTargetDuration = details.averagetargetduration || details.targetduration || 10; + this._live = details.live; + this.updateMediaElementDuration(); + } + }; + /** + * Update Media Source duration to current level duration or override to Infinity if configuration parameter + * 'liveDurationInfinity` is set to `true` + * More details: https://github.com/video-dev/hls.js/issues/355 + */ + BufferController.prototype.updateMediaElementDuration = function () { + var config = this.hls.config; + var duration; + if (this._levelDuration === null || + !this.media || + !this.mediaSource || + !this.sourceBuffer || + this.media.readyState === 0 || + this.mediaSource.readyState !== 'open') { + return; + } + for (var type in this.sourceBuffer) { + if (this.sourceBuffer[type].updating === true) { + // can't set duration whilst a buffer is updating + return; + } + } + duration = this.media.duration; + // initialise to the value that the media source is reporting + if (this._msDuration === null) { + this._msDuration = this.mediaSource.duration; + } + if (this._live === true && config.liveDurationInfinity === true) { + // Override duration to Infinity + logger_1.logger.log('Media Source duration is set to Infinity'); + this._msDuration = this.mediaSource.duration = Infinity; + } + else if ((this._levelDuration > this._msDuration && this._levelDuration > duration) || !Number.isFinite(duration)) { + // levelDuration was the last value we set. + // not using mediaSource.duration as the browser may tweak this value + // only update Media Source duration if its value increase, this is to avoid + // flushing already buffered portion when switching between quality level + logger_1.logger.log("Updating Media Source duration to " + this._levelDuration.toFixed(3)); + this._msDuration = this.mediaSource.duration = this._levelDuration; + } + }; + BufferController.prototype.doFlush = function () { + // loop through all buffer ranges to flush + while (this.flushRange.length) { + var range = this.flushRange[0]; + // flushBuffer will abort any buffer append in progress and flush Audio/Video Buffer + if (this.flushBuffer(range.start, range.end, range.type)) { + // range flushed, remove from flush array + this.flushRange.shift(); + this.flushBufferCounter = 0; + } + else { + this._needsFlush = true; + // avoid looping, wait for SB update end to retrigger a flush + return; + } + } + if (this.flushRange.length === 0) { + // everything flushed + this._needsFlush = false; + // let's recompute this.appended, which is used to avoid flush looping + var appended = 0; + var sourceBuffer = this.sourceBuffer; + try { + for (var type in sourceBuffer) { + appended += sourceBuffer[type].buffered.length; + } + } + catch (error) { + // error could be thrown while accessing buffered, in case sourcebuffer has already been removed from MediaSource + // this is harmess at this stage, catch this to avoid reporting an internal exception + logger_1.logger.error('error while accessing sourceBuffer.buffered'); + } + this.appended = appended; + this.hls.trigger(events_1.default.BUFFER_FLUSHED); + } + }; + BufferController.prototype.doAppending = function () { + var _a = this, hls = _a.hls, segments = _a.segments, sourceBuffer = _a.sourceBuffer; + if (Object.keys(sourceBuffer).length) { + if (this.media.error) { + this.segments = []; + logger_1.logger.error('trying to append although a media error occured, flush segment and abort'); + return; + } + if (this.appending) { + // logger.log(`sb appending in progress`); + return; + } + if (segments && segments.length) { + var segment = segments.shift(); + try { + var type = segment.type, sb = sourceBuffer[type]; + if (sb) { + if (!sb.updating) { + // reset sourceBuffer ended flag before appending segment + sb.ended = false; + // logger.log(`appending ${segment.content} ${type} SB, size:${segment.data.length}, ${segment.parent}`); + this.parent = segment.parent; + sb.appendBuffer(segment.data); + this.appendError = 0; + this.appended++; + this.appending = true; + } + else { + segments.unshift(segment); + } + } + else { + // in case we don't have any source buffer matching with this segment type, + // it means that Mediasource fails to create sourcebuffer + // discard this segment, and trigger update end + this.onSBUpdateEnd(); + } + } + catch (err) { + // in case any error occured while appending, put back segment in segments table + logger_1.logger.error("error while trying to append buffer:" + err.message); + segments.unshift(segment); + var event_1 = { type: errors_1.ErrorTypes.MEDIA_ERROR, parent: segment.parent }; + if (err.code !== 22) { + if (this.appendError) { + this.appendError++; + } + else { + this.appendError = 1; + } + event_1.details = errors_1.ErrorDetails.BUFFER_APPEND_ERROR; + /* with UHD content, we could get loop of quota exceeded error until + browser is able to evict some data from sourcebuffer. retrying help recovering this + */ + if (this.appendError > hls.config.appendErrorMaxRetry) { + logger_1.logger.log("fail " + hls.config.appendErrorMaxRetry + " times to append segment in sourceBuffer"); + this.segments = []; + event_1.fatal = true; + hls.trigger(events_1.default.ERROR, event_1); + } + else { + event_1.fatal = false; + hls.trigger(events_1.default.ERROR, event_1); + } + } + else { + // QuotaExceededError: http://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror + // let's stop appending any segments, and report BUFFER_FULL_ERROR error + this.segments = []; + event_1.details = errors_1.ErrorDetails.BUFFER_FULL_ERROR; + event_1.fatal = false; + hls.trigger(events_1.default.ERROR, event_1); + } + } + } + } + }; + /* + flush specified buffered range, + return true once range has been flushed. + as sourceBuffer.remove() is asynchronous, flushBuffer will be retriggered on sourceBuffer update end + */ + BufferController.prototype.flushBuffer = function (startOffset, endOffset, typeIn) { + var sb; + var sourceBuffer = this.sourceBuffer; + if (Object.keys(sourceBuffer).length) { + logger_1.logger.log("flushBuffer,pos/start/end: " + this.media.currentTime.toFixed(3) + "/" + startOffset + "/" + endOffset); + // safeguard to avoid infinite looping : don't try to flush more than the nb of appended segments + if (this.flushBufferCounter < this.appended) { + for (var type in sourceBuffer) { + // check if sourcebuffer type is defined (typeIn): if yes, let's only flush this one + // if no, let's flush all sourcebuffers + if (typeIn && type !== typeIn) { + continue; + } + sb = sourceBuffer[type]; + // we are going to flush buffer, mark source buffer as 'not ended' + sb.ended = false; + if (!sb.updating) { + if (this.removeBufferRange(type, sb, startOffset, endOffset)) { + this.flushBufferCounter++; + return false; + } + } + else { + logger_1.logger.warn('cannot flush, sb updating in progress'); + return false; + } + } + } + else { + logger_1.logger.warn('abort flushing too many retries'); + } + logger_1.logger.log('buffer flushed'); + } + // everything flushed ! + return true; + }; + /** + * Removes first buffered range from provided source buffer that lies within given start and end offsets. + * + * @param type Type of the source buffer, logging purposes only. + * @param sb Target SourceBuffer instance. + * @param startOffset + * @param endOffset + * + * @returns {boolean} True when source buffer remove requested. + */ + BufferController.prototype.removeBufferRange = function (type, sb, startOffset, endOffset) { + try { + for (var i = 0; i < sb.buffered.length; i++) { + var bufStart = sb.buffered.start(i); + var bufEnd = sb.buffered.end(i); + var removeStart = Math.max(bufStart, startOffset); + var removeEnd = Math.min(bufEnd, endOffset); + /* sometimes sourcebuffer.remove() does not flush + the exact expected time range. + to avoid rounding issues/infinite loop, + only flush buffer range of length greater than 500ms. + */ + if (Math.min(removeEnd, bufEnd) - removeStart > 0.5) { + logger_1.logger.log("sb remove " + type + " [" + removeStart + "," + removeEnd + "], of [" + bufStart + "," + bufEnd + "], pos:" + this.media.currentTime); + sb.remove(removeStart, removeEnd); + return true; + } + } + } + catch (error) { + logger_1.logger.warn('removeBufferRange failed', error); + } + return false; + }; + return BufferController; +}(event_handler_1.default)); +exports.default = BufferController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/cap-level-controller.js": +/*!************************************************!*\ + !*** ./src/controller/cap-level-controller.js ***! + \************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * cap stream level to media size dimension controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var CapLevelController = /** @class */ (function (_super) { + __extends(CapLevelController, _super); + function CapLevelController(hls) { + var _this = _super.call(this, hls, events_1.default.FPS_DROP_LEVEL_CAPPING, events_1.default.MEDIA_ATTACHING, events_1.default.MANIFEST_PARSED, events_1.default.BUFFER_CODECS, events_1.default.MEDIA_DETACHING) || this; + _this.autoLevelCapping = Number.POSITIVE_INFINITY; + _this.firstLevel = null; + _this.levels = []; + _this.media = null; + _this.restrictedLevels = []; + _this.timer = null; + return _this; + } + CapLevelController.prototype.destroy = function () { + if (this.hls.config.capLevelToPlayerSize) { + this.media = null; + this._stopCapping(); + } + }; + CapLevelController.prototype.onFpsDropLevelCapping = function (data) { + // Don't add a restricted level more than once + if (CapLevelController.isLevelAllowed(data.droppedLevel, this.restrictedLevels)) { + this.restrictedLevels.push(data.droppedLevel); + } + }; + CapLevelController.prototype.onMediaAttaching = function (data) { + this.media = data.media instanceof window.HTMLVideoElement ? data.media : null; + }; + CapLevelController.prototype.onManifestParsed = function (data) { + var hls = this.hls; + this.restrictedLevels = []; + this.levels = data.levels; + this.firstLevel = data.firstLevel; + if (hls.config.capLevelToPlayerSize && data.video) { + // Start capping immediately if the manifest has signaled video codecs + this._startCapping(); + } + }; + // Only activate capping when playing a video stream; otherwise, multi-bitrate audio-only streams will be restricted + // to the first level + CapLevelController.prototype.onBufferCodecs = function (data) { + var hls = this.hls; + if (hls.config.capLevelToPlayerSize && data.video) { + // If the manifest did not signal a video codec capping has been deferred until we're certain video is present + this._startCapping(); + } + }; + CapLevelController.prototype.onLevelsUpdated = function (data) { + this.levels = data.levels; + }; + CapLevelController.prototype.onMediaDetaching = function () { + this._stopCapping(); + }; + CapLevelController.prototype.detectPlayerSize = function () { + if (this.media) { + var levelsLength = this.levels ? this.levels.length : 0; + if (levelsLength) { + var hls_1 = this.hls; + hls_1.autoLevelCapping = this.getMaxLevel(levelsLength - 1); + if (hls_1.autoLevelCapping > this.autoLevelCapping) { + // if auto level capping has a higher value for the previous one, flush the buffer using nextLevelSwitch + // usually happen when the user go to the fullscreen mode. + hls_1.streamController.nextLevelSwitch(); + } + this.autoLevelCapping = hls_1.autoLevelCapping; + } + } + }; + /* + * returns level should be the one with the dimensions equal or greater than the media (player) dimensions (so the video will be downscaled) + */ + CapLevelController.prototype.getMaxLevel = function (capLevelIndex) { + var _this = this; + if (!this.levels) { + return -1; + } + var validLevels = this.levels.filter(function (level, index) { + return CapLevelController.isLevelAllowed(index, _this.restrictedLevels) && index <= capLevelIndex; + }); + return CapLevelController.getMaxLevelByMediaSize(validLevels, this.mediaWidth, this.mediaHeight); + }; + CapLevelController.prototype._startCapping = function () { + if (this.timer) { + // Don't reset capping if started twice; this can happen if the manifest signals a video codec + return; + } + this.autoLevelCapping = Number.POSITIVE_INFINITY; + this.hls.firstLevel = this.getMaxLevel(this.firstLevel); + clearInterval(this.timer); + this.timer = setInterval(this.detectPlayerSize.bind(this), 1000); + this.detectPlayerSize(); + }; + CapLevelController.prototype._stopCapping = function () { + this.restrictedLevels = []; + this.firstLevel = null; + this.autoLevelCapping = Number.POSITIVE_INFINITY; + if (this.timer) { + this.timer = clearInterval(this.timer); + this.timer = null; + } + }; + Object.defineProperty(CapLevelController.prototype, "mediaWidth", { + get: function () { + var width; + var media = this.media; + if (media) { + width = media.width || media.clientWidth || media.offsetWidth; + width *= CapLevelController.contentScaleFactor; + } + return width; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(CapLevelController.prototype, "mediaHeight", { + get: function () { + var height; + var media = this.media; + if (media) { + height = media.height || media.clientHeight || media.offsetHeight; + height *= CapLevelController.contentScaleFactor; + } + return height; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(CapLevelController, "contentScaleFactor", { + get: function () { + var pixelRatio = 1; + try { + pixelRatio = window.devicePixelRatio; + } + catch (e) { } + return pixelRatio; + }, + enumerable: true, + configurable: true + }); + CapLevelController.isLevelAllowed = function (level, restrictedLevels) { + if (restrictedLevels === void 0) { restrictedLevels = []; } + return restrictedLevels.indexOf(level) === -1; + }; + CapLevelController.getMaxLevelByMediaSize = function (levels, width, height) { + if (!levels || (levels && !levels.length)) { + return -1; + } + // Levels can have the same dimensions but differing bandwidths - since levels are ordered, we can look to the next + // to determine whether we've chosen the greatest bandwidth for the media's dimensions + var atGreatestBandiwdth = function (curLevel, nextLevel) { + if (!nextLevel) { + return true; + } + return curLevel.width !== nextLevel.width || curLevel.height !== nextLevel.height; + }; + // If we run through the loop without breaking, the media's dimensions are greater than every level, so default to + // the max level + var maxLevelIndex = levels.length - 1; + for (var i = 0; i < levels.length; i += 1) { + var level = levels[i]; + if ((level.width >= width || level.height >= height) && atGreatestBandiwdth(level, levels[i + 1])) { + maxLevelIndex = i; + break; + } + } + return maxLevelIndex; + }; + return CapLevelController; +}(event_handler_1.default)); +exports.default = CapLevelController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/eme-controller.js": +/*!******************************************!*\ + !*** ./src/controller/eme-controller.js ***! + \******************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * @author Stephan Hesse | + * + * DRM support for Hls.js + */ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var XMLHttpRequest = window.XMLHttpRequest; +var MAX_LICENSE_REQUEST_FAILURES = 3; +/** + * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/requestMediaKeySystemAccess + */ +var KeySystems = { + WIDEVINE: 'com.widevine.alpha', + PLAYREADY: 'com.microsoft.playready' +}; +/** + * @see https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemConfiguration + * @param {Array} audioCodecs List of required audio codecs to support + * @param {Array} videoCodecs List of required video codecs to support + * @param {object} drmSystemOptions Optional parameters/requirements for the key-system + * @returns {Array} An array of supported configurations + */ +var createWidevineMediaKeySystemConfigurations = function (audioCodecs, videoCodecs, drmSystemOptions) { + var baseConfig = { + // initDataTypes: ['keyids', 'mp4'], + // label: "", + // persistentState: "not-allowed", // or "required" ? + // distinctiveIdentifier: "not-allowed", // or "required" ? + // sessionTypes: ['temporary'], + videoCapabilities: [ + // { contentType: 'video/mp4; codecs="avc1.42E01E"' } + ] + }; + videoCodecs.forEach(function (codec) { + baseConfig.videoCapabilities.push({ + contentType: "video/mp4; codecs=\"" + codec + "\"" + }); + }); + return [ + baseConfig + ]; +}; +/** + * The idea here is to handle key-system (and their respective platforms) specific configuration differences + * in order to work with the local requestMediaKeySystemAccess method. + * + * We can also rule-out platform-related key-system support at this point by throwing an error or returning null. + * + * @param {string} keySystem Identifier for the key-system, see `KeySystems` enum + * @param {Array} audioCodecs List of required audio codecs to support + * @param {Array} videoCodecs List of required video codecs to support + * @returns {Array | null} A non-empty Array of MediaKeySystemConfiguration objects or `null` + */ +var getSupportedMediaKeySystemConfigurations = function (keySystem, audioCodecs, videoCodecs) { + switch (keySystem) { + case KeySystems.WIDEVINE: + return createWidevineMediaKeySystemConfigurations(audioCodecs, videoCodecs); + default: + throw Error('Unknown key-system: ' + keySystem); + } +}; +/** + * Controller to deal with encrypted media extensions (EME) + * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API + * + * @class + * @constructor + */ +var EMEController = /** @class */ (function (_super) { + __extends(EMEController, _super); + /** + * @constructs + * @param {Hls} hls Our Hls.js instance + */ + function EMEController(hls) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHED, events_1.default.MANIFEST_PARSED) || this; + _this._widevineLicenseUrl = hls.config.widevineLicenseUrl; + _this._licenseXhrSetup = hls.config.licenseXhrSetup; + _this._emeEnabled = hls.config.emeEnabled; + _this._requestMediaKeySystemAccess = hls.config.requestMediaKeySystemAccessFunc; + _this._mediaKeysList = []; + _this._media = null; + _this._hasSetMediaKeys = false; + _this._isMediaEncrypted = false; + _this._requestLicenseFailureCount = 0; + return _this; + } + /** + * + * @param {string} keySystem Identifier for the key-system, see `KeySystems` enum + * @returns {string} License server URL for key-system (if any configured, otherwise causes error) + */ + EMEController.prototype.getLicenseServerUrl = function (keySystem) { + var url; + switch (keySystem) { + case KeySystems.WIDEVINE: + url = this._widevineLicenseUrl; + break; + default: + url = null; + break; + } + if (!url) { + logger_1.logger.error("No license server URL configured for key-system \"" + keySystem + "\""); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED, + fatal: true + }); + } + return url; + }; + /** + * Requests access object and adds it to our list upon success + * @private + * @param {string} keySystem System ID (see `KeySystems`) + * @param {Array} audioCodecs List of required audio codecs to support + * @param {Array} videoCodecs List of required video codecs to support + */ + EMEController.prototype._attemptKeySystemAccess = function (keySystem, audioCodecs, videoCodecs) { + // TODO: add other DRM "options" + var _this = this; + var mediaKeySystemConfigs = getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs); + if (!mediaKeySystemConfigs) { + logger_1.logger.warn('Can not create config for key-system (maybe because platform is not supported):', keySystem); + return; + } + logger_1.logger.log('Requesting encrypted media key-system access'); + // expecting interface like window.navigator.requestMediaKeySystemAccess + this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs) + .then(function (mediaKeySystemAccess) { + _this._onMediaKeySystemAccessObtained(keySystem, mediaKeySystemAccess); + }) + .catch(function (err) { + logger_1.logger.error("Failed to obtain key-system \"" + keySystem + "\" access:", err); + }); + }; + Object.defineProperty(EMEController.prototype, "requestMediaKeySystemAccess", { + get: function () { + if (!this._requestMediaKeySystemAccess) { + throw new Error('No requestMediaKeySystemAccess function configured'); + } + return this._requestMediaKeySystemAccess; + }, + enumerable: true, + configurable: true + }); + /** + * Handles obtaining access to a key-system + * + * @param {string} keySystem + * @param {MediaKeySystemAccess} mediaKeySystemAccess https://developer.mozilla.org/en-US/docs/Web/API/MediaKeySystemAccess + */ + EMEController.prototype._onMediaKeySystemAccessObtained = function (keySystem, mediaKeySystemAccess) { + var _this = this; + logger_1.logger.log("Access for key-system \"" + keySystem + "\" obtained"); + var mediaKeysListItem = { + mediaKeys: null, + mediaKeysSession: null, + mediaKeysSessionInitialized: false, + mediaKeySystemAccess: mediaKeySystemAccess, + mediaKeySystemDomain: keySystem + }; + this._mediaKeysList.push(mediaKeysListItem); + mediaKeySystemAccess.createMediaKeys() + .then(function (mediaKeys) { + mediaKeysListItem.mediaKeys = mediaKeys; + logger_1.logger.log("Media-keys created for key-system \"" + keySystem + "\""); + _this._onMediaKeysCreated(); + }) + .catch(function (err) { + logger_1.logger.error('Failed to create media-keys:', err); + }); + }; + /** + * Handles key-creation (represents access to CDM). We are going to create key-sessions upon this + * for all existing keys where no session exists yet. + */ + EMEController.prototype._onMediaKeysCreated = function () { + var _this = this; + // check for all key-list items if a session exists, otherwise, create one + this._mediaKeysList.forEach(function (mediaKeysListItem) { + if (!mediaKeysListItem.mediaKeysSession) { + mediaKeysListItem.mediaKeysSession = mediaKeysListItem.mediaKeys.createSession(); + _this._onNewMediaKeySession(mediaKeysListItem.mediaKeysSession); + } + }); + }; + /** + * + * @param {*} keySession + */ + EMEController.prototype._onNewMediaKeySession = function (keySession) { + var _this = this; + logger_1.logger.log("New key-system session " + keySession.sessionId); + keySession.addEventListener('message', function (event) { + _this._onKeySessionMessage(keySession, event.message); + }, false); + }; + EMEController.prototype._onKeySessionMessage = function (keySession, message) { + logger_1.logger.log('Got EME message event, creating license request'); + this._requestLicense(message, function (data) { + logger_1.logger.log('Received license data, updating key-session'); + keySession.update(data); + }); + }; + EMEController.prototype._onMediaEncrypted = function (initDataType, initData) { + logger_1.logger.log("Media is encrypted using \"" + initDataType + "\" init data type"); + this._isMediaEncrypted = true; + this._mediaEncryptionInitDataType = initDataType; + this._mediaEncryptionInitData = initData; + this._attemptSetMediaKeys(); + this._generateRequestWithPreferredKeySession(); + }; + EMEController.prototype._attemptSetMediaKeys = function () { + if (!this._hasSetMediaKeys) { + // FIXME: see if we can/want/need-to really to deal with several potential key-sessions? + var keysListItem = this._mediaKeysList[0]; + if (!keysListItem || !keysListItem.mediaKeys) { + logger_1.logger.error('Fatal: Media is encrypted but no CDM access or no keys have been obtained yet'); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_NO_KEYS, + fatal: true + }); + return; + } + logger_1.logger.log('Setting keys for encrypted media'); + this._media.setMediaKeys(keysListItem.mediaKeys); + this._hasSetMediaKeys = true; + } + }; + EMEController.prototype._generateRequestWithPreferredKeySession = function () { + var _this = this; + // FIXME: see if we can/want/need-to really to deal with several potential key-sessions? + var keysListItem = this._mediaKeysList[0]; + if (!keysListItem) { + logger_1.logger.error('Fatal: Media is encrypted but not any key-system access has been obtained yet'); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_NO_ACCESS, + fatal: true + }); + return; + } + if (keysListItem.mediaKeysSessionInitialized) { + logger_1.logger.warn('Key-Session already initialized but requested again'); + return; + } + var keySession = keysListItem.mediaKeysSession; + if (!keySession) { + logger_1.logger.error('Fatal: Media is encrypted but no key-session existing'); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_NO_SESSION, + fatal: true + }); + } + var initDataType = this._mediaEncryptionInitDataType; + var initData = this._mediaEncryptionInitData; + logger_1.logger.log("Generating key-session request for \"" + initDataType + "\" init data type"); + keysListItem.mediaKeysSessionInitialized = true; + keySession.generateRequest(initDataType, initData) + .then(function () { + logger_1.logger.debug('Key-session generation succeeded'); + }) + .catch(function (err) { + logger_1.logger.error('Error generating key-session request:', err); + _this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_NO_SESSION, + fatal: false + }); + }); + }; + /** + * @param {string} url License server URL + * @param {ArrayBuffer} keyMessage Message data issued by key-system + * @param {function} callback Called when XHR has succeeded + * @returns {XMLHttpRequest} Unsent (but opened state) XHR object + */ + EMEController.prototype._createLicenseXhr = function (url, keyMessage, callback) { + var xhr = new XMLHttpRequest(); + var licenseXhrSetup = this._licenseXhrSetup; + try { + if (licenseXhrSetup) { + try { + licenseXhrSetup(xhr, url); + } + catch (e) { + // let's try to open before running setup + xhr.open('POST', url, true); + licenseXhrSetup(xhr, url); + } + } + // if licenseXhrSetup did not yet call open, let's do it now + if (!xhr.readyState) { + xhr.open('POST', url, true); + } + } + catch (e) { + // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS + logger_1.logger.error('Error setting up key-system license XHR', e); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED, + fatal: true + }); + return; + } + xhr.responseType = 'arraybuffer'; + xhr.onreadystatechange = + this._onLicenseRequestReadyStageChange.bind(this, xhr, url, keyMessage, callback); + return xhr; + }; + /** + * @param {XMLHttpRequest} xhr + * @param {string} url License server URL + * @param {ArrayBuffer} keyMessage Message data issued by key-system + * @param {function} callback Called when XHR has succeeded + * + */ + EMEController.prototype._onLicenseRequestReadyStageChange = function (xhr, url, keyMessage, callback) { + switch (xhr.readyState) { + case 4: + if (xhr.status === 200) { + this._requestLicenseFailureCount = 0; + logger_1.logger.log('License request succeeded'); + callback(xhr.response); + } + else { + logger_1.logger.error("License Request XHR failed (" + url + "). Status: " + xhr.status + " (" + xhr.statusText + ")"); + this._requestLicenseFailureCount++; + if (this._requestLicenseFailureCount <= MAX_LICENSE_REQUEST_FAILURES) { + var attemptsLeft = MAX_LICENSE_REQUEST_FAILURES - this._requestLicenseFailureCount + 1; + logger_1.logger.warn("Retrying license request, " + attemptsLeft + " attempts left"); + this._requestLicense(keyMessage, callback); + return; + } + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED, + fatal: true + }); + } + break; + } + }; + /** + * @param {object} keysListItem + * @param {ArrayBuffer} keyMessage + * @returns {ArrayBuffer} Challenge data posted to license server + */ + EMEController.prototype._generateLicenseRequestChallenge = function (keysListItem, keyMessage) { + var challenge; + if (keysListItem.mediaKeySystemDomain === KeySystems.PLAYREADY) { + logger_1.logger.error('PlayReady is not supported (yet)'); + // from https://github.com/MicrosoftEdge/Demos/blob/master/eme/scripts/demo.js + /* + if (this.licenseType !== this.LICENSE_TYPE_WIDEVINE) { + // For PlayReady CDMs, we need to dig the Challenge out of the XML. + var keyMessageXml = new DOMParser().parseFromString(String.fromCharCode.apply(null, new Uint16Array(keyMessage)), 'application/xml'); + if (keyMessageXml.getElementsByTagName('Challenge')[0]) { + challenge = atob(keyMessageXml.getElementsByTagName('Challenge')[0].childNodes[0].nodeValue); + } else { + throw 'Cannot find in key message'; + } + var headerNames = keyMessageXml.getElementsByTagName('name'); + var headerValues = keyMessageXml.getElementsByTagName('value'); + if (headerNames.length !== headerValues.length) { + throw 'Mismatched header / pair in key message'; + } + for (var i = 0; i < headerNames.length; i++) { + xhr.setRequestHeader(headerNames[i].childNodes[0].nodeValue, headerValues[i].childNodes[0].nodeValue); + } + } + */ + } + else if (keysListItem.mediaKeySystemDomain === KeySystems.WIDEVINE) { + // For Widevine CDMs, the challenge is the keyMessage. + challenge = keyMessage; + } + else { + logger_1.logger.error('Unsupported key-system:', keysListItem.mediaKeySystemDomain); + } + return challenge; + }; + EMEController.prototype._requestLicense = function (keyMessage, callback) { + logger_1.logger.log('Requesting content license for key-system'); + var keysListItem = this._mediaKeysList[0]; + if (!keysListItem) { + logger_1.logger.error('Fatal error: Media is encrypted but no key-system access has been obtained yet'); + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.KEY_SYSTEM_ERROR, + details: errors_1.ErrorDetails.KEY_SYSTEM_NO_ACCESS, + fatal: true + }); + return; + } + var url = this.getLicenseServerUrl(keysListItem.mediaKeySystemDomain); + var xhr = this._createLicenseXhr(url, keyMessage, callback); + logger_1.logger.log("Sending license request to URL: " + url); + xhr.send(this._generateLicenseRequestChallenge(keysListItem, keyMessage)); + }; + EMEController.prototype.onMediaAttached = function (data) { + var _this = this; + if (!this._emeEnabled) { + return; + } + var media = data.media; + // keep reference of media + this._media = media; + // FIXME: also handle detaching media ! + media.addEventListener('encrypted', function (e) { + _this._onMediaEncrypted(e.initDataType, e.initData); + }); + }; + EMEController.prototype.onManifestParsed = function (data) { + if (!this._emeEnabled) { + return; + } + var audioCodecs = data.levels.map(function (level) { return level.audioCodec; }); + var videoCodecs = data.levels.map(function (level) { return level.videoCodec; }); + this._attemptKeySystemAccess(KeySystems.WIDEVINE, audioCodecs, videoCodecs); + }; + return EMEController; +}(event_handler_1.default)); +exports.default = EMEController; + + +/***/ }), + +/***/ "./src/controller/fps-controller.js": +/*!******************************************!*\ + !*** ./src/controller/fps-controller.js ***! + \******************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * FPS Controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var performance = window.performance; +var FPSController = /** @class */ (function (_super) { + __extends(FPSController, _super); + function FPSController(hls) { + return _super.call(this, hls, events_1.default.MEDIA_ATTACHING) || this; + } + FPSController.prototype.destroy = function () { + if (this.timer) { + clearInterval(this.timer); + } + this.isVideoPlaybackQualityAvailable = false; + }; + FPSController.prototype.onMediaAttaching = function (data) { + var config = this.hls.config; + if (config.capLevelOnFPSDrop) { + var video_1 = this.video = data.media instanceof window.HTMLVideoElement ? data.media : null; + if (typeof video_1.getVideoPlaybackQuality === 'function') { + this.isVideoPlaybackQualityAvailable = true; + } + clearInterval(this.timer); + this.timer = setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod); + } + }; + FPSController.prototype.checkFPS = function (video, decodedFrames, droppedFrames) { + var currentTime = performance.now(); + if (decodedFrames) { + if (this.lastTime) { + var currentPeriod = currentTime - this.lastTime, currentDropped = droppedFrames - this.lastDroppedFrames, currentDecoded = decodedFrames - this.lastDecodedFrames, droppedFPS = 1000 * currentDropped / currentPeriod, hls_1 = this.hls; + hls_1.trigger(events_1.default.FPS_DROP, { currentDropped: currentDropped, currentDecoded: currentDecoded, totalDroppedFrames: droppedFrames }); + if (droppedFPS > 0) { + // logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod)); + if (currentDropped > hls_1.config.fpsDroppedMonitoringThreshold * currentDecoded) { + var currentLevel = hls_1.currentLevel; + logger_1.logger.warn('drop FPS ratio greater than max allowed value for currentLevel: ' + currentLevel); + if (currentLevel > 0 && (hls_1.autoLevelCapping === -1 || hls_1.autoLevelCapping >= currentLevel)) { + currentLevel = currentLevel - 1; + hls_1.trigger(events_1.default.FPS_DROP_LEVEL_CAPPING, { level: currentLevel, droppedLevel: hls_1.currentLevel }); + hls_1.autoLevelCapping = currentLevel; + hls_1.streamController.nextLevelSwitch(); + } + } + } + } + this.lastTime = currentTime; + this.lastDroppedFrames = droppedFrames; + this.lastDecodedFrames = decodedFrames; + } + }; + FPSController.prototype.checkFPSInterval = function () { + var video = this.video; + if (video) { + if (this.isVideoPlaybackQualityAvailable) { + var videoPlaybackQuality = video.getVideoPlaybackQuality(); + this.checkFPS(video, videoPlaybackQuality.totalVideoFrames, videoPlaybackQuality.droppedVideoFrames); + } + else { + this.checkFPS(video, video.webkitDecodedFrameCount, video.webkitDroppedFrameCount); + } + } + }; + return FPSController; +}(event_handler_1.default)); +exports.default = FPSController; + + +/***/ }), + +/***/ "./src/controller/fragment-finders.js": +/*!********************************************!*\ + !*** ./src/controller/fragment-finders.js ***! + \********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var binary_search_1 = __webpack_require__(/*! ../utils/binary-search */ "./src/utils/binary-search.js"); +/** + * Returns first fragment whose endPdt value exceeds the given PDT. + * @param {Array} fragments - The array of candidate fragments + * @param {number|null} [PDTValue = null] - The PDT value which must be exceeded + * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start/end can be within in order to be considered contiguous + * @returns {*|null} fragment - The best matching fragment + */ +function findFragmentByPDT(fragments, PDTValue, maxFragLookUpTolerance) { + if (!Array.isArray(fragments) || !fragments.length || !Number.isFinite(PDTValue)) { + return null; + } + // if less than start + if (PDTValue < fragments[0].programDateTime) { + return null; + } + if (PDTValue >= fragments[fragments.length - 1].endProgramDateTime) { + return null; + } + maxFragLookUpTolerance = maxFragLookUpTolerance || 0; + for (var seg = 0; seg < fragments.length; ++seg) { + var frag = fragments[seg]; + if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) { + return frag; + } + } + return null; +} +exports.findFragmentByPDT = findFragmentByPDT; +/** + * Finds a fragment based on the SN of the previous fragment; or based on the needs of the current buffer. + * This method compensates for small buffer gaps by applying a tolerance to the start of any candidate fragment, thus + * breaking any traps which would cause the same fragment to be continuously selected within a small range. + * @param {*} fragPrevious - The last frag successfully appended + * @param {Array} fragments - The array of candidate fragments + * @param {number} [bufferEnd = 0] - The end of the contiguous buffered range the playhead is currently within + * @param {number} maxFragLookUpTolerance - The amount of time that a fragment's start/end can be within in order to be considered contiguous + * @returns {*} foundFrag - The best matching fragment + */ +function findFragmentByPTS(fragPrevious, fragments, bufferEnd, maxFragLookUpTolerance) { + if (bufferEnd === void 0) { bufferEnd = 0; } + if (maxFragLookUpTolerance === void 0) { maxFragLookUpTolerance = 0; } + var fragNext = fragPrevious ? fragments[fragPrevious.sn - fragments[0].sn + 1] : null; + // Prefer the next fragment if it's within tolerance + if (fragNext && !fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext)) { + return fragNext; + } + return binary_search_1.default.search(fragments, fragmentWithinToleranceTest.bind(null, bufferEnd, maxFragLookUpTolerance)); +} +exports.findFragmentByPTS = findFragmentByPTS; +/** + * The test function used by the findFragmentBySn's BinarySearch to look for the best match to the current buffer conditions. + * @param {*} candidate - The fragment to test + * @param {number} [bufferEnd = 0] - The end of the current buffered range the playhead is currently within + * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start can be within in order to be considered contiguous + * @returns {number} - 0 if it matches, 1 if too low, -1 if too high + */ +function fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, candidate) { + if (bufferEnd === void 0) { bufferEnd = 0; } + if (maxFragLookUpTolerance === void 0) { maxFragLookUpTolerance = 0; } + // offset should be within fragment boundary - config.maxFragLookUpTolerance + // this is to cope with situations like + // bufferEnd = 9.991 + // frag[Ø] : [0,10] + // frag[1] : [10,20] + // bufferEnd is within frag[0] range ... although what we are expecting is to return frag[1] here + // frag start frag start+duration + // |-----------------------------| + // <---> <---> + // ...--------><-----------------------------><---------.... + // previous frag matching fragment next frag + // return -1 return 0 return 1 + // logger.log(`level/sn/start/end/bufEnd:${level}/${candidate.sn}/${candidate.start}/${(candidate.start+candidate.duration)}/${bufferEnd}`); + // Set the lookup tolerance to be small enough to detect the current segment - ensures we don't skip over very small segments + var candidateLookupTolerance = Math.min(maxFragLookUpTolerance, candidate.duration + (candidate.deltaPTS ? candidate.deltaPTS : 0)); + if (candidate.start + candidate.duration - candidateLookupTolerance <= bufferEnd) { + return 1; + } + else if (candidate.start - candidateLookupTolerance > bufferEnd && candidate.start) { + // if maxFragLookUpTolerance will have negative value then don't return -1 for first element + return -1; + } + return 0; +} +exports.fragmentWithinToleranceTest = fragmentWithinToleranceTest; +/** + * The test function used by the findFragmentByPdt's BinarySearch to look for the best match to the current buffer conditions. + * This function tests the candidate's program date time values, as represented in Unix time + * @param {*} candidate - The fragment to test + * @param {number} [pdtBufferEnd = 0] - The Unix time representing the end of the current buffered range + * @param {number} [maxFragLookUpTolerance = 0] - The amount of time that a fragment's start can be within in order to be considered contiguous + * @returns {boolean} True if contiguous, false otherwise + */ +function pdtWithinToleranceTest(pdtBufferEnd, maxFragLookUpTolerance, candidate) { + var candidateLookupTolerance = Math.min(maxFragLookUpTolerance, candidate.duration + (candidate.deltaPTS ? candidate.deltaPTS : 0)) * 1000; + return candidate.endProgramDateTime - candidateLookupTolerance > pdtBufferEnd; +} +exports.pdtWithinToleranceTest = pdtWithinToleranceTest; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/fragment-tracker.js": +/*!********************************************!*\ + !*** ./src/controller/fragment-tracker.js ***! + \********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +exports.FragmentState = { + NOT_LOADED: 'NOT_LOADED', + APPENDING: 'APPENDING', + PARTIAL: 'PARTIAL', + OK: 'OK' +}; +var FragmentTracker = /** @class */ (function (_super) { + __extends(FragmentTracker, _super); + function FragmentTracker(hls) { + var _this = _super.call(this, hls, events_1.default.BUFFER_APPENDED, events_1.default.FRAG_BUFFERED, events_1.default.FRAG_LOADED) || this; + _this.bufferPadding = 0.2; + _this.fragments = Object.create(null); + _this.timeRanges = Object.create(null); + _this.config = hls.config; + return _this; + } + FragmentTracker.prototype.destroy = function () { + this.fragments = null; + this.timeRanges = null; + this.config = null; + event_handler_1.default.prototype.destroy.call(this); + _super.prototype.destroy.call(this); + }; + /** + * Return a Fragment that match the position and levelType. + * If not found any Fragment, return null + * @param {number} position + * @param {LevelType} levelType + * @returns {Fragment|null} + */ + FragmentTracker.prototype.getBufferedFrag = function (position, levelType) { + var fragments = this.fragments; + var bufferedFrags = Object.keys(fragments).filter(function (key) { + var fragmentEntity = fragments[key]; + if (fragmentEntity.body.type !== levelType) { + return false; + } + if (!fragmentEntity.buffered) { + return false; + } + var frag = fragmentEntity.body; + return frag.startPTS <= position && position <= frag.endPTS; + }); + if (bufferedFrags.length === 0) { + return null; + } + else { + // https://github.com/video-dev/hls.js/pull/1545#discussion_r166229566 + var bufferedFragKey = bufferedFrags.pop(); + return fragments[bufferedFragKey].body; + } + }; + /** + * Partial fragments effected by coded frame eviction will be removed + * The browser will unload parts of the buffer to free up memory for new buffer data + * Fragments will need to be reloaded when the buffer is freed up, removing partial fragments will allow them to reload(since there might be parts that are still playable) + * @param {String} elementaryStream The elementaryStream of media this is (eg. video/audio) + * @param {TimeRanges} timeRange TimeRange object from a sourceBuffer + */ + FragmentTracker.prototype.detectEvictedFragments = function (elementaryStream, timeRange) { + var _this = this; + var fragmentTimes, time; + // Check if any flagged fragments have been unloaded + Object.keys(this.fragments).forEach(function (key) { + var fragmentEntity = _this.fragments[key]; + if (fragmentEntity.buffered === true) { + var esData = fragmentEntity.range[elementaryStream]; + if (esData) { + fragmentTimes = esData.time; + for (var i = 0; i < fragmentTimes.length; i++) { + time = fragmentTimes[i]; + if (_this.isTimeBuffered(time.startPTS, time.endPTS, timeRange) === false) { + // Unregister partial fragment as it needs to load again to be reused + _this.removeFragment(fragmentEntity.body); + break; + } + } + } + } + }); + }; + /** + * Checks if the fragment passed in is loaded in the buffer properly + * Partially loaded fragments will be registered as a partial fragment + * @param {Object} fragment Check the fragment against all sourceBuffers loaded + */ + FragmentTracker.prototype.detectPartialFragments = function (fragment) { + var _this = this; + var fragKey = this.getFragmentKey(fragment); + var fragmentEntity = this.fragments[fragKey]; + if (fragmentEntity) { + fragmentEntity.buffered = true; + Object.keys(this.timeRanges).forEach(function (elementaryStream) { + if (fragment.hasElementaryStream(elementaryStream)) { + var timeRange = _this.timeRanges[elementaryStream]; + // Check for malformed fragments + // Gaps need to be calculated for each elementaryStream + fragmentEntity.range[elementaryStream] = _this.getBufferedTimes(fragment.startPTS, fragment.endPTS, timeRange); + } + }); + } + }; + FragmentTracker.prototype.getBufferedTimes = function (startPTS, endPTS, timeRange) { + var fragmentTimes = []; + var startTime, endTime; + var fragmentPartial = false; + for (var i = 0; i < timeRange.length; i++) { + startTime = timeRange.start(i) - this.bufferPadding; + endTime = timeRange.end(i) + this.bufferPadding; + if (startPTS >= startTime && endPTS <= endTime) { + // Fragment is entirely contained in buffer + // No need to check the other timeRange times since it's completely playable + fragmentTimes.push({ + startPTS: Math.max(startPTS, timeRange.start(i)), + endPTS: Math.min(endPTS, timeRange.end(i)) + }); + break; + } + else if (startPTS < endTime && endPTS > startTime) { + // Check for intersection with buffer + // Get playable sections of the fragment + fragmentTimes.push({ + startPTS: Math.max(startPTS, timeRange.start(i)), + endPTS: Math.min(endPTS, timeRange.end(i)) + }); + fragmentPartial = true; + } + else if (endPTS <= startTime) { + // No need to check the rest of the timeRange as it is in order + break; + } + } + return { + time: fragmentTimes, + partial: fragmentPartial + }; + }; + FragmentTracker.prototype.getFragmentKey = function (fragment) { + return fragment.type + "_" + fragment.level + "_" + fragment.urlId + "_" + fragment.sn; + }; + /** + * Gets the partial fragment for a certain time + * @param {Number} time + * @returns {Object} fragment Returns a partial fragment at a time or null if there is no partial fragment + */ + FragmentTracker.prototype.getPartialFragment = function (time) { + var _this = this; + var timePadding, startTime, endTime; + var bestFragment = null; + var bestOverlap = 0; + Object.keys(this.fragments).forEach(function (key) { + var fragmentEntity = _this.fragments[key]; + if (_this.isPartial(fragmentEntity)) { + startTime = fragmentEntity.body.startPTS - _this.bufferPadding; + endTime = fragmentEntity.body.endPTS + _this.bufferPadding; + if (time >= startTime && time <= endTime) { + // Use the fragment that has the most padding from start and end time + timePadding = Math.min(time - startTime, endTime - time); + if (bestOverlap <= timePadding) { + bestFragment = fragmentEntity.body; + bestOverlap = timePadding; + } + } + } + }); + return bestFragment; + }; + /** + * @param {Object} fragment The fragment to check + * @returns {String} Returns the fragment state when a fragment never loaded or if it partially loaded + */ + FragmentTracker.prototype.getState = function (fragment) { + var fragKey = this.getFragmentKey(fragment); + var fragmentEntity = this.fragments[fragKey]; + var state = exports.FragmentState.NOT_LOADED; + if (fragmentEntity !== undefined) { + if (!fragmentEntity.buffered) { + state = exports.FragmentState.APPENDING; + } + else if (this.isPartial(fragmentEntity) === true) { + state = exports.FragmentState.PARTIAL; + } + else { + state = exports.FragmentState.OK; + } + } + return state; + }; + FragmentTracker.prototype.isPartial = function (fragmentEntity) { + return fragmentEntity.buffered === true && + ((fragmentEntity.range.video !== undefined && fragmentEntity.range.video.partial === true) || + (fragmentEntity.range.audio !== undefined && fragmentEntity.range.audio.partial === true)); + }; + FragmentTracker.prototype.isTimeBuffered = function (startPTS, endPTS, timeRange) { + var startTime, endTime; + for (var i = 0; i < timeRange.length; i++) { + startTime = timeRange.start(i) - this.bufferPadding; + endTime = timeRange.end(i) + this.bufferPadding; + if (startPTS >= startTime && endPTS <= endTime) { + return true; + } + if (endPTS <= startTime) { + // No need to check the rest of the timeRange as it is in order + return false; + } + } + return false; + }; + /** + * Fires when a fragment loading is completed + */ + FragmentTracker.prototype.onFragLoaded = function (e) { + var fragment = e.frag; + // don't track initsegment (for which sn is not a number) + // don't track frags used for bitrateTest, they're irrelevant. + if (Number.isFinite(fragment.sn) && !fragment.bitrateTest) { + this.fragments[this.getFragmentKey(fragment)] = { + body: fragment, + range: Object.create(null), + buffered: false + }; + } + }; + /** + * Fires when the buffer is updated + */ + FragmentTracker.prototype.onBufferAppended = function (e) { + var _this = this; + // Store the latest timeRanges loaded in the buffer + this.timeRanges = e.timeRanges; + Object.keys(this.timeRanges).forEach(function (elementaryStream) { + var timeRange = _this.timeRanges[elementaryStream]; + _this.detectEvictedFragments(elementaryStream, timeRange); + }); + }; + /** + * Fires after a fragment has been loaded into the source buffer + */ + FragmentTracker.prototype.onFragBuffered = function (e) { + this.detectPartialFragments(e.frag); + }; + /** + * Return true if fragment tracker has the fragment. + * @param {Object} fragment + * @returns {boolean} + */ + FragmentTracker.prototype.hasFragment = function (fragment) { + var fragKey = this.getFragmentKey(fragment); + return this.fragments[fragKey] !== undefined; + }; + /** + * Remove a fragment from fragment tracker until it is loaded again + * @param {Object} fragment The fragment to remove + */ + FragmentTracker.prototype.removeFragment = function (fragment) { + var fragKey = this.getFragmentKey(fragment); + delete this.fragments[fragKey]; + }; + /** + * Remove all fragments from fragment tracker. + */ + FragmentTracker.prototype.removeAllFragments = function () { + this.fragments = Object.create(null); + }; + return FragmentTracker; +}(event_handler_1.default)); +exports.FragmentTracker = FragmentTracker; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/gap-controller.js": +/*!******************************************!*\ + !*** ./src/controller/gap-controller.js ***! + \******************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var buffer_helper_1 = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var stallDebounceInterval = 1000; +var jumpThreshold = 0.5; // tolerance needed as some browsers stalls playback before reaching buffered range end +var GapController = /** @class */ (function () { + function GapController(config, media, fragmentTracker, hls) { + this.config = config; + this.media = media; + this.fragmentTracker = fragmentTracker; + this.hls = hls; + this.stallReported = false; + } + /** + * Checks if the playhead is stuck within a gap, and if so, attempts to free it. + * A gap is an unbuffered range between two buffered ranges (or the start and the first buffered range). + * @param lastCurrentTime + * @param buffered + */ + GapController.prototype.poll = function (lastCurrentTime, buffered) { + var _a = this, config = _a.config, media = _a.media; + var currentTime = media.currentTime; + var tnow = window.performance.now(); + if (currentTime !== lastCurrentTime) { + // The playhead is now moving, but was previously stalled + if (this.stallReported) { + logger_1.logger.warn("playback not stuck anymore @" + currentTime + ", after " + Math.round(tnow - this.stalled) + "ms"); + this.stallReported = false; + } + this.stalled = null; + this.nudgeRetry = 0; + return; + } + if (media.ended || !media.buffered.length || media.readyState > 2) { + return; + } + if (media.seeking && buffer_helper_1.BufferHelper.isBuffered(media, currentTime)) { + return; + } + // The playhead isn't moving but it should be + // Allow some slack time to for small stalls to resolve themselves + var stalledDuration = tnow - this.stalled; + var bufferInfo = buffer_helper_1.BufferHelper.bufferInfo(media, currentTime, config.maxBufferHole); + if (!this.stalled) { + this.stalled = tnow; + return; + } + else if (stalledDuration >= stallDebounceInterval) { + // Report stalling after trying to fix + this._reportStall(bufferInfo.len); + } + this._tryFixBufferStall(bufferInfo, stalledDuration); + }; + /** + * Detects and attempts to fix known buffer stalling issues. + * @param bufferInfo - The properties of the current buffer. + * @param stalledDuration - The amount of time Hls.js has been stalling for. + * @private + */ + GapController.prototype._tryFixBufferStall = function (bufferInfo, stalledDuration) { + var _a = this, config = _a.config, fragmentTracker = _a.fragmentTracker, media = _a.media; + var currentTime = media.currentTime; + var partial = fragmentTracker.getPartialFragment(currentTime); + if (partial) { + // Try to skip over the buffer hole caused by a partial fragment + // This method isn't limited by the size of the gap between buffered ranges + this._trySkipBufferHole(partial); + } + if (bufferInfo.len > jumpThreshold && stalledDuration > config.highBufferWatchdogPeriod * 1000) { + // Try to nudge currentTime over a buffer hole if we've been stalling for the configured amount of seconds + // We only try to jump the hole if it's under the configured size + // Reset stalled so to rearm watchdog timer + this.stalled = null; + this._tryNudgeBuffer(); + } + }; + /** + * Triggers a BUFFER_STALLED_ERROR event, but only once per stall period. + * @param bufferLen - The playhead distance from the end of the current buffer segment. + * @private + */ + GapController.prototype._reportStall = function (bufferLen) { + var _a = this, hls = _a.hls, media = _a.media, stallReported = _a.stallReported; + if (!stallReported) { + // Report stalled error once + this.stallReported = true; + logger_1.logger.warn("Playback stalling at @" + media.currentTime + " due to low buffer"); + hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.MEDIA_ERROR, + details: errors_1.ErrorDetails.BUFFER_STALLED_ERROR, + fatal: false, + buffer: bufferLen + }); + } + }; + /** + * Attempts to fix buffer stalls by jumping over known gaps caused by partial fragments + * @param partial - The partial fragment found at the current time (where playback is stalling). + * @private + */ + GapController.prototype._trySkipBufferHole = function (partial) { + var _a = this, hls = _a.hls, media = _a.media; + var currentTime = media.currentTime; + var lastEndTime = 0; + // Check if currentTime is between unbuffered regions of partial fragments + for (var i = 0; i < media.buffered.length; i++) { + var startTime = media.buffered.start(i); + if (currentTime >= lastEndTime && currentTime < startTime) { + media.currentTime = Math.max(startTime, media.currentTime + 0.1); + logger_1.logger.warn("skipping hole, adjusting currentTime from " + currentTime + " to " + media.currentTime); + this.stalled = null; + hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.MEDIA_ERROR, + details: errors_1.ErrorDetails.BUFFER_SEEK_OVER_HOLE, + fatal: false, + reason: "fragment loaded with buffer holes, seeking from " + currentTime + " to " + media.currentTime, + frag: partial + }); + return; + } + lastEndTime = media.buffered.end(i); + } + }; + /** + * Attempts to fix buffer stalls by advancing the mediaElement's current time by a small amount. + * @private + */ + GapController.prototype._tryNudgeBuffer = function () { + var _a = this, config = _a.config, hls = _a.hls, media = _a.media; + var currentTime = media.currentTime; + var nudgeRetry = (this.nudgeRetry || 0) + 1; + this.nudgeRetry = nudgeRetry; + if (nudgeRetry < config.nudgeMaxRetry) { + var targetTime = currentTime + nudgeRetry * config.nudgeOffset; + logger_1.logger.log("adjust currentTime from " + currentTime + " to " + targetTime); + // playback stalled in buffered area ... let's nudge currentTime to try to overcome this + media.currentTime = targetTime; + hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.MEDIA_ERROR, + details: errors_1.ErrorDetails.BUFFER_NUDGE_ON_STALL, + fatal: false + }); + } + else { + logger_1.logger.error("still stuck in high buffer @" + currentTime + " after " + config.nudgeMaxRetry + ", raise fatal error"); + hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.MEDIA_ERROR, + details: errors_1.ErrorDetails.BUFFER_STALLED_ERROR, + fatal: true + }); + } + }; + return GapController; +}()); +exports.default = GapController; + + +/***/ }), + +/***/ "./src/controller/id3-track-controller.js": +/*!************************************************!*\ + !*** ./src/controller/id3-track-controller.js ***! + \************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * id3 metadata track controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var id3_1 = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.js"); +var texttrack_utils_1 = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.js"); +var ID3TrackController = /** @class */ (function (_super) { + __extends(ID3TrackController, _super); + function ID3TrackController(hls) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHED, events_1.default.MEDIA_DETACHING, events_1.default.FRAG_PARSING_METADATA) || this; + _this.id3Track = undefined; + _this.media = undefined; + return _this; + } + ID3TrackController.prototype.destroy = function () { + event_handler_1.default.prototype.destroy.call(this); + }; + // Add ID3 metatadata text track. + ID3TrackController.prototype.onMediaAttached = function (data) { + this.media = data.media; + if (!this.media) { + } + }; + ID3TrackController.prototype.onMediaDetaching = function () { + texttrack_utils_1.clearCurrentCues(this.id3Track); + this.id3Track = undefined; + this.media = undefined; + }; + ID3TrackController.prototype.getID3Track = function (textTracks) { + for (var i = 0; i < textTracks.length; i++) { + var textTrack = textTracks[i]; + if (textTrack.kind === 'metadata' && textTrack.label === 'id3') { + // send 'addtrack' when reusing the textTrack for metadata, + // same as what we do for captions + texttrack_utils_1.sendAddTrackEvent(textTrack, this.media); + return textTrack; + } + } + return this.media.addTextTrack('metadata', 'id3'); + }; + ID3TrackController.prototype.onFragParsingMetadata = function (data) { + var fragment = data.frag; + var samples = data.samples; + // create track dynamically + if (!this.id3Track) { + this.id3Track = this.getID3Track(this.media.textTracks); + this.id3Track.mode = 'hidden'; + } + // Attempt to recreate Safari functionality by creating + // WebKitDataCue objects when available and store the decoded + // ID3 data in the value property of the cue + var Cue = window.WebKitDataCue || window.VTTCue || window.TextTrackCue; + for (var i = 0; i < samples.length; i++) { + var frames_1 = id3_1.default.getID3Frames(samples[i].data); + if (frames_1) { + var startTime = samples[i].pts; + var endTime = i < samples.length - 1 ? samples[i + 1].pts : fragment.endPTS; + // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE + if (startTime === endTime) { + endTime += 0.0001; + } + for (var j = 0; j < frames_1.length; j++) { + var frame = frames_1[j]; + // Safari doesn't put the timestamp frame in the TextTrack + if (!id3_1.default.isTimeStampFrame(frame)) { + var cue = new Cue(startTime, endTime, ''); + cue.value = frame; + this.id3Track.addCue(cue); + } + } + } + } + }; + return ID3TrackController; +}(event_handler_1.default)); +exports.default = ID3TrackController; + + +/***/ }), + +/***/ "./src/controller/level-controller.js": +/*!********************************************!*\ + !*** ./src/controller/level-controller.js ***! + \********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * Level Controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var codecs_1 = __webpack_require__(/*! ../utils/codecs */ "./src/utils/codecs.js"); +var level_helper_1 = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.js"); +var performance = window.performance; +var chromeOrFirefox; +var LevelController = /** @class */ (function (_super) { + __extends(LevelController, _super); + function LevelController(hls) { + var _this = _super.call(this, hls, events_1.default.MANIFEST_LOADED, events_1.default.LEVEL_LOADED, events_1.default.AUDIO_TRACK_SWITCHED, events_1.default.FRAG_LOADED, events_1.default.ERROR) || this; + _this.canload = false; + _this.currentLevelIndex = null; + _this.manualLevelIndex = -1; + _this.timer = null; + chromeOrFirefox = /chrome|firefox/.test(navigator.userAgent.toLowerCase()); + return _this; + } + LevelController.prototype.onHandlerDestroying = function () { + this.clearTimer(); + this.manualLevelIndex = -1; + }; + LevelController.prototype.clearTimer = function () { + if (this.timer !== null) { + clearTimeout(this.timer); + this.timer = null; + } + }; + LevelController.prototype.startLoad = function () { + var levels = this._levels; + this.canload = true; + this.levelRetryCount = 0; + // clean up live level details to force reload them, and reset load errors + if (levels) { + levels.forEach(function (level) { + level.loadError = 0; + var levelDetails = level.details; + if (levelDetails && levelDetails.live) { + level.details = undefined; + } + }); + } + // speed up live playlist refresh if timer exists + if (this.timer !== null) { + this.loadLevel(); + } + }; + LevelController.prototype.stopLoad = function () { + this.canload = false; + }; + LevelController.prototype.onManifestLoaded = function (data) { + var levels = []; + var audioTracks = []; + var bitrateStart; + var levelSet = {}; + var levelFromSet = null; + var videoCodecFound = false; + var audioCodecFound = false; + // regroup redundant levels together + data.levels.forEach(function (level) { + var attributes = level.attrs; + level.loadError = 0; + level.fragmentError = false; + videoCodecFound = videoCodecFound || !!level.videoCodec; + audioCodecFound = audioCodecFound || !!level.audioCodec; + // erase audio codec info if browser does not support mp4a.40.34. + // demuxer will autodetect codec and fallback to mpeg/audio + if (chromeOrFirefox && level.audioCodec && level.audioCodec.indexOf('mp4a.40.34') !== -1) { + level.audioCodec = undefined; + } + levelFromSet = levelSet[level.bitrate]; // FIXME: we would also have to match the resolution here + if (!levelFromSet) { + level.url = [level.url]; + level.urlId = 0; + levelSet[level.bitrate] = level; + levels.push(level); + } + else { + levelFromSet.url.push(level.url); + } + if (attributes) { + if (attributes.AUDIO) { + audioCodecFound = true; + level_helper_1.addGroupId(levelFromSet || level, 'audio', attributes.AUDIO); + } + if (attributes.SUBTITLES) { + level_helper_1.addGroupId(levelFromSet || level, 'text', attributes.SUBTITLES); + } + } + }); + // remove audio-only level if we also have levels with audio+video codecs signalled + if (videoCodecFound && audioCodecFound) { + levels = levels.filter(function (_a) { + var videoCodec = _a.videoCodec; + return !!videoCodec; + }); + } + // only keep levels with supported audio/video codecs + levels = levels.filter(function (_a) { + var audioCodec = _a.audioCodec, videoCodec = _a.videoCodec; + return (!audioCodec || codecs_1.isCodecSupportedInMp4(audioCodec, 'audio')) && (!videoCodec || codecs_1.isCodecSupportedInMp4(videoCodec, 'video')); + }); + if (data.audioTracks) { + audioTracks = data.audioTracks.filter(function (track) { return !track.audioCodec || codecs_1.isCodecSupportedInMp4(track.audioCodec, 'audio'); }); + // Reassign id's after filtering since they're used as array indices + audioTracks.forEach(function (track, index) { + track.id = index; + }); + } + if (levels.length > 0) { + // start bitrate is the first bitrate of the manifest + bitrateStart = levels[0].bitrate; + // sort level on bitrate + levels.sort(function (a, b) { return a.bitrate - b.bitrate; }); + this._levels = levels; + // find index of first level in sorted levels + for (var i = 0; i < levels.length; i++) { + if (levels[i].bitrate === bitrateStart) { + this._firstLevel = i; + logger_1.logger.log("manifest loaded," + levels.length + " level(s) found, first bitrate:" + bitrateStart); + break; + } + } + // Audio is only alternate if manifest include a URI along with the audio group tag + this.hls.trigger(events_1.default.MANIFEST_PARSED, { + levels: levels, + audioTracks: audioTracks, + firstLevel: this._firstLevel, + stats: data.stats, + audio: audioCodecFound, + video: videoCodecFound, + altAudio: audioTracks.some(function (t) { return !!t.url; }) + }); + } + else { + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.MEDIA_ERROR, + details: errors_1.ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR, + fatal: true, + url: this.hls.url, + reason: 'no level with compatible codecs found in manifest' + }); + } + }; + Object.defineProperty(LevelController.prototype, "levels", { + get: function () { + return this._levels; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(LevelController.prototype, "level", { + get: function () { + return this.currentLevelIndex; + }, + set: function (newLevel) { + var levels = this._levels; + if (levels) { + newLevel = Math.min(newLevel, levels.length - 1); + if (this.currentLevelIndex !== newLevel || !levels[newLevel].details) { + this.setLevelInternal(newLevel); + } + } + }, + enumerable: true, + configurable: true + }); + LevelController.prototype.setLevelInternal = function (newLevel) { + var levels = this._levels; + var hls = this.hls; + // check if level idx is valid + if (newLevel >= 0 && newLevel < levels.length) { + // stopping live reloading timer if any + this.clearTimer(); + if (this.currentLevelIndex !== newLevel) { + logger_1.logger.log("switching to level " + newLevel); + this.currentLevelIndex = newLevel; + var levelProperties = levels[newLevel]; + levelProperties.level = newLevel; + hls.trigger(events_1.default.LEVEL_SWITCHING, levelProperties); + } + var level = levels[newLevel]; + var levelDetails = level.details; + // check if we need to load playlist for this level + if (!levelDetails || levelDetails.live) { + // level not retrieved yet, or live playlist we need to (re)load it + var urlId = level.urlId; + hls.trigger(events_1.default.LEVEL_LOADING, { url: level.url[urlId], level: newLevel, id: urlId }); + } + } + else { + // invalid level id given, trigger error + hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.OTHER_ERROR, + details: errors_1.ErrorDetails.LEVEL_SWITCH_ERROR, + level: newLevel, + fatal: false, + reason: 'invalid level idx' + }); + } + }; + Object.defineProperty(LevelController.prototype, "manualLevel", { + get: function () { + return this.manualLevelIndex; + }, + set: function (newLevel) { + this.manualLevelIndex = newLevel; + if (this._startLevel === undefined) { + this._startLevel = newLevel; + } + if (newLevel !== -1) { + this.level = newLevel; + } + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(LevelController.prototype, "firstLevel", { + get: function () { + return this._firstLevel; + }, + set: function (newLevel) { + this._firstLevel = newLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(LevelController.prototype, "startLevel", { + get: function () { + // hls.startLevel takes precedence over config.startLevel + // if none of these values are defined, fallback on this._firstLevel (first quality level appearing in variant manifest) + if (this._startLevel === undefined) { + var configStartLevel = this.hls.config.startLevel; + if (configStartLevel !== undefined) { + return configStartLevel; + } + else { + return this._firstLevel; + } + } + else { + return this._startLevel; + } + }, + set: function (newLevel) { + this._startLevel = newLevel; + }, + enumerable: true, + configurable: true + }); + LevelController.prototype.onError = function (data) { + if (data.fatal) { + if (data.type === errors_1.ErrorTypes.NETWORK_ERROR) { + this.clearTimer(); + } + return; + } + var levelError = false, fragmentError = false; + var levelIndex; + // try to recover not fatal errors + switch (data.details) { + case errors_1.ErrorDetails.FRAG_LOAD_ERROR: + case errors_1.ErrorDetails.FRAG_LOAD_TIMEOUT: + case errors_1.ErrorDetails.KEY_LOAD_ERROR: + case errors_1.ErrorDetails.KEY_LOAD_TIMEOUT: + levelIndex = data.frag.level; + fragmentError = true; + break; + case errors_1.ErrorDetails.LEVEL_LOAD_ERROR: + case errors_1.ErrorDetails.LEVEL_LOAD_TIMEOUT: + levelIndex = data.context.level; + levelError = true; + break; + case errors_1.ErrorDetails.REMUX_ALLOC_ERROR: + levelIndex = data.level; + levelError = true; + break; + } + if (levelIndex !== undefined) { + this.recoverLevel(data, levelIndex, levelError, fragmentError); + } + }; + /** + * Switch to a redundant stream if any available. + * If redundant stream is not available, emergency switch down if ABR mode is enabled. + * + * @param {Object} errorEvent + * @param {Number} levelIndex current level index + * @param {Boolean} levelError + * @param {Boolean} fragmentError + */ + // FIXME Find a better abstraction where fragment/level retry management is well decoupled + LevelController.prototype.recoverLevel = function (errorEvent, levelIndex, levelError, fragmentError) { + var _this = this; + var config = this.hls.config; + var errorDetails = errorEvent.details; + var level = this._levels[levelIndex]; + var redundantLevels, delay, nextLevel; + level.loadError++; + level.fragmentError = fragmentError; + if (levelError) { + if ((this.levelRetryCount + 1) <= config.levelLoadingMaxRetry) { + // exponential backoff capped to max retry timeout + delay = Math.min(Math.pow(2, this.levelRetryCount) * config.levelLoadingRetryDelay, config.levelLoadingMaxRetryTimeout); + // Schedule level reload + this.timer = setTimeout(function () { return _this.loadLevel(); }, delay); + // boolean used to inform stream controller not to switch back to IDLE on non fatal error + errorEvent.levelRetry = true; + this.levelRetryCount++; + logger_1.logger.warn("level controller, " + errorDetails + ", retry in " + delay + " ms, current retry count is " + this.levelRetryCount); + } + else { + logger_1.logger.error("level controller, cannot recover from " + errorDetails + " error"); + this.currentLevelIndex = null; + // stopping live reloading timer if any + this.clearTimer(); + // switch error to fatal + errorEvent.fatal = true; + return; + } + } + // Try any redundant streams if available for both errors: level and fragment + // If level.loadError reaches redundantLevels it means that we tried them all, no hope => let's switch down + if (levelError || fragmentError) { + redundantLevels = level.url.length; + if (redundantLevels > 1 && level.loadError < redundantLevels) { + level.urlId = (level.urlId + 1) % redundantLevels; + level.details = undefined; + logger_1.logger.warn("level controller, " + errorDetails + " for level " + levelIndex + ": switching to redundant URL-id " + level.urlId); + // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId); + // console.log('New video quality level audio group id:', level.attrs.AUDIO); + } + else { + // Search for available level + if (this.manualLevelIndex === -1) { + // When lowest level has been reached, let's start hunt from the top + nextLevel = (levelIndex === 0) ? this._levels.length - 1 : levelIndex - 1; + logger_1.logger.warn("level controller, " + errorDetails + ": switch to " + nextLevel); + this.hls.nextAutoLevel = this.currentLevelIndex = nextLevel; + } + else if (fragmentError) { + // Allow fragment retry as long as configuration allows. + // reset this._level so that another call to set level() will trigger again a frag load + logger_1.logger.warn("level controller, " + errorDetails + ": reload a fragment"); + this.currentLevelIndex = null; + } + } + } + }; + // reset errors on the successful load of a fragment + LevelController.prototype.onFragLoaded = function (_a) { + var frag = _a.frag; + if (frag !== undefined && frag.type === 'main') { + var level = this._levels[frag.level]; + if (level !== undefined) { + level.fragmentError = false; + level.loadError = 0; + this.levelRetryCount = 0; + } + } + }; + LevelController.prototype.onLevelLoaded = function (data) { + var _this = this; + var levelId = data.level; + // only process level loaded events matching with expected level + if (levelId !== this.currentLevelIndex) { + return; + } + var curLevel = this._levels[levelId]; + // reset level load error counter on successful level loaded only if there is no issues with fragments + if (!curLevel.fragmentError) { + curLevel.loadError = 0; + this.levelRetryCount = 0; + } + var newDetails = data.details; + // if current playlist is a live playlist, arm a timer to reload it + if (newDetails.live) { + var targetdurationMs = 1000 * (newDetails.averagetargetduration ? newDetails.averagetargetduration : newDetails.targetduration); + var reloadInterval = targetdurationMs, curDetails = curLevel.details; + if (curDetails && newDetails.endSN === curDetails.endSN) { + // follow HLS Spec, If the client reloads a Playlist file and finds that it has not + // changed then it MUST wait for a period of one-half the target + // duration before retrying. + reloadInterval /= 2; + logger_1.logger.log('same live playlist, reload twice faster'); + } + // decrement reloadInterval with level loading delay + reloadInterval -= performance.now() - data.stats.trequest; + // in any case, don't reload more than half of target duration + reloadInterval = Math.max(targetdurationMs / 2, Math.round(reloadInterval)); + logger_1.logger.log("live playlist, reload in " + Math.round(reloadInterval) + " ms"); + this.timer = setTimeout(function () { return _this.loadLevel(); }, reloadInterval); + } + else { + this.clearTimer(); + } + }; + LevelController.prototype.onAudioTrackSwitched = function (data) { + var audioGroupId = this.hls.audioTracks[data.id].groupId; + var currentLevel = this.hls.levels[this.currentLevelIndex]; + if (!currentLevel) { + return; + } + if (currentLevel.audioGroupIds) { + var urlId = currentLevel.audioGroupIds.findIndex(function (groupId) { return groupId === audioGroupId; }); + if (urlId !== currentLevel.urlId) { + currentLevel.urlId = urlId; + this.startLoad(); + } + } + }; + LevelController.prototype.loadLevel = function () { + logger_1.logger.debug('call to loadLevel'); + if (this.currentLevelIndex !== null && this.canload) { + var levelObject = this._levels[this.currentLevelIndex]; + if (typeof levelObject === 'object' && + levelObject.url.length > 0) { + var level = this.currentLevelIndex; + var id = levelObject.urlId; + var url = levelObject.url[id]; + logger_1.logger.log("Attempt loading level index " + level + " with URL-id " + id); + // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId); + // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level); + this.hls.trigger(events_1.default.LEVEL_LOADING, { url: url, level: level, id: id }); + } + } + }; + Object.defineProperty(LevelController.prototype, "nextLoadLevel", { + get: function () { + if (this.manualLevelIndex !== -1) { + return this.manualLevelIndex; + } + else { + return this.hls.nextAutoLevel; + } + }, + set: function (nextLevel) { + this.level = nextLevel; + if (this.manualLevelIndex === -1) { + this.hls.nextAutoLevel = nextLevel; + } + }, + enumerable: true, + configurable: true + }); + return LevelController; +}(event_handler_1.default)); +exports.default = LevelController; + + +/***/ }), + +/***/ "./src/controller/level-helper.js": +/*!****************************************!*\ + !*** ./src/controller/level-helper.js ***! + \****************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/** + * @module LevelHelper + * + * Providing methods dealing with playlist sliding and drift + * + * TODO: Create an actual `Level` class/model that deals with all this logic in an object-oriented-manner. + * + * */ +Object.defineProperty(exports, "__esModule", { value: true }); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +function addGroupId(level, type, id) { + switch (type) { + case 'audio': + if (!level.audioGroupIds) { + level.audioGroupIds = []; + } + level.audioGroupIds.push(id); + break; + case 'text': + if (!level.textGroupIds) { + level.textGroupIds = []; + } + level.textGroupIds.push(id); + break; + } +} +exports.addGroupId = addGroupId; +function updatePTS(fragments, fromIdx, toIdx) { + var fragFrom = fragments[fromIdx], fragTo = fragments[toIdx], fragToPTS = fragTo.startPTS; + // if we know startPTS[toIdx] + if (Number.isFinite(fragToPTS)) { + // update fragment duration. + // it helps to fix drifts between playlist reported duration and fragment real duration + if (toIdx > fromIdx) { + fragFrom.duration = fragToPTS - fragFrom.start; + if (fragFrom.duration < 0) { + logger_1.logger.warn("negative duration computed for frag " + fragFrom.sn + ",level " + fragFrom.level + ", there should be some duration drift between playlist and fragment!"); + } + } + else { + fragTo.duration = fragFrom.start - fragToPTS; + if (fragTo.duration < 0) { + logger_1.logger.warn("negative duration computed for frag " + fragTo.sn + ",level " + fragTo.level + ", there should be some duration drift between playlist and fragment!"); + } + } + } + else { + // we dont know startPTS[toIdx] + if (toIdx > fromIdx) { + fragTo.start = fragFrom.start + fragFrom.duration; + } + else { + fragTo.start = Math.max(fragFrom.start - fragTo.duration, 0); + } + } +} +exports.updatePTS = updatePTS; +function updateFragPTSDTS(details, frag, startPTS, endPTS, startDTS, endDTS) { + // update frag PTS/DTS + var maxStartPTS = startPTS; + if (Number.isFinite(frag.startPTS)) { + // delta PTS between audio and video + var deltaPTS = Math.abs(frag.startPTS - startPTS); + if (!Number.isFinite(frag.deltaPTS)) { + frag.deltaPTS = deltaPTS; + } + else { + frag.deltaPTS = Math.max(deltaPTS, frag.deltaPTS); + } + maxStartPTS = Math.max(startPTS, frag.startPTS); + startPTS = Math.min(startPTS, frag.startPTS); + endPTS = Math.max(endPTS, frag.endPTS); + startDTS = Math.min(startDTS, frag.startDTS); + endDTS = Math.max(endDTS, frag.endDTS); + } + var drift = startPTS - frag.start; + frag.start = frag.startPTS = startPTS; + frag.maxStartPTS = maxStartPTS; + frag.endPTS = endPTS; + frag.startDTS = startDTS; + frag.endDTS = endDTS; + frag.duration = endPTS - startPTS; + var sn = frag.sn; + // exit if sn out of range + if (!details || sn < details.startSN || sn > details.endSN) { + return 0; + } + var fragIdx, fragments, i; + fragIdx = sn - details.startSN; + fragments = details.fragments; + // update frag reference in fragments array + // rationale is that fragments array might not contain this frag object. + // this will happen if playlist has been refreshed between frag loading and call to updateFragPTSDTS() + // if we don't update frag, we won't be able to propagate PTS info on the playlist + // resulting in invalid sliding computation + fragments[fragIdx] = frag; + // adjust fragment PTS/duration from seqnum-1 to frag 0 + for (i = fragIdx; i > 0; i--) { + updatePTS(fragments, i, i - 1); + } + // adjust fragment PTS/duration from seqnum to last frag + for (i = fragIdx; i < fragments.length - 1; i++) { + updatePTS(fragments, i, i + 1); + } + details.PTSKnown = true; + return drift; +} +exports.updateFragPTSDTS = updateFragPTSDTS; +function mergeDetails(oldDetails, newDetails) { + var start = Math.max(oldDetails.startSN, newDetails.startSN) - newDetails.startSN, end = Math.min(oldDetails.endSN, newDetails.endSN) - newDetails.startSN, delta = newDetails.startSN - oldDetails.startSN, oldfragments = oldDetails.fragments, newfragments = newDetails.fragments, ccOffset = 0, PTSFrag; + // potentially retrieve cached initsegment + if (newDetails.initSegment && oldDetails.initSegment) { + newDetails.initSegment = oldDetails.initSegment; + } + // check if old/new playlists have fragments in common + if (end < start) { + newDetails.PTSKnown = false; + return; + } + // loop through overlapping SN and update startPTS , cc, and duration if any found + for (var i = start; i <= end; i++) { + var oldFrag = oldfragments[delta + i], newFrag = newfragments[i]; + if (newFrag && oldFrag) { + ccOffset = oldFrag.cc - newFrag.cc; + if (Number.isFinite(oldFrag.startPTS)) { + newFrag.start = newFrag.startPTS = oldFrag.startPTS; + newFrag.endPTS = oldFrag.endPTS; + newFrag.duration = oldFrag.duration; + newFrag.backtracked = oldFrag.backtracked; + newFrag.dropped = oldFrag.dropped; + PTSFrag = newFrag; + } + } + } + if (ccOffset) { + logger_1.logger.log('discontinuity sliding from playlist, take drift into account'); + for (i = 0; i < newfragments.length; i++) { + newfragments[i].cc += ccOffset; + } + } + // if at least one fragment contains PTS info, recompute PTS information for all fragments + if (PTSFrag) { + updateFragPTSDTS(newDetails, PTSFrag, PTSFrag.startPTS, PTSFrag.endPTS, PTSFrag.startDTS, PTSFrag.endDTS); + } + else { + // ensure that delta is within oldfragments range + // also adjust sliding in case delta is 0 (we could have old=[50-60] and new=old=[50-61]) + // in that case we also need to adjust start offset of all fragments + if (delta >= 0 && delta < oldfragments.length) { + // adjust start by sliding offset + var sliding = oldfragments[delta].start; + for (i = 0; i < newfragments.length; i++) { + newfragments[i].start += sliding; + } + } + } + // if we are here, it means we have fragments overlapping between + // old and new level. reliable PTS info is thus relying on old level + newDetails.PTSKnown = oldDetails.PTSKnown; +} +exports.mergeDetails = mergeDetails; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/stream-controller.js": +/*!*********************************************!*\ + !*** ./src/controller/stream-controller.js ***! + \*********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * Stream Controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var binary_search_1 = __webpack_require__(/*! ../utils/binary-search */ "./src/utils/binary-search.js"); +var buffer_helper_1 = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.js"); +var demuxer_1 = __webpack_require__(/*! ../demux/demuxer */ "./src/demux/demuxer.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var fragment_tracker_1 = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.js"); +var fragment_1 = __webpack_require__(/*! ../loader/fragment */ "./src/loader/fragment.js"); +var playlist_loader_1 = __webpack_require__(/*! ../loader/playlist-loader */ "./src/loader/playlist-loader.js"); +var LevelHelper = __webpack_require__(/*! ./level-helper */ "./src/controller/level-helper.js"); +var time_ranges_1 = __webpack_require__(/*! ../utils/time-ranges */ "./src/utils/time-ranges.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var discontinuities_1 = __webpack_require__(/*! ../utils/discontinuities */ "./src/utils/discontinuities.js"); +var fragment_finders_1 = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.js"); +var gap_controller_1 = __webpack_require__(/*! ./gap-controller */ "./src/controller/gap-controller.js"); +var base_stream_controller_1 = __webpack_require__(/*! ./base-stream-controller */ "./src/controller/base-stream-controller.js"); +var TICK_INTERVAL = 100; // how often to tick in ms +var StreamController = /** @class */ (function (_super) { + __extends(StreamController, _super); + function StreamController(hls, fragmentTracker) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHED, events_1.default.MEDIA_DETACHING, events_1.default.MANIFEST_LOADING, events_1.default.MANIFEST_PARSED, events_1.default.LEVEL_LOADED, events_1.default.KEY_LOADED, events_1.default.FRAG_LOADED, events_1.default.FRAG_LOAD_EMERGENCY_ABORTED, events_1.default.FRAG_PARSING_INIT_SEGMENT, events_1.default.FRAG_PARSING_DATA, events_1.default.FRAG_PARSED, events_1.default.ERROR, events_1.default.AUDIO_TRACK_SWITCHING, events_1.default.AUDIO_TRACK_SWITCHED, events_1.default.BUFFER_CREATED, events_1.default.BUFFER_APPENDED, events_1.default.BUFFER_FLUSHED) || this; + _this.fragmentTracker = fragmentTracker; + _this.config = hls.config; + _this.audioCodecSwap = false; + _this._state = base_stream_controller_1.State.STOPPED; + _this.stallReported = false; + _this.gapController = null; + return _this; + } + StreamController.prototype.onHandlerDestroying = function () { + this.stopLoad(); + _super.prototype.onHandlerDestroying.call(this); + }; + StreamController.prototype.onHandlerDestroyed = function () { + this.state = base_stream_controller_1.State.STOPPED; + this.fragmentTracker = null; + _super.prototype.onHandlerDestroyed.call(this); + }; + StreamController.prototype.startLoad = function (startPosition) { + if (this.levels) { + var lastCurrentTime = this.lastCurrentTime, hls_1 = this.hls; + this.stopLoad(); + this.setInterval(TICK_INTERVAL); + this.level = -1; + this.fragLoadError = 0; + if (!this.startFragRequested) { + // determine load level + var startLevel = hls_1.startLevel; + if (startLevel === -1) { + // -1 : guess start Level by doing a bitrate test by loading first fragment of lowest quality level + startLevel = 0; + this.bitrateTest = true; + } + // set new level to playlist loader : this will trigger start level load + // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded + this.level = hls_1.nextLoadLevel = startLevel; + this.loadedmetadata = false; + } + // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime + if (lastCurrentTime > 0 && startPosition === -1) { + logger_1.logger.log("override startPosition with lastCurrentTime @" + lastCurrentTime.toFixed(3)); + startPosition = lastCurrentTime; + } + this.state = base_stream_controller_1.State.IDLE; + this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition; + this.tick(); + } + else { + this.forceStartLoad = true; + this.state = base_stream_controller_1.State.STOPPED; + } + }; + StreamController.prototype.stopLoad = function () { + var frag = this.fragCurrent; + if (frag) { + if (frag.loader) { + frag.loader.abort(); + } + this.fragmentTracker.removeFragment(frag); + this.fragCurrent = null; + } + this.fragPrevious = null; + if (this.demuxer) { + this.demuxer.destroy(); + this.demuxer = null; + } + this.clearInterval(); + this.state = base_stream_controller_1.State.STOPPED; + this.forceStartLoad = false; + }; + StreamController.prototype.doTick = function () { + switch (this.state) { + case base_stream_controller_1.State.BUFFER_FLUSHING: + // in buffer flushing state, reset fragLoadError counter + this.fragLoadError = 0; + break; + case base_stream_controller_1.State.IDLE: + this._doTickIdle(); + break; + case base_stream_controller_1.State.WAITING_LEVEL: + var level = this.levels[this.level]; + // check if playlist is already loaded + if (level && level.details) { + this.state = base_stream_controller_1.State.IDLE; + } + break; + case base_stream_controller_1.State.FRAG_LOADING_WAITING_RETRY: + var now = window.performance.now(); + var retryDate = this.retryDate; + // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading + if (!retryDate || (now >= retryDate) || (this.media && this.media.seeking)) { + logger_1.logger.log('mediaController: retryDate reached, switch back to IDLE state'); + this.state = base_stream_controller_1.State.IDLE; + } + break; + case base_stream_controller_1.State.ERROR: + case base_stream_controller_1.State.STOPPED: + case base_stream_controller_1.State.FRAG_LOADING: + case base_stream_controller_1.State.PARSING: + case base_stream_controller_1.State.PARSED: + case base_stream_controller_1.State.ENDED: + break; + default: + break; + } + // check buffer + this._checkBuffer(); + // check/update current fragment + this._checkFragmentChanged(); + }; + // Ironically the "idle" state is the on we do the most logic in it seems .... + // NOTE: Maybe we could rather schedule a check for buffer length after half of the currently + // played segment, or on pause/play/seek instead of naively checking every 100ms? + StreamController.prototype._doTickIdle = function () { + var hls = this.hls, config = hls.config, media = this.media; + // if start level not parsed yet OR + // if video not attached AND start fragment already requested OR start frag prefetch disable + // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment + if (this.levelLastLoaded === undefined || (!media && (this.startFragRequested || !config.startFragPrefetch))) { + return; + } + // if we have not yet loaded any fragment, start loading from start position + var pos; + if (this.loadedmetadata) { + pos = media.currentTime; + } + else { + pos = this.nextLoadPosition; + } + // determine next load level + var level = hls.nextLoadLevel, levelInfo = this.levels[level]; + if (!levelInfo) { + return; + } + var levelBitrate = levelInfo.bitrate, maxBufLen; + // compute max Buffer Length that we could get from this load level, based on level bitrate. don't buffer more than 60 MB and more than 30s + if (levelBitrate) { + maxBufLen = Math.max(8 * config.maxBufferSize / levelBitrate, config.maxBufferLength); + } + else { + maxBufLen = config.maxBufferLength; + } + maxBufLen = Math.min(maxBufLen, config.maxMaxBufferLength); + // determine next candidate fragment to be loaded, based on current position and end of buffer position + // ensure up to `config.maxMaxBufferLength` of buffer upfront + var bufferInfo = buffer_helper_1.BufferHelper.bufferInfo(this.mediaBuffer ? this.mediaBuffer : media, pos, config.maxBufferHole), bufferLen = bufferInfo.len; + // Stay idle if we are still with buffer margins + if (bufferLen >= maxBufLen) { + return; + } + // if buffer length is less than maxBufLen try to load a new fragment ... + logger_1.logger.trace("buffer length of " + bufferLen.toFixed(3) + " is below max of " + maxBufLen.toFixed(3) + ". checking for more payload ..."); + // set next load level : this will trigger a playlist load if needed + this.level = hls.nextLoadLevel = level; + var levelDetails = levelInfo.details; + // if level info not retrieved yet, switch state and wait for level retrieval + // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load + // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist) + if (!levelDetails || (levelDetails.live && this.levelLastLoaded !== level)) { + this.state = base_stream_controller_1.State.WAITING_LEVEL; + return; + } + if (this._streamEnded(bufferInfo, levelDetails)) { + var data = {}; + if (this.altAudio) { + data.type = 'video'; + } + this.hls.trigger(events_1.default.BUFFER_EOS, data); + this.state = base_stream_controller_1.State.ENDED; + return; + } + // if we have the levelDetails for the selected variant, lets continue enrichen our stream (load keys/fragments or trigger EOS, etc..) + this._fetchPayloadOrEos(pos, bufferInfo, levelDetails); + }; + StreamController.prototype._fetchPayloadOrEos = function (pos, bufferInfo, levelDetails) { + var fragPrevious = this.fragPrevious, level = this.level, fragments = levelDetails.fragments, fragLen = fragments.length; + // empty playlist + if (fragLen === 0) { + return; + } + // find fragment index, contiguous with end of buffer position + var start = fragments[0].start, end = fragments[fragLen - 1].start + fragments[fragLen - 1].duration, bufferEnd = bufferInfo.end, frag; + if (levelDetails.initSegment && !levelDetails.initSegment.data) { + frag = levelDetails.initSegment; + } + else { + // in case of live playlist we need to ensure that requested position is not located before playlist start + if (levelDetails.live) { + var initialLiveManifestSize = this.config.initialLiveManifestSize; + if (fragLen < initialLiveManifestSize) { + logger_1.logger.warn("Can not start playback of a level, reason: not enough fragments " + fragLen + " < " + initialLiveManifestSize); + return; + } + frag = this._ensureFragmentAtLivePoint(levelDetails, bufferEnd, start, end, fragPrevious, fragments, fragLen); + // if it explicitely returns null don't load any fragment and exit function now + if (frag === null) { + return; + } + } + else { + // VoD playlist: if bufferEnd before start of playlist, load first fragment + if (bufferEnd < start) { + frag = fragments[0]; + } + } + } + if (!frag) { + frag = this._findFragment(start, fragPrevious, fragLen, fragments, bufferEnd, end, levelDetails); + } + if (frag) { + if (frag.encrypted) { + logger_1.logger.log("Loading key for " + frag.sn + " of [" + levelDetails.startSN + " ," + levelDetails.endSN + "],level " + level); + this._loadKey(frag); + } + else { + logger_1.logger.log("Loading " + frag.sn + " of [" + levelDetails.startSN + " ," + levelDetails.endSN + "],level " + level + ", currentTime:" + pos.toFixed(3) + ",bufferEnd:" + bufferEnd.toFixed(3)); + this._loadFragment(frag); + } + } + }; + StreamController.prototype._ensureFragmentAtLivePoint = function (levelDetails, bufferEnd, start, end, fragPrevious, fragments, fragLen) { + var config = this.hls.config, media = this.media; + var frag; + // check if requested position is within seekable boundaries : + // logger.log(`start/pos/bufEnd/seeking:${start.toFixed(3)}/${pos.toFixed(3)}/${bufferEnd.toFixed(3)}/${this.media.seeking}`); + var maxLatency = config.liveMaxLatencyDuration !== undefined ? config.liveMaxLatencyDuration : config.liveMaxLatencyDurationCount * levelDetails.targetduration; + if (bufferEnd < Math.max(start - config.maxFragLookUpTolerance, end - maxLatency)) { + var liveSyncPosition = this.liveSyncPosition = this.computeLivePosition(start, levelDetails); + logger_1.logger.log("buffer end: " + bufferEnd.toFixed(3) + " is located too far from the end of live sliding playlist, reset currentTime to : " + liveSyncPosition.toFixed(3)); + bufferEnd = liveSyncPosition; + if (media && media.readyState && media.duration > liveSyncPosition) { + media.currentTime = liveSyncPosition; + } + this.nextLoadPosition = liveSyncPosition; + } + // if end of buffer greater than live edge, don't load any fragment + // this could happen if live playlist intermittently slides in the past. + // level 1 loaded [182580161,182580167] + // level 1 loaded [182580162,182580169] + // Loading 182580168 of [182580162 ,182580169],level 1 .. + // Loading 182580169 of [182580162 ,182580169],level 1 .. + // level 1 loaded [182580162,182580168] <============= here we should have bufferEnd > end. in that case break to avoid reloading 182580168 + // level 1 loaded [182580164,182580171] + // + // don't return null in case media not loaded yet (readystate === 0) + if (levelDetails.PTSKnown && bufferEnd > end && media && media.readyState) { + return null; + } + if (this.startFragRequested && !levelDetails.PTSKnown) { + /* we are switching level on live playlist, but we don't have any PTS info for that quality level ... + try to load frag matching with next SN. + even if SN are not synchronized between playlists, loading this frag will help us + compute playlist sliding and find the right one after in case it was not the right consecutive one */ + if (fragPrevious) { + if (levelDetails.hasProgramDateTime) { + // Relies on PDT in order to switch bitrates (Support EXT-X-DISCONTINUITY without EXT-X-DISCONTINUITY-SEQUENCE) + logger_1.logger.log("live playlist, switching playlist, load frag with same PDT: " + fragPrevious.programDateTime); + frag = fragment_finders_1.findFragmentByPDT(fragments, fragPrevious.endProgramDateTime, config.maxFragLookUpTolerance); + } + else { + // Uses buffer and sequence number to calculate switch segment (required if using EXT-X-DISCONTINUITY-SEQUENCE) + var targetSN = fragPrevious.sn + 1; + if (targetSN >= levelDetails.startSN && targetSN <= levelDetails.endSN) { + var fragNext = fragments[targetSN - levelDetails.startSN]; + if (fragPrevious.cc === fragNext.cc) { + frag = fragNext; + logger_1.logger.log("live playlist, switching playlist, load frag with next SN: " + frag.sn); + } + } + // next frag SN not available (or not with same continuity counter) + // look for a frag sharing the same CC + if (!frag) { + frag = binary_search_1.default.search(fragments, function (frag) { + return fragPrevious.cc - frag.cc; + }); + if (frag) { + logger_1.logger.log("live playlist, switching playlist, load frag with same CC: " + frag.sn); + } + } + } + } + if (!frag) { + /* we have no idea about which fragment should be loaded. + so let's load mid fragment. it will help computing playlist sliding and find the right one + */ + frag = fragments[Math.min(fragLen - 1, Math.round(fragLen / 2))]; + logger_1.logger.log("live playlist, switching playlist, unknown, load middle frag : " + frag.sn); + } + } + return frag; + }; + StreamController.prototype._findFragment = function (start, fragPrevious, fragLen, fragments, bufferEnd, end, levelDetails) { + var config = this.hls.config; + var frag; + if (bufferEnd < end) { + var lookupTolerance = (bufferEnd > end - config.maxFragLookUpTolerance) ? 0 : config.maxFragLookUpTolerance; + // Remove the tolerance if it would put the bufferEnd past the actual end of stream + // Uses buffer and sequence number to calculate switch segment (required if using EXT-X-DISCONTINUITY-SEQUENCE) + frag = fragment_finders_1.findFragmentByPTS(fragPrevious, fragments, bufferEnd, lookupTolerance); + } + else { + // reach end of playlist + frag = fragments[fragLen - 1]; + } + if (frag) { + var curSNIdx = frag.sn - levelDetails.startSN; + var sameLevel = fragPrevious && frag.level === fragPrevious.level; + var prevFrag = fragments[curSNIdx - 1]; + var nextFrag = fragments[curSNIdx + 1]; + // logger.log('find SN matching with pos:' + bufferEnd + ':' + frag.sn); + if (fragPrevious && frag.sn === fragPrevious.sn) { + if (sameLevel && !frag.backtracked) { + if (frag.sn < levelDetails.endSN) { + var deltaPTS = fragPrevious.deltaPTS; + // if there is a significant delta between audio and video, larger than max allowed hole, + // and if previous remuxed fragment did not start with a keyframe. (fragPrevious.dropped) + // let's try to load previous fragment again to get last keyframe + // then we will reload again current fragment (that way we should be able to fill the buffer hole ...) + if (deltaPTS && deltaPTS > config.maxBufferHole && fragPrevious.dropped && curSNIdx) { + frag = prevFrag; + logger_1.logger.warn('SN just loaded, with large PTS gap between audio and video, maybe frag is not starting with a keyframe ? load previous one to try to overcome this'); + } + else { + frag = nextFrag; + logger_1.logger.log("SN just loaded, load next one: " + frag.sn, frag); + } + } + else { + frag = null; + } + } + else if (frag.backtracked) { + // Only backtrack a max of 1 consecutive fragment to prevent sliding back too far when little or no frags start with keyframes + if (nextFrag && nextFrag.backtracked) { + logger_1.logger.warn("Already backtracked from fragment " + nextFrag.sn + ", will not backtrack to fragment " + frag.sn + ". Loading fragment " + nextFrag.sn); + frag = nextFrag; + } + else { + // If a fragment has dropped frames and it's in a same level/sequence, load the previous fragment to try and find the keyframe + // Reset the dropped count now since it won't be reset until we parse the fragment again, which prevents infinite backtracking on the same segment + logger_1.logger.warn('Loaded fragment with dropped frames, backtracking 1 segment to find a keyframe'); + frag.dropped = 0; + if (prevFrag) { + frag = prevFrag; + frag.backtracked = true; + } + else if (curSNIdx) { + // can't backtrack on very first fragment + frag = null; + } + } + } + } + } + return frag; + }; + StreamController.prototype._loadKey = function (frag) { + this.state = base_stream_controller_1.State.KEY_LOADING; + this.hls.trigger(events_1.default.KEY_LOADING, { frag: frag }); + }; + StreamController.prototype._loadFragment = function (frag) { + // Check if fragment is not loaded + var fragState = this.fragmentTracker.getState(frag); + this.fragCurrent = frag; + this.startFragRequested = true; + // Don't update nextLoadPosition for fragments which are not buffered + if (Number.isFinite(frag.sn) && !frag.bitrateTest) { + this.nextLoadPosition = frag.start + frag.duration; + } + // Allow backtracked fragments to load + if (frag.backtracked || fragState === fragment_tracker_1.FragmentState.NOT_LOADED || fragState === fragment_tracker_1.FragmentState.PARTIAL) { + frag.autoLevel = this.hls.autoLevelEnabled; + frag.bitrateTest = this.bitrateTest; + this.hls.trigger(events_1.default.FRAG_LOADING, { frag: frag }); + // lazy demuxer init, as this could take some time ... do it during frag loading + if (!this.demuxer) { + this.demuxer = new demuxer_1.default(this.hls, 'main'); + } + this.state = base_stream_controller_1.State.FRAG_LOADING; + } + else if (fragState === fragment_tracker_1.FragmentState.APPENDING) { + // Lower the buffer size and try again + if (this._reduceMaxBufferLength(frag.duration)) { + this.fragmentTracker.removeFragment(frag); + } + } + }; + Object.defineProperty(StreamController.prototype, "state", { + get: function () { + return this._state; + }, + set: function (nextState) { + if (this.state !== nextState) { + var previousState = this.state; + this._state = nextState; + logger_1.logger.log("main stream:" + previousState + "->" + nextState); + this.hls.trigger(events_1.default.STREAM_STATE_TRANSITION, { previousState: previousState, nextState: nextState }); + } + }, + enumerable: true, + configurable: true + }); + StreamController.prototype.getBufferedFrag = function (position) { + return this.fragmentTracker.getBufferedFrag(position, playlist_loader_1.default.LevelType.MAIN); + }; + Object.defineProperty(StreamController.prototype, "currentLevel", { + get: function () { + var media = this.media; + if (media) { + var frag = this.getBufferedFrag(media.currentTime); + if (frag) { + return frag.level; + } + } + return -1; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(StreamController.prototype, "nextBufferedFrag", { + get: function () { + var media = this.media; + if (media) { + // first get end range of current fragment + return this.followingBufferedFrag(this.getBufferedFrag(media.currentTime)); + } + else { + return null; + } + }, + enumerable: true, + configurable: true + }); + StreamController.prototype.followingBufferedFrag = function (frag) { + if (frag) { + // try to get range of next fragment (500ms after this range) + return this.getBufferedFrag(frag.endPTS + 0.5); + } + return null; + }; + Object.defineProperty(StreamController.prototype, "nextLevel", { + get: function () { + var frag = this.nextBufferedFrag; + if (frag) { + return frag.level; + } + else { + return -1; + } + }, + enumerable: true, + configurable: true + }); + StreamController.prototype._checkFragmentChanged = function () { + var fragPlayingCurrent, currentTime, video = this.media; + if (video && video.readyState && video.seeking === false) { + currentTime = video.currentTime; + /* if video element is in seeked state, currentTime can only increase. + (assuming that playback rate is positive ...) + As sometimes currentTime jumps back to zero after a + media decode error, check this, to avoid seeking back to + wrong position after a media decode error + */ + if (currentTime > this.lastCurrentTime) { + this.lastCurrentTime = currentTime; + } + if (buffer_helper_1.BufferHelper.isBuffered(video, currentTime)) { + fragPlayingCurrent = this.getBufferedFrag(currentTime); + } + else if (buffer_helper_1.BufferHelper.isBuffered(video, currentTime + 0.1)) { + /* ensure that FRAG_CHANGED event is triggered at startup, + when first video frame is displayed and playback is paused. + add a tolerance of 100ms, in case current position is not buffered, + check if current pos+100ms is buffered and use that buffer range + for FRAG_CHANGED event reporting */ + fragPlayingCurrent = this.getBufferedFrag(currentTime + 0.1); + } + if (fragPlayingCurrent) { + var fragPlaying = fragPlayingCurrent; + if (fragPlaying !== this.fragPlaying) { + this.hls.trigger(events_1.default.FRAG_CHANGED, { frag: fragPlaying }); + var fragPlayingLevel = fragPlaying.level; + if (!this.fragPlaying || this.fragPlaying.level !== fragPlayingLevel) { + this.hls.trigger(events_1.default.LEVEL_SWITCHED, { level: fragPlayingLevel }); + } + this.fragPlaying = fragPlaying; + } + } + } + }; + /* + on immediate level switch : + - pause playback if playing + - cancel any pending load request + - and trigger a buffer flush + */ + StreamController.prototype.immediateLevelSwitch = function () { + logger_1.logger.log('immediateLevelSwitch'); + if (!this.immediateSwitch) { + this.immediateSwitch = true; + var media = this.media, previouslyPaused = void 0; + if (media) { + previouslyPaused = media.paused; + media.pause(); + } + else { + // don't restart playback after instant level switch in case media not attached + previouslyPaused = true; + } + this.previouslyPaused = previouslyPaused; + } + var fragCurrent = this.fragCurrent; + if (fragCurrent && fragCurrent.loader) { + fragCurrent.loader.abort(); + } + this.fragCurrent = null; + // flush everything + this.flushMainBuffer(0, Number.POSITIVE_INFINITY); + }; + /** + * on immediate level switch end, after new fragment has been buffered: + * - nudge video decoder by slightly adjusting video currentTime (if currentTime buffered) + * - resume the playback if needed + */ + StreamController.prototype.immediateLevelSwitchEnd = function () { + var media = this.media; + if (media && media.buffered.length) { + this.immediateSwitch = false; + if (buffer_helper_1.BufferHelper.isBuffered(media, media.currentTime)) { + // only nudge if currentTime is buffered + media.currentTime -= 0.0001; + } + if (!this.previouslyPaused) { + media.play(); + } + } + }; + /** + * try to switch ASAP without breaking video playback: + * in order to ensure smooth but quick level switching, + * we need to find the next flushable buffer range + * we should take into account new segment fetch time + */ + StreamController.prototype.nextLevelSwitch = function () { + var media = this.media; + // ensure that media is defined and that metadata are available (to retrieve currentTime) + if (media && media.readyState) { + var fetchdelay = void 0, fragPlayingCurrent = void 0, nextBufferedFrag = void 0; + fragPlayingCurrent = this.getBufferedFrag(media.currentTime); + if (fragPlayingCurrent && fragPlayingCurrent.startPTS > 1) { + // flush buffer preceding current fragment (flush until current fragment start offset) + // minus 1s to avoid video freezing, that could happen if we flush keyframe of current video ... + this.flushMainBuffer(0, fragPlayingCurrent.startPTS - 1); + } + if (!media.paused) { + // add a safety delay of 1s + var nextLevelId = this.hls.nextLoadLevel, nextLevel = this.levels[nextLevelId], fragLastKbps = this.fragLastKbps; + if (fragLastKbps && this.fragCurrent) { + fetchdelay = this.fragCurrent.duration * nextLevel.bitrate / (1000 * fragLastKbps) + 1; + } + else { + fetchdelay = 0; + } + } + else { + fetchdelay = 0; + } + // logger.log('fetchdelay:'+fetchdelay); + // find buffer range that will be reached once new fragment will be fetched + nextBufferedFrag = this.getBufferedFrag(media.currentTime + fetchdelay); + if (nextBufferedFrag) { + // we can flush buffer range following this one without stalling playback + nextBufferedFrag = this.followingBufferedFrag(nextBufferedFrag); + if (nextBufferedFrag) { + // if we are here, we can also cancel any loading/demuxing in progress, as they are useless + var fragCurrent = this.fragCurrent; + if (fragCurrent && fragCurrent.loader) { + fragCurrent.loader.abort(); + } + this.fragCurrent = null; + // start flush position is the start PTS of next buffered frag. + // we use frag.naxStartPTS which is max(audio startPTS, video startPTS). + // in case there is a small PTS Delta between audio and video, using maxStartPTS avoids flushing last samples from current fragment + this.flushMainBuffer(nextBufferedFrag.maxStartPTS, Number.POSITIVE_INFINITY); + } + } + } + }; + StreamController.prototype.flushMainBuffer = function (startOffset, endOffset) { + this.state = base_stream_controller_1.State.BUFFER_FLUSHING; + var flushScope = { startOffset: startOffset, endOffset: endOffset }; + // if alternate audio tracks are used, only flush video, otherwise flush everything + if (this.altAudio) { + flushScope.type = 'video'; + } + this.hls.trigger(events_1.default.BUFFER_FLUSHING, flushScope); + }; + StreamController.prototype.onMediaAttached = function (data) { + var media = this.media = this.mediaBuffer = data.media; + this.onvseeking = this.onMediaSeeking.bind(this); + this.onvseeked = this.onMediaSeeked.bind(this); + this.onvended = this.onMediaEnded.bind(this); + media.addEventListener('seeking', this.onvseeking); + media.addEventListener('seeked', this.onvseeked); + media.addEventListener('ended', this.onvended); + var config = this.config; + if (this.levels && config.autoStartLoad) { + this.hls.startLoad(config.startPosition); + } + this.gapController = new gap_controller_1.default(config, media, this.fragmentTracker, this.hls); + }; + StreamController.prototype.onMediaDetaching = function () { + var media = this.media; + if (media && media.ended) { + logger_1.logger.log('MSE detaching and video ended, reset startPosition'); + this.startPosition = this.lastCurrentTime = 0; + } + // reset fragment backtracked flag + var levels = this.levels; + if (levels) { + levels.forEach(function (level) { + if (level.details) { + level.details.fragments.forEach(function (fragment) { + fragment.backtracked = undefined; + }); + } + }); + } + // remove video listeners + if (media) { + media.removeEventListener('seeking', this.onvseeking); + media.removeEventListener('seeked', this.onvseeked); + media.removeEventListener('ended', this.onvended); + this.onvseeking = this.onvseeked = this.onvended = null; + } + this.media = this.mediaBuffer = null; + this.loadedmetadata = false; + this.stopLoad(); + }; + StreamController.prototype.onMediaSeeked = function () { + var media = this.media, currentTime = media ? media.currentTime : undefined; + if (Number.isFinite(currentTime)) { + logger_1.logger.log("media seeked to " + currentTime.toFixed(3)); + } + // tick to speed up FRAGMENT_PLAYING triggering + this.tick(); + }; + StreamController.prototype.onManifestLoading = function () { + // reset buffer on manifest loading + logger_1.logger.log('trigger BUFFER_RESET'); + this.hls.trigger(events_1.default.BUFFER_RESET); + this.fragmentTracker.removeAllFragments(); + this.stalled = false; + this.startPosition = this.lastCurrentTime = 0; + }; + StreamController.prototype.onManifestParsed = function (data) { + var aac = false, heaac = false, codec; + data.levels.forEach(function (level) { + // detect if we have different kind of audio codecs used amongst playlists + codec = level.audioCodec; + if (codec) { + if (codec.indexOf('mp4a.40.2') !== -1) { + aac = true; + } + if (codec.indexOf('mp4a.40.5') !== -1) { + heaac = true; + } + } + }); + this.audioCodecSwitch = (aac && heaac); + if (this.audioCodecSwitch) { + logger_1.logger.log('both AAC/HE-AAC audio found in levels; declaring level codec as HE-AAC'); + } + this.levels = data.levels; + this.startFragRequested = false; + var config = this.config; + if (config.autoStartLoad || this.forceStartLoad) { + this.hls.startLoad(config.startPosition); + } + }; + StreamController.prototype.onLevelLoaded = function (data) { + var newDetails = data.details; + var newLevelId = data.level; + var lastLevel = this.levels[this.levelLastLoaded]; + var curLevel = this.levels[newLevelId]; + var duration = newDetails.totalduration; + var sliding = 0; + logger_1.logger.log("level " + newLevelId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "],duration:" + duration); + if (newDetails.live) { + var curDetails = curLevel.details; + if (curDetails && newDetails.fragments.length > 0) { + // we already have details for that level, merge them + LevelHelper.mergeDetails(curDetails, newDetails); + sliding = newDetails.fragments[0].start; + this.liveSyncPosition = this.computeLivePosition(sliding, curDetails); + if (newDetails.PTSKnown && Number.isFinite(sliding)) { + logger_1.logger.log("live playlist sliding:" + sliding.toFixed(3)); + } + else { + logger_1.logger.log('live playlist - outdated PTS, unknown sliding'); + discontinuities_1.alignStream(this.fragPrevious, lastLevel, newDetails); + } + } + else { + logger_1.logger.log('live playlist - first load, unknown sliding'); + newDetails.PTSKnown = false; + discontinuities_1.alignStream(this.fragPrevious, lastLevel, newDetails); + } + } + else { + newDetails.PTSKnown = false; + } + // override level info + curLevel.details = newDetails; + this.levelLastLoaded = newLevelId; + this.hls.trigger(events_1.default.LEVEL_UPDATED, { details: newDetails, level: newLevelId }); + if (this.startFragRequested === false) { + // compute start position if set to -1. use it straight away if value is defined + if (this.startPosition === -1 || this.lastCurrentTime === -1) { + // first, check if start time offset has been set in playlist, if yes, use this value + var startTimeOffset = newDetails.startTimeOffset; + if (Number.isFinite(startTimeOffset)) { + if (startTimeOffset < 0) { + logger_1.logger.log("negative start time offset " + startTimeOffset + ", count from end of last fragment"); + startTimeOffset = sliding + duration + startTimeOffset; + } + logger_1.logger.log("start time offset found in playlist, adjust startPosition to " + startTimeOffset); + this.startPosition = startTimeOffset; + } + else { + // if live playlist, set start position to be fragment N-this.config.liveSyncDurationCount (usually 3) + if (newDetails.live) { + this.startPosition = this.computeLivePosition(sliding, newDetails); + logger_1.logger.log("configure startPosition to " + this.startPosition); + } + else { + this.startPosition = 0; + } + } + this.lastCurrentTime = this.startPosition; + } + this.nextLoadPosition = this.startPosition; + } + // only switch batck to IDLE state if we were waiting for level to start downloading a new fragment + if (this.state === base_stream_controller_1.State.WAITING_LEVEL) { + this.state = base_stream_controller_1.State.IDLE; + } + // trigger handler right now + this.tick(); + }; + StreamController.prototype.onKeyLoaded = function () { + if (this.state === base_stream_controller_1.State.KEY_LOADING) { + this.state = base_stream_controller_1.State.IDLE; + this.tick(); + } + }; + StreamController.prototype.onFragLoaded = function (data) { + var _a = this, fragCurrent = _a.fragCurrent, hls = _a.hls, levels = _a.levels, media = _a.media; + var fragLoaded = data.frag; + if (this.state === base_stream_controller_1.State.FRAG_LOADING && + fragCurrent && + fragLoaded.type === 'main' && + fragLoaded.level === fragCurrent.level && + fragLoaded.sn === fragCurrent.sn) { + var stats = data.stats; + var currentLevel = levels[fragCurrent.level]; + var details = currentLevel.details; + // reset frag bitrate test in any case after frag loaded event + // if this frag was loaded to perform a bitrate test AND if hls.nextLoadLevel is greater than 0 + // then this means that we should be able to load a fragment at a higher quality level + this.bitrateTest = false; + this.stats = stats; + logger_1.logger.log("Loaded " + fragCurrent.sn + " of [" + details.startSN + " ," + details.endSN + "],level " + fragCurrent.level); + if (fragLoaded.bitrateTest && hls.nextLoadLevel) { + // switch back to IDLE state ... we just loaded a fragment to determine adequate start bitrate and initialize autoswitch algo + this.state = base_stream_controller_1.State.IDLE; + this.startFragRequested = false; + stats.tparsed = stats.tbuffered = window.performance.now(); + hls.trigger(events_1.default.FRAG_BUFFERED, { stats: stats, frag: fragCurrent, id: 'main' }); + this.tick(); + } + else if (fragLoaded.sn === 'initSegment') { + this.state = base_stream_controller_1.State.IDLE; + stats.tparsed = stats.tbuffered = window.performance.now(); + details.initSegment.data = data.payload; + hls.trigger(events_1.default.FRAG_BUFFERED, { stats: stats, frag: fragCurrent, id: 'main' }); + this.tick(); + } + else { + logger_1.logger.log("Parsing " + fragCurrent.sn + " of [" + details.startSN + " ," + details.endSN + "],level " + fragCurrent.level + ", cc " + fragCurrent.cc); + this.state = base_stream_controller_1.State.PARSING; + this.pendingBuffering = true; + this.appended = false; + // Bitrate test frags are not usually buffered so the fragment tracker ignores them. If Hls.js decides to buffer + // it (and therefore ends up at this line), then the fragment tracker needs to be manually informed. + if (fragLoaded.bitrateTest) { + fragLoaded.bitrateTest = false; + this.fragmentTracker.onFragLoaded({ + frag: fragLoaded + }); + } + // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live) and if media is not seeking (this is to overcome potential timestamp drifts between playlists and fragments) + var accurateTimeOffset = !(media && media.seeking) && (details.PTSKnown || !details.live); + var initSegmentData = details.initSegment ? details.initSegment.data : []; + var audioCodec = this._getAudioCodec(currentLevel); + // transmux the MPEG-TS data to ISO-BMFF segments + var demuxer = this.demuxer = this.demuxer || new demuxer_1.default(this.hls, 'main'); + demuxer.push(data.payload, initSegmentData, audioCodec, currentLevel.videoCodec, fragCurrent, details.totalduration, accurateTimeOffset); + } + } + this.fragLoadError = 0; + }; + StreamController.prototype.onFragParsingInitSegment = function (data) { + var fragCurrent = this.fragCurrent; + var fragNew = data.frag; + if (fragCurrent && + data.id === 'main' && + fragNew.sn === fragCurrent.sn && + fragNew.level === fragCurrent.level && + this.state === base_stream_controller_1.State.PARSING) { + var tracks = data.tracks, trackName = void 0, track = void 0; + // if audio track is expected to come from audio stream controller, discard any coming from main + if (tracks.audio && this.altAudio) { + delete tracks.audio; + } + // include levelCodec in audio and video tracks + track = tracks.audio; + if (track) { + var audioCodec = this.levels[this.level].audioCodec, ua = navigator.userAgent.toLowerCase(); + if (audioCodec && this.audioCodecSwap) { + logger_1.logger.log('swapping playlist audio codec'); + if (audioCodec.indexOf('mp4a.40.5') !== -1) { + audioCodec = 'mp4a.40.2'; + } + else { + audioCodec = 'mp4a.40.5'; + } + } + // in case AAC and HE-AAC audio codecs are signalled in manifest + // force HE-AAC , as it seems that most browsers prefers that way, + // except for mono streams OR on FF + // these conditions might need to be reviewed ... + if (this.audioCodecSwitch) { + // don't force HE-AAC if mono stream + if (track.metadata.channelCount !== 1 && + // don't force HE-AAC if firefox + ua.indexOf('firefox') === -1) { + audioCodec = 'mp4a.40.5'; + } + } + // HE-AAC is broken on Android, always signal audio codec as AAC even if variant manifest states otherwise + if (ua.indexOf('android') !== -1 && track.container !== 'audio/mpeg') { // Exclude mpeg audio + audioCodec = 'mp4a.40.2'; + logger_1.logger.log("Android: force audio codec to " + audioCodec); + } + track.levelCodec = audioCodec; + track.id = data.id; + } + track = tracks.video; + if (track) { + track.levelCodec = this.levels[this.level].videoCodec; + track.id = data.id; + } + this.hls.trigger(events_1.default.BUFFER_CODECS, tracks); + // loop through tracks that are going to be provided to bufferController + for (trackName in tracks) { + track = tracks[trackName]; + logger_1.logger.log("main track:" + trackName + ",container:" + track.container + ",codecs[level/parsed]=[" + track.levelCodec + "/" + track.codec + "]"); + var initSegment = track.initSegment; + if (initSegment) { + this.appended = true; + // arm pending Buffering flag before appending a segment + this.pendingBuffering = true; + this.hls.trigger(events_1.default.BUFFER_APPENDING, { type: trackName, data: initSegment, parent: 'main', content: 'initSegment' }); + } + } + // trigger handler right now + this.tick(); + } + }; + StreamController.prototype.onFragParsingData = function (data) { + var _this = this; + var fragCurrent = this.fragCurrent; + var fragNew = data.frag; + if (fragCurrent && + data.id === 'main' && + fragNew.sn === fragCurrent.sn && + fragNew.level === fragCurrent.level && + !(data.type === 'audio' && this.altAudio) && // filter out main audio if audio track is loaded through audio stream controller + this.state === base_stream_controller_1.State.PARSING) { + var level = this.levels[this.level], frag = fragCurrent; + if (!Number.isFinite(data.endPTS)) { + data.endPTS = data.startPTS + fragCurrent.duration; + data.endDTS = data.startDTS + fragCurrent.duration; + } + if (data.hasAudio === true) { + frag.addElementaryStream(fragment_1.default.ElementaryStreamTypes.AUDIO); + } + if (data.hasVideo === true) { + frag.addElementaryStream(fragment_1.default.ElementaryStreamTypes.VIDEO); + } + logger_1.logger.log("Parsed " + data.type + ",PTS:[" + data.startPTS.toFixed(3) + "," + data.endPTS.toFixed(3) + "],DTS:[" + data.startDTS.toFixed(3) + "/" + data.endDTS.toFixed(3) + "],nb:" + data.nb + ",dropped:" + (data.dropped || 0)); + // Detect gaps in a fragment and try to fix it by finding a keyframe in the previous fragment (see _findFragments) + if (data.type === 'video') { + frag.dropped = data.dropped; + if (frag.dropped) { + if (!frag.backtracked) { + var levelDetails = level.details; + if (levelDetails && frag.sn === levelDetails.startSN) { + logger_1.logger.warn('missing video frame(s) on first frag, appending with gap', frag.sn); + } + else { + logger_1.logger.warn('missing video frame(s), backtracking fragment', frag.sn); + // Return back to the IDLE state without appending to buffer + // Causes findFragments to backtrack a segment and find the keyframe + // Audio fragments arriving before video sets the nextLoadPosition, causing _findFragments to skip the backtracked fragment + this.fragmentTracker.removeFragment(frag); + frag.backtracked = true; + this.nextLoadPosition = data.startPTS; + this.state = base_stream_controller_1.State.IDLE; + this.fragPrevious = frag; + this.tick(); + return; + } + } + else { + logger_1.logger.warn('Already backtracked on this fragment, appending with the gap', frag.sn); + } + } + else { + // Only reset the backtracked flag if we've loaded the frag without any dropped frames + frag.backtracked = false; + } + } + var drift = LevelHelper.updateFragPTSDTS(level.details, frag, data.startPTS, data.endPTS, data.startDTS, data.endDTS), hls_2 = this.hls; + hls_2.trigger(events_1.default.LEVEL_PTS_UPDATED, { details: level.details, level: this.level, drift: drift, type: data.type, start: data.startPTS, end: data.endPTS }); + // has remuxer dropped video frames located before first keyframe ? + [data.data1, data.data2].forEach(function (buffer) { + // only append in PARSING state (rationale is that an appending error could happen synchronously on first segment appending) + // in that case it is useless to append following segments + if (buffer && buffer.length && _this.state === base_stream_controller_1.State.PARSING) { + _this.appended = true; + // arm pending Buffering flag before appending a segment + _this.pendingBuffering = true; + hls_2.trigger(events_1.default.BUFFER_APPENDING, { type: data.type, data: buffer, parent: 'main', content: 'data' }); + } + }); + // trigger handler right now + this.tick(); + } + }; + StreamController.prototype.onFragParsed = function (data) { + var fragCurrent = this.fragCurrent; + var fragNew = data.frag; + if (fragCurrent && + data.id === 'main' && + fragNew.sn === fragCurrent.sn && + fragNew.level === fragCurrent.level && + this.state === base_stream_controller_1.State.PARSING) { + this.stats.tparsed = window.performance.now(); + this.state = base_stream_controller_1.State.PARSED; + this._checkAppendedParsed(); + } + }; + StreamController.prototype.onAudioTrackSwitching = function (data) { + // if any URL found on new audio track, it is an alternate audio track + var altAudio = !!data.url, trackId = data.id; + // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered + // don't do anything if we switch to alt audio: audio stream controller is handling it. + // we will just have to change buffer scheduling on audioTrackSwitched + if (!altAudio) { + if (this.mediaBuffer !== this.media) { + logger_1.logger.log('switching on main audio, use media.buffered to schedule main fragment loading'); + this.mediaBuffer = this.media; + var fragCurrent = this.fragCurrent; + // we need to refill audio buffer from main: cancel any frag loading to speed up audio switch + if (fragCurrent.loader) { + logger_1.logger.log('switching to main audio track, cancel main fragment load'); + fragCurrent.loader.abort(); + } + this.fragCurrent = null; + this.fragPrevious = null; + // destroy demuxer to force init segment generation (following audio switch) + if (this.demuxer) { + this.demuxer.destroy(); + this.demuxer = null; + } + // switch to IDLE state to load new fragment + this.state = base_stream_controller_1.State.IDLE; + } + var hls_3 = this.hls; + // switching to main audio, flush all audio and trigger track switched + hls_3.trigger(events_1.default.BUFFER_FLUSHING, { startOffset: 0, endOffset: Number.POSITIVE_INFINITY, type: 'audio' }); + hls_3.trigger(events_1.default.AUDIO_TRACK_SWITCHED, { id: trackId }); + this.altAudio = false; + } + }; + StreamController.prototype.onAudioTrackSwitched = function (data) { + var trackId = data.id, altAudio = !!this.hls.audioTracks[trackId].url; + if (altAudio) { + var videoBuffer = this.videoBuffer; + // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered + if (videoBuffer && this.mediaBuffer !== videoBuffer) { + logger_1.logger.log('switching on alternate audio, use video.buffered to schedule main fragment loading'); + this.mediaBuffer = videoBuffer; + } + } + this.altAudio = altAudio; + this.tick(); + }; + StreamController.prototype.onBufferCreated = function (data) { + var tracks = data.tracks, mediaTrack, name, alternate = false; + for (var type in tracks) { + var track = tracks[type]; + if (track.id === 'main') { + name = type; + mediaTrack = track; + // keep video source buffer reference + if (type === 'video') { + this.videoBuffer = tracks[type].buffer; + } + } + else { + alternate = true; + } + } + if (alternate && mediaTrack) { + logger_1.logger.log("alternate track found, use " + name + ".buffered to schedule main fragment loading"); + this.mediaBuffer = mediaTrack.buffer; + } + else { + this.mediaBuffer = this.media; + } + }; + StreamController.prototype.onBufferAppended = function (data) { + if (data.parent === 'main') { + var state = this.state; + if (state === base_stream_controller_1.State.PARSING || state === base_stream_controller_1.State.PARSED) { + // check if all buffers have been appended + this.pendingBuffering = (data.pending > 0); + this._checkAppendedParsed(); + } + } + }; + StreamController.prototype._checkAppendedParsed = function () { + // trigger handler right now + if (this.state === base_stream_controller_1.State.PARSED && (!this.appended || !this.pendingBuffering)) { + var frag = this.fragCurrent; + if (frag) { + var media = this.mediaBuffer ? this.mediaBuffer : this.media; + logger_1.logger.log("main buffered : " + time_ranges_1.default.toString(media.buffered)); + this.fragPrevious = frag; + var stats = this.stats; + stats.tbuffered = window.performance.now(); + // we should get rid of this.fragLastKbps + this.fragLastKbps = Math.round(8 * stats.total / (stats.tbuffered - stats.tfirst)); + this.hls.trigger(events_1.default.FRAG_BUFFERED, { stats: stats, frag: frag, id: 'main' }); + this.state = base_stream_controller_1.State.IDLE; + } + this.tick(); + } + }; + StreamController.prototype.onError = function (data) { + var frag = data.frag || this.fragCurrent; + // don't handle frag error not related to main fragment + if (frag && frag.type !== 'main') { + return; + } + // 0.5 : tolerance needed as some browsers stalls playback before reaching buffered end + var mediaBuffered = !!this.media && buffer_helper_1.BufferHelper.isBuffered(this.media, this.media.currentTime) && buffer_helper_1.BufferHelper.isBuffered(this.media, this.media.currentTime + 0.5); + switch (data.details) { + case errors_1.ErrorDetails.FRAG_LOAD_ERROR: + case errors_1.ErrorDetails.FRAG_LOAD_TIMEOUT: + case errors_1.ErrorDetails.KEY_LOAD_ERROR: + case errors_1.ErrorDetails.KEY_LOAD_TIMEOUT: + if (!data.fatal) { + // keep retrying until the limit will be reached + if ((this.fragLoadError + 1) <= this.config.fragLoadingMaxRetry) { + // exponential backoff capped to config.fragLoadingMaxRetryTimeout + var delay = Math.min(Math.pow(2, this.fragLoadError) * this.config.fragLoadingRetryDelay, this.config.fragLoadingMaxRetryTimeout); + logger_1.logger.warn("mediaController: frag loading failed, retry in " + delay + " ms"); + this.retryDate = window.performance.now() + delay; + // retry loading state + // if loadedmetadata is not set, it means that we are emergency switch down on first frag + // in that case, reset startFragRequested flag + if (!this.loadedmetadata) { + this.startFragRequested = false; + this.nextLoadPosition = this.startPosition; + } + this.fragLoadError++; + this.state = base_stream_controller_1.State.FRAG_LOADING_WAITING_RETRY; + } + else { + logger_1.logger.error("mediaController: " + data.details + " reaches max retry, redispatch as fatal ..."); + // switch error to fatal + data.fatal = true; + this.state = base_stream_controller_1.State.ERROR; + } + } + break; + case errors_1.ErrorDetails.LEVEL_LOAD_ERROR: + case errors_1.ErrorDetails.LEVEL_LOAD_TIMEOUT: + if (this.state !== base_stream_controller_1.State.ERROR) { + if (data.fatal) { + // if fatal error, stop processing + this.state = base_stream_controller_1.State.ERROR; + logger_1.logger.warn("streamController: " + data.details + ",switch to " + this.state + " state ..."); + } + else { + // in case of non fatal error while loading level, if level controller is not retrying to load level , switch back to IDLE + if (!data.levelRetry && this.state === base_stream_controller_1.State.WAITING_LEVEL) { + this.state = base_stream_controller_1.State.IDLE; + } + } + } + break; + case errors_1.ErrorDetails.BUFFER_FULL_ERROR: + // if in appending state + if (data.parent === 'main' && (this.state === base_stream_controller_1.State.PARSING || this.state === base_stream_controller_1.State.PARSED)) { + // reduce max buf len if current position is buffered + if (mediaBuffered) { + this._reduceMaxBufferLength(this.config.maxBufferLength); + this.state = base_stream_controller_1.State.IDLE; + } + else { + // current position is not buffered, but browser is still complaining about buffer full error + // this happens on IE/Edge, refer to https://github.com/video-dev/hls.js/pull/708 + // in that case flush the whole buffer to recover + logger_1.logger.warn('buffer full error also media.currentTime is not buffered, flush everything'); + this.fragCurrent = null; + // flush everything + this.flushMainBuffer(0, Number.POSITIVE_INFINITY); + } + } + break; + default: + break; + } + }; + StreamController.prototype._reduceMaxBufferLength = function (minLength) { + var config = this.config; + if (config.maxMaxBufferLength >= minLength) { + // reduce max buffer length as it might be too high. we do this to avoid loop flushing ... + config.maxMaxBufferLength /= 2; + logger_1.logger.warn("main:reduce max buffer length to " + config.maxMaxBufferLength + "s"); + return true; + } + return false; + }; + /** + * Checks the health of the buffer and attempts to resolve playback stalls. + * @private + */ + StreamController.prototype._checkBuffer = function () { + var media = this.media; + if (!media || media.readyState === 0) { + // Exit early if we don't have media or if the media hasn't bufferd anything yet (readyState 0) + return; + } + var mediaBuffer = this.mediaBuffer ? this.mediaBuffer : media; + var buffered = mediaBuffer.buffered; + if (!this.loadedmetadata && buffered.length) { + this.loadedmetadata = true; + this._seekToStartPos(); + } + else if (this.immediateSwitch) { + this.immediateLevelSwitchEnd(); + } + else { + this.gapController.poll(this.lastCurrentTime, buffered); + } + }; + StreamController.prototype.onFragLoadEmergencyAborted = function () { + this.state = base_stream_controller_1.State.IDLE; + // if loadedmetadata is not set, it means that we are emergency switch down on first frag + // in that case, reset startFragRequested flag + if (!this.loadedmetadata) { + this.startFragRequested = false; + this.nextLoadPosition = this.startPosition; + } + this.tick(); + }; + StreamController.prototype.onBufferFlushed = function () { + /* after successful buffer flushing, filter flushed fragments from bufferedFrags + use mediaBuffered instead of media (so that we will check against video.buffered ranges in case of alt audio track) + */ + var media = this.mediaBuffer ? this.mediaBuffer : this.media; + if (media) { + // filter fragments potentially evicted from buffer. this is to avoid memleak on live streams + this.fragmentTracker.detectEvictedFragments(fragment_1.default.ElementaryStreamTypes.VIDEO, media.buffered); + } + // move to IDLE once flush complete. this should trigger new fragment loading + this.state = base_stream_controller_1.State.IDLE; + // reset reference to frag + this.fragPrevious = null; + }; + StreamController.prototype.swapAudioCodec = function () { + this.audioCodecSwap = !this.audioCodecSwap; + }; + StreamController.prototype.computeLivePosition = function (sliding, levelDetails) { + var targetLatency = this.config.liveSyncDuration !== undefined ? this.config.liveSyncDuration : this.config.liveSyncDurationCount * levelDetails.targetduration; + return sliding + Math.max(0, levelDetails.totalduration - targetLatency); + }; + /** + * Seeks to the set startPosition if not equal to the mediaElement's current time. + * @private + */ + StreamController.prototype._seekToStartPos = function () { + var media = this.media; + var currentTime = media.currentTime; + // only adjust currentTime if different from startPosition or if startPosition not buffered + // at that stage, there should be only one buffered range, as we reach that code after first fragment has been buffered + var startPosition = media.seeking ? currentTime : this.startPosition; + // if currentTime not matching with expected startPosition or startPosition not buffered but close to first buffered + if (currentTime !== startPosition) { + // if startPosition not buffered, let's seek to buffered.start(0) + logger_1.logger.log("target start position not buffered, seek to buffered.start(0) " + startPosition + " from current time " + currentTime + " "); + media.currentTime = startPosition; + } + }; + StreamController.prototype._getAudioCodec = function (currentLevel) { + var audioCodec = this.config.defaultAudioCodec || currentLevel.audioCodec; + if (this.audioCodecSwap) { + logger_1.logger.log('swapping playlist audio codec'); + if (audioCodec) { + if (audioCodec.indexOf('mp4a.40.5') !== -1) { + audioCodec = 'mp4a.40.2'; + } + else { + audioCodec = 'mp4a.40.5'; + } + } + } + return audioCodec; + }; + Object.defineProperty(StreamController.prototype, "liveSyncPosition", { + get: function () { + return this._liveSyncPosition; + }, + set: function (value) { + this._liveSyncPosition = value; + }, + enumerable: true, + configurable: true + }); + return StreamController; +}(base_stream_controller_1.default)); +exports.default = StreamController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/controller/subtitle-stream-controller.js": +/*!******************************************************!*\ + !*** ./src/controller/subtitle-stream-controller.js ***! + \******************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * @class SubtitleStreamController + */ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var decrypter_1 = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.js"); +var task_loop_1 = __webpack_require__(/*! ../task-loop */ "./src/task-loop.js"); +var buffer_helper_1 = __webpack_require__(/*! ../utils/buffer-helper */ "./src/utils/buffer-helper.js"); +var fragment_finders_1 = __webpack_require__(/*! ./fragment-finders */ "./src/controller/fragment-finders.js"); +var fragment_tracker_1 = __webpack_require__(/*! ./fragment-tracker */ "./src/controller/fragment-tracker.js"); +var performance = window.performance; +exports.SubtitleStreamControllerState = { + STOPPED: 'STOPPED', + IDLE: 'IDLE', + KEY_LOADING: 'KEY_LOADING', + FRAG_LOADING: 'FRAG_LOADING' +}; +var State = exports.SubtitleStreamControllerState; +var TICK_INTERVAL = 500; // how often to tick in ms +var SubtitleStreamController = /** @class */ (function (_super) { + __extends(SubtitleStreamController, _super); + function SubtitleStreamController(hls, fragmentTracker) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHED, events_1.default.MEDIA_DETACHING, events_1.default.ERROR, events_1.default.KEY_LOADED, events_1.default.FRAG_LOADED, events_1.default.SUBTITLE_TRACKS_UPDATED, events_1.default.SUBTITLE_TRACK_SWITCH, events_1.default.SUBTITLE_TRACK_LOADED, events_1.default.SUBTITLE_FRAG_PROCESSED) || this; + _this.fragmentTracker = fragmentTracker; + _this.config = hls.config; + _this.state = State.STOPPED; + _this.tracks = []; + _this.tracksBuffered = []; + _this.currentTrackId = -1; + _this.decrypter = new decrypter_1.default(hls, hls.config); + return _this; + } + SubtitleStreamController.prototype.onHandlerDestroyed = function () { + this.fragmentTracker = null; + this.state = State.STOPPED; + _super.prototype.onHandlerDestroyed.call(this); + }; + SubtitleStreamController.prototype.onSubtitleFragProcessed = function (data) { + this.state = State.IDLE; + if (!data.success) { + return; + } + var buffered = this.tracksBuffered[this.currentTrackId]; + var frag = data.frag; + this.fragPrevious = frag; + if (!buffered) { + return; + } + // Create/update a buffered array matching the interface used by BufferHelper.bufferedInfo + // so we can re-use the logic used to detect how much have been buffered + // FIXME: put this in a utility function or proper object for time-ranges manipulation? + var timeRange; + for (var i = 0; i < buffered.length; i++) { + if (frag.start >= buffered[i].start && frag.start <= buffered[i].end) { + timeRange = buffered[i]; + break; + } + } + if (timeRange) { + timeRange.end = frag.start + frag.duration; + } + else { + buffered.push({ + start: frag.start, + end: frag.start + frag.duration + }); + } + }; + SubtitleStreamController.prototype.onMediaAttached = function (data) { + this.media = data.media; + this.state = State.IDLE; + }; + SubtitleStreamController.prototype.onMediaDetaching = function () { + this.media = null; + this.state = State.STOPPED; + }; + // If something goes wrong, procede to next frag, if we were processing one. + SubtitleStreamController.prototype.onError = function (data) { + var frag = data.frag; + // don't handle error not related to subtitle fragment + if (!frag || frag.type !== 'subtitle') { + return; + } + this.state = State.IDLE; + }; + // Got all new subtitle tracks. + SubtitleStreamController.prototype.onSubtitleTracksUpdated = function (data) { + var _this = this; + logger_1.logger.log('subtitle tracks updated'); + this.tracksBuffered = []; + this.tracks = data.subtitleTracks; + this.tracks.forEach(function (track) { + _this.tracksBuffered[track.id] = []; + }); + }; + SubtitleStreamController.prototype.onSubtitleTrackSwitch = function (data) { + this.currentTrackId = data.id; + if (!this.tracks || this.currentTrackId === -1) { + this.clearInterval(); + return; + } + // Check if track has the necessary details to load fragments + var currentTrack = this.tracks[this.currentTrackId]; + if (currentTrack && currentTrack.details) { + this.setInterval(TICK_INTERVAL); + } + }; + // Got a new set of subtitle fragments. + SubtitleStreamController.prototype.onSubtitleTrackLoaded = function (data) { + var id = data.id, details = data.details; + if (!this.tracks) { + logger_1.logger.warn('Can not update subtitle details, no tracks found'); + return; + } + if (this.tracks[id]) { + logger_1.logger.log('Updating subtitle track details'); + this.tracks[id].details = details; + } + this.setInterval(TICK_INTERVAL); + }; + SubtitleStreamController.prototype.onKeyLoaded = function () { + if (this.state === State.KEY_LOADING) { + this.state = State.IDLE; + } + }; + SubtitleStreamController.prototype.onFragLoaded = function (data) { + var fragCurrent = this.fragCurrent; + var decryptData = data.frag.decryptdata; + var fragLoaded = data.frag; + var hls = this.hls; + if (this.state === State.FRAG_LOADING && + fragCurrent && + data.frag.type === 'subtitle' && + fragCurrent.sn === data.frag.sn) { + // check to see if the payload needs to be decrypted + if (data.payload.byteLength > 0 && (decryptData && decryptData.key && decryptData.method === 'AES-128')) { + var startTime_1 = performance.now(); + // decrypt the subtitles + this.decrypter.decrypt(data.payload, decryptData.key.buffer, decryptData.iv.buffer, function (decryptedData) { + var endTime = performance.now(); + hls.trigger(events_1.default.FRAG_DECRYPTED, { frag: fragLoaded, payload: decryptedData, stats: { tstart: startTime_1, tdecrypt: endTime } }); + }); + } + } + }; + SubtitleStreamController.prototype.doTick = function () { + if (!this.media) { + this.state = State.IDLE; + return; + } + switch (this.state) { + case State.IDLE: + var tracks = this.tracks; + var trackId = this.currentTrackId; + if (!tracks || !tracks[trackId] || !tracks[trackId].details) { + break; + } + var trackDetails = tracks[trackId].details; + var config = this.config; + var maxBufferHole = config.maxBufferHole; + var maxConfigBuffer = Math.min(config.maxBufferLength, config.maxMaxBufferLength); + var maxFragLookUpTolerance = config.maxFragLookUpTolerance; + var bufferedInfo = buffer_helper_1.BufferHelper.bufferedInfo(this._getBuffered(), this.media.currentTime, maxBufferHole); + var bufferEnd = bufferedInfo.end; + var bufferLen = bufferedInfo.len; + var fragments = trackDetails.fragments; + var fragLen = fragments.length; + var end = fragments[fragLen - 1].start + fragments[fragLen - 1].duration; + var foundFrag = void 0; + if (bufferLen < maxConfigBuffer && bufferEnd < end) { + foundFrag = fragment_finders_1.findFragmentByPTS(this.fragPrevious, fragments, bufferEnd, maxFragLookUpTolerance); + } + else if (trackDetails.hasProgramDateTime && this.fragPrevious) { + foundFrag = fragment_finders_1.findFragmentByPDT(fragments, this.fragPrevious.endProgramDateTime, maxFragLookUpTolerance); + } + if (foundFrag && foundFrag.encrypted) { + logger_1.logger.log("Loading key for " + foundFrag.sn); + this.state = State.KEY_LOADING; + this.hls.trigger(events_1.default.KEY_LOADING, { frag: foundFrag }); + } + else if (foundFrag && this.fragmentTracker.getState(foundFrag) === fragment_tracker_1.FragmentState.NOT_LOADED) { + // only load if fragment is not loaded + foundFrag.trackId = trackId; // Frags don't know their subtitle track ID, so let's just add that... + this.fragCurrent = foundFrag; + this.state = State.FRAG_LOADING; + this.hls.trigger(events_1.default.FRAG_LOADING, { frag: foundFrag }); + } + } + }; + SubtitleStreamController.prototype._getBuffered = function () { + return this.tracksBuffered[this.currentTrackId] || []; + }; + return SubtitleStreamController; +}(task_loop_1.default)); +exports.SubtitleStreamController = SubtitleStreamController; + + +/***/ }), + +/***/ "./src/controller/subtitle-track-controller.js": +/*!*****************************************************!*\ + !*** ./src/controller/subtitle-track-controller.js ***! + \*****************************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * subtitle track controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +function filterSubtitleTracks(textTrackList) { + var tracks = []; + for (var i = 0; i < textTrackList.length; i++) { + if (textTrackList[i].kind === 'subtitles') { + tracks.push(textTrackList[i]); + } + } + return tracks; +} +var SubtitleTrackController = /** @class */ (function (_super) { + __extends(SubtitleTrackController, _super); + function SubtitleTrackController(hls) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHED, events_1.default.MEDIA_DETACHING, events_1.default.MANIFEST_LOADING, events_1.default.MANIFEST_LOADED, events_1.default.SUBTITLE_TRACK_LOADED) || this; + _this.tracks = []; + _this.trackId = -1; + _this.media = null; + /** + * @member {boolean} subtitleDisplay Enable/disable subtitle display rendering + */ + _this.subtitleDisplay = true; + return _this; + } + SubtitleTrackController.prototype._onTextTracksChanged = function () { + // Media is undefined when switching streams via loadSource() + if (!this.media) { + return; + } + var trackId = -1; + var tracks = filterSubtitleTracks(this.media.textTracks); + for (var id = 0; id < tracks.length; id++) { + if (tracks[id].mode === 'hidden') { + // Do not break in case there is a following track with showing. + trackId = id; + } + else if (tracks[id].mode === 'showing') { + trackId = id; + break; + } + } + // Setting current subtitleTrack will invoke code. + this.subtitleTrack = trackId; + }; + SubtitleTrackController.prototype.destroy = function () { + event_handler_1.default.prototype.destroy.call(this); + }; + // Listen for subtitle track change, then extract the current track ID. + SubtitleTrackController.prototype.onMediaAttached = function (data) { + var _this = this; + this.media = data.media; + if (!this.media) { + return; + } + if (this.queuedDefaultTrack) { + this.subtitleTrack = this.queuedDefaultTrack; + delete this.queuedDefaultTrack; + } + this.trackChangeListener = this._onTextTracksChanged.bind(this); + this.useTextTrackPolling = !(this.media.textTracks && 'onchange' in this.media.textTracks); + if (this.useTextTrackPolling) { + this.subtitlePollingInterval = setInterval(function () { + _this.trackChangeListener(); + }, 500); + } + else { + this.media.textTracks.addEventListener('change', this.trackChangeListener); + } + }; + SubtitleTrackController.prototype.onMediaDetaching = function () { + if (!this.media) { + return; + } + if (this.useTextTrackPolling) { + clearInterval(this.subtitlePollingInterval); + } + else { + this.media.textTracks.removeEventListener('change', this.trackChangeListener); + } + this.media = null; + }; + // Reset subtitle tracks on manifest loading + SubtitleTrackController.prototype.onManifestLoading = function () { + this.tracks = []; + this.trackId = -1; + }; + // Fired whenever a new manifest is loaded. + SubtitleTrackController.prototype.onManifestLoaded = function (data) { + var _this = this; + var tracks = data.subtitles || []; + this.tracks = tracks; + this.trackId = -1; + this.hls.trigger(events_1.default.SUBTITLE_TRACKS_UPDATED, { subtitleTracks: tracks }); + // loop through available subtitle tracks and autoselect default if needed + // TODO: improve selection logic to handle forced, etc + tracks.forEach(function (track) { + if (track.default) { + // setting this.subtitleTrack will trigger internal logic + // if media has not been attached yet, it will fail + // we keep a reference to the default track id + // and we'll set subtitleTrack when onMediaAttached is triggered + if (_this.media) { + _this.subtitleTrack = track.id; + } + else { + _this.queuedDefaultTrack = track.id; + } + } + }); + }; + // Trigger subtitle track playlist reload. + SubtitleTrackController.prototype.onTick = function () { + var trackId = this.trackId; + var subtitleTrack = this.tracks[trackId]; + if (!subtitleTrack) { + return; + } + var details = subtitleTrack.details; + // check if we need to load playlist for this subtitle Track + if (!details || details.live) { + // track not retrieved yet, or live playlist we need to (re)load it + logger_1.logger.log("(re)loading playlist for subtitle track " + trackId); + this.hls.trigger(events_1.default.SUBTITLE_TRACK_LOADING, { url: subtitleTrack.url, id: trackId }); + } + }; + SubtitleTrackController.prototype.onSubtitleTrackLoaded = function (data) { + var _this = this; + if (data.id < this.tracks.length) { + logger_1.logger.log("subtitle track " + data.id + " loaded"); + this.tracks[data.id].details = data.details; + // check if current playlist is a live playlist + if (data.details.live && !this.timer) { + // if live playlist we will have to reload it periodically + // set reload period to playlist target duration + this.timer = setInterval(function () { + _this.onTick(); + }, 1000 * data.details.targetduration, this); + } + if (!data.details.live && this.timer) { + // playlist is not live and timer is armed : stopping it + this._stopTimer(); + } + } + }; + Object.defineProperty(SubtitleTrackController.prototype, "subtitleTracks", { + /** get alternate subtitle tracks list from playlist **/ + get: function () { + return this.tracks; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(SubtitleTrackController.prototype, "subtitleTrack", { + /** get index of the selected subtitle track (index in subtitle track lists) **/ + get: function () { + return this.trackId; + }, + /** select a subtitle track, based on its index in subtitle track lists**/ + set: function (subtitleTrackId) { + if (this.trackId !== subtitleTrackId) { + this._toggleTrackModes(subtitleTrackId); + this.setSubtitleTrackInternal(subtitleTrackId); + } + }, + enumerable: true, + configurable: true + }); + /** + * This method is responsible for validating the subtitle index and periodically reloading if live. + * Dispatches the SUBTITLE_TRACK_SWITCH event, which instructs the subtitle-stream-controller to load the selected track. + * @param newId - The id of the subtitle track to activate. + */ + SubtitleTrackController.prototype.setSubtitleTrackInternal = function (newId) { + var _a = this, hls = _a.hls, tracks = _a.tracks; + if (typeof newId !== 'number' || newId < -1 || newId >= tracks.length) { + return; + } + this._stopTimer(); + this.trackId = newId; + logger_1.logger.log("switching to subtitle track " + newId); + hls.trigger(events_1.default.SUBTITLE_TRACK_SWITCH, { id: newId }); + if (newId === -1) { + return; + } + // check if we need to load playlist for this subtitle Track + var subtitleTrack = tracks[newId]; + var details = subtitleTrack.details; + if (!details || details.live) { + // track not retrieved yet, or live playlist we need to (re)load it + logger_1.logger.log("(re)loading playlist for subtitle track " + newId); + hls.trigger(events_1.default.SUBTITLE_TRACK_LOADING, { url: subtitleTrack.url, id: newId }); + } + }; + SubtitleTrackController.prototype._stopTimer = function () { + if (this.timer) { + clearInterval(this.timer); + this.timer = null; + } + }; + /** + * Disables the old subtitleTrack and sets current mode on the next subtitleTrack. + * This operates on the DOM textTracks. + * A value of -1 will disable all subtitle tracks. + * @param newId - The id of the next track to enable + * @private + */ + SubtitleTrackController.prototype._toggleTrackModes = function (newId) { + var _a = this, media = _a.media, subtitleDisplay = _a.subtitleDisplay, trackId = _a.trackId; + if (!media) { + return; + } + var textTracks = filterSubtitleTracks(media.textTracks); + if (newId === -1) { + [].slice.call(textTracks).forEach(function (track) { + track.mode = 'disabled'; + }); + } + else { + var oldTrack = textTracks[trackId]; + if (oldTrack) { + oldTrack.mode = 'disabled'; + } + } + var nextTrack = textTracks[newId]; + if (nextTrack) { + nextTrack.mode = subtitleDisplay ? 'showing' : 'hidden'; + } + }; + return SubtitleTrackController; +}(event_handler_1.default)); +exports.default = SubtitleTrackController; + + +/***/ }), + +/***/ "./src/controller/timeline-controller.js": +/*!***********************************************!*\ + !*** ./src/controller/timeline-controller.js ***! + \***********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * Timeline Controller +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var cea_608_parser_1 = __webpack_require__(/*! ../utils/cea-608-parser */ "./src/utils/cea-608-parser.js"); +var output_filter_1 = __webpack_require__(/*! ../utils/output-filter */ "./src/utils/output-filter.js"); +var webvtt_parser_1 = __webpack_require__(/*! ../utils/webvtt-parser */ "./src/utils/webvtt-parser.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var texttrack_utils_1 = __webpack_require__(/*! ../utils/texttrack-utils */ "./src/utils/texttrack-utils.js"); +function canReuseVttTextTrack(inUseTrack, manifestTrack) { + return inUseTrack && inUseTrack.label === manifestTrack.name && !(inUseTrack.textTrack1 || inUseTrack.textTrack2); +} +function intersection(x1, x2, y1, y2) { + return Math.min(x2, y2) - Math.max(x1, y1); +} +var TimelineController = /** @class */ (function (_super) { + __extends(TimelineController, _super); + function TimelineController(hls) { + var _this = _super.call(this, hls, events_1.default.MEDIA_ATTACHING, events_1.default.MEDIA_DETACHING, events_1.default.FRAG_PARSING_USERDATA, events_1.default.FRAG_DECRYPTED, events_1.default.MANIFEST_LOADING, events_1.default.MANIFEST_LOADED, events_1.default.FRAG_LOADED, events_1.default.LEVEL_SWITCHING, events_1.default.INIT_PTS_FOUND) || this; + _this.hls = hls; + _this.config = hls.config; + _this.enabled = true; + _this.Cues = hls.config.cueHandler; + _this.textTracks = []; + _this.tracks = []; + _this.unparsedVttFrags = []; + _this.initPTS = []; + _this.cueRanges = []; + _this.captionsTracks = {}; + _this.captionsProperties = { + textTrack1: { + label: _this.config.captionsTextTrack1Label, + languageCode: _this.config.captionsTextTrack1LanguageCode + }, + textTrack2: { + label: _this.config.captionsTextTrack2Label, + languageCode: _this.config.captionsTextTrack2LanguageCode + } + }; + if (_this.config.enableCEA708Captions) { + var channel1 = new output_filter_1.default(_this, 'textTrack1'); + var channel2 = new output_filter_1.default(_this, 'textTrack2'); + _this.cea608Parser = new cea_608_parser_1.default(0, channel1, channel2); + } + return _this; + } + TimelineController.prototype.addCues = function (trackName, startTime, endTime, screen) { + // skip cues which overlap more than 50% with previously parsed time ranges + var ranges = this.cueRanges; + var merged = false; + for (var i = ranges.length; i--;) { + var cueRange = ranges[i]; + var overlap = intersection(cueRange[0], cueRange[1], startTime, endTime); + if (overlap >= 0) { + cueRange[0] = Math.min(cueRange[0], startTime); + cueRange[1] = Math.max(cueRange[1], endTime); + merged = true; + if ((overlap / (endTime - startTime)) > 0.5) { + return; + } + } + } + if (!merged) { + ranges.push([startTime, endTime]); + } + this.Cues.newCue(this.captionsTracks[trackName], startTime, endTime, screen); + }; + // Triggered when an initial PTS is found; used for synchronisation of WebVTT. + TimelineController.prototype.onInitPtsFound = function (data) { + var _this = this; + if (data.id === 'main') { + this.initPTS[data.frag.cc] = data.initPTS; + } + // Due to asynchronous processing, initial PTS may arrive later than the first VTT fragments are loaded. + // Parse any unparsed fragments upon receiving the initial PTS. + if (this.unparsedVttFrags.length) { + var unparsedVttFrags = this.unparsedVttFrags; + this.unparsedVttFrags = []; + unparsedVttFrags.forEach(function (frag) { + _this.onFragLoaded(frag); + }); + } + }; + TimelineController.prototype.getExistingTrack = function (trackName) { + var media = this.media; + if (media) { + for (var i = 0; i < media.textTracks.length; i++) { + var textTrack = media.textTracks[i]; + if (textTrack[trackName]) { + return textTrack; + } + } + } + return null; + }; + TimelineController.prototype.createCaptionsTrack = function (trackName) { + var _a = this.captionsProperties[trackName], label = _a.label, languageCode = _a.languageCode; + var captionsTracks = this.captionsTracks; + if (!captionsTracks[trackName]) { + // Enable reuse of existing text track. + var existingTrack = this.getExistingTrack(trackName); + if (!existingTrack) { + var textTrack = this.createTextTrack('captions', label, languageCode); + if (textTrack) { + // Set a special property on the track so we know it's managed by Hls.js + textTrack[trackName] = true; + captionsTracks[trackName] = textTrack; + } + } + else { + captionsTracks[trackName] = existingTrack; + texttrack_utils_1.clearCurrentCues(captionsTracks[trackName]); + texttrack_utils_1.sendAddTrackEvent(captionsTracks[trackName], this.media); + } + } + }; + TimelineController.prototype.createTextTrack = function (kind, label, lang) { + var media = this.media; + if (media) { + return media.addTextTrack(kind, label, lang); + } + }; + TimelineController.prototype.destroy = function () { + event_handler_1.default.prototype.destroy.call(this); + }; + TimelineController.prototype.onMediaAttaching = function (data) { + this.media = data.media; + this._cleanTracks(); + }; + TimelineController.prototype.onMediaDetaching = function () { + var captionsTracks = this.captionsTracks; + Object.keys(captionsTracks).forEach(function (trackName) { + texttrack_utils_1.clearCurrentCues(captionsTracks[trackName]); + delete captionsTracks[trackName]; + }); + }; + TimelineController.prototype.onManifestLoading = function () { + this.lastSn = -1; // Detect discontiguity in fragment parsing + this.prevCC = -1; + this.vttCCs = { + ccOffset: 0, + presentationOffset: 0, + 0: { + start: 0, prevCC: -1, new: false + } + }; + this._cleanTracks(); + }; + TimelineController.prototype._cleanTracks = function () { + // clear outdated subtitles + var media = this.media; + if (media) { + var textTracks = media.textTracks; + if (textTracks) { + for (var i = 0; i < textTracks.length; i++) { + texttrack_utils_1.clearCurrentCues(textTracks[i]); + } + } + } + }; + TimelineController.prototype.onManifestLoaded = function (data) { + var _this = this; + this.textTracks = []; + this.unparsedVttFrags = this.unparsedVttFrags || []; + this.initPTS = []; + this.cueRanges = []; + if (this.config.enableWebVTT) { + this.tracks = data.subtitles || []; + var inUseTracks_1 = this.media ? this.media.textTracks : []; + this.tracks.forEach(function (track, index) { + var textTrack; + if (index < inUseTracks_1.length) { + var inUseTrack = [].slice.call(inUseTracks_1).find(function (inUseTrack) { return canReuseVttTextTrack(inUseTrack, track); }); + // Reuse tracks with the same label, but do not reuse 608/708 tracks + if (inUseTrack) { + textTrack = inUseTrack; + } + } + if (!textTrack) { + textTrack = _this.createTextTrack('subtitles', track.name, track.lang); + } + if (track.default) { + textTrack.mode = _this.hls.subtitleDisplay ? 'showing' : 'hidden'; + } + else { + textTrack.mode = 'disabled'; + } + _this.textTracks.push(textTrack); + }); + } + }; + TimelineController.prototype.onLevelSwitching = function () { + this.enabled = this.hls.currentLevel.closedCaptions !== 'NONE'; + }; + TimelineController.prototype.onFragLoaded = function (data) { + var frag = data.frag, payload = data.payload; + if (frag.type === 'main') { + var sn = frag.sn; + // if this frag isn't contiguous, clear the parser so cues with bad start/end times aren't added to the textTrack + if (sn !== this.lastSn + 1) { + var cea608Parser = this.cea608Parser; + if (cea608Parser) { + cea608Parser.reset(); + } + } + this.lastSn = sn; + } // eslint-disable-line brace-style + // If fragment is subtitle type, parse as WebVTT. + else if (frag.type === 'subtitle') { + if (payload.byteLength) { + // We need an initial synchronisation PTS. Store fragments as long as none has arrived. + if (!Number.isFinite(this.initPTS[frag.cc])) { + this.unparsedVttFrags.push(data); + if (this.initPTS.length) { + // finish unsuccessfully, otherwise the subtitle-stream-controller could be blocked from loading new frags. + this.hls.trigger(events_1.default.SUBTITLE_FRAG_PROCESSED, { success: false, frag: frag }); + } + return; + } + var decryptData = frag.decryptdata; + // If the subtitles are not encrypted, parse VTTs now. Otherwise, we need to wait. + if ((decryptData == null) || (decryptData.key == null) || (decryptData.method !== 'AES-128')) { + this._parseVTTs(frag, payload); + } + } + else { + // In case there is no payload, finish unsuccessfully. + this.hls.trigger(events_1.default.SUBTITLE_FRAG_PROCESSED, { success: false, frag: frag }); + } + } + }; + TimelineController.prototype._parseVTTs = function (frag, payload) { + var vttCCs = this.vttCCs; + if (!vttCCs[frag.cc]) { + vttCCs[frag.cc] = { start: frag.start, prevCC: this.prevCC, new: true }; + this.prevCC = frag.cc; + } + var textTracks = this.textTracks, hls = this.hls; + // Parse the WebVTT file contents. + webvtt_parser_1.default.parse(payload, this.initPTS[frag.cc], vttCCs, frag.cc, function (cues) { + var currentTrack = textTracks[frag.trackId]; + // WebVTTParser.parse is an async method and if the currently selected text track mode is set to "disabled" + // before parsing is done then don't try to access currentTrack.cues.getCueById as cues will be null + // and trying to access getCueById method of cues will throw an exception + if (currentTrack.mode === 'disabled') { + hls.trigger(events_1.default.SUBTITLE_FRAG_PROCESSED, { success: false, frag: frag }); + return; + } + // Add cues and trigger event with success true. + cues.forEach(function (cue) { + // Sometimes there are cue overlaps on segmented vtts so the same + // cue can appear more than once in different vtt files. + // This avoid showing duplicated cues with same timecode and text. + if (!currentTrack.cues.getCueById(cue.id)) { + try { + currentTrack.addCue(cue); + } + catch (err) { + var textTrackCue = new window.TextTrackCue(cue.startTime, cue.endTime, cue.text); + textTrackCue.id = cue.id; + currentTrack.addCue(textTrackCue); + } + } + }); + hls.trigger(events_1.default.SUBTITLE_FRAG_PROCESSED, { success: true, frag: frag }); + }, function (e) { + // Something went wrong while parsing. Trigger event with success false. + logger_1.logger.log("Failed to parse VTT cue: " + e); + hls.trigger(events_1.default.SUBTITLE_FRAG_PROCESSED, { success: false, frag: frag }); + }); + }; + TimelineController.prototype.onFragDecrypted = function (data) { + var decryptedData = data.payload, frag = data.frag; + if (frag.type === 'subtitle') { + if (!Number.isFinite(this.initPTS[frag.cc])) { + this.unparsedVttFrags.push(data); + return; + } + this._parseVTTs(frag, decryptedData); + } + }; + TimelineController.prototype.onFragParsingUserdata = function (data) { + // push all of the CEA-708 messages into the interpreter + // immediately. It will create the proper timestamps based on our PTS value + if (this.enabled && this.config.enableCEA708Captions) { + for (var i = 0; i < data.samples.length; i++) { + var ccdatas = this.extractCea608Data(data.samples[i].bytes); + this.cea608Parser.addData(data.samples[i].pts, ccdatas); + } + } + }; + TimelineController.prototype.extractCea608Data = function (byteArray) { + var count = byteArray[0] & 31; + var position = 2; + var tmpByte, ccbyte1, ccbyte2, ccValid, ccType; + var actualCCBytes = []; + for (var j = 0; j < count; j++) { + tmpByte = byteArray[position++]; + ccbyte1 = 0x7F & byteArray[position++]; + ccbyte2 = 0x7F & byteArray[position++]; + ccValid = (4 & tmpByte) !== 0; + ccType = 3 & tmpByte; + if (ccbyte1 === 0 && ccbyte2 === 0) { + continue; + } + if (ccValid) { + if (ccType === 0) { // || ccType === 1 + actualCCBytes.push(ccbyte1); + actualCCBytes.push(ccbyte2); + } + } + } + return actualCCBytes; + }; + return TimelineController; +}(event_handler_1.default)); +exports.default = TimelineController; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/crypt/aes-crypto.js": +/*!*********************************!*\ + !*** ./src/crypt/aes-crypto.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var AESCrypto = /** @class */ (function () { + function AESCrypto(subtle, iv) { + this.subtle = subtle; + this.aesIV = iv; + } + AESCrypto.prototype.decrypt = function (data, key) { + return this.subtle.decrypt({ name: 'AES-CBC', iv: this.aesIV }, key, data); + }; + return AESCrypto; +}()); +exports.default = AESCrypto; + + +/***/ }), + +/***/ "./src/crypt/aes-decryptor.js": +/*!************************************!*\ + !*** ./src/crypt/aes-decryptor.js ***! + \************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +// PKCS7 +function removePadding(buffer) { + var outputBytes = buffer.byteLength; + var paddingBytes = outputBytes && (new DataView(buffer)).getUint8(outputBytes - 1); + if (paddingBytes) { + return buffer.slice(0, outputBytes - paddingBytes); + } + else { + return buffer; + } +} +exports.removePadding = removePadding; +var AESDecryptor = /** @class */ (function () { + function AESDecryptor() { + // Static after running initTable + this.rcon = [0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36]; + this.subMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)]; + this.invSubMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)]; + this.sBox = new Uint32Array(256); + this.invSBox = new Uint32Array(256); + // Changes during runtime + this.key = new Uint32Array(0); + this.initTable(); + } + // Using view.getUint32() also swaps the byte order. + AESDecryptor.prototype.uint8ArrayToUint32Array_ = function (arrayBuffer) { + var view = new DataView(arrayBuffer); + var newArray = new Uint32Array(4); + for (var i = 0; i < 4; i++) { + newArray[i] = view.getUint32(i * 4); + } + return newArray; + }; + AESDecryptor.prototype.initTable = function () { + var sBox = this.sBox; + var invSBox = this.invSBox; + var subMix = this.subMix; + var subMix0 = subMix[0]; + var subMix1 = subMix[1]; + var subMix2 = subMix[2]; + var subMix3 = subMix[3]; + var invSubMix = this.invSubMix; + var invSubMix0 = invSubMix[0]; + var invSubMix1 = invSubMix[1]; + var invSubMix2 = invSubMix[2]; + var invSubMix3 = invSubMix[3]; + var d = new Uint32Array(256); + var x = 0; + var xi = 0; + var i = 0; + for (i = 0; i < 256; i++) { + if (i < 128) { + d[i] = i << 1; + } + else { + d[i] = (i << 1) ^ 0x11b; + } + } + for (i = 0; i < 256; i++) { + var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4); + sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63; + sBox[x] = sx; + invSBox[sx] = x; + // Compute multiplication + var x2 = d[x]; + var x4 = d[x2]; + var x8 = d[x4]; + // Compute sub/invSub bytes, mix columns tables + var t = (d[sx] * 0x101) ^ (sx * 0x1010100); + subMix0[x] = (t << 24) | (t >>> 8); + subMix1[x] = (t << 16) | (t >>> 16); + subMix2[x] = (t << 8) | (t >>> 24); + subMix3[x] = t; + // Compute inv sub bytes, inv mix columns tables + t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100); + invSubMix0[sx] = (t << 24) | (t >>> 8); + invSubMix1[sx] = (t << 16) | (t >>> 16); + invSubMix2[sx] = (t << 8) | (t >>> 24); + invSubMix3[sx] = t; + // Compute next counter + if (!x) { + x = xi = 1; + } + else { + x = x2 ^ d[d[d[x8 ^ x2]]]; + xi ^= d[d[xi]]; + } + } + }; + AESDecryptor.prototype.expandKey = function (keyBuffer) { + // convert keyBuffer to Uint32Array + var key = this.uint8ArrayToUint32Array_(keyBuffer); + var sameKey = true; + var offset = 0; + while (offset < key.length && sameKey) { + sameKey = (key[offset] === this.key[offset]); + offset++; + } + if (sameKey) { + return; + } + this.key = key; + var keySize = this.keySize = key.length; + if (keySize !== 4 && keySize !== 6 && keySize !== 8) { + throw new Error('Invalid aes key size=' + keySize); + } + var ksRows = this.ksRows = (keySize + 6 + 1) * 4; + var ksRow; + var invKsRow; + var keySchedule = this.keySchedule = new Uint32Array(ksRows); + var invKeySchedule = this.invKeySchedule = new Uint32Array(ksRows); + var sbox = this.sBox; + var rcon = this.rcon; + var invSubMix = this.invSubMix; + var invSubMix0 = invSubMix[0]; + var invSubMix1 = invSubMix[1]; + var invSubMix2 = invSubMix[2]; + var invSubMix3 = invSubMix[3]; + var prev; + var t; + for (ksRow = 0; ksRow < ksRows; ksRow++) { + if (ksRow < keySize) { + prev = keySchedule[ksRow] = key[ksRow]; + continue; + } + t = prev; + if (ksRow % keySize === 0) { + // Rot word + t = (t << 8) | (t >>> 24); + // Sub word + t = (sbox[t >>> 24] << 24) | (sbox[(t >>> 16) & 0xff] << 16) | (sbox[(t >>> 8) & 0xff] << 8) | sbox[t & 0xff]; + // Mix Rcon + t ^= rcon[(ksRow / keySize) | 0] << 24; + } + else if (keySize > 6 && ksRow % keySize === 4) { + // Sub word + t = (sbox[t >>> 24] << 24) | (sbox[(t >>> 16) & 0xff] << 16) | (sbox[(t >>> 8) & 0xff] << 8) | sbox[t & 0xff]; + } + keySchedule[ksRow] = prev = (keySchedule[ksRow - keySize] ^ t) >>> 0; + } + for (invKsRow = 0; invKsRow < ksRows; invKsRow++) { + ksRow = ksRows - invKsRow; + if (invKsRow & 3) { + t = keySchedule[ksRow]; + } + else { + t = keySchedule[ksRow - 4]; + } + if (invKsRow < 4 || ksRow <= 4) { + invKeySchedule[invKsRow] = t; + } + else { + invKeySchedule[invKsRow] = invSubMix0[sbox[t >>> 24]] ^ invSubMix1[sbox[(t >>> 16) & 0xff]] ^ invSubMix2[sbox[(t >>> 8) & 0xff]] ^ invSubMix3[sbox[t & 0xff]]; + } + invKeySchedule[invKsRow] = invKeySchedule[invKsRow] >>> 0; + } + }; + // Adding this as a method greatly improves performance. + AESDecryptor.prototype.networkToHostOrderSwap = function (word) { + return (word << 24) | ((word & 0xff00) << 8) | ((word & 0xff0000) >> 8) | (word >>> 24); + }; + AESDecryptor.prototype.decrypt = function (inputArrayBuffer, offset, aesIV, removePKCS7Padding) { + var nRounds = this.keySize + 6; + var invKeySchedule = this.invKeySchedule; + var invSBOX = this.invSBox; + var invSubMix = this.invSubMix; + var invSubMix0 = invSubMix[0]; + var invSubMix1 = invSubMix[1]; + var invSubMix2 = invSubMix[2]; + var invSubMix3 = invSubMix[3]; + var initVector = this.uint8ArrayToUint32Array_(aesIV); + var initVector0 = initVector[0]; + var initVector1 = initVector[1]; + var initVector2 = initVector[2]; + var initVector3 = initVector[3]; + var inputInt32 = new Int32Array(inputArrayBuffer); + var outputInt32 = new Int32Array(inputInt32.length); + var t0, t1, t2, t3; + var s0, s1, s2, s3; + var inputWords0, inputWords1, inputWords2, inputWords3; + var ksRow, i; + var swapWord = this.networkToHostOrderSwap; + while (offset < inputInt32.length) { + inputWords0 = swapWord(inputInt32[offset]); + inputWords1 = swapWord(inputInt32[offset + 1]); + inputWords2 = swapWord(inputInt32[offset + 2]); + inputWords3 = swapWord(inputInt32[offset + 3]); + s0 = inputWords0 ^ invKeySchedule[0]; + s1 = inputWords3 ^ invKeySchedule[1]; + s2 = inputWords2 ^ invKeySchedule[2]; + s3 = inputWords1 ^ invKeySchedule[3]; + ksRow = 4; + // Iterate through the rounds of decryption + for (i = 1; i < nRounds; i++) { + t0 = invSubMix0[s0 >>> 24] ^ invSubMix1[(s1 >> 16) & 0xff] ^ invSubMix2[(s2 >> 8) & 0xff] ^ invSubMix3[s3 & 0xff] ^ invKeySchedule[ksRow]; + t1 = invSubMix0[s1 >>> 24] ^ invSubMix1[(s2 >> 16) & 0xff] ^ invSubMix2[(s3 >> 8) & 0xff] ^ invSubMix3[s0 & 0xff] ^ invKeySchedule[ksRow + 1]; + t2 = invSubMix0[s2 >>> 24] ^ invSubMix1[(s3 >> 16) & 0xff] ^ invSubMix2[(s0 >> 8) & 0xff] ^ invSubMix3[s1 & 0xff] ^ invKeySchedule[ksRow + 2]; + t3 = invSubMix0[s3 >>> 24] ^ invSubMix1[(s0 >> 16) & 0xff] ^ invSubMix2[(s1 >> 8) & 0xff] ^ invSubMix3[s2 & 0xff] ^ invKeySchedule[ksRow + 3]; + // Update state + s0 = t0; + s1 = t1; + s2 = t2; + s3 = t3; + ksRow = ksRow + 4; + } + // Shift rows, sub bytes, add round key + t0 = ((invSBOX[s0 >>> 24] << 24) ^ (invSBOX[(s1 >> 16) & 0xff] << 16) ^ (invSBOX[(s2 >> 8) & 0xff] << 8) ^ invSBOX[s3 & 0xff]) ^ invKeySchedule[ksRow]; + t1 = ((invSBOX[s1 >>> 24] << 24) ^ (invSBOX[(s2 >> 16) & 0xff] << 16) ^ (invSBOX[(s3 >> 8) & 0xff] << 8) ^ invSBOX[s0 & 0xff]) ^ invKeySchedule[ksRow + 1]; + t2 = ((invSBOX[s2 >>> 24] << 24) ^ (invSBOX[(s3 >> 16) & 0xff] << 16) ^ (invSBOX[(s0 >> 8) & 0xff] << 8) ^ invSBOX[s1 & 0xff]) ^ invKeySchedule[ksRow + 2]; + t3 = ((invSBOX[s3 >>> 24] << 24) ^ (invSBOX[(s0 >> 16) & 0xff] << 16) ^ (invSBOX[(s1 >> 8) & 0xff] << 8) ^ invSBOX[s2 & 0xff]) ^ invKeySchedule[ksRow + 3]; + ksRow = ksRow + 3; + // Write + outputInt32[offset] = swapWord(t0 ^ initVector0); + outputInt32[offset + 1] = swapWord(t3 ^ initVector1); + outputInt32[offset + 2] = swapWord(t2 ^ initVector2); + outputInt32[offset + 3] = swapWord(t1 ^ initVector3); + // reset initVector to last 4 unsigned int + initVector0 = inputWords0; + initVector1 = inputWords1; + initVector2 = inputWords2; + initVector3 = inputWords3; + offset = offset + 4; + } + return removePKCS7Padding ? removePadding(outputInt32.buffer) : outputInt32.buffer; + }; + AESDecryptor.prototype.destroy = function () { + this.key = undefined; + this.keySize = undefined; + this.ksRows = undefined; + this.sBox = undefined; + this.invSBox = undefined; + this.subMix = undefined; + this.invSubMix = undefined; + this.keySchedule = undefined; + this.invKeySchedule = undefined; + this.rcon = undefined; + }; + return AESDecryptor; +}()); +exports.default = AESDecryptor; + + +/***/ }), + +/***/ "./src/crypt/decrypter.js": +/*!********************************!*\ + !*** ./src/crypt/decrypter.js ***! + \********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var aes_crypto_1 = __webpack_require__(/*! ./aes-crypto */ "./src/crypt/aes-crypto.js"); +var fast_aes_key_1 = __webpack_require__(/*! ./fast-aes-key */ "./src/crypt/fast-aes-key.js"); +var aes_decryptor_1 = __webpack_require__(/*! ./aes-decryptor */ "./src/crypt/aes-decryptor.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var get_self_scope_1 = __webpack_require__(/*! ../utils/get-self-scope */ "./src/utils/get-self-scope.js"); +// see https://stackoverflow.com/a/11237259/589493 +var global = get_self_scope_1.getSelfScope(); // safeguard for code that might run both on worker and main thread +var Decrypter = /** @class */ (function () { + function Decrypter(observer, config, _a) { + var _b = (_a === void 0 ? {} : _a).removePKCS7Padding, removePKCS7Padding = _b === void 0 ? true : _b; + this.logEnabled = true; + this.observer = observer; + this.config = config; + this.removePKCS7Padding = removePKCS7Padding; + // built in decryptor expects PKCS7 padding + if (removePKCS7Padding) { + try { + var browserCrypto = global.crypto; + if (browserCrypto) { + this.subtle = browserCrypto.subtle || browserCrypto.webkitSubtle; + } + } + catch (e) { } + } + this.disableWebCrypto = !this.subtle; + } + Decrypter.prototype.isSync = function () { + return (this.disableWebCrypto && this.config.enableSoftwareAES); + }; + Decrypter.prototype.decrypt = function (data, key, iv, callback) { + var _this = this; + if (this.disableWebCrypto && this.config.enableSoftwareAES) { + if (this.logEnabled) { + logger_1.logger.log('JS AES decrypt'); + this.logEnabled = false; + } + var decryptor = this.decryptor; + if (!decryptor) { + this.decryptor = decryptor = new aes_decryptor_1.default(); + } + decryptor.expandKey(key); + callback(decryptor.decrypt(data, 0, iv, this.removePKCS7Padding)); + } + else { + if (this.logEnabled) { + logger_1.logger.log('WebCrypto AES decrypt'); + this.logEnabled = false; + } + var subtle_1 = this.subtle; + if (this.key !== key) { + this.key = key; + this.fastAesKey = new fast_aes_key_1.default(subtle_1, key); + } + this.fastAesKey.expandKey() + .then(function (aesKey) { + // decrypt using web crypto + var crypto = new aes_crypto_1.default(subtle_1, iv); + crypto.decrypt(data, aesKey) + .catch(function (err) { + _this.onWebCryptoError(err, data, key, iv, callback); + }) + .then(function (result) { + callback(result); + }); + }) + .catch(function (err) { + _this.onWebCryptoError(err, data, key, iv, callback); + }); + } + }; + Decrypter.prototype.onWebCryptoError = function (err, data, key, iv, callback) { + if (this.config.enableSoftwareAES) { + logger_1.logger.log('WebCrypto Error, disable WebCrypto API'); + this.disableWebCrypto = true; + this.logEnabled = true; + this.decrypt(data, key, iv, callback); + } + else { + logger_1.logger.error("decrypting error : " + err.message); + this.observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.FRAG_DECRYPT_ERROR, fatal: true, reason: err.message }); + } + }; + Decrypter.prototype.destroy = function () { + var decryptor = this.decryptor; + if (decryptor) { + decryptor.destroy(); + this.decryptor = undefined; + } + }; + return Decrypter; +}()); +exports.default = Decrypter; + + +/***/ }), + +/***/ "./src/crypt/fast-aes-key.js": +/*!***********************************!*\ + !*** ./src/crypt/fast-aes-key.js ***! + \***********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var FastAESKey = /** @class */ (function () { + function FastAESKey(subtle, key) { + this.subtle = subtle; + this.key = key; + } + FastAESKey.prototype.expandKey = function () { + return this.subtle.importKey('raw', this.key, { name: 'AES-CBC' }, false, ['encrypt', 'decrypt']); + }; + return FastAESKey; +}()); +exports.default = FastAESKey; + + +/***/ }), + +/***/ "./src/demux/aacdemuxer.js": +/*!*********************************!*\ + !*** ./src/demux/aacdemuxer.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * AAC demuxer + */ +var ADTS = __webpack_require__(/*! ./adts */ "./src/demux/adts.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var id3_1 = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.js"); +var AACDemuxer = /** @class */ (function () { + function AACDemuxer(observer, remuxer, config) { + this.observer = observer; + this.config = config; + this.remuxer = remuxer; + } + AACDemuxer.prototype.resetInitSegment = function (initSegment, audioCodec, videoCodec, duration) { + this._audioTrack = { container: 'audio/adts', type: 'audio', id: 0, sequenceNumber: 0, isAAC: true, samples: [], len: 0, manifestCodec: audioCodec, duration: duration, inputTimeScale: 90000 }; + }; + AACDemuxer.prototype.resetTimeStamp = function () { + }; + AACDemuxer.probe = function (data) { + if (!data) { + return false; + } + // Check for the ADTS sync word + // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1 + // Layer bits (position 14 and 15) in header should be always 0 for ADTS + // More info https://wiki.multimedia.cx/index.php?title=ADTS + var id3Data = id3_1.default.getID3Data(data, 0) || []; + var offset = id3Data.length; + for (var length_1 = data.length; offset < length_1; offset++) { + if (ADTS.probe(data, offset)) { + logger_1.logger.log('ADTS sync word found !'); + return true; + } + } + return false; + }; + // feed incoming data to the front of the parsing pipeline + AACDemuxer.prototype.append = function (data, timeOffset, contiguous, accurateTimeOffset) { + var track = this._audioTrack; + var id3Data = id3_1.default.getID3Data(data, 0) || []; + var timestamp = id3_1.default.getTimeStamp(id3Data); + var pts = Number.isFinite(timestamp) ? timestamp * 90 : timeOffset * 90000; + var frameIndex = 0; + var stamp = pts; + var length = data.length; + var offset = id3Data.length; + var id3Samples = [{ pts: stamp, dts: stamp, data: id3Data }]; + while (offset < length - 1) { + if (ADTS.isHeader(data, offset) && (offset + 5) < length) { + ADTS.initTrackConfig(track, this.observer, data, offset, track.manifestCodec); + var frame = ADTS.appendFrame(track, data, offset, pts, frameIndex); + if (frame) { + offset += frame.length; + stamp = frame.sample.pts; + frameIndex++; + } + else { + logger_1.logger.log('Unable to parse AAC frame'); + break; + } + } + else if (id3_1.default.isHeader(data, offset)) { + id3Data = id3_1.default.getID3Data(data, offset); + id3Samples.push({ pts: stamp, dts: stamp, data: id3Data }); + offset += id3Data.length; + } + else { + // nothing found, keep looking + offset++; + } + } + this.remuxer.remux(track, { samples: [] }, { samples: id3Samples, inputTimeScale: 90000 }, { samples: [] }, timeOffset, contiguous, accurateTimeOffset); + }; + AACDemuxer.prototype.destroy = function () { + }; + return AACDemuxer; +}()); +exports.default = AACDemuxer; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/demux/adts.js": +/*!***************************!*\ + !*** ./src/demux/adts.js ***! + \***************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * ADTS parser helper + */ +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +function getAudioConfig(observer, data, offset, audioCodec) { + var adtsObjectType, // :int + adtsSampleingIndex, // :int + adtsExtensionSampleingIndex, // :int + adtsChanelConfig, // :int + config, userAgent = navigator.userAgent.toLowerCase(), manifestCodec = audioCodec, adtsSampleingRates = [ + 96000, 88200, + 64000, 48000, + 44100, 32000, + 24000, 22050, + 16000, 12000, + 11025, 8000, + 7350 + ]; + // byte 2 + adtsObjectType = ((data[offset + 2] & 0xC0) >>> 6) + 1; + adtsSampleingIndex = ((data[offset + 2] & 0x3C) >>> 2); + if (adtsSampleingIndex > adtsSampleingRates.length - 1) { + observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.FRAG_PARSING_ERROR, fatal: true, reason: "invalid ADTS sampling index:" + adtsSampleingIndex }); + return; + } + adtsChanelConfig = ((data[offset + 2] & 0x01) << 2); + // byte 3 + adtsChanelConfig |= ((data[offset + 3] & 0xC0) >>> 6); + logger_1.logger.log("manifest codec:" + audioCodec + ",ADTS data:type:" + adtsObjectType + ",sampleingIndex:" + adtsSampleingIndex + "[" + adtsSampleingRates[adtsSampleingIndex] + "Hz],channelConfig:" + adtsChanelConfig); + // firefox: freq less than 24kHz = AAC SBR (HE-AAC) + if (/firefox/i.test(userAgent)) { + if (adtsSampleingIndex >= 6) { + adtsObjectType = 5; + config = new Array(4); + // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies + // there is a factor 2 between frame sample rate and output sample rate + // multiply frequency by 2 (see table below, equivalent to substract 3) + adtsExtensionSampleingIndex = adtsSampleingIndex - 3; + } + else { + adtsObjectType = 2; + config = new Array(2); + adtsExtensionSampleingIndex = adtsSampleingIndex; + } + // Android : always use AAC + } + else if (userAgent.indexOf('android') !== -1) { + adtsObjectType = 2; + config = new Array(2); + adtsExtensionSampleingIndex = adtsSampleingIndex; + } + else { + /* for other browsers (Chrome/Vivaldi/Opera ...) + always force audio type to be HE-AAC SBR, as some browsers do not support audio codec switch properly (like Chrome ...) + */ + adtsObjectType = 5; + config = new Array(4); + // if (manifest codec is HE-AAC or HE-AACv2) OR (manifest codec not specified AND frequency less than 24kHz) + if ((audioCodec && ((audioCodec.indexOf('mp4a.40.29') !== -1) || + (audioCodec.indexOf('mp4a.40.5') !== -1))) || + (!audioCodec && adtsSampleingIndex >= 6)) { + // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies + // there is a factor 2 between frame sample rate and output sample rate + // multiply frequency by 2 (see table below, equivalent to substract 3) + adtsExtensionSampleingIndex = adtsSampleingIndex - 3; + } + else { + // if (manifest codec is AAC) AND (frequency less than 24kHz AND nb channel is 1) OR (manifest codec not specified and mono audio) + // Chrome fails to play back with low frequency AAC LC mono when initialized with HE-AAC. This is not a problem with stereo. + if (audioCodec && audioCodec.indexOf('mp4a.40.2') !== -1 && ((adtsSampleingIndex >= 6 && adtsChanelConfig === 1) || + /vivaldi/i.test(userAgent)) || + (!audioCodec && adtsChanelConfig === 1)) { + adtsObjectType = 2; + config = new Array(2); + } + adtsExtensionSampleingIndex = adtsSampleingIndex; + } + } + /* refer to http://wiki.multimedia.cx/index.php?title=MPEG-4_Audio#Audio_Specific_Config + ISO 14496-3 (AAC).pdf - Table 1.13 — Syntax of AudioSpecificConfig() + Audio Profile / Audio Object Type + 0: Null + 1: AAC Main + 2: AAC LC (Low Complexity) + 3: AAC SSR (Scalable Sample Rate) + 4: AAC LTP (Long Term Prediction) + 5: SBR (Spectral Band Replication) + 6: AAC Scalable + sampling freq + 0: 96000 Hz + 1: 88200 Hz + 2: 64000 Hz + 3: 48000 Hz + 4: 44100 Hz + 5: 32000 Hz + 6: 24000 Hz + 7: 22050 Hz + 8: 16000 Hz + 9: 12000 Hz + 10: 11025 Hz + 11: 8000 Hz + 12: 7350 Hz + 13: Reserved + 14: Reserved + 15: frequency is written explictly + Channel Configurations + These are the channel configurations: + 0: Defined in AOT Specifc Config + 1: 1 channel: front-center + 2: 2 channels: front-left, front-right + */ + // audioObjectType = profile => profile, the MPEG-4 Audio Object Type minus 1 + config[0] = adtsObjectType << 3; + // samplingFrequencyIndex + config[0] |= (adtsSampleingIndex & 0x0E) >> 1; + config[1] |= (adtsSampleingIndex & 0x01) << 7; + // channelConfiguration + config[1] |= adtsChanelConfig << 3; + if (adtsObjectType === 5) { + // adtsExtensionSampleingIndex + config[1] |= (adtsExtensionSampleingIndex & 0x0E) >> 1; + config[2] = (adtsExtensionSampleingIndex & 0x01) << 7; + // adtsObjectType (force to 2, chrome is checking that object type is less than 5 ??? + // https://chromium.googlesource.com/chromium/src.git/+/master/media/formats/mp4/aac.cc + config[2] |= 2 << 2; + config[3] = 0; + } + return { config: config, samplerate: adtsSampleingRates[adtsSampleingIndex], channelCount: adtsChanelConfig, codec: ('mp4a.40.' + adtsObjectType), manifestCodec: manifestCodec }; +} +exports.getAudioConfig = getAudioConfig; +function isHeaderPattern(data, offset) { + return data[offset] === 0xff && (data[offset + 1] & 0xf6) === 0xf0; +} +exports.isHeaderPattern = isHeaderPattern; +function getHeaderLength(data, offset) { + return (data[offset + 1] & 0x01 ? 7 : 9); +} +exports.getHeaderLength = getHeaderLength; +function getFullFrameLength(data, offset) { + return ((data[offset + 3] & 0x03) << 11) | + (data[offset + 4] << 3) | + ((data[offset + 5] & 0xE0) >>> 5); +} +exports.getFullFrameLength = getFullFrameLength; +function isHeader(data, offset) { + // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1 + // Layer bits (position 14 and 15) in header should be always 0 for ADTS + // More info https://wiki.multimedia.cx/index.php?title=ADTS + if (offset + 1 < data.length && isHeaderPattern(data, offset)) { + return true; + } + return false; +} +exports.isHeader = isHeader; +function probe(data, offset) { + // same as isHeader but we also check that ADTS frame follows last ADTS frame + // or end of data is reached + if (offset + 1 < data.length && isHeaderPattern(data, offset)) { + // ADTS header Length + var headerLength = getHeaderLength(data, offset); + // ADTS frame Length + var frameLength = headerLength; + if (offset + 5 < data.length) { + frameLength = getFullFrameLength(data, offset); + } + var newOffset = offset + frameLength; + if (newOffset === data.length || (newOffset + 1 < data.length && isHeaderPattern(data, newOffset))) { + return true; + } + } + return false; +} +exports.probe = probe; +function initTrackConfig(track, observer, data, offset, audioCodec) { + if (!track.samplerate) { + var config = getAudioConfig(observer, data, offset, audioCodec); + track.config = config.config; + track.samplerate = config.samplerate; + track.channelCount = config.channelCount; + track.codec = config.codec; + track.manifestCodec = config.manifestCodec; + logger_1.logger.log("parsed codec:" + track.codec + ",rate:" + config.samplerate + ",nb channel:" + config.channelCount); + } +} +exports.initTrackConfig = initTrackConfig; +function getFrameDuration(samplerate) { + return 1024 * 90000 / samplerate; +} +exports.getFrameDuration = getFrameDuration; +function parseFrameHeader(data, offset, pts, frameIndex, frameDuration) { + var headerLength, frameLength, stamp; + var length = data.length; + // The protection skip bit tells us if we have 2 bytes of CRC data at the end of the ADTS header + headerLength = getHeaderLength(data, offset); + // retrieve frame size + frameLength = getFullFrameLength(data, offset); + frameLength -= headerLength; + if ((frameLength > 0) && ((offset + headerLength + frameLength) <= length)) { + stamp = pts + frameIndex * frameDuration; + // logger.log(`AAC frame, offset/length/total/pts:${offset+headerLength}/${frameLength}/${data.byteLength}/${(stamp/90).toFixed(0)}`); + return { headerLength: headerLength, frameLength: frameLength, stamp: stamp }; + } + return undefined; +} +exports.parseFrameHeader = parseFrameHeader; +function appendFrame(track, data, offset, pts, frameIndex) { + var frameDuration = getFrameDuration(track.samplerate); + var header = parseFrameHeader(data, offset, pts, frameIndex, frameDuration); + if (header) { + var stamp = header.stamp; + var headerLength = header.headerLength; + var frameLength = header.frameLength; + // logger.log(`AAC frame, offset/length/total/pts:${offset+headerLength}/${frameLength}/${data.byteLength}/${(stamp/90).toFixed(0)}`); + var aacSample = { + unit: data.subarray(offset + headerLength, offset + headerLength + frameLength), + pts: stamp, + dts: stamp + }; + track.samples.push(aacSample); + track.len += frameLength; + return { sample: aacSample, length: frameLength + headerLength }; + } + return undefined; +} +exports.appendFrame = appendFrame; + + +/***/ }), + +/***/ "./src/demux/demuxer-inline.js": +/*!*************************************!*\ + !*** ./src/demux/demuxer-inline.js ***! + \*************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * + * inline demuxer: probe fragments and instantiate + * appropriate demuxer depending on content type (TSDemuxer, AACDemuxer, ...) + * + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var decrypter_1 = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.js"); +var aacdemuxer_1 = __webpack_require__(/*! ../demux/aacdemuxer */ "./src/demux/aacdemuxer.js"); +var mp4demuxer_1 = __webpack_require__(/*! ../demux/mp4demuxer */ "./src/demux/mp4demuxer.js"); +var tsdemuxer_1 = __webpack_require__(/*! ../demux/tsdemuxer */ "./src/demux/tsdemuxer.js"); +var mp3demuxer_1 = __webpack_require__(/*! ../demux/mp3demuxer */ "./src/demux/mp3demuxer.js"); +var mp4_remuxer_1 = __webpack_require__(/*! ../remux/mp4-remuxer */ "./src/remux/mp4-remuxer.js"); +var passthrough_remuxer_1 = __webpack_require__(/*! ../remux/passthrough-remuxer */ "./src/remux/passthrough-remuxer.js"); +var get_self_scope_1 = __webpack_require__(/*! ../utils/get-self-scope */ "./src/utils/get-self-scope.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +// see https://stackoverflow.com/a/11237259/589493 +var global = get_self_scope_1.getSelfScope(); // safeguard for code that might run both on worker and main thread +var now; +// performance.now() not available on WebWorker, at least on Safari Desktop +try { + now = global.performance.now.bind(global.performance); +} +catch (err) { + logger_1.logger.debug('Unable to use Performance API on this environment'); + now = global.Date.now; +} +var DemuxerInline = /** @class */ (function () { + function DemuxerInline(observer, typeSupported, config, vendor) { + this.observer = observer; + this.typeSupported = typeSupported; + this.config = config; + this.vendor = vendor; + } + DemuxerInline.prototype.destroy = function () { + var demuxer = this.demuxer; + if (demuxer) { + demuxer.destroy(); + } + }; + DemuxerInline.prototype.push = function (data, decryptdata, initSegment, audioCodec, videoCodec, timeOffset, discontinuity, trackSwitch, contiguous, duration, accurateTimeOffset, defaultInitPTS) { + var _this = this; + if ((data.byteLength > 0) && (decryptdata != null) && (decryptdata.key != null) && (decryptdata.method === 'AES-128')) { + var decrypter = this.decrypter; + if (decrypter == null) { + decrypter = this.decrypter = new decrypter_1.default(this.observer, this.config); + } + var startTime_1 = now(); + decrypter.decrypt(data, decryptdata.key.buffer, decryptdata.iv.buffer, function (decryptedData) { + var endTime = now(); + _this.observer.trigger(events_1.default.FRAG_DECRYPTED, { stats: { tstart: startTime_1, tdecrypt: endTime } }); + _this.pushDecrypted(new Uint8Array(decryptedData), decryptdata, new Uint8Array(initSegment), audioCodec, videoCodec, timeOffset, discontinuity, trackSwitch, contiguous, duration, accurateTimeOffset, defaultInitPTS); + }); + } + else { + this.pushDecrypted(new Uint8Array(data), decryptdata, new Uint8Array(initSegment), audioCodec, videoCodec, timeOffset, discontinuity, trackSwitch, contiguous, duration, accurateTimeOffset, defaultInitPTS); + } + }; + DemuxerInline.prototype.pushDecrypted = function (data, decryptdata, initSegment, audioCodec, videoCodec, timeOffset, discontinuity, trackSwitch, contiguous, duration, accurateTimeOffset, defaultInitPTS) { + var demuxer = this.demuxer; + if (!demuxer || + // in case of continuity change, or track switch + // we might switch from content type (AAC container to TS container, or TS to fmp4 for example) + // so let's check that current demuxer is still valid + ((discontinuity || trackSwitch) && !this.probe(data))) { + var observer = this.observer; + var typeSupported = this.typeSupported; + var config = this.config; + // probing order is TS/AAC/MP3/MP4 + var muxConfig = [ + { demux: tsdemuxer_1.default, remux: mp4_remuxer_1.default }, + { demux: mp4demuxer_1.default, remux: passthrough_remuxer_1.default }, + { demux: aacdemuxer_1.default, remux: mp4_remuxer_1.default }, + { demux: mp3demuxer_1.default, remux: mp4_remuxer_1.default } + ]; + // probe for content type + for (var i = 0, len = muxConfig.length; i < len; i++) { + var mux = muxConfig[i]; + var probe = mux.demux.probe; + if (probe(data)) { + var remuxer_1 = this.remuxer = new mux.remux(observer, config, typeSupported, this.vendor); + demuxer = new mux.demux(observer, remuxer_1, config, typeSupported); + this.probe = probe; + break; + } + } + if (!demuxer) { + observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.FRAG_PARSING_ERROR, fatal: true, reason: 'no demux matching with content found' }); + return; + } + this.demuxer = demuxer; + } + var remuxer = this.remuxer; + if (discontinuity || trackSwitch) { + demuxer.resetInitSegment(initSegment, audioCodec, videoCodec, duration); + remuxer.resetInitSegment(); + } + if (discontinuity) { + demuxer.resetTimeStamp(defaultInitPTS); + remuxer.resetTimeStamp(defaultInitPTS); + } + if (typeof demuxer.setDecryptData === 'function') { + demuxer.setDecryptData(decryptdata); + } + demuxer.append(data, timeOffset, contiguous, accurateTimeOffset); + }; + return DemuxerInline; +}()); +exports.default = DemuxerInline; + + +/***/ }), + +/***/ "./src/demux/demuxer-worker.js": +/*!*************************************!*\ + !*** ./src/demux/demuxer-worker.js ***! + \*************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* demuxer web worker. + * - listen to worker message, and trigger DemuxerInline upon reception of Fragments. + * - provides MP4 Boxes back to main thread using [transferable objects](https://developers.google.com/web/updates/2011/12/Transferable-Objects-Lightning-Fast) in order to minimize message passing overhead. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var demuxer_inline_1 = __webpack_require__(/*! ../demux/demuxer-inline */ "./src/demux/demuxer-inline.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var events_2 = __webpack_require__(/*! events */ "./node_modules/node-libs-browser/node_modules/events/events.js"); +var DemuxerWorker = function (self) { + // observer setup + var observer = new events_2.EventEmitter(); + observer.trigger = function trigger(event) { + var data = []; + for (var _i = 1; _i < arguments.length; _i++) { + data[_i - 1] = arguments[_i]; + } + observer.emit.apply(observer, [event, event].concat(data)); + }; + observer.off = function off(event) { + var data = []; + for (var _i = 1; _i < arguments.length; _i++) { + data[_i - 1] = arguments[_i]; + } + observer.removeListener.apply(observer, [event].concat(data)); + }; + var forwardMessage = function (ev, data) { + self.postMessage({ event: ev, data: data }); + }; + self.addEventListener('message', function (ev) { + var data = ev.data; + // console.log('demuxer cmd:' + data.cmd); + switch (data.cmd) { + case 'init': + var config = JSON.parse(data.config); + self.demuxer = new demuxer_inline_1.default(observer, data.typeSupported, config, data.vendor); + logger_1.enableLogs(config.debug); + // signal end of worker init + forwardMessage('init', null); + break; + case 'demux': + self.demuxer.push(data.data, data.decryptdata, data.initSegment, data.audioCodec, data.videoCodec, data.timeOffset, data.discontinuity, data.trackSwitch, data.contiguous, data.duration, data.accurateTimeOffset, data.defaultInitPTS); + break; + default: + break; + } + }); + // forward events to main thread + observer.on(events_1.default.FRAG_DECRYPTED, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_INIT_SEGMENT, forwardMessage); + observer.on(events_1.default.FRAG_PARSED, forwardMessage); + observer.on(events_1.default.ERROR, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_METADATA, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_USERDATA, forwardMessage); + observer.on(events_1.default.INIT_PTS_FOUND, forwardMessage); + // special case for FRAG_PARSING_DATA: pass data1/data2 as transferable object (no copy) + observer.on(events_1.default.FRAG_PARSING_DATA, function (ev, data) { + var transferable = []; + var message = { event: ev, data: data }; + if (data.data1) { + message.data1 = data.data1.buffer; + transferable.push(data.data1.buffer); + delete data.data1; + } + if (data.data2) { + message.data2 = data.data2.buffer; + transferable.push(data.data2.buffer); + delete data.data2; + } + self.postMessage(message, transferable); + }); +}; +exports.default = DemuxerWorker; + + +/***/ }), + +/***/ "./src/demux/demuxer.js": +/*!******************************!*\ + !*** ./src/demux/demuxer.js ***! + \******************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var work = __webpack_require__(/*! webworkify-webpack */ "./node_modules/webworkify-webpack/index.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var demuxer_inline_1 = __webpack_require__(/*! ../demux/demuxer-inline */ "./src/demux/demuxer-inline.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var mediasource_helper_1 = __webpack_require__(/*! ../utils/mediasource-helper */ "./src/utils/mediasource-helper.js"); +var get_self_scope_1 = __webpack_require__(/*! ../utils/get-self-scope */ "./src/utils/get-self-scope.js"); +var observer_1 = __webpack_require__(/*! ../observer */ "./src/observer.js"); +// see https://stackoverflow.com/a/11237259/589493 +var global = get_self_scope_1.getSelfScope(); // safeguard for code that might run both on worker and main thread +var MediaSource = mediasource_helper_1.getMediaSource(); +var Demuxer = /** @class */ (function () { + function Demuxer(hls, id) { + var _this = this; + this.hls = hls; + this.id = id; + var observer = this.observer = new observer_1.Observer(); + var config = hls.config; + var forwardMessage = function (ev, data) { + data = data || {}; + data.frag = _this.frag; + data.id = _this.id; + hls.trigger(ev, data); + }; + // forward events to main thread + observer.on(events_1.default.FRAG_DECRYPTED, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_INIT_SEGMENT, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_DATA, forwardMessage); + observer.on(events_1.default.FRAG_PARSED, forwardMessage); + observer.on(events_1.default.ERROR, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_METADATA, forwardMessage); + observer.on(events_1.default.FRAG_PARSING_USERDATA, forwardMessage); + observer.on(events_1.default.INIT_PTS_FOUND, forwardMessage); + var typeSupported = { + mp4: MediaSource.isTypeSupported('video/mp4'), + mpeg: MediaSource.isTypeSupported('audio/mpeg'), + mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"') + }; + // navigator.vendor is not always available in Web Worker + // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator + var vendor = navigator.vendor; + if (config.enableWorker && (typeof (Worker) !== 'undefined')) { + logger_1.logger.log('demuxing in webworker'); + var w = void 0; + try { + w = this.w = work(/*require.resolve*/(/*! ../demux/demuxer-worker.js */ "./src/demux/demuxer-worker.js")); + this.onwmsg = this.onWorkerMessage.bind(this); + w.addEventListener('message', this.onwmsg); + w.onerror = function (event) { + hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.OTHER_ERROR, details: errors_1.ErrorDetails.INTERNAL_EXCEPTION, fatal: true, event: 'demuxerWorker', err: { message: event.message + ' (' + event.filename + ':' + event.lineno + ')' } }); + }; + w.postMessage({ cmd: 'init', typeSupported: typeSupported, vendor: vendor, id: id, config: JSON.stringify(config) }); + } + catch (err) { + logger_1.logger.warn('Error in worker:', err); + logger_1.logger.error('Error while initializing DemuxerWorker, fallback on DemuxerInline'); + if (w) { + // revoke the Object URL that was used to create demuxer worker, so as not to leak it + global.URL.revokeObjectURL(w.objectURL); + } + this.demuxer = new demuxer_inline_1.default(observer, typeSupported, config, vendor); + this.w = undefined; + } + } + else { + this.demuxer = new demuxer_inline_1.default(observer, typeSupported, config, vendor); + } + } + Demuxer.prototype.destroy = function () { + var w = this.w; + if (w) { + w.removeEventListener('message', this.onwmsg); + w.terminate(); + this.w = null; + } + else { + var demuxer = this.demuxer; + if (demuxer) { + demuxer.destroy(); + this.demuxer = null; + } + } + var observer = this.observer; + if (observer) { + observer.removeAllListeners(); + this.observer = null; + } + }; + Demuxer.prototype.push = function (data, initSegment, audioCodec, videoCodec, frag, duration, accurateTimeOffset, defaultInitPTS) { + var w = this.w; + var timeOffset = Number.isFinite(frag.startPTS) ? frag.startPTS : frag.start; + var decryptdata = frag.decryptdata; + var lastFrag = this.frag; + var discontinuity = !(lastFrag && (frag.cc === lastFrag.cc)); + var trackSwitch = !(lastFrag && (frag.level === lastFrag.level)); + var nextSN = lastFrag && (frag.sn === (lastFrag.sn + 1)); + var contiguous = !trackSwitch && nextSN; + if (discontinuity) { + logger_1.logger.log(this.id + ":discontinuity detected"); + } + if (trackSwitch) { + logger_1.logger.log(this.id + ":switch detected"); + } + this.frag = frag; + if (w) { + // post fragment payload as transferable objects for ArrayBuffer (no copy) + w.postMessage({ cmd: 'demux', data: data, decryptdata: decryptdata, initSegment: initSegment, audioCodec: audioCodec, videoCodec: videoCodec, timeOffset: timeOffset, discontinuity: discontinuity, trackSwitch: trackSwitch, contiguous: contiguous, duration: duration, accurateTimeOffset: accurateTimeOffset, defaultInitPTS: defaultInitPTS }, data instanceof ArrayBuffer ? [data] : []); + } + else { + var demuxer = this.demuxer; + if (demuxer) { + demuxer.push(data, decryptdata, initSegment, audioCodec, videoCodec, timeOffset, discontinuity, trackSwitch, contiguous, duration, accurateTimeOffset, defaultInitPTS); + } + } + }; + Demuxer.prototype.onWorkerMessage = function (ev) { + var data = ev.data, hls = this.hls; + switch (data.event) { + case 'init': + // revoke the Object URL that was used to create demuxer worker, so as not to leak it + global.URL.revokeObjectURL(this.w.objectURL); + break; + // special case for FRAG_PARSING_DATA: data1 and data2 are transferable objects + case events_1.default.FRAG_PARSING_DATA: + data.data.data1 = new Uint8Array(data.data1); + if (data.data2) { + data.data.data2 = new Uint8Array(data.data2); + } + /* falls through */ + default: + data.data = data.data || {}; + data.data.frag = this.frag; + data.data.id = this.id; + hls.trigger(data.event, data.data); + break; + } + }; + return Demuxer; +}()); +exports.default = Demuxer; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/demux/exp-golomb.js": +/*!*********************************!*\ + !*** ./src/demux/exp-golomb.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * Parser for exponential Golomb codes, a variable-bitwidth number encoding scheme used by h264. +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var ExpGolomb = /** @class */ (function () { + function ExpGolomb(data) { + this.data = data; + // the number of bytes left to examine in this.data + this.bytesAvailable = data.byteLength; + // the current word being examined + this.word = 0; // :uint + // the number of bits left to examine in the current word + this.bitsAvailable = 0; // :uint + } + // ():void + ExpGolomb.prototype.loadWord = function () { + var data = this.data, bytesAvailable = this.bytesAvailable, position = data.byteLength - bytesAvailable, workingBytes = new Uint8Array(4), availableBytes = Math.min(4, bytesAvailable); + if (availableBytes === 0) { + throw new Error('no bytes available'); + } + workingBytes.set(data.subarray(position, position + availableBytes)); + this.word = new DataView(workingBytes.buffer).getUint32(0); + // track the amount of this.data that has been processed + this.bitsAvailable = availableBytes * 8; + this.bytesAvailable -= availableBytes; + }; + // (count:int):void + ExpGolomb.prototype.skipBits = function (count) { + var skipBytes; // :int + if (this.bitsAvailable > count) { + this.word <<= count; + this.bitsAvailable -= count; + } + else { + count -= this.bitsAvailable; + skipBytes = count >> 3; + count -= (skipBytes >> 3); + this.bytesAvailable -= skipBytes; + this.loadWord(); + this.word <<= count; + this.bitsAvailable -= count; + } + }; + // (size:int):uint + ExpGolomb.prototype.readBits = function (size) { + var bits = Math.min(this.bitsAvailable, size), // :uint + valu = this.word >>> (32 - bits); // :uint + if (size > 32) { + logger_1.logger.error('Cannot read more than 32 bits at a time'); + } + this.bitsAvailable -= bits; + if (this.bitsAvailable > 0) { + this.word <<= bits; + } + else if (this.bytesAvailable > 0) { + this.loadWord(); + } + bits = size - bits; + if (bits > 0 && this.bitsAvailable) { + return valu << bits | this.readBits(bits); + } + else { + return valu; + } + }; + // ():uint + ExpGolomb.prototype.skipLZ = function () { + var leadingZeroCount; // :uint + for (leadingZeroCount = 0; leadingZeroCount < this.bitsAvailable; ++leadingZeroCount) { + if ((this.word & (0x80000000 >>> leadingZeroCount)) !== 0) { + // the first bit of working word is 1 + this.word <<= leadingZeroCount; + this.bitsAvailable -= leadingZeroCount; + return leadingZeroCount; + } + } + // we exhausted word and still have not found a 1 + this.loadWord(); + return leadingZeroCount + this.skipLZ(); + }; + // ():void + ExpGolomb.prototype.skipUEG = function () { + this.skipBits(1 + this.skipLZ()); + }; + // ():void + ExpGolomb.prototype.skipEG = function () { + this.skipBits(1 + this.skipLZ()); + }; + // ():uint + ExpGolomb.prototype.readUEG = function () { + var clz = this.skipLZ(); // :uint + return this.readBits(clz + 1) - 1; + }; + // ():int + ExpGolomb.prototype.readEG = function () { + var valu = this.readUEG(); // :int + if (0x01 & valu) { + // the number is odd if the low order bit is set + return (1 + valu) >>> 1; // add 1 to make it even, and divide by 2 + } + else { + return -1 * (valu >>> 1); // divide by two then make it negative + } + }; + // Some convenience functions + // :Boolean + ExpGolomb.prototype.readBoolean = function () { + return this.readBits(1) === 1; + }; + // ():int + ExpGolomb.prototype.readUByte = function () { + return this.readBits(8); + }; + // ():int + ExpGolomb.prototype.readUShort = function () { + return this.readBits(16); + }; + // ():int + ExpGolomb.prototype.readUInt = function () { + return this.readBits(32); + }; + /** + * Advance the ExpGolomb decoder past a scaling list. The scaling + * list is optionally transmitted as part of a sequence parameter + * set and is not relevant to transmuxing. + * @param count {number} the number of entries in this scaling list + * @see Recommendation ITU-T H.264, Section 7.3.2.1.1.1 + */ + ExpGolomb.prototype.skipScalingList = function (count) { + var lastScale = 8, nextScale = 8, j, deltaScale; + for (j = 0; j < count; j++) { + if (nextScale !== 0) { + deltaScale = this.readEG(); + nextScale = (lastScale + deltaScale + 256) % 256; + } + lastScale = (nextScale === 0) ? lastScale : nextScale; + } + }; + /** + * Read a sequence parameter set and return some interesting video + * properties. A sequence parameter set is the H264 metadata that + * describes the properties of upcoming video frames. + * @param data {Uint8Array} the bytes of a sequence parameter set + * @return {object} an object with configuration parsed from the + * sequence parameter set, including the dimensions of the + * associated video frames. + */ + ExpGolomb.prototype.readSPS = function () { + var frameCropLeftOffset = 0, frameCropRightOffset = 0, frameCropTopOffset = 0, frameCropBottomOffset = 0, profileIdc, profileCompat, levelIdc, numRefFramesInPicOrderCntCycle, picWidthInMbsMinus1, picHeightInMapUnitsMinus1, frameMbsOnlyFlag, scalingListCount, i, readUByte = this.readUByte.bind(this), readBits = this.readBits.bind(this), readUEG = this.readUEG.bind(this), readBoolean = this.readBoolean.bind(this), skipBits = this.skipBits.bind(this), skipEG = this.skipEG.bind(this), skipUEG = this.skipUEG.bind(this), skipScalingList = this.skipScalingList.bind(this); + readUByte(); + profileIdc = readUByte(); // profile_idc + profileCompat = readBits(5); // constraint_set[0-4]_flag, u(5) + skipBits(3); // reserved_zero_3bits u(3), + levelIdc = readUByte(); // level_idc u(8) + skipUEG(); // seq_parameter_set_id + // some profiles have more optional data we don't need + if (profileIdc === 100 || + profileIdc === 110 || + profileIdc === 122 || + profileIdc === 244 || + profileIdc === 44 || + profileIdc === 83 || + profileIdc === 86 || + profileIdc === 118 || + profileIdc === 128) { + var chromaFormatIdc = readUEG(); + if (chromaFormatIdc === 3) { + skipBits(1); + } // separate_colour_plane_flag + skipUEG(); // bit_depth_luma_minus8 + skipUEG(); // bit_depth_chroma_minus8 + skipBits(1); // qpprime_y_zero_transform_bypass_flag + if (readBoolean()) { // seq_scaling_matrix_present_flag + scalingListCount = (chromaFormatIdc !== 3) ? 8 : 12; + for (i = 0; i < scalingListCount; i++) { + if (readBoolean()) { // seq_scaling_list_present_flag[ i ] + if (i < 6) { + skipScalingList(16); + } + else { + skipScalingList(64); + } + } + } + } + } + skipUEG(); // log2_max_frame_num_minus4 + var picOrderCntType = readUEG(); + if (picOrderCntType === 0) { + readUEG(); // log2_max_pic_order_cnt_lsb_minus4 + } + else if (picOrderCntType === 1) { + skipBits(1); // delta_pic_order_always_zero_flag + skipEG(); // offset_for_non_ref_pic + skipEG(); // offset_for_top_to_bottom_field + numRefFramesInPicOrderCntCycle = readUEG(); + for (i = 0; i < numRefFramesInPicOrderCntCycle; i++) { + skipEG(); + } // offset_for_ref_frame[ i ] + } + skipUEG(); // max_num_ref_frames + skipBits(1); // gaps_in_frame_num_value_allowed_flag + picWidthInMbsMinus1 = readUEG(); + picHeightInMapUnitsMinus1 = readUEG(); + frameMbsOnlyFlag = readBits(1); + if (frameMbsOnlyFlag === 0) { + skipBits(1); + } // mb_adaptive_frame_field_flag + skipBits(1); // direct_8x8_inference_flag + if (readBoolean()) { // frame_cropping_flag + frameCropLeftOffset = readUEG(); + frameCropRightOffset = readUEG(); + frameCropTopOffset = readUEG(); + frameCropBottomOffset = readUEG(); + } + var pixelRatio = [1, 1]; + if (readBoolean()) { + // vui_parameters_present_flag + if (readBoolean()) { + // aspect_ratio_info_present_flag + var aspectRatioIdc = readUByte(); + switch (aspectRatioIdc) { + case 1: + pixelRatio = [1, 1]; + break; + case 2: + pixelRatio = [12, 11]; + break; + case 3: + pixelRatio = [10, 11]; + break; + case 4: + pixelRatio = [16, 11]; + break; + case 5: + pixelRatio = [40, 33]; + break; + case 6: + pixelRatio = [24, 11]; + break; + case 7: + pixelRatio = [20, 11]; + break; + case 8: + pixelRatio = [32, 11]; + break; + case 9: + pixelRatio = [80, 33]; + break; + case 10: + pixelRatio = [18, 11]; + break; + case 11: + pixelRatio = [15, 11]; + break; + case 12: + pixelRatio = [64, 33]; + break; + case 13: + pixelRatio = [160, 99]; + break; + case 14: + pixelRatio = [4, 3]; + break; + case 15: + pixelRatio = [3, 2]; + break; + case 16: + pixelRatio = [2, 1]; + break; + case 255: { + pixelRatio = [readUByte() << 8 | readUByte(), readUByte() << 8 | readUByte()]; + break; + } + } + } + } + return { + width: Math.ceil((((picWidthInMbsMinus1 + 1) * 16) - frameCropLeftOffset * 2 - frameCropRightOffset * 2)), + height: ((2 - frameMbsOnlyFlag) * (picHeightInMapUnitsMinus1 + 1) * 16) - ((frameMbsOnlyFlag ? 2 : 4) * (frameCropTopOffset + frameCropBottomOffset)), + pixelRatio: pixelRatio + }; + }; + ExpGolomb.prototype.readSliceType = function () { + // skip NALu type + this.readUByte(); + // discard first_mb_in_slice + this.readUEG(); + // return slice_type + return this.readUEG(); + }; + return ExpGolomb; +}()); +exports.default = ExpGolomb; + + +/***/ }), + +/***/ "./src/demux/id3.js": +/*!**************************!*\ + !*** ./src/demux/id3.js ***! + \**************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * ID3 parser + */ +var ID3 = /** @class */ (function () { + function ID3() { + } + /** + * Returns true if an ID3 header can be found at offset in data + * @param {Uint8Array} data - The data to search in + * @param {number} offset - The offset at which to start searching + * @return {boolean} - True if an ID3 header is found + */ + ID3.isHeader = function (data, offset) { + /* + * http://id3.org/id3v2.3.0 + * [0] = 'I' + * [1] = 'D' + * [2] = '3' + * [3,4] = {Version} + * [5] = {Flags} + * [6-9] = {ID3 Size} + * + * An ID3v2 tag can be detected with the following pattern: + * $49 44 33 yy yy xx zz zz zz zz + * Where yy is less than $FF, xx is the 'flags' byte and zz is less than $80 + */ + if (offset + 10 <= data.length) { + // look for 'ID3' identifier + if (data[offset] === 0x49 && data[offset + 1] === 0x44 && data[offset + 2] === 0x33) { + // check version is within range + if (data[offset + 3] < 0xFF && data[offset + 4] < 0xFF) { + // check size is within range + if (data[offset + 6] < 0x80 && data[offset + 7] < 0x80 && data[offset + 8] < 0x80 && data[offset + 9] < 0x80) { + return true; + } + } + } + } + return false; + }; + /** + * Returns true if an ID3 footer can be found at offset in data + * @param {Uint8Array} data - The data to search in + * @param {number} offset - The offset at which to start searching + * @return {boolean} - True if an ID3 footer is found + */ + ID3.isFooter = function (data, offset) { + /* + * The footer is a copy of the header, but with a different identifier + */ + if (offset + 10 <= data.length) { + // look for '3DI' identifier + if (data[offset] === 0x33 && data[offset + 1] === 0x44 && data[offset + 2] === 0x49) { + // check version is within range + if (data[offset + 3] < 0xFF && data[offset + 4] < 0xFF) { + // check size is within range + if (data[offset + 6] < 0x80 && data[offset + 7] < 0x80 && data[offset + 8] < 0x80 && data[offset + 9] < 0x80) { + return true; + } + } + } + } + return false; + }; + /** + * Returns any adjacent ID3 tags found in data starting at offset, as one block of data + * @param {Uint8Array} data - The data to search in + * @param {number} offset - The offset at which to start searching + * @return {Uint8Array} - The block of data containing any ID3 tags found + */ + ID3.getID3Data = function (data, offset) { + var front = offset; + var length = 0; + while (ID3.isHeader(data, offset)) { + // ID3 header is 10 bytes + length += 10; + var size = ID3._readSize(data, offset + 6); + length += size; + if (ID3.isFooter(data, offset + 10)) { + // ID3 footer is 10 bytes + length += 10; + } + offset += length; + } + if (length > 0) { + return data.subarray(front, front + length); + } + return undefined; + }; + ID3._readSize = function (data, offset) { + var size = 0; + size = ((data[offset] & 0x7f) << 21); + size |= ((data[offset + 1] & 0x7f) << 14); + size |= ((data[offset + 2] & 0x7f) << 7); + size |= (data[offset + 3] & 0x7f); + return size; + }; + /** + * Searches for the Elementary Stream timestamp found in the ID3 data chunk + * @param {Uint8Array} data - Block of data containing one or more ID3 tags + * @return {number} - The timestamp + */ + ID3.getTimeStamp = function (data) { + var frames = ID3.getID3Frames(data); + for (var i = 0; i < frames.length; i++) { + var frame = frames[i]; + if (ID3.isTimeStampFrame(frame)) { + return ID3._readTimeStamp(frame); + } + } + return undefined; + }; + /** + * Returns true if the ID3 frame is an Elementary Stream timestamp frame + * @param {ID3 frame} frame + */ + ID3.isTimeStampFrame = function (frame) { + return (frame && frame.key === 'PRIV' && frame.info === 'com.apple.streaming.transportStreamTimestamp'); + }; + ID3._getFrameData = function (data) { + /* + Frame ID $xx xx xx xx (four characters) + Size $xx xx xx xx + Flags $xx xx + */ + var type = String.fromCharCode(data[0], data[1], data[2], data[3]); + var size = ID3._readSize(data, 4); + // skip frame id, size, and flags + var offset = 10; + return { type: type, size: size, data: data.subarray(offset, offset + size) }; + }; + /** + * Returns an array of ID3 frames found in all the ID3 tags in the id3Data + * @param {Uint8Array} id3Data - The ID3 data containing one or more ID3 tags + * @return {ID3 frame[]} - Array of ID3 frame objects + */ + ID3.getID3Frames = function (id3Data) { + var offset = 0; + var frames = []; + while (ID3.isHeader(id3Data, offset)) { + var size = ID3._readSize(id3Data, offset + 6); + // skip past ID3 header + offset += 10; + var end = offset + size; + // loop through frames in the ID3 tag + while (offset + 8 < end) { + var frameData = ID3._getFrameData(id3Data.subarray(offset)); + var frame = ID3._decodeFrame(frameData); + if (frame) { + frames.push(frame); + } + // skip frame header and frame data + offset += frameData.size + 10; + } + if (ID3.isFooter(id3Data, offset)) { + offset += 10; + } + } + return frames; + }; + ID3._decodeFrame = function (frame) { + if (frame.type === 'PRIV') { + return ID3._decodePrivFrame(frame); + } + else if (frame.type[0] === 'T') { + return ID3._decodeTextFrame(frame); + } + else if (frame.type[0] === 'W') { + return ID3._decodeURLFrame(frame); + } + return undefined; + }; + ID3._readTimeStamp = function (timeStampFrame) { + if (timeStampFrame.data.byteLength === 8) { + var data = new Uint8Array(timeStampFrame.data); + // timestamp is 33 bit expressed as a big-endian eight-octet number, + // with the upper 31 bits set to zero. + var pts33Bit = data[3] & 0x1; + var timestamp = (data[4] << 23) + + (data[5] << 15) + + (data[6] << 7) + + data[7]; + timestamp /= 45; + if (pts33Bit) { + timestamp += 47721858.84; + } // 2^32 / 90 + return Math.round(timestamp); + } + return undefined; + }; + ID3._decodePrivFrame = function (frame) { + /* + Format: \0 + */ + if (frame.size < 2) { + return undefined; + } + var owner = ID3._utf8ArrayToStr(frame.data, true); + var privateData = new Uint8Array(frame.data.subarray(owner.length + 1)); + return { key: frame.type, info: owner, data: privateData.buffer }; + }; + ID3._decodeTextFrame = function (frame) { + if (frame.size < 2) { + return undefined; + } + if (frame.type === 'TXXX') { + /* + Format: + [0] = {Text Encoding} + [1-?] = {Description}\0{Value} + */ + var index = 1; + var description = ID3._utf8ArrayToStr(frame.data.subarray(index)); + index += description.length + 1; + var value = ID3._utf8ArrayToStr(frame.data.subarray(index)); + return { key: frame.type, info: description, data: value }; + } + else { + /* + Format: + [0] = {Text Encoding} + [1-?] = {Value} + */ + var text = ID3._utf8ArrayToStr(frame.data.subarray(1)); + return { key: frame.type, data: text }; + } + }; + ID3._decodeURLFrame = function (frame) { + if (frame.type === 'WXXX') { + /* + Format: + [0] = {Text Encoding} + [1-?] = {Description}\0{URL} + */ + if (frame.size < 2) { + return undefined; + } + var index = 1; + var description = ID3._utf8ArrayToStr(frame.data.subarray(index)); + index += description.length + 1; + var value = ID3._utf8ArrayToStr(frame.data.subarray(index)); + return { key: frame.type, info: description, data: value }; + } + else { + /* + Format: + [0-?] = {URL} + */ + var url = ID3._utf8ArrayToStr(frame.data); + return { key: frame.type, data: url }; + } + }; + // http://stackoverflow.com/questions/8936984/uint8array-to-string-in-javascript/22373197 + // http://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt + /* utf.js - UTF-8 <=> UTF-16 convertion + * + * Copyright (C) 1999 Masanao Izumo + * Version: 1.0 + * LastModified: Dec 25 1999 + * This library is free. You can redistribute it and/or modify it. + */ + ID3._utf8ArrayToStr = function (array, exitOnNull) { + if (exitOnNull === void 0) { exitOnNull = false; } + var len = array.length; + var c; + var char2; + var char3; + var out = ''; + var i = 0; + while (i < len) { + c = array[i++]; + if (c === 0x00 && exitOnNull) { + return out; + } + else if (c === 0x00 || c === 0x03) { + // If the character is 3 (END_OF_TEXT) or 0 (NULL) then skip it + continue; + } + switch (c >> 4) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + // 0xxxxxxx + out += String.fromCharCode(c); + break; + case 12: + case 13: + // 110x xxxx 10xx xxxx + char2 = array[i++]; + out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F)); + break; + case 14: + // 1110 xxxx 10xx xxxx 10xx xxxx + char2 = array[i++]; + char3 = array[i++]; + out += String.fromCharCode(((c & 0x0F) << 12) | + ((char2 & 0x3F) << 6) | + ((char3 & 0x3F) << 0)); + break; + default: + } + } + return out; + }; + return ID3; +}()); +var utf8ArrayToStr = ID3._utf8ArrayToStr; +exports.utf8ArrayToStr = utf8ArrayToStr; +exports.default = ID3; + + +/***/ }), + +/***/ "./src/demux/mp3demuxer.js": +/*!*********************************!*\ + !*** ./src/demux/mp3demuxer.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * MP3 demuxer + */ +var id3_1 = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var mpegaudio_1 = __webpack_require__(/*! ./mpegaudio */ "./src/demux/mpegaudio.js"); +var MP3Demuxer = /** @class */ (function () { + function MP3Demuxer(observer, remuxer, config) { + this.observer = observer; + this.config = config; + this.remuxer = remuxer; + } + MP3Demuxer.prototype.resetInitSegment = function (initSegment, audioCodec, videoCodec, duration) { + this._audioTrack = { container: 'audio/mpeg', type: 'audio', id: -1, sequenceNumber: 0, isAAC: false, samples: [], len: 0, manifestCodec: audioCodec, duration: duration, inputTimeScale: 90000 }; + }; + MP3Demuxer.prototype.resetTimeStamp = function () { + }; + MP3Demuxer.probe = function (data) { + // check if data contains ID3 timestamp and MPEG sync word + var offset, length; + var id3Data = id3_1.default.getID3Data(data, 0); + if (id3Data && id3_1.default.getTimeStamp(id3Data) !== undefined) { + // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1 + // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III) + // More info http://www.mp3-tech.org/programmer/frame_header.html + for (offset = id3Data.length, length = Math.min(data.length - 1, offset + 100); offset < length; offset++) { + if (mpegaudio_1.default.probe(data, offset)) { + logger_1.logger.log('MPEG Audio sync word found !'); + return true; + } + } + } + return false; + }; + // feed incoming data to the front of the parsing pipeline + MP3Demuxer.prototype.append = function (data, timeOffset, contiguous, accurateTimeOffset) { + var id3Data = id3_1.default.getID3Data(data, 0); + var timestamp = id3_1.default.getTimeStamp(id3Data); + var pts = timestamp ? 90 * timestamp : timeOffset * 90000; + var offset = id3Data.length; + var length = data.length; + var frameIndex = 0, stamp = 0; + var track = this._audioTrack; + var id3Samples = [{ pts: pts, dts: pts, data: id3Data }]; + while (offset < length) { + if (mpegaudio_1.default.isHeader(data, offset)) { + var frame = mpegaudio_1.default.appendFrame(track, data, offset, pts, frameIndex); + if (frame) { + offset += frame.length; + stamp = frame.sample.pts; + frameIndex++; + } + else { + // logger.log('Unable to parse Mpeg audio frame'); + break; + } + } + else if (id3_1.default.isHeader(data, offset)) { + id3Data = id3_1.default.getID3Data(data, offset); + id3Samples.push({ pts: stamp, dts: stamp, data: id3Data }); + offset += id3Data.length; + } + else { + // nothing found, keep looking + offset++; + } + } + this.remuxer.remux(track, { samples: [] }, { samples: id3Samples, inputTimeScale: 90000 }, { samples: [] }, timeOffset, contiguous, accurateTimeOffset); + }; + MP3Demuxer.prototype.destroy = function () { + }; + return MP3Demuxer; +}()); +exports.default = MP3Demuxer; + + +/***/ }), + +/***/ "./src/demux/mp4demuxer.js": +/*!*********************************!*\ + !*** ./src/demux/mp4demuxer.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * MP4 demuxer + */ +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var UINT32_MAX = Math.pow(2, 32) - 1; +var MP4Demuxer = /** @class */ (function () { + function MP4Demuxer(observer, remuxer) { + this.observer = observer; + this.remuxer = remuxer; + } + MP4Demuxer.prototype.resetTimeStamp = function (initPTS) { + this.initPTS = initPTS; + }; + MP4Demuxer.prototype.resetInitSegment = function (initSegment, audioCodec, videoCodec, duration) { + // jshint unused:false + if (initSegment && initSegment.byteLength) { + var initData = this.initData = MP4Demuxer.parseInitSegment(initSegment); + // default audio codec if nothing specified + // TODO : extract that from initsegment + if (audioCodec == null) { + audioCodec = 'mp4a.40.5'; + } + if (videoCodec == null) { + videoCodec = 'avc1.42e01e'; + } + var tracks = {}; + if (initData.audio && initData.video) { + tracks.audiovideo = { container: 'video/mp4', codec: audioCodec + ',' + videoCodec, initSegment: duration ? initSegment : null }; + } + else { + if (initData.audio) { + tracks.audio = { container: 'audio/mp4', codec: audioCodec, initSegment: duration ? initSegment : null }; + } + if (initData.video) { + tracks.video = { container: 'video/mp4', codec: videoCodec, initSegment: duration ? initSegment : null }; + } + } + this.observer.trigger(events_1.default.FRAG_PARSING_INIT_SEGMENT, { tracks: tracks }); + } + else { + if (audioCodec) { + this.audioCodec = audioCodec; + } + if (videoCodec) { + this.videoCodec = videoCodec; + } + } + }; + MP4Demuxer.probe = function (data) { + // ensure we find a moof box in the first 16 kB + return MP4Demuxer.findBox({ data: data, start: 0, end: Math.min(data.length, 16384) }, ['moof']).length > 0; + }; + MP4Demuxer.bin2str = function (buffer) { + return String.fromCharCode.apply(null, buffer); + }; + MP4Demuxer.readUint16 = function (buffer, offset) { + if (buffer.data) { + offset += buffer.start; + buffer = buffer.data; + } + var val = buffer[offset] << 8 | + buffer[offset + 1]; + return val < 0 ? 65536 + val : val; + }; + MP4Demuxer.readUint32 = function (buffer, offset) { + if (buffer.data) { + offset += buffer.start; + buffer = buffer.data; + } + var val = buffer[offset] << 24 | + buffer[offset + 1] << 16 | + buffer[offset + 2] << 8 | + buffer[offset + 3]; + return val < 0 ? 4294967296 + val : val; + }; + MP4Demuxer.writeUint32 = function (buffer, offset, value) { + if (buffer.data) { + offset += buffer.start; + buffer = buffer.data; + } + buffer[offset] = value >> 24; + buffer[offset + 1] = (value >> 16) & 0xff; + buffer[offset + 2] = (value >> 8) & 0xff; + buffer[offset + 3] = value & 0xff; + }; + // Find the data for a box specified by its path + MP4Demuxer.findBox = function (data, path) { + var results = [], i, size, type, end, subresults, start, endbox; + if (data.data) { + start = data.start; + end = data.end; + data = data.data; + } + else { + start = 0; + end = data.byteLength; + } + if (!path.length) { + // short-circuit the search for empty paths + return null; + } + for (i = start; i < end;) { + size = MP4Demuxer.readUint32(data, i); + type = MP4Demuxer.bin2str(data.subarray(i + 4, i + 8)); + endbox = size > 1 ? i + size : end; + if (type === path[0]) { + if (path.length === 1) { + // this is the end of the path and we've found the box we were + // looking for + results.push({ data: data, start: i + 8, end: endbox }); + } + else { + // recursively search for the next box along the path + subresults = MP4Demuxer.findBox({ data: data, start: i + 8, end: endbox }, path.slice(1)); + if (subresults.length) { + results = results.concat(subresults); + } + } + } + i = endbox; + } + // we've finished searching all of data + return results; + }; + MP4Demuxer.parseSegmentIndex = function (initSegment) { + var moov = MP4Demuxer.findBox(initSegment, ['moov'])[0]; + var moovEndOffset = moov ? moov.end : null; // we need this in case we need to chop of garbage of the end of current data + var index = 0; + var sidx = MP4Demuxer.findBox(initSegment, ['sidx']); + var references; + if (!sidx || !sidx[0]) { + return null; + } + references = []; + sidx = sidx[0]; + var version = sidx.data[0]; + // set initial offset, we skip the reference ID (not needed) + index = version === 0 ? 8 : 16; + var timescale = MP4Demuxer.readUint32(sidx, index); + index += 4; + // TODO: parse earliestPresentationTime and firstOffset + // usually zero in our case + var earliestPresentationTime = 0; + var firstOffset = 0; + if (version === 0) { + index += 8; + } + else { + index += 16; + } + // skip reserved + index += 2; + var startByte = sidx.end + firstOffset; + var referencesCount = MP4Demuxer.readUint16(sidx, index); + index += 2; + for (var i = 0; i < referencesCount; i++) { + var referenceIndex = index; + var referenceInfo = MP4Demuxer.readUint32(sidx, referenceIndex); + referenceIndex += 4; + var referenceSize = referenceInfo & 0x7FFFFFFF; + var referenceType = (referenceInfo & 0x80000000) >>> 31; + if (referenceType === 1) { + console.warn('SIDX has hierarchical references (not supported)'); + return; + } + var subsegmentDuration = MP4Demuxer.readUint32(sidx, referenceIndex); + referenceIndex += 4; + references.push({ + referenceSize: referenceSize, + subsegmentDuration: subsegmentDuration, + info: { + duration: subsegmentDuration / timescale, + start: startByte, + end: startByte + referenceSize - 1 + } + }); + startByte += referenceSize; + // Skipping 1 bit for |startsWithSap|, 3 bits for |sapType|, and 28 bits + // for |sapDelta|. + referenceIndex += 4; + // skip to next ref + index = referenceIndex; + } + return { + earliestPresentationTime: earliestPresentationTime, + timescale: timescale, + version: version, + referencesCount: referencesCount, + references: references, + moovEndOffset: moovEndOffset + }; + }; + /** + * Parses an MP4 initialization segment and extracts stream type and + * timescale values for any declared tracks. Timescale values indicate the + * number of clock ticks per second to assume for time-based values + * elsewhere in the MP4. + * + * To determine the start time of an MP4, you need two pieces of + * information: the timescale unit and the earliest base media decode + * time. Multiple timescales can be specified within an MP4 but the + * base media decode time is always expressed in the timescale from + * the media header box for the track: + * ``` + * moov > trak > mdia > mdhd.timescale + * moov > trak > mdia > hdlr + * ``` + * @param init {Uint8Array} the bytes of the init segment + * @return {object} a hash of track type to timescale values or null if + * the init segment is malformed. + */ + MP4Demuxer.parseInitSegment = function (initSegment) { + var result = []; + var traks = MP4Demuxer.findBox(initSegment, ['moov', 'trak']); + traks.forEach(function (trak) { + var tkhd = MP4Demuxer.findBox(trak, ['tkhd'])[0]; + if (tkhd) { + var version = tkhd.data[tkhd.start]; + var index = version === 0 ? 12 : 20; + var trackId = MP4Demuxer.readUint32(tkhd, index); + var mdhd = MP4Demuxer.findBox(trak, ['mdia', 'mdhd'])[0]; + if (mdhd) { + version = mdhd.data[mdhd.start]; + index = version === 0 ? 12 : 20; + var timescale = MP4Demuxer.readUint32(mdhd, index); + var hdlr = MP4Demuxer.findBox(trak, ['mdia', 'hdlr'])[0]; + if (hdlr) { + var hdlrType = MP4Demuxer.bin2str(hdlr.data.subarray(hdlr.start + 8, hdlr.start + 12)); + var type = { 'soun': 'audio', 'vide': 'video' }[hdlrType]; + if (type) { + // extract codec info. TODO : parse codec details to be able to build MIME type + var codecBox = MP4Demuxer.findBox(trak, ['mdia', 'minf', 'stbl', 'stsd']); + if (codecBox.length) { + codecBox = codecBox[0]; + var codecType = MP4Demuxer.bin2str(codecBox.data.subarray(codecBox.start + 12, codecBox.start + 16)); + logger_1.logger.log("MP4Demuxer:" + type + ":" + codecType + " found"); + } + result[trackId] = { timescale: timescale, type: type }; + result[type] = { timescale: timescale, id: trackId }; + } + } + } + } + }); + return result; + }; + /** + * Determine the base media decode start time, in seconds, for an MP4 + * fragment. If multiple fragments are specified, the earliest time is + * returned. + * + * The base media decode time can be parsed from track fragment + * metadata: + * ``` + * moof > traf > tfdt.baseMediaDecodeTime + * ``` + * It requires the timescale value from the mdhd to interpret. + * + * @param timescale {object} a hash of track ids to timescale values. + * @return {number} the earliest base media decode start time for the + * fragment, in seconds + */ + MP4Demuxer.getStartDTS = function (initData, fragment) { + var trafs, baseTimes, result; + // we need info from two childrend of each track fragment box + trafs = MP4Demuxer.findBox(fragment, ['moof', 'traf']); + // determine the start times for each track + baseTimes = [].concat.apply([], trafs.map(function (traf) { + return MP4Demuxer.findBox(traf, ['tfhd']).map(function (tfhd) { + var id, scale, baseTime; + // get the track id from the tfhd + id = MP4Demuxer.readUint32(tfhd, 4); + // assume a 90kHz clock if no timescale was specified + scale = initData[id].timescale || 90e3; + // get the base media decode time from the tfdt + baseTime = MP4Demuxer.findBox(traf, ['tfdt']).map(function (tfdt) { + var version, result; + version = tfdt.data[tfdt.start]; + result = MP4Demuxer.readUint32(tfdt, 4); + if (version === 1) { + result *= Math.pow(2, 32); + result += MP4Demuxer.readUint32(tfdt, 8); + } + return result; + })[0]; + // convert base time to seconds + return baseTime / scale; + }); + })); + // return the minimum + result = Math.min.apply(null, baseTimes); + return isFinite(result) ? result : 0; + }; + MP4Demuxer.offsetStartDTS = function (initData, fragment, timeOffset) { + MP4Demuxer.findBox(fragment, ['moof', 'traf']).map(function (traf) { + return MP4Demuxer.findBox(traf, ['tfhd']).map(function (tfhd) { + // get the track id from the tfhd + var id = MP4Demuxer.readUint32(tfhd, 4); + // assume a 90kHz clock if no timescale was specified + var timescale = initData[id].timescale || 90e3; + // get the base media decode time from the tfdt + MP4Demuxer.findBox(traf, ['tfdt']).map(function (tfdt) { + var version = tfdt.data[tfdt.start]; + var baseMediaDecodeTime = MP4Demuxer.readUint32(tfdt, 4); + if (version === 0) { + MP4Demuxer.writeUint32(tfdt, 4, baseMediaDecodeTime - timeOffset * timescale); + } + else { + baseMediaDecodeTime *= Math.pow(2, 32); + baseMediaDecodeTime += MP4Demuxer.readUint32(tfdt, 8); + baseMediaDecodeTime -= timeOffset * timescale; + baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0); + var upper = Math.floor(baseMediaDecodeTime / (UINT32_MAX + 1)); + var lower = Math.floor(baseMediaDecodeTime % (UINT32_MAX + 1)); + MP4Demuxer.writeUint32(tfdt, 4, upper); + MP4Demuxer.writeUint32(tfdt, 8, lower); + } + }); + }); + }); + }; + // feed incoming data to the front of the parsing pipeline + MP4Demuxer.prototype.append = function (data, timeOffset, contiguous, accurateTimeOffset) { + var initData = this.initData; + if (!initData) { + this.resetInitSegment(data, this.audioCodec, this.videoCodec, false); + initData = this.initData; + } + var startDTS, initPTS = this.initPTS; + if (initPTS === undefined) { + var startDTS_1 = MP4Demuxer.getStartDTS(initData, data); + this.initPTS = initPTS = startDTS_1 - timeOffset; + this.observer.trigger(events_1.default.INIT_PTS_FOUND, { initPTS: initPTS }); + } + MP4Demuxer.offsetStartDTS(initData, data, initPTS); + startDTS = MP4Demuxer.getStartDTS(initData, data); + this.remuxer.remux(initData.audio, initData.video, null, null, startDTS, contiguous, accurateTimeOffset, data); + }; + MP4Demuxer.prototype.destroy = function () { }; + return MP4Demuxer; +}()); +exports.default = MP4Demuxer; + + +/***/ }), + +/***/ "./src/demux/mpegaudio.js": +/*!********************************!*\ + !*** ./src/demux/mpegaudio.js ***! + \********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * MPEG parser helper + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var MpegAudio = { + BitratesMap: [ + 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, + 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, + 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, + 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, + 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160 + ], + SamplingRateMap: [44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000], + SamplesCoefficients: [ + // MPEG 2.5 + [ + 0, + 72, + 144, + 12 // Layer1 + ], + // Reserved + [ + 0, + 0, + 0, + 0 // Layer1 + ], + // MPEG 2 + [ + 0, + 72, + 144, + 12 // Layer1 + ], + // MPEG 1 + [ + 0, + 144, + 144, + 12 // Layer1 + ] + ], + BytesInSlot: [ + 0, + 1, + 1, + 4 // Layer1 + ], + appendFrame: function (track, data, offset, pts, frameIndex) { + // Using http://www.datavoyage.com/mpgscript/mpeghdr.htm as a reference + if (offset + 24 > data.length) { + return undefined; + } + var header = this.parseHeader(data, offset); + if (header && offset + header.frameLength <= data.length) { + var frameDuration = header.samplesPerFrame * 90000 / header.sampleRate; + var stamp = pts + frameIndex * frameDuration; + var sample = { unit: data.subarray(offset, offset + header.frameLength), pts: stamp, dts: stamp }; + track.config = []; + track.channelCount = header.channelCount; + track.samplerate = header.sampleRate; + track.samples.push(sample); + track.len += header.frameLength; + return { sample: sample, length: header.frameLength }; + } + return undefined; + }, + parseHeader: function (data, offset) { + var headerB = (data[offset + 1] >> 3) & 3; + var headerC = (data[offset + 1] >> 1) & 3; + var headerE = (data[offset + 2] >> 4) & 15; + var headerF = (data[offset + 2] >> 2) & 3; + var headerG = (data[offset + 2] >> 1) & 1; + if (headerB !== 1 && headerE !== 0 && headerE !== 15 && headerF !== 3) { + var columnInBitrates = headerB === 3 ? (3 - headerC) : (headerC === 3 ? 3 : 4); + var bitRate = MpegAudio.BitratesMap[columnInBitrates * 14 + headerE - 1] * 1000; + var columnInSampleRates = headerB === 3 ? 0 : headerB === 2 ? 1 : 2; + var sampleRate = MpegAudio.SamplingRateMap[columnInSampleRates * 3 + headerF]; + var channelCount = data[offset + 3] >> 6 === 3 ? 1 : 2; // If bits of channel mode are `11` then it is a single channel (Mono) + var sampleCoefficient = MpegAudio.SamplesCoefficients[headerB][headerC]; + var bytesInSlot = MpegAudio.BytesInSlot[headerC]; + var samplesPerFrame = sampleCoefficient * 8 * bytesInSlot; + var frameLength = parseInt(sampleCoefficient * bitRate / sampleRate + headerG, 10) * bytesInSlot; + return { sampleRate: sampleRate, channelCount: channelCount, frameLength: frameLength, samplesPerFrame: samplesPerFrame }; + } + return undefined; + }, + isHeaderPattern: function (data, offset) { + return data[offset] === 0xff && (data[offset + 1] & 0xe0) === 0xe0 && (data[offset + 1] & 0x06) !== 0x00; + }, + isHeader: function (data, offset) { + // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1 + // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III) + // More info http://www.mp3-tech.org/programmer/frame_header.html + if (offset + 1 < data.length && this.isHeaderPattern(data, offset)) { + return true; + } + return false; + }, + probe: function (data, offset) { + // same as isHeader but we also check that MPEG frame follows last MPEG frame + // or end of data is reached + if (offset + 1 < data.length && this.isHeaderPattern(data, offset)) { + // MPEG header Length + var headerLength = 4; + // MPEG frame Length + var header = this.parseHeader(data, offset); + var frameLength = headerLength; + if (header && header.frameLength) { + frameLength = header.frameLength; + } + var newOffset = offset + frameLength; + if (newOffset === data.length || (newOffset + 1 < data.length && this.isHeaderPattern(data, newOffset))) { + return true; + } + } + return false; + } +}; +exports.default = MpegAudio; + + +/***/ }), + +/***/ "./src/demux/sample-aes.js": +/*!*********************************!*\ + !*** ./src/demux/sample-aes.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * SAMPLE-AES decrypter +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var decrypter_1 = __webpack_require__(/*! ../crypt/decrypter */ "./src/crypt/decrypter.js"); +var SampleAesDecrypter = /** @class */ (function () { + function SampleAesDecrypter(observer, config, decryptdata, discardEPB) { + this.decryptdata = decryptdata; + this.discardEPB = discardEPB; + this.decrypter = new decrypter_1.default(observer, config, { removePKCS7Padding: false }); + } + SampleAesDecrypter.prototype.decryptBuffer = function (encryptedData, callback) { + this.decrypter.decrypt(encryptedData, this.decryptdata.key.buffer, this.decryptdata.iv.buffer, callback); + }; + // AAC - encrypt all full 16 bytes blocks starting from offset 16 + SampleAesDecrypter.prototype.decryptAacSample = function (samples, sampleIndex, callback, sync) { + var curUnit = samples[sampleIndex].unit; + var encryptedData = curUnit.subarray(16, curUnit.length - curUnit.length % 16); + var encryptedBuffer = encryptedData.buffer.slice(encryptedData.byteOffset, encryptedData.byteOffset + encryptedData.length); + var localthis = this; + this.decryptBuffer(encryptedBuffer, function (decryptedData) { + decryptedData = new Uint8Array(decryptedData); + curUnit.set(decryptedData, 16); + if (!sync) { + localthis.decryptAacSamples(samples, sampleIndex + 1, callback); + } + }); + }; + SampleAesDecrypter.prototype.decryptAacSamples = function (samples, sampleIndex, callback) { + for (;; sampleIndex++) { + if (sampleIndex >= samples.length) { + callback(); + return; + } + if (samples[sampleIndex].unit.length < 32) { + continue; + } + var sync = this.decrypter.isSync(); + this.decryptAacSample(samples, sampleIndex, callback, sync); + if (!sync) { + return; + } + } + }; + // AVC - encrypt one 16 bytes block out of ten, starting from offset 32 + SampleAesDecrypter.prototype.getAvcEncryptedData = function (decodedData) { + var encryptedDataLen = Math.floor((decodedData.length - 48) / 160) * 16 + 16; + var encryptedData = new Int8Array(encryptedDataLen); + var outputPos = 0; + for (var inputPos = 32; inputPos <= decodedData.length - 16; inputPos += 160, outputPos += 16) { + encryptedData.set(decodedData.subarray(inputPos, inputPos + 16), outputPos); + } + return encryptedData; + }; + SampleAesDecrypter.prototype.getAvcDecryptedUnit = function (decodedData, decryptedData) { + decryptedData = new Uint8Array(decryptedData); + var inputPos = 0; + for (var outputPos = 32; outputPos <= decodedData.length - 16; outputPos += 160, inputPos += 16) { + decodedData.set(decryptedData.subarray(inputPos, inputPos + 16), outputPos); + } + return decodedData; + }; + SampleAesDecrypter.prototype.decryptAvcSample = function (samples, sampleIndex, unitIndex, callback, curUnit, sync) { + var decodedData = this.discardEPB(curUnit.data); + var encryptedData = this.getAvcEncryptedData(decodedData); + var localthis = this; + this.decryptBuffer(encryptedData.buffer, function (decryptedData) { + curUnit.data = localthis.getAvcDecryptedUnit(decodedData, decryptedData); + if (!sync) { + localthis.decryptAvcSamples(samples, sampleIndex, unitIndex + 1, callback); + } + }); + }; + SampleAesDecrypter.prototype.decryptAvcSamples = function (samples, sampleIndex, unitIndex, callback) { + for (;; sampleIndex++, unitIndex = 0) { + if (sampleIndex >= samples.length) { + callback(); + return; + } + var curUnits = samples[sampleIndex].units; + for (;; unitIndex++) { + if (unitIndex >= curUnits.length) { + break; + } + var curUnit = curUnits[unitIndex]; + if (curUnit.length <= 48 || (curUnit.type !== 1 && curUnit.type !== 5)) { + continue; + } + var sync = this.decrypter.isSync(); + this.decryptAvcSample(samples, sampleIndex, unitIndex, callback, curUnit, sync); + if (!sync) { + return; + } + } + } + }; + return SampleAesDecrypter; +}()); +exports.default = SampleAesDecrypter; + + +/***/ }), + +/***/ "./src/demux/tsdemuxer.js": +/*!********************************!*\ + !*** ./src/demux/tsdemuxer.js ***! + \********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * highly optimized TS demuxer: + * parse PAT, PMT + * extract PES packet from audio and video PIDs + * extract AVC/H264 NAL units and AAC/ADTS samples from PES packet + * trigger the remuxer upon parsing completion + * it also tries to workaround as best as it can audio codec switch (HE-AAC to AAC and vice versa), without having to restart the MediaSource. + * it also controls the remuxing process : + * upon discontinuity or level switch detection, it will also notifies the remuxer so that it can reset its state. +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var ADTS = __webpack_require__(/*! ./adts */ "./src/demux/adts.js"); +var mpegaudio_1 = __webpack_require__(/*! ./mpegaudio */ "./src/demux/mpegaudio.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var exp_golomb_1 = __webpack_require__(/*! ./exp-golomb */ "./src/demux/exp-golomb.js"); +var sample_aes_1 = __webpack_require__(/*! ./sample-aes */ "./src/demux/sample-aes.js"); +// import Hex from '../utils/hex'; +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +// We are using fixed track IDs for driving the MP4 remuxer +// instead of following the TS PIDs. +// There is no reason not to do this and some browsers/SourceBuffer-demuxers +// may not like if there are TrackID "switches" +// See https://github.com/video-dev/hls.js/issues/1331 +// Here we are mapping our internal track types to constant MP4 track IDs +// With MSE currently one can only have one track of each, and we are muxing +// whatever video/audio rendition in them. +var RemuxerTrackIdConfig = { + video: 1, + audio: 2, + id3: 3, + text: 4 +}; +var TSDemuxer = /** @class */ (function () { + function TSDemuxer(observer, remuxer, config, typeSupported) { + this.observer = observer; + this.config = config; + this.typeSupported = typeSupported; + this.remuxer = remuxer; + this.sampleAes = null; + } + TSDemuxer.prototype.setDecryptData = function (decryptdata) { + if ((decryptdata != null) && (decryptdata.key != null) && (decryptdata.method === 'SAMPLE-AES')) { + this.sampleAes = new sample_aes_1.default(this.observer, this.config, decryptdata, this.discardEPB); + } + else { + this.sampleAes = null; + } + }; + TSDemuxer.probe = function (data) { + var syncOffset = TSDemuxer._syncOffset(data); + if (syncOffset < 0) { + return false; + } + else { + if (syncOffset) { + logger_1.logger.warn("MPEG2-TS detected but first sync word found @ offset " + syncOffset + ", junk ahead ?"); + } + return true; + } + }; + TSDemuxer._syncOffset = function (data) { + // scan 1000 first bytes + var scanwindow = Math.min(1000, data.length - 3 * 188); + var i = 0; + while (i < scanwindow) { + // a TS fragment should contain at least 3 TS packets, a PAT, a PMT, and one PID, each starting with 0x47 + if (data[i] === 0x47 && data[i + 188] === 0x47 && data[i + 2 * 188] === 0x47) { + return i; + } + else { + i++; + } + } + return -1; + }; + /** + * Creates a track model internal to demuxer used to drive remuxing input + * + * @param {string} type 'audio' | 'video' | 'id3' | 'text' + * @param {number} duration + * @return {object} TSDemuxer's internal track model + */ + TSDemuxer.createTrack = function (type, duration) { + return { + container: type === 'video' || type === 'audio' ? 'video/mp2t' : undefined, + type: type, + id: RemuxerTrackIdConfig[type], + pid: -1, + inputTimeScale: 90000, + sequenceNumber: 0, + samples: [], + len: 0, + dropped: type === 'video' ? 0 : undefined, + isAAC: type === 'audio' ? true : undefined, + duration: type === 'audio' ? duration : undefined + }; + }; + /** + * Initializes a new init segment on the demuxer/remuxer interface. Needed for discontinuities/track-switches (or at stream start) + * Resets all internal track instances of the demuxer. + * + * @override Implements generic demuxing/remuxing interface (see DemuxerInline) + * @param {object} initSegment + * @param {string} audioCodec + * @param {string} videoCodec + * @param {number} duration (in TS timescale = 90kHz) + */ + TSDemuxer.prototype.resetInitSegment = function (initSegment, audioCodec, videoCodec, duration) { + this.pmtParsed = false; + this._pmtId = -1; + this._avcTrack = TSDemuxer.createTrack('video', duration); + this._audioTrack = TSDemuxer.createTrack('audio', duration); + this._id3Track = TSDemuxer.createTrack('id3', duration); + this._txtTrack = TSDemuxer.createTrack('text', duration); + // flush any partial content + this.aacOverFlow = null; + this.aacLastPTS = null; + this.avcSample = null; + this.audioCodec = audioCodec; + this.videoCodec = videoCodec; + this._duration = duration; + }; + /** + * + * @override + */ + TSDemuxer.prototype.resetTimeStamp = function () { }; + // feed incoming data to the front of the parsing pipeline + TSDemuxer.prototype.append = function (data, timeOffset, contiguous, accurateTimeOffset) { + var start, len = data.length, stt, pid, atf, offset, pes, unknownPIDs = false; + this.contiguous = contiguous; + var pmtParsed = this.pmtParsed, avcTrack = this._avcTrack, audioTrack = this._audioTrack, id3Track = this._id3Track, avcId = avcTrack.pid, audioId = audioTrack.pid, id3Id = id3Track.pid, pmtId = this._pmtId, avcData = avcTrack.pesData, audioData = audioTrack.pesData, id3Data = id3Track.pesData, parsePAT = this._parsePAT, parsePMT = this._parsePMT, parsePES = this._parsePES, parseAVCPES = this._parseAVCPES.bind(this), parseAACPES = this._parseAACPES.bind(this), parseMPEGPES = this._parseMPEGPES.bind(this), parseID3PES = this._parseID3PES.bind(this); + var syncOffset = TSDemuxer._syncOffset(data); + // don't parse last TS packet if incomplete + len -= (len + syncOffset) % 188; + // loop through TS packets + for (start = syncOffset; start < len; start += 188) { + if (data[start] === 0x47) { + stt = !!(data[start + 1] & 0x40); + // pid is a 13-bit field starting at the last bit of TS[1] + pid = ((data[start + 1] & 0x1f) << 8) + data[start + 2]; + atf = (data[start + 3] & 0x30) >> 4; + // if an adaption field is present, its length is specified by the fifth byte of the TS packet header. + if (atf > 1) { + offset = start + 5 + data[start + 4]; + // continue if there is only adaptation field + if (offset === (start + 188)) { + continue; + } + } + else { + offset = start + 4; + } + switch (pid) { + case avcId: + if (stt) { + if (avcData && (pes = parsePES(avcData)) && pes.pts !== undefined) { + parseAVCPES(pes, false); + } + avcData = { data: [], size: 0 }; + } + if (avcData) { + avcData.data.push(data.subarray(offset, start + 188)); + avcData.size += start + 188 - offset; + } + break; + case audioId: + if (stt) { + if (audioData && (pes = parsePES(audioData)) && pes.pts !== undefined) { + if (audioTrack.isAAC) { + parseAACPES(pes); + } + else { + parseMPEGPES(pes); + } + } + audioData = { data: [], size: 0 }; + } + if (audioData) { + audioData.data.push(data.subarray(offset, start + 188)); + audioData.size += start + 188 - offset; + } + break; + case id3Id: + if (stt) { + if (id3Data && (pes = parsePES(id3Data)) && pes.pts !== undefined) { + parseID3PES(pes); + } + id3Data = { data: [], size: 0 }; + } + if (id3Data) { + id3Data.data.push(data.subarray(offset, start + 188)); + id3Data.size += start + 188 - offset; + } + break; + case 0: + if (stt) { + offset += data[offset] + 1; + } + pmtId = this._pmtId = parsePAT(data, offset); + break; + case pmtId: + if (stt) { + offset += data[offset] + 1; + } + var parsedPIDs = parsePMT(data, offset, this.typeSupported.mpeg === true || this.typeSupported.mp3 === true, this.sampleAes != null); + // only update track id if track PID found while parsing PMT + // this is to avoid resetting the PID to -1 in case + // track PID transiently disappears from the stream + // this could happen in case of transient missing audio samples for example + // NOTE this is only the PID of the track as found in TS, + // but we are not using this for MP4 track IDs. + avcId = parsedPIDs.avc; + if (avcId > 0) { + avcTrack.pid = avcId; + } + audioId = parsedPIDs.audio; + if (audioId > 0) { + audioTrack.pid = audioId; + audioTrack.isAAC = parsedPIDs.isAAC; + } + id3Id = parsedPIDs.id3; + if (id3Id > 0) { + id3Track.pid = id3Id; + } + if (unknownPIDs && !pmtParsed) { + logger_1.logger.log('reparse from beginning'); + unknownPIDs = false; + // we set it to -188, the += 188 in the for loop will reset start to 0 + start = syncOffset - 188; + } + pmtParsed = this.pmtParsed = true; + break; + case 17: + case 0x1fff: + break; + default: + unknownPIDs = true; + break; + } + } + else { + this.observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.FRAG_PARSING_ERROR, fatal: false, reason: 'TS packet did not start with 0x47' }); + } + } + // try to parse last PES packets + if (avcData && (pes = parsePES(avcData)) && pes.pts !== undefined) { + parseAVCPES(pes, true); + avcTrack.pesData = null; + } + else { + // either avcData null or PES truncated, keep it for next frag parsing + avcTrack.pesData = avcData; + } + if (audioData && (pes = parsePES(audioData)) && pes.pts !== undefined) { + if (audioTrack.isAAC) { + parseAACPES(pes); + } + else { + parseMPEGPES(pes); + } + audioTrack.pesData = null; + } + else { + if (audioData && audioData.size) { + logger_1.logger.log('last AAC PES packet truncated,might overlap between fragments'); + } + // either audioData null or PES truncated, keep it for next frag parsing + audioTrack.pesData = audioData; + } + if (id3Data && (pes = parsePES(id3Data)) && pes.pts !== undefined) { + parseID3PES(pes); + id3Track.pesData = null; + } + else { + // either id3Data null or PES truncated, keep it for next frag parsing + id3Track.pesData = id3Data; + } + if (this.sampleAes == null) { + this.remuxer.remux(audioTrack, avcTrack, id3Track, this._txtTrack, timeOffset, contiguous, accurateTimeOffset); + } + else { + this.decryptAndRemux(audioTrack, avcTrack, id3Track, this._txtTrack, timeOffset, contiguous, accurateTimeOffset); + } + }; + TSDemuxer.prototype.decryptAndRemux = function (audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset) { + if (audioTrack.samples && audioTrack.isAAC) { + var localthis_1 = this; + this.sampleAes.decryptAacSamples(audioTrack.samples, 0, function () { + localthis_1.decryptAndRemuxAvc(audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset); + }); + } + else { + this.decryptAndRemuxAvc(audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset); + } + }; + TSDemuxer.prototype.decryptAndRemuxAvc = function (audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset) { + if (videoTrack.samples) { + var localthis_2 = this; + this.sampleAes.decryptAvcSamples(videoTrack.samples, 0, 0, function () { + localthis_2.remuxer.remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset); + }); + } + else { + this.remuxer.remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset); + } + }; + TSDemuxer.prototype.destroy = function () { + this._initPTS = this._initDTS = undefined; + this._duration = 0; + }; + TSDemuxer.prototype._parsePAT = function (data, offset) { + // skip the PSI header and parse the first PMT entry + return (data[offset + 10] & 0x1F) << 8 | data[offset + 11]; + // logger.log('PMT PID:' + this._pmtId); + }; + TSDemuxer.prototype._parsePMT = function (data, offset, mpegSupported, isSampleAes) { + var sectionLength, tableEnd, programInfoLength, pid, result = { audio: -1, avc: -1, id3: -1, isAAC: true }; + sectionLength = (data[offset + 1] & 0x0f) << 8 | data[offset + 2]; + tableEnd = offset + 3 + sectionLength - 4; + // to determine where the table is, we have to figure out how + // long the program info descriptors are + programInfoLength = (data[offset + 10] & 0x0f) << 8 | data[offset + 11]; + // advance the offset to the first entry in the mapping table + offset += 12 + programInfoLength; + while (offset < tableEnd) { + pid = (data[offset + 1] & 0x1F) << 8 | data[offset + 2]; + switch (data[offset]) { + case 0xcf: // SAMPLE-AES AAC + if (!isSampleAes) { + logger_1.logger.log('unkown stream type:' + data[offset]); + break; + } + /* falls through */ + // ISO/IEC 13818-7 ADTS AAC (MPEG-2 lower bit-rate audio) + case 0x0f: + // logger.log('AAC PID:' + pid); + if (result.audio === -1) { + result.audio = pid; + } + break; + // Packetized metadata (ID3) + case 0x15: + // logger.log('ID3 PID:' + pid); + if (result.id3 === -1) { + result.id3 = pid; + } + break; + case 0xdb: // SAMPLE-AES AVC + if (!isSampleAes) { + logger_1.logger.log('unkown stream type:' + data[offset]); + break; + } + /* falls through */ + // ITU-T Rec. H.264 and ISO/IEC 14496-10 (lower bit-rate video) + case 0x1b: + // logger.log('AVC PID:' + pid); + if (result.avc === -1) { + result.avc = pid; + } + break; + // ISO/IEC 11172-3 (MPEG-1 audio) + // or ISO/IEC 13818-3 (MPEG-2 halved sample rate audio) + case 0x03: + case 0x04: + // logger.log('MPEG PID:' + pid); + if (!mpegSupported) { + logger_1.logger.log('MPEG audio found, not supported in this browser for now'); + } + else if (result.audio === -1) { + result.audio = pid; + result.isAAC = false; + } + break; + case 0x24: + logger_1.logger.warn('HEVC stream type found, not supported for now'); + break; + default: + logger_1.logger.log('unkown stream type:' + data[offset]); + break; + } + // move to the next table entry + // skip past the elementary stream descriptors, if present + offset += ((data[offset + 3] & 0x0F) << 8 | data[offset + 4]) + 5; + } + return result; + }; + TSDemuxer.prototype._parsePES = function (stream) { + var i = 0, frag, pesFlags, pesPrefix, pesLen, pesHdrLen, pesData, pesPts, pesDts, payloadStartOffset, data = stream.data; + // safety check + if (!stream || stream.size === 0) { + return null; + } + // we might need up to 19 bytes to read PES header + // if first chunk of data is less than 19 bytes, let's merge it with following ones until we get 19 bytes + // usually only one merge is needed (and this is rare ...) + while (data[0].length < 19 && data.length > 1) { + var newData = new Uint8Array(data[0].length + data[1].length); + newData.set(data[0]); + newData.set(data[1], data[0].length); + data[0] = newData; + data.splice(1, 1); + } + // retrieve PTS/DTS from first fragment + frag = data[0]; + pesPrefix = (frag[0] << 16) + (frag[1] << 8) + frag[2]; + if (pesPrefix === 1) { + pesLen = (frag[4] << 8) + frag[5]; + // if PES parsed length is not zero and greater than total received length, stop parsing. PES might be truncated + // minus 6 : PES header size + if (pesLen && pesLen > stream.size - 6) { + return null; + } + pesFlags = frag[7]; + if (pesFlags & 0xC0) { + /* PES header described here : http://dvd.sourceforge.net/dvdinfo/pes-hdr.html + as PTS / DTS is 33 bit we cannot use bitwise operator in JS, + as Bitwise operators treat their operands as a sequence of 32 bits */ + pesPts = (frag[9] & 0x0E) * 536870912 + // 1 << 29 + (frag[10] & 0xFF) * 4194304 + // 1 << 22 + (frag[11] & 0xFE) * 16384 + // 1 << 14 + (frag[12] & 0xFF) * 128 + // 1 << 7 + (frag[13] & 0xFE) / 2; + // check if greater than 2^32 -1 + if (pesPts > 4294967295) { + // decrement 2^33 + pesPts -= 8589934592; + } + if (pesFlags & 0x40) { + pesDts = (frag[14] & 0x0E) * 536870912 + // 1 << 29 + (frag[15] & 0xFF) * 4194304 + // 1 << 22 + (frag[16] & 0xFE) * 16384 + // 1 << 14 + (frag[17] & 0xFF) * 128 + // 1 << 7 + (frag[18] & 0xFE) / 2; + // check if greater than 2^32 -1 + if (pesDts > 4294967295) { + // decrement 2^33 + pesDts -= 8589934592; + } + if (pesPts - pesDts > 60 * 90000) { + logger_1.logger.warn(Math.round((pesPts - pesDts) / 90000) + "s delta between PTS and DTS, align them"); + pesPts = pesDts; + } + } + else { + pesDts = pesPts; + } + } + pesHdrLen = frag[8]; + // 9 bytes : 6 bytes for PES header + 3 bytes for PES extension + payloadStartOffset = pesHdrLen + 9; + stream.size -= payloadStartOffset; + // reassemble PES packet + pesData = new Uint8Array(stream.size); + for (var j = 0, dataLen = data.length; j < dataLen; j++) { + frag = data[j]; + var len = frag.byteLength; + if (payloadStartOffset) { + if (payloadStartOffset > len) { + // trim full frag if PES header bigger than frag + payloadStartOffset -= len; + continue; + } + else { + // trim partial frag if PES header smaller than frag + frag = frag.subarray(payloadStartOffset); + len -= payloadStartOffset; + payloadStartOffset = 0; + } + } + pesData.set(frag, i); + i += len; + } + if (pesLen) { + // payload size : remove PES header + PES extension + pesLen -= pesHdrLen + 3; + } + return { data: pesData, pts: pesPts, dts: pesDts, len: pesLen }; + } + else { + return null; + } + }; + TSDemuxer.prototype.pushAccesUnit = function (avcSample, avcTrack) { + if (avcSample.units.length && avcSample.frame) { + var samples = avcTrack.samples; + var nbSamples = samples.length; + // only push AVC sample if starting with a keyframe is not mandatory OR + // if keyframe already found in this fragment OR + // keyframe found in last fragment (track.sps) AND + // samples already appended (we already found a keyframe in this fragment) OR fragment is contiguous + if (!this.config.forceKeyFrameOnDiscontinuity || + avcSample.key === true || + (avcTrack.sps && (nbSamples || this.contiguous))) { + avcSample.id = nbSamples; + samples.push(avcSample); + } + else { + // dropped samples, track it + avcTrack.dropped++; + } + } + if (avcSample.debug.length) { + logger_1.logger.log(avcSample.pts + '/' + avcSample.dts + ':' + avcSample.debug); + } + }; + TSDemuxer.prototype._parseAVCPES = function (pes, last) { + var _this = this; + // logger.log('parse new PES'); + var track = this._avcTrack, units = this._parseAVCNALu(pes.data), debug = false, expGolombDecoder, avcSample = this.avcSample, push, spsfound = false, i, pushAccesUnit = this.pushAccesUnit.bind(this), createAVCSample = function (key, pts, dts, debug) { + return { key: key, pts: pts, dts: dts, units: [], debug: debug }; + }; + // free pes.data to save up some memory + pes.data = null; + // if new NAL units found and last sample still there, let's push ... + // this helps parsing streams with missing AUD (only do this if AUD never found) + if (avcSample && units.length && !track.audFound) { + pushAccesUnit(avcSample, track); + avcSample = this.avcSample = createAVCSample(false, pes.pts, pes.dts, ''); + } + units.forEach(function (unit) { + switch (unit.type) { + // NDR + case 1: + push = true; + if (!avcSample) { + avcSample = _this.avcSample = createAVCSample(true, pes.pts, pes.dts, ''); + } + if (debug) { + avcSample.debug += 'NDR '; + } + avcSample.frame = true; + var data = unit.data; + // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...) + if (spsfound && data.length > 4) { + // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR + var sliceType = new exp_golomb_1.default(data).readSliceType(); + // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice + // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples. + // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice. + // I slice: A slice that is not an SI slice that is decoded using intra prediction only. + // if (sliceType === 2 || sliceType === 7) { + if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) { + avcSample.key = true; + } + } + break; + // IDR + case 5: + push = true; + // handle PES not starting with AUD + if (!avcSample) { + avcSample = _this.avcSample = createAVCSample(true, pes.pts, pes.dts, ''); + } + if (debug) { + avcSample.debug += 'IDR '; + } + avcSample.key = true; + avcSample.frame = true; + break; + // SEI + case 6: + push = true; + if (debug && avcSample) { + avcSample.debug += 'SEI '; + } + expGolombDecoder = new exp_golomb_1.default(_this.discardEPB(unit.data)); + // skip frameType + expGolombDecoder.readUByte(); + var payloadType = 0; + var payloadSize = 0; + var endOfCaptions = false; + var b = 0; + while (!endOfCaptions && expGolombDecoder.bytesAvailable > 1) { + payloadType = 0; + do { + b = expGolombDecoder.readUByte(); + payloadType += b; + } while (b === 0xFF); + // Parse payload size. + payloadSize = 0; + do { + b = expGolombDecoder.readUByte(); + payloadSize += b; + } while (b === 0xFF); + // TODO: there can be more than one payload in an SEI packet... + // TODO: need to read type and size in a while loop to get them all + if (payloadType === 4 && expGolombDecoder.bytesAvailable !== 0) { + endOfCaptions = true; + var countryCode = expGolombDecoder.readUByte(); + if (countryCode === 181) { + var providerCode = expGolombDecoder.readUShort(); + if (providerCode === 49) { + var userStructure = expGolombDecoder.readUInt(); + if (userStructure === 0x47413934) { + var userDataType = expGolombDecoder.readUByte(); + // Raw CEA-608 bytes wrapped in CEA-708 packet + if (userDataType === 3) { + var firstByte = expGolombDecoder.readUByte(); + var secondByte = expGolombDecoder.readUByte(); + var totalCCs = 31 & firstByte; + var byteArray = [firstByte, secondByte]; + for (i = 0; i < totalCCs; i++) { + // 3 bytes per CC + byteArray.push(expGolombDecoder.readUByte()); + byteArray.push(expGolombDecoder.readUByte()); + byteArray.push(expGolombDecoder.readUByte()); + } + _this._insertSampleInOrder(_this._txtTrack.samples, { type: 3, pts: pes.pts, bytes: byteArray }); + } + } + } + } + } + else if (payloadSize < expGolombDecoder.bytesAvailable) { + for (i = 0; i < payloadSize; i++) { + expGolombDecoder.readUByte(); + } + } + } + break; + // SPS + case 7: + push = true; + spsfound = true; + if (debug && avcSample) { + avcSample.debug += 'SPS '; + } + if (!track.sps) { + expGolombDecoder = new exp_golomb_1.default(unit.data); + var config = expGolombDecoder.readSPS(); + track.width = config.width; + track.height = config.height; + track.pixelRatio = config.pixelRatio; + track.sps = [unit.data]; + track.duration = _this._duration; + var codecarray = unit.data.subarray(1, 4); + var codecstring = 'avc1.'; + for (i = 0; i < 3; i++) { + var h = codecarray[i].toString(16); + if (h.length < 2) { + h = '0' + h; + } + codecstring += h; + } + track.codec = codecstring; + } + break; + // PPS + case 8: + push = true; + if (debug && avcSample) { + avcSample.debug += 'PPS '; + } + if (!track.pps) { + track.pps = [unit.data]; + } + break; + // AUD + case 9: + push = false; + track.audFound = true; + if (avcSample) { + pushAccesUnit(avcSample, track); + } + avcSample = _this.avcSample = createAVCSample(false, pes.pts, pes.dts, debug ? 'AUD ' : ''); + break; + // Filler Data + case 12: + push = false; + break; + default: + push = false; + if (avcSample) { + avcSample.debug += 'unknown NAL ' + unit.type + ' '; + } + break; + } + if (avcSample && push) { + var units_1 = avcSample.units; + units_1.push(unit); + } + }); + // if last PES packet, push samples + if (last && avcSample) { + pushAccesUnit(avcSample, track); + this.avcSample = null; + } + }; + TSDemuxer.prototype._insertSampleInOrder = function (arr, data) { + var len = arr.length; + if (len > 0) { + if (data.pts >= arr[len - 1].pts) { + arr.push(data); + } + else { + for (var pos = len - 1; pos >= 0; pos--) { + if (data.pts < arr[pos].pts) { + arr.splice(pos, 0, data); + break; + } + } + } + } + else { + arr.push(data); + } + }; + TSDemuxer.prototype._getLastNalUnit = function () { + var avcSample = this.avcSample, lastUnit; + // try to fallback to previous sample if current one is empty + if (!avcSample || avcSample.units.length === 0) { + var track = this._avcTrack, samples = track.samples; + avcSample = samples[samples.length - 1]; + } + if (avcSample) { + var units = avcSample.units; + lastUnit = units[units.length - 1]; + } + return lastUnit; + }; + TSDemuxer.prototype._parseAVCNALu = function (array) { + var i = 0, len = array.byteLength, value, overflow, track = this._avcTrack, state = track.naluState || 0, lastState = state; + var units = [], unit, unitType, lastUnitStart = -1, lastUnitType; + // logger.log('PES:' + Hex.hexDump(array)); + if (state === -1) { + // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet + lastUnitStart = 0; + // NALu type is value read from offset 0 + lastUnitType = array[0] & 0x1f; + state = 0; + i = 1; + } + while (i < len) { + value = array[i++]; + // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case + if (!state) { + state = value ? 0 : 1; + continue; + } + if (state === 1) { + state = value ? 0 : 2; + continue; + } + // here we have state either equal to 2 or 3 + if (!value) { + state = 3; + } + else if (value === 1) { + if (lastUnitStart >= 0) { + unit = { data: array.subarray(lastUnitStart, i - state - 1), type: lastUnitType }; + // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength); + units.push(unit); + } + else { + // lastUnitStart is undefined => this is the first start code found in this PES packet + // first check if start code delimiter is overlapping between 2 PES packets, + // ie it started in last packet (lastState not zero) + // and ended at the beginning of this PES packet (i <= 4 - lastState) + var lastUnit = this._getLastNalUnit(); + if (lastUnit) { + if (lastState && (i <= 4 - lastState)) { + // start delimiter overlapping between PES packets + // strip start delimiter bytes from the end of last NAL unit + // check if lastUnit had a state different from zero + if (lastUnit.state) { + // strip last bytes + lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState); + } + } + // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit. + overflow = i - state - 1; + if (overflow > 0) { + // logger.log('first NALU found with overflow:' + overflow); + var tmp = new Uint8Array(lastUnit.data.byteLength + overflow); + tmp.set(lastUnit.data, 0); + tmp.set(array.subarray(0, overflow), lastUnit.data.byteLength); + lastUnit.data = tmp; + } + } + } + // check if we can read unit type + if (i < len) { + unitType = array[i] & 0x1f; + // logger.log('find NALU @ offset:' + i + ',type:' + unitType); + lastUnitStart = i; + lastUnitType = unitType; + state = 0; + } + else { + // not enough byte to read unit type. let's read it on next PES parsing + state = -1; + } + } + else { + state = 0; + } + } + if (lastUnitStart >= 0 && state >= 0) { + unit = { data: array.subarray(lastUnitStart, len), type: lastUnitType, state: state }; + units.push(unit); + // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state); + } + // no NALu found + if (units.length === 0) { + // append pes.data to previous NAL unit + var lastUnit = this._getLastNalUnit(); + if (lastUnit) { + var tmp = new Uint8Array(lastUnit.data.byteLength + array.byteLength); + tmp.set(lastUnit.data, 0); + tmp.set(array, lastUnit.data.byteLength); + lastUnit.data = tmp; + } + } + track.naluState = state; + return units; + }; + /** + * remove Emulation Prevention bytes from a RBSP + */ + TSDemuxer.prototype.discardEPB = function (data) { + var length = data.byteLength, EPBPositions = [], i = 1, newLength, newData; + // Find all `Emulation Prevention Bytes` + while (i < length - 2) { + if (data[i] === 0 && + data[i + 1] === 0 && + data[i + 2] === 0x03) { + EPBPositions.push(i + 2); + i += 2; + } + else { + i++; + } + } + // If no Emulation Prevention Bytes were found just return the original + // array + if (EPBPositions.length === 0) { + return data; + } + // Create a new array to hold the NAL unit data + newLength = length - EPBPositions.length; + newData = new Uint8Array(newLength); + var sourceIndex = 0; + for (i = 0; i < newLength; sourceIndex++, i++) { + if (sourceIndex === EPBPositions[0]) { + // Skip this byte + sourceIndex++; + // Remove this position index + EPBPositions.shift(); + } + newData[i] = data[sourceIndex]; + } + return newData; + }; + TSDemuxer.prototype._parseAACPES = function (pes) { + var track = this._audioTrack, data = pes.data, pts = pes.pts, startOffset = 0, aacOverFlow = this.aacOverFlow, aacLastPTS = this.aacLastPTS, frameDuration, frameIndex, offset, stamp, len; + if (aacOverFlow) { + var tmp = new Uint8Array(aacOverFlow.byteLength + data.byteLength); + tmp.set(aacOverFlow, 0); + tmp.set(data, aacOverFlow.byteLength); + // logger.log(`AAC: append overflowing ${aacOverFlow.byteLength} bytes to beginning of new PES`); + data = tmp; + } + // look for ADTS header (0xFFFx) + for (offset = startOffset, len = data.length; offset < len - 1; offset++) { + if (ADTS.isHeader(data, offset)) { + break; + } + } + // if ADTS header does not start straight from the beginning of the PES payload, raise an error + if (offset) { + var reason = void 0, fatal = void 0; + if (offset < len - 1) { + reason = "AAC PES did not start with ADTS header,offset:" + offset; + fatal = false; + } + else { + reason = 'no ADTS header found in AAC PES'; + fatal = true; + } + logger_1.logger.warn("parsing error:" + reason); + this.observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.FRAG_PARSING_ERROR, fatal: fatal, reason: reason }); + if (fatal) { + return; + } + } + ADTS.initTrackConfig(track, this.observer, data, offset, this.audioCodec); + frameIndex = 0; + frameDuration = ADTS.getFrameDuration(track.samplerate); + // if last AAC frame is overflowing, we should ensure timestamps are contiguous: + // first sample PTS should be equal to last sample PTS + frameDuration + if (aacOverFlow && aacLastPTS) { + var newPTS = aacLastPTS + frameDuration; + if (Math.abs(newPTS - pts) > 1) { + logger_1.logger.log("AAC: align PTS for overlapping frames by " + Math.round((newPTS - pts) / 90)); + pts = newPTS; + } + } + // scan for aac samples + while (offset < len) { + if (ADTS.isHeader(data, offset) && (offset + 5) < len) { + var frame = ADTS.appendFrame(track, data, offset, pts, frameIndex); + if (frame) { + // logger.log(`${Math.round(frame.sample.pts)} : AAC`); + offset += frame.length; + stamp = frame.sample.pts; + frameIndex++; + } + else { + // logger.log('Unable to parse AAC frame'); + break; + } + } + else { + // nothing found, keep looking + offset++; + } + } + if (offset < len) { + aacOverFlow = data.subarray(offset, len); + // logger.log(`AAC: overflow detected:${len-offset}`); + } + else { + aacOverFlow = null; + } + this.aacOverFlow = aacOverFlow; + this.aacLastPTS = stamp; + }; + TSDemuxer.prototype._parseMPEGPES = function (pes) { + var data = pes.data; + var length = data.length; + var frameIndex = 0; + var offset = 0; + var pts = pes.pts; + while (offset < length) { + if (mpegaudio_1.default.isHeader(data, offset)) { + var frame = mpegaudio_1.default.appendFrame(this._audioTrack, data, offset, pts, frameIndex); + if (frame) { + offset += frame.length; + frameIndex++; + } + else { + // logger.log('Unable to parse Mpeg audio frame'); + break; + } + } + else { + // nothing found, keep looking + offset++; + } + } + }; + TSDemuxer.prototype._parseID3PES = function (pes) { + this._id3Track.samples.push(pes); + }; + return TSDemuxer; +}()); +exports.default = TSDemuxer; + + +/***/ }), + +/***/ "./src/errors.js": +/*!***********************!*\ + !*** ./src/errors.js ***! + \***********************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +exports.ErrorTypes = { + // Identifier for a network error (loading error / timeout ...) + NETWORK_ERROR: 'networkError', + // Identifier for a media Error (video/parsing/mediasource error) + MEDIA_ERROR: 'mediaError', + // EME (encrypted media extensions) errors + KEY_SYSTEM_ERROR: 'keySystemError', + // Identifier for a mux Error (demuxing/remuxing) + MUX_ERROR: 'muxError', + // Identifier for all other errors + OTHER_ERROR: 'otherError' +}; +/** + * @enum {ErrorDetails} + * @typedef {string} ErrorDetail + */ +exports.ErrorDetails = { + KEY_SYSTEM_NO_KEYS: 'keySystemNoKeys', + KEY_SYSTEM_NO_ACCESS: 'keySystemNoAccess', + KEY_SYSTEM_NO_SESSION: 'keySystemNoSession', + KEY_SYSTEM_LICENSE_REQUEST_FAILED: 'keySystemLicenseRequestFailed', + // Identifier for a manifest load error - data: { url : faulty URL, response : { code: error code, text: error text }} + MANIFEST_LOAD_ERROR: 'manifestLoadError', + // Identifier for a manifest load timeout - data: { url : faulty URL, response : { code: error code, text: error text }} + MANIFEST_LOAD_TIMEOUT: 'manifestLoadTimeOut', + // Identifier for a manifest parsing error - data: { url : faulty URL, reason : error reason} + MANIFEST_PARSING_ERROR: 'manifestParsingError', + // Identifier for a manifest with only incompatible codecs error - data: { url : faulty URL, reason : error reason} + MANIFEST_INCOMPATIBLE_CODECS_ERROR: 'manifestIncompatibleCodecsError', + // Identifier for a level load error - data: { url : faulty URL, response : { code: error code, text: error text }} + LEVEL_LOAD_ERROR: 'levelLoadError', + // Identifier for a level load timeout - data: { url : faulty URL, response : { code: error code, text: error text }} + LEVEL_LOAD_TIMEOUT: 'levelLoadTimeOut', + // Identifier for a level switch error - data: { level : faulty level Id, event : error description} + LEVEL_SWITCH_ERROR: 'levelSwitchError', + // Identifier for an audio track load error - data: { url : faulty URL, response : { code: error code, text: error text }} + AUDIO_TRACK_LOAD_ERROR: 'audioTrackLoadError', + // Identifier for an audio track load timeout - data: { url : faulty URL, response : { code: error code, text: error text }} + AUDIO_TRACK_LOAD_TIMEOUT: 'audioTrackLoadTimeOut', + // Identifier for fragment load error - data: { frag : fragment object, response : { code: error code, text: error text }} + FRAG_LOAD_ERROR: 'fragLoadError', + // Identifier for fragment load timeout error - data: { frag : fragment object} + FRAG_LOAD_TIMEOUT: 'fragLoadTimeOut', + // Identifier for a fragment decryption error event - data: {id : demuxer Id,frag: fragment object, reason : parsing error description } + FRAG_DECRYPT_ERROR: 'fragDecryptError', + // Identifier for a fragment parsing error event - data: { id : demuxer Id, reason : parsing error description } + // will be renamed DEMUX_PARSING_ERROR and switched to MUX_ERROR in the next major release + FRAG_PARSING_ERROR: 'fragParsingError', + // Identifier for a remux alloc error event - data: { id : demuxer Id, frag : fragment object, bytes : nb of bytes on which allocation failed , reason : error text } + REMUX_ALLOC_ERROR: 'remuxAllocError', + // Identifier for decrypt key load error - data: { frag : fragment object, response : { code: error code, text: error text }} + KEY_LOAD_ERROR: 'keyLoadError', + // Identifier for decrypt key load timeout error - data: { frag : fragment object} + KEY_LOAD_TIMEOUT: 'keyLoadTimeOut', + // Triggered when an exception occurs while adding a sourceBuffer to MediaSource - data : { err : exception , mimeType : mimeType } + BUFFER_ADD_CODEC_ERROR: 'bufferAddCodecError', + // Identifier for a buffer append error - data: append error description + BUFFER_APPEND_ERROR: 'bufferAppendError', + // Identifier for a buffer appending error event - data: appending error description + BUFFER_APPENDING_ERROR: 'bufferAppendingError', + // Identifier for a buffer stalled error event + BUFFER_STALLED_ERROR: 'bufferStalledError', + // Identifier for a buffer full event + BUFFER_FULL_ERROR: 'bufferFullError', + // Identifier for a buffer seek over hole event + BUFFER_SEEK_OVER_HOLE: 'bufferSeekOverHole', + // Identifier for a buffer nudge on stall (playback is stuck although currentTime is in a buffered area) + BUFFER_NUDGE_ON_STALL: 'bufferNudgeOnStall', + // Identifier for an internal exception happening inside hls.js while handling an event + INTERNAL_EXCEPTION: 'internalException' +}; + + +/***/ }), + +/***/ "./src/event-handler.js": +/*!******************************!*\ + !*** ./src/event-handler.js ***! + \******************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* +* +* All objects in the event handling chain should inherit from this class +* +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var logger_1 = __webpack_require__(/*! ./utils/logger */ "./src/utils/logger.js"); +var errors_1 = __webpack_require__(/*! ./errors */ "./src/errors.js"); +var events_1 = __webpack_require__(/*! ./events */ "./src/events.js"); +var FORBIDDEN_EVENT_NAMES = { + 'hlsEventGeneric': true, + 'hlsHandlerDestroying': true, + 'hlsHandlerDestroyed': true +}; +var EventHandler = /** @class */ (function () { + function EventHandler(hls) { + var events = []; + for (var _i = 1; _i < arguments.length; _i++) { + events[_i - 1] = arguments[_i]; + } + this.hls = hls; + this.onEvent = this.onEvent.bind(this); + this.handledEvents = events; + this.useGenericHandler = true; + this.registerListeners(); + } + EventHandler.prototype.destroy = function () { + this.onHandlerDestroying(); + this.unregisterListeners(); + this.onHandlerDestroyed(); + }; + EventHandler.prototype.onHandlerDestroying = function () { }; + EventHandler.prototype.onHandlerDestroyed = function () { }; + EventHandler.prototype.isEventHandler = function () { + return typeof this.handledEvents === 'object' && this.handledEvents.length && typeof this.onEvent === 'function'; + }; + EventHandler.prototype.registerListeners = function () { + if (this.isEventHandler()) { + this.handledEvents.forEach(function (event) { + if (FORBIDDEN_EVENT_NAMES[event]) { + throw new Error('Forbidden event-name: ' + event); + } + this.hls.on(event, this.onEvent); + }, this); + } + }; + EventHandler.prototype.unregisterListeners = function () { + if (this.isEventHandler()) { + this.handledEvents.forEach(function (event) { + this.hls.off(event, this.onEvent); + }, this); + } + }; + /** + * arguments: event (string), data (any) + */ + EventHandler.prototype.onEvent = function (event, data) { + this.onEventGeneric(event, data); + }; + EventHandler.prototype.onEventGeneric = function (event, data) { + var eventToFunction = function (event, data) { + var funcName = 'on' + event.replace('hls', ''); + if (typeof this[funcName] !== 'function') { + throw new Error("Event " + event + " has no generic handler in this " + this.constructor.name + " class (tried " + funcName + ")"); + } + return this[funcName].bind(this, data); + }; + try { + eventToFunction.call(this, event, data).call(); + } + catch (err) { + logger_1.logger.error("An internal error happened while handling event " + event + ". Error message: \"" + err.message + "\". Here is a stacktrace:", err); + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.OTHER_ERROR, details: errors_1.ErrorDetails.INTERNAL_EXCEPTION, fatal: false, event: event, err: err }); + } + }; + return EventHandler; +}()); +exports.default = EventHandler; + + +/***/ }), + +/***/ "./src/events.js": +/*!***********************!*\ + !*** ./src/events.js ***! + \***********************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * @readonly + * @enum {string} + */ +var HlsEvents = { + // fired before MediaSource is attaching to media element - data: { media } + MEDIA_ATTACHING: 'hlsMediaAttaching', + // fired when MediaSource has been succesfully attached to media element - data: { } + MEDIA_ATTACHED: 'hlsMediaAttached', + // fired before detaching MediaSource from media element - data: { } + MEDIA_DETACHING: 'hlsMediaDetaching', + // fired when MediaSource has been detached from media element - data: { } + MEDIA_DETACHED: 'hlsMediaDetached', + // fired when we buffer is going to be reset - data: { } + BUFFER_RESET: 'hlsBufferReset', + // fired when we know about the codecs that we need buffers for to push into - data: {tracks : { container, codec, levelCodec, initSegment, metadata }} + BUFFER_CODECS: 'hlsBufferCodecs', + // fired when sourcebuffers have been created - data: { tracks : tracks } + BUFFER_CREATED: 'hlsBufferCreated', + // fired when we append a segment to the buffer - data: { segment: segment object } + BUFFER_APPENDING: 'hlsBufferAppending', + // fired when we are done with appending a media segment to the buffer - data : { parent : segment parent that triggered BUFFER_APPENDING, pending : nb of segments waiting for appending for this segment parent} + BUFFER_APPENDED: 'hlsBufferAppended', + // fired when the stream is finished and we want to notify the media buffer that there will be no more data - data: { } + BUFFER_EOS: 'hlsBufferEos', + // fired when the media buffer should be flushed - data { startOffset, endOffset } + BUFFER_FLUSHING: 'hlsBufferFlushing', + // fired when the media buffer has been flushed - data: { } + BUFFER_FLUSHED: 'hlsBufferFlushed', + // fired to signal that a manifest loading starts - data: { url : manifestURL} + MANIFEST_LOADING: 'hlsManifestLoading', + // fired after manifest has been loaded - data: { levels : [available quality levels], audioTracks : [ available audio tracks], url : manifestURL, stats : { trequest, tfirst, tload, mtime}} + MANIFEST_LOADED: 'hlsManifestLoaded', + // fired after manifest has been parsed - data: { levels : [available quality levels], firstLevel : index of first quality level appearing in Manifest} + MANIFEST_PARSED: 'hlsManifestParsed', + // fired when a level switch is requested - data: { level : id of new level } + LEVEL_SWITCHING: 'hlsLevelSwitching', + // fired when a level switch is effective - data: { level : id of new level } + LEVEL_SWITCHED: 'hlsLevelSwitched', + // fired when a level playlist loading starts - data: { url : level URL, level : id of level being loaded} + LEVEL_LOADING: 'hlsLevelLoading', + // fired when a level playlist loading finishes - data: { details : levelDetails object, level : id of loaded level, stats : { trequest, tfirst, tload, mtime} } + LEVEL_LOADED: 'hlsLevelLoaded', + // fired when a level's details have been updated based on previous details, after it has been loaded - data: { details : levelDetails object, level : id of updated level } + LEVEL_UPDATED: 'hlsLevelUpdated', + // fired when a level's PTS information has been updated after parsing a fragment - data: { details : levelDetails object, level : id of updated level, drift: PTS drift observed when parsing last fragment } + LEVEL_PTS_UPDATED: 'hlsLevelPtsUpdated', + // fired to notify that audio track lists has been updated - data: { audioTracks : audioTracks } + AUDIO_TRACKS_UPDATED: 'hlsAudioTracksUpdated', + // fired when an audio track switching is requested - data: { id : audio track id } + AUDIO_TRACK_SWITCHING: 'hlsAudioTrackSwitching', + // fired when an audio track switch actually occurs - data: { id : audio track id } + AUDIO_TRACK_SWITCHED: 'hlsAudioTrackSwitched', + // fired when an audio track loading starts - data: { url : audio track URL, id : audio track id } + AUDIO_TRACK_LOADING: 'hlsAudioTrackLoading', + // fired when an audio track loading finishes - data: { details : levelDetails object, id : audio track id, stats : { trequest, tfirst, tload, mtime } } + AUDIO_TRACK_LOADED: 'hlsAudioTrackLoaded', + // fired to notify that subtitle track lists has been updated - data: { subtitleTracks : subtitleTracks } + SUBTITLE_TRACKS_UPDATED: 'hlsSubtitleTracksUpdated', + // fired when an subtitle track switch occurs - data: { id : subtitle track id } + SUBTITLE_TRACK_SWITCH: 'hlsSubtitleTrackSwitch', + // fired when a subtitle track loading starts - data: { url : subtitle track URL, id : subtitle track id } + SUBTITLE_TRACK_LOADING: 'hlsSubtitleTrackLoading', + // fired when a subtitle track loading finishes - data: { details : levelDetails object, id : subtitle track id, stats : { trequest, tfirst, tload, mtime } } + SUBTITLE_TRACK_LOADED: 'hlsSubtitleTrackLoaded', + // fired when a subtitle fragment has been processed - data: { success : boolean, frag : the processed frag } + SUBTITLE_FRAG_PROCESSED: 'hlsSubtitleFragProcessed', + // fired when the first timestamp is found - data: { id : demuxer id, initPTS: initPTS, frag : fragment object } + INIT_PTS_FOUND: 'hlsInitPtsFound', + // fired when a fragment loading starts - data: { frag : fragment object } + FRAG_LOADING: 'hlsFragLoading', + // fired when a fragment loading is progressing - data: { frag : fragment object, { trequest, tfirst, loaded } } + FRAG_LOAD_PROGRESS: 'hlsFragLoadProgress', + // Identifier for fragment load aborting for emergency switch down - data: { frag : fragment object } + FRAG_LOAD_EMERGENCY_ABORTED: 'hlsFragLoadEmergencyAborted', + // fired when a fragment loading is completed - data: { frag : fragment object, payload : fragment payload, stats : { trequest, tfirst, tload, length } } + FRAG_LOADED: 'hlsFragLoaded', + // fired when a fragment has finished decrypting - data: { id : demuxer id, frag: fragment object, payload : fragment payload, stats : { tstart, tdecrypt } } + FRAG_DECRYPTED: 'hlsFragDecrypted', + // fired when Init Segment has been extracted from fragment - data: { id : demuxer id, frag: fragment object, moov : moov MP4 box, codecs : codecs found while parsing fragment } + FRAG_PARSING_INIT_SEGMENT: 'hlsFragParsingInitSegment', + // fired when parsing sei text is completed - data: { id : demuxer id, frag: fragment object, samples : [ sei samples pes ] } + FRAG_PARSING_USERDATA: 'hlsFragParsingUserdata', + // fired when parsing id3 is completed - data: { id : demuxer id, frag: fragment object, samples : [ id3 samples pes ] } + FRAG_PARSING_METADATA: 'hlsFragParsingMetadata', + // fired when data have been extracted from fragment - data: { id : demuxer id, frag: fragment object, data1 : moof MP4 box or TS fragments, data2 : mdat MP4 box or null} + FRAG_PARSING_DATA: 'hlsFragParsingData', + // fired when fragment parsing is completed - data: { id : demuxer id, frag: fragment object } + FRAG_PARSED: 'hlsFragParsed', + // fired when fragment remuxed MP4 boxes have all been appended into SourceBuffer - data: { id : demuxer id, frag : fragment object, stats : { trequest, tfirst, tload, tparsed, tbuffered, length, bwEstimate } } + FRAG_BUFFERED: 'hlsFragBuffered', + // fired when fragment matching with current media position is changing - data : { id : demuxer id, frag : fragment object } + FRAG_CHANGED: 'hlsFragChanged', + // Identifier for a FPS drop event - data: { curentDropped, currentDecoded, totalDroppedFrames } + FPS_DROP: 'hlsFpsDrop', + // triggered when FPS drop triggers auto level capping - data: { level, droppedlevel } + FPS_DROP_LEVEL_CAPPING: 'hlsFpsDropLevelCapping', + // Identifier for an error event - data: { type : error type, details : error details, fatal : if true, hls.js cannot/will not try to recover, if false, hls.js will try to recover,other error specific data } + ERROR: 'hlsError', + // fired when hls.js instance starts destroying. Different from MEDIA_DETACHED as one could want to detach and reattach a media to the instance of hls.js to handle mid-rolls for example - data: { } + DESTROYING: 'hlsDestroying', + // fired when a decrypt key loading starts - data: { frag : fragment object } + KEY_LOADING: 'hlsKeyLoading', + // fired when a decrypt key loading is completed - data: { frag : fragment object, payload : key payload, stats : { trequest, tfirst, tload, length } } + KEY_LOADED: 'hlsKeyLoaded', + // fired upon stream controller state transitions - data: { previousState, nextState } + STREAM_STATE_TRANSITION: 'hlsStreamStateTransition' +}; +exports.default = HlsEvents; + + +/***/ }), + +/***/ "./src/hls.js": +/*!********************!*\ + !*** ./src/hls.js ***! + \********************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var URLToolkit = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js"); +var errors_1 = __webpack_require__(/*! ./errors */ "./src/errors.js"); +var playlist_loader_1 = __webpack_require__(/*! ./loader/playlist-loader */ "./src/loader/playlist-loader.js"); +var fragment_loader_1 = __webpack_require__(/*! ./loader/fragment-loader */ "./src/loader/fragment-loader.js"); +var key_loader_1 = __webpack_require__(/*! ./loader/key-loader */ "./src/loader/key-loader.js"); +var fragment_tracker_1 = __webpack_require__(/*! ./controller/fragment-tracker */ "./src/controller/fragment-tracker.js"); +var stream_controller_1 = __webpack_require__(/*! ./controller/stream-controller */ "./src/controller/stream-controller.js"); +var level_controller_1 = __webpack_require__(/*! ./controller/level-controller */ "./src/controller/level-controller.js"); +var id3_track_controller_1 = __webpack_require__(/*! ./controller/id3-track-controller */ "./src/controller/id3-track-controller.js"); +var is_supported_1 = __webpack_require__(/*! ./is-supported */ "./src/is-supported.js"); +var logger_1 = __webpack_require__(/*! ./utils/logger */ "./src/utils/logger.js"); +var config_1 = __webpack_require__(/*! ./config */ "./src/config.js"); +var events_1 = __webpack_require__(/*! ./events */ "./src/events.js"); +var observer_1 = __webpack_require__(/*! ./observer */ "./src/observer.js"); +/** + * @module Hls + * @class + * @constructor + */ +var Hls = /** @class */ (function (_super) { + __extends(Hls, _super); + /** + * Creates an instance of an HLS client that can attach to exactly one `HTMLMediaElement`. + * + * @constructs Hls + * @param {HlsConfig} config + */ + function Hls(config) { + if (config === void 0) { config = {}; } + var _this = _super.call(this) || this; + var defaultConfig = Hls.DefaultConfig; + if ((config.liveSyncDurationCount || config.liveMaxLatencyDurationCount) && (config.liveSyncDuration || config.liveMaxLatencyDuration)) { + throw new Error('Illegal hls.js config: don\'t mix up liveSyncDurationCount/liveMaxLatencyDurationCount and liveSyncDuration/liveMaxLatencyDuration'); + } + for (var prop in defaultConfig) { + if (prop in config) + continue; + config[prop] = defaultConfig[prop]; + } + if (config.liveMaxLatencyDurationCount !== undefined && config.liveMaxLatencyDurationCount <= config.liveSyncDurationCount) { + throw new Error('Illegal hls.js config: "liveMaxLatencyDurationCount" must be gt "liveSyncDurationCount"'); + } + if (config.liveMaxLatencyDuration !== undefined && (config.liveMaxLatencyDuration <= config.liveSyncDuration || config.liveSyncDuration === undefined)) { + throw new Error('Illegal hls.js config: "liveMaxLatencyDuration" must be gt "liveSyncDuration"'); + } + logger_1.enableLogs(config.debug); + _this.config = config; + _this._autoLevelCapping = -1; + // core controllers and network loaders + /** + * @member {AbrController} abrController + */ + var abrController = _this.abrController = new config.abrController(_this); + var bufferController = new config.bufferController(_this); + var capLevelController = new config.capLevelController(_this); + var fpsController = new config.fpsController(_this); + var playListLoader = new playlist_loader_1.default(_this); + var fragmentLoader = new fragment_loader_1.default(_this); + var keyLoader = new key_loader_1.default(_this); + var id3TrackController = new id3_track_controller_1.default(_this); + // network controllers + /** + * @member {LevelController} levelController + */ + var levelController = _this.levelController = new level_controller_1.default(_this); + // FIXME: FragmentTracker must be defined before StreamController because the order of event handling is important + var fragmentTracker = new fragment_tracker_1.FragmentTracker(_this); + /** + * @member {StreamController} streamController + */ + var streamController = _this.streamController = new stream_controller_1.default(_this, fragmentTracker); + var networkControllers = [levelController, streamController]; + // optional audio stream controller + /** + * @var {ICoreComponent | Controller} + */ + var Controller = config.audioStreamController; + if (Controller) { + networkControllers.push(new Controller(_this, fragmentTracker)); + } + /** + * @member {INetworkController[]} networkControllers + */ + _this.networkControllers = networkControllers; + /** + * @var {ICoreComponent[]} + */ + var coreComponents = [ + playListLoader, + fragmentLoader, + keyLoader, + abrController, + bufferController, + capLevelController, + fpsController, + id3TrackController, + fragmentTracker + ]; + // optional audio track and subtitle controller + Controller = config.audioTrackController; + if (Controller) { + var audioTrackController = new Controller(_this); + /** + * @member {AudioTrackController} audioTrackController + */ + _this.audioTrackController = audioTrackController; + coreComponents.push(audioTrackController); + } + Controller = config.subtitleTrackController; + if (Controller) { + var subtitleTrackController = new Controller(_this); + /** + * @member {SubtitleTrackController} subtitleTrackController + */ + _this.subtitleTrackController = subtitleTrackController; + coreComponents.push(subtitleTrackController); + } + Controller = config.emeController; + if (Controller) { + var emeController = new Controller(_this); + /** + * @member {EMEController} emeController + */ + _this.emeController = emeController; + coreComponents.push(emeController); + } + // optional subtitle controllers + Controller = config.subtitleStreamController; + if (Controller) { + coreComponents.push(new Controller(_this, fragmentTracker)); + } + Controller = config.timelineController; + if (Controller) { + coreComponents.push(new Controller(_this)); + } + /** + * @member {ICoreComponent[]} + */ + _this.coreComponents = coreComponents; + return _this; + } + Object.defineProperty(Hls, "version", { + /** + * @type {string} + */ + get: function () { + return "0.12.2"; + }, + enumerable: true, + configurable: true + }); + /** + * @type {boolean} + */ + Hls.isSupported = function () { + return is_supported_1.isSupported(); + }; + Object.defineProperty(Hls, "Events", { + /** + * @type {HlsEvents} + */ + get: function () { + return events_1.default; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls, "ErrorTypes", { + /** + * @type {HlsErrorTypes} + */ + get: function () { + return errors_1.ErrorTypes; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls, "ErrorDetails", { + /** + * @type {HlsErrorDetails} + */ + get: function () { + return errors_1.ErrorDetails; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls, "DefaultConfig", { + /** + * @type {HlsConfig} + */ + get: function () { + if (!Hls.defaultConfig) { + return config_1.hlsDefaultConfig; + } + return Hls.defaultConfig; + }, + /** + * @type {HlsConfig} + */ + set: function (defaultConfig) { + Hls.defaultConfig = defaultConfig; + }, + enumerable: true, + configurable: true + }); + /** + * Dispose of the instance + */ + Hls.prototype.destroy = function () { + logger_1.logger.log('destroy'); + this.trigger(events_1.default.DESTROYING); + this.detachMedia(); + this.coreComponents.concat(this.networkControllers).forEach(function (component) { + component.destroy(); + }); + this.url = null; + this.removeAllListeners(); + this._autoLevelCapping = -1; + }; + /** + * Attach a media element + * @param {HTMLMediaElement} media + */ + Hls.prototype.attachMedia = function (media) { + logger_1.logger.log('attachMedia'); + this.media = media; + this.trigger(events_1.default.MEDIA_ATTACHING, { media: media }); + }; + /** + * Detach from the media + */ + Hls.prototype.detachMedia = function () { + logger_1.logger.log('detachMedia'); + this.trigger(events_1.default.MEDIA_DETACHING); + this.media = null; + }; + /** + * Set the source URL. Can be relative or absolute. + * @param {string} url + */ + Hls.prototype.loadSource = function (url) { + url = URLToolkit.buildAbsoluteURL(window.location.href, url, { alwaysNormalize: true }); + logger_1.logger.log("loadSource:" + url); + this.url = url; + // when attaching to a source URL, trigger a playlist load + this.trigger(events_1.default.MANIFEST_LOADING, { url: url }); + }; + /** + * Start loading data from the stream source. + * Depending on default config, client starts loading automatically when a source is set. + * + * @param {number} startPosition Set the start position to stream from + * @default -1 None (from earliest point) + */ + Hls.prototype.startLoad = function (startPosition) { + if (startPosition === void 0) { startPosition = -1; } + logger_1.logger.log("startLoad(" + startPosition + ")"); + this.networkControllers.forEach(function (controller) { + controller.startLoad(startPosition); + }); + }; + /** + * Stop loading of any stream data. + */ + Hls.prototype.stopLoad = function () { + logger_1.logger.log('stopLoad'); + this.networkControllers.forEach(function (controller) { + controller.stopLoad(); + }); + }; + /** + * Swap through possible audio codecs in the stream (for example to switch from stereo to 5.1) + */ + Hls.prototype.swapAudioCodec = function () { + logger_1.logger.log('swapAudioCodec'); + this.streamController.swapAudioCodec(); + }; + /** + * When the media-element fails, this allows to detach and then re-attach it + * as one call (convenience method). + * + * Automatic recovery of media-errors by this process is configurable. + */ + Hls.prototype.recoverMediaError = function () { + logger_1.logger.log('recoverMediaError'); + var media = this.media; + this.detachMedia(); + this.attachMedia(media); + }; + Object.defineProperty(Hls.prototype, "levels", { + /** + * @type {QualityLevel[]} + */ + get: function () { + return this.levelController.levels; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "currentLevel", { + /** + * Index of quality level currently played + * @type {number} + */ + get: function () { + return this.streamController.currentLevel; + }, + /** + * Set quality level index immediately . + * This will flush the current buffer to replace the quality asap. + * That means playback will interrupt at least shortly to re-buffer and re-sync eventually. + * @type {number} -1 for automatic level selection + */ + set: function (newLevel) { + logger_1.logger.log("set currentLevel:" + newLevel); + this.loadLevel = newLevel; + this.streamController.immediateLevelSwitch(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "nextLevel", { + /** + * Index of next quality level loaded as scheduled by stream controller. + * @type {number} + */ + get: function () { + return this.streamController.nextLevel; + }, + /** + * Set quality level index for next loaded data. + * This will switch the video quality asap, without interrupting playback. + * May abort current loading of data, and flush parts of buffer (outside currently played fragment region). + * @type {number} -1 for automatic level selection + */ + set: function (newLevel) { + logger_1.logger.log("set nextLevel:" + newLevel); + this.levelController.manualLevel = newLevel; + this.streamController.nextLevelSwitch(); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "loadLevel", { + /** + * Return the quality level of the currently or last (of none is loaded currently) segment + * @type {number} + */ + get: function () { + return this.levelController.level; + }, + /** + * Set quality level index for next loaded data in a conservative way. + * This will switch the quality without flushing, but interrupt current loading. + * Thus the moment when the quality switch will appear in effect will only be after the already existing buffer. + * @type {number} newLevel -1 for automatic level selection + */ + set: function (newLevel) { + logger_1.logger.log("set loadLevel:" + newLevel); + this.levelController.manualLevel = newLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "nextLoadLevel", { + /** + * get next quality level loaded + * @type {number} + */ + get: function () { + return this.levelController.nextLoadLevel; + }, + /** + * Set quality level of next loaded segment in a fully "non-destructive" way. + * Same as `loadLevel` but will wait for next switch (until current loading is done). + * @type {number} level + */ + set: function (level) { + this.levelController.nextLoadLevel = level; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "firstLevel", { + /** + * Return "first level": like a default level, if not set, + * falls back to index of first level referenced in manifest + * @type {number} + */ + get: function () { + return Math.max(this.levelController.firstLevel, this.minAutoLevel); + }, + /** + * Sets "first-level", see getter. + * @type {number} + */ + set: function (newLevel) { + logger_1.logger.log("set firstLevel:" + newLevel); + this.levelController.firstLevel = newLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "startLevel", { + /** + * Return start level (level of first fragment that will be played back) + * if not overrided by user, first level appearing in manifest will be used as start level + * if -1 : automatic start level selection, playback will start from level matching download bandwidth + * (determined from download of first segment) + * @type {number} + */ + get: function () { + return this.levelController.startLevel; + }, + /** + * set start level (level of first fragment that will be played back) + * if not overrided by user, first level appearing in manifest will be used as start level + * if -1 : automatic start level selection, playback will start from level matching download bandwidth + * (determined from download of first segment) + * @type {number} newLevel + */ + set: function (newLevel) { + logger_1.logger.log("set startLevel:" + newLevel); + var hls = this; + // if not in automatic start level detection, ensure startLevel is greater than minAutoLevel + if (newLevel !== -1) { + newLevel = Math.max(newLevel, hls.minAutoLevel); + } + hls.levelController.startLevel = newLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "autoLevelCapping", { + /** + * Capping/max level value that should be used by automatic level selection algorithm (`ABRController`) + * @type {number} + */ + get: function () { + return this._autoLevelCapping; + }, + /** + * Capping/max level value that should be used by automatic level selection algorithm (`ABRController`) + * @type {number} + */ + set: function (newLevel) { + logger_1.logger.log("set autoLevelCapping:" + newLevel); + this._autoLevelCapping = newLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "autoLevelEnabled", { + /** + * True when automatic level selection enabled + * @type {boolean} + */ + get: function () { + return (this.levelController.manualLevel === -1); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "manualLevel", { + /** + * Level set manually (if any) + * @type {number} + */ + get: function () { + return this.levelController.manualLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "minAutoLevel", { + /** + * min level selectable in auto mode according to config.minAutoBitrate + * @type {number} + */ + get: function () { + var hls = this, levels = hls.levels, minAutoBitrate = hls.config.minAutoBitrate, len = levels ? levels.length : 0; + for (var i = 0; i < len; i++) { + var levelNextBitrate = levels[i].realBitrate ? Math.max(levels[i].realBitrate, levels[i].bitrate) : levels[i].bitrate; + if (levelNextBitrate > minAutoBitrate) { + return i; + } + } + return 0; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "maxAutoLevel", { + /** + * max level selectable in auto mode according to autoLevelCapping + * @type {number} + */ + get: function () { + var hls = this; + var levels = hls.levels; + var autoLevelCapping = hls.autoLevelCapping; + var maxAutoLevel; + if (autoLevelCapping === -1 && levels && levels.length) { + maxAutoLevel = levels.length - 1; + } + else { + maxAutoLevel = autoLevelCapping; + } + return maxAutoLevel; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "nextAutoLevel", { + /** + * next automatically selected quality level + * @type {number} + */ + get: function () { + var hls = this; + // ensure next auto level is between min and max auto level + return Math.min(Math.max(hls.abrController.nextAutoLevel, hls.minAutoLevel), hls.maxAutoLevel); + }, + /** + * this setter is used to force next auto level. + * this is useful to force a switch down in auto mode: + * in case of load error on level N, hls.js can set nextAutoLevel to N-1 for example) + * forced value is valid for one fragment. upon succesful frag loading at forced level, + * this value will be resetted to -1 by ABR controller. + * @type {number} + */ + set: function (nextLevel) { + var hls = this; + hls.abrController.nextAutoLevel = Math.max(hls.minAutoLevel, nextLevel); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "audioTracks", { + /** + * @type {AudioTrack[]} + */ + get: function () { + var audioTrackController = this.audioTrackController; + return audioTrackController ? audioTrackController.audioTracks : []; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "audioTrack", { + /** + * index of the selected audio track (index in audio track lists) + * @type {number} + */ + get: function () { + var audioTrackController = this.audioTrackController; + return audioTrackController ? audioTrackController.audioTrack : -1; + }, + /** + * selects an audio track, based on its index in audio track lists + * @type {number} + */ + set: function (audioTrackId) { + var audioTrackController = this.audioTrackController; + if (audioTrackController) { + audioTrackController.audioTrack = audioTrackId; + } + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "liveSyncPosition", { + /** + * @type {Seconds} + */ + get: function () { + return this.streamController.liveSyncPosition; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "subtitleTracks", { + /** + * get alternate subtitle tracks list from playlist + * @type {SubtitleTrack[]} + */ + get: function () { + var subtitleTrackController = this.subtitleTrackController; + return subtitleTrackController ? subtitleTrackController.subtitleTracks : []; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "subtitleTrack", { + /** + * index of the selected subtitle track (index in subtitle track lists) + * @type {number} + */ + get: function () { + var subtitleTrackController = this.subtitleTrackController; + return subtitleTrackController ? subtitleTrackController.subtitleTrack : -1; + }, + /** + * select an subtitle track, based on its index in subtitle track lists + * @type{number} + */ + set: function (subtitleTrackId) { + var subtitleTrackController = this.subtitleTrackController; + if (subtitleTrackController) { + subtitleTrackController.subtitleTrack = subtitleTrackId; + } + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Hls.prototype, "subtitleDisplay", { + /** + * @type {boolean} + */ + get: function () { + var subtitleTrackController = this.subtitleTrackController; + return subtitleTrackController ? subtitleTrackController.subtitleDisplay : false; + }, + /** + * Enable/disable subtitle display rendering + * @type {boolean} + */ + set: function (value) { + var subtitleTrackController = this.subtitleTrackController; + if (subtitleTrackController) { + subtitleTrackController.subtitleDisplay = value; + } + }, + enumerable: true, + configurable: true + }); + return Hls; +}(observer_1.Observer)); +exports.default = Hls; + + +/***/ }), + +/***/ "./src/is-supported.js": +/*!*****************************!*\ + !*** ./src/is-supported.js ***! + \*****************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var mediasource_helper_1 = __webpack_require__(/*! ./utils/mediasource-helper */ "./src/utils/mediasource-helper.js"); +function isSupported() { + var mediaSource = mediasource_helper_1.getMediaSource(); + var sourceBuffer = window.SourceBuffer || window.WebKitSourceBuffer; + var isTypeSupported = mediaSource && + typeof mediaSource.isTypeSupported === 'function' && + mediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"'); + // if SourceBuffer is exposed ensure its API is valid + // safari and old version of Chrome doe not expose SourceBuffer globally so checking SourceBuffer.prototype is impossible + var sourceBufferValidAPI = !sourceBuffer || + (sourceBuffer.prototype && + typeof sourceBuffer.prototype.appendBuffer === 'function' && + typeof sourceBuffer.prototype.remove === 'function'); + return !!isTypeSupported && !!sourceBufferValidAPI; +} +exports.isSupported = isSupported; + + +/***/ }), + +/***/ "./src/loader/fragment-loader.js": +/*!***************************************!*\ + !*** ./src/loader/fragment-loader.js ***! + \***************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/* + * Fragment Loader +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var FragmentLoader = /** @class */ (function (_super) { + __extends(FragmentLoader, _super); + function FragmentLoader(hls) { + var _this = _super.call(this, hls, events_1.default.FRAG_LOADING) || this; + _this.loaders = {}; + return _this; + } + FragmentLoader.prototype.destroy = function () { + var loaders = this.loaders; + for (var loaderName in loaders) { + var loader = loaders[loaderName]; + if (loader) { + loader.destroy(); + } + } + this.loaders = {}; + _super.prototype.destroy.call(this); + }; + FragmentLoader.prototype.onFragLoading = function (data) { + var frag = data.frag, type = frag.type, loaders = this.loaders, config = this.hls.config, FragmentILoader = config.fLoader, DefaultILoader = config.loader; + // reset fragment state + frag.loaded = 0; + var loader = loaders[type]; + if (loader) { + logger_1.logger.warn("abort previous fragment loader for type: " + type); + loader.abort(); + } + loader = loaders[type] = frag.loader = + config.fLoader ? new FragmentILoader(config) : new DefaultILoader(config); + var loaderContext, loaderConfig, loaderCallbacks; + loaderContext = { url: frag.url, frag: frag, responseType: 'arraybuffer', progressData: false }; + var start = frag.byteRangeStartOffset, end = frag.byteRangeEndOffset; + if (Number.isFinite(start) && Number.isFinite(end)) { + loaderContext.rangeStart = start; + loaderContext.rangeEnd = end; + } + loaderConfig = { + timeout: config.fragLoadingTimeOut, + maxRetry: 0, + retryDelay: 0, + maxRetryDelay: config.fragLoadingMaxRetryTimeout + }; + loaderCallbacks = { + onSuccess: this.loadsuccess.bind(this), + onError: this.loaderror.bind(this), + onTimeout: this.loadtimeout.bind(this), + onProgress: this.loadprogress.bind(this) + }; + loader.load(loaderContext, loaderConfig, loaderCallbacks); + }; + FragmentLoader.prototype.loadsuccess = function (response, stats, context, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + var payload = response.data, frag = context.frag; + // detach fragment loader on load success + frag.loader = undefined; + this.loaders[frag.type] = undefined; + this.hls.trigger(events_1.default.FRAG_LOADED, { payload: payload, frag: frag, stats: stats, networkDetails: networkDetails }); + }; + FragmentLoader.prototype.loaderror = function (response, context, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + var frag = context.frag; + var loader = frag.loader; + if (loader) { + loader.abort(); + } + this.loaders[frag.type] = undefined; + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.NETWORK_ERROR, details: errors_1.ErrorDetails.FRAG_LOAD_ERROR, fatal: false, frag: context.frag, response: response, networkDetails: networkDetails }); + }; + FragmentLoader.prototype.loadtimeout = function (stats, context, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + var frag = context.frag; + var loader = frag.loader; + if (loader) { + loader.abort(); + } + this.loaders[frag.type] = undefined; + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.NETWORK_ERROR, details: errors_1.ErrorDetails.FRAG_LOAD_TIMEOUT, fatal: false, frag: context.frag, networkDetails: networkDetails }); + }; + // data will be used for progressive parsing + FragmentLoader.prototype.loadprogress = function (stats, context, data, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + var frag = context.frag; + frag.loaded = stats.loaded; + this.hls.trigger(events_1.default.FRAG_LOAD_PROGRESS, { frag: frag, stats: stats, networkDetails: networkDetails }); + }; + return FragmentLoader; +}(event_handler_1.default)); +exports.default = FragmentLoader; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/loader/fragment.js": +/*!********************************!*\ + !*** ./src/loader/fragment.js ***! + \********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var URLToolkit = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js"); +var level_key_1 = __webpack_require__(/*! ./level-key */ "./src/loader/level-key.js"); +var Fragment = /** @class */ (function () { + function Fragment() { + var _a; + this._url = null; + this._byteRange = null; + this._decryptdata = null; + this.tagList = []; + this.programDateTime = null; + this.rawProgramDateTime = null; + // Holds the types of data this fragment supports + this._elementaryStreams = (_a = {}, + _a[Fragment.ElementaryStreamTypes.AUDIO] = false, + _a[Fragment.ElementaryStreamTypes.VIDEO] = false, + _a); + } + Object.defineProperty(Fragment, "ElementaryStreamTypes", { + /** + * `type` property for this._elementaryStreams + * + * @enum + */ + get: function () { + return { + AUDIO: 'audio', + VIDEO: 'video' + }; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "url", { + get: function () { + if (!this._url && this.relurl) { + this._url = URLToolkit.buildAbsoluteURL(this.baseurl, this.relurl, { alwaysNormalize: true }); + } + return this._url; + }, + set: function (value) { + this._url = value; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "byteRange", { + get: function () { + if (!this._byteRange && !this.rawByteRange) { + return []; + } + if (this._byteRange) { + return this._byteRange; + } + var byteRange = []; + if (this.rawByteRange) { + var params = this.rawByteRange.split('@', 2); + if (params.length === 1) { + var lastByteRangeEndOffset = this.lastByteRangeEndOffset; + byteRange[0] = lastByteRangeEndOffset || 0; + } + else { + byteRange[0] = parseInt(params[1]); + } + byteRange[1] = parseInt(params[0]) + byteRange[0]; + this._byteRange = byteRange; + } + return byteRange; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "byteRangeStartOffset", { + /** + * @type {number} + */ + get: function () { + return this.byteRange[0]; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "byteRangeEndOffset", { + get: function () { + return this.byteRange[1]; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "decryptdata", { + get: function () { + if (!this._decryptdata) { + this._decryptdata = this.fragmentDecryptdataFromLevelkey(this.levelkey, this.sn); + } + return this._decryptdata; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "endProgramDateTime", { + get: function () { + if (!Number.isFinite(this.programDateTime)) { + return null; + } + var duration = !Number.isFinite(this.duration) ? 0 : this.duration; + return this.programDateTime + (duration * 1000); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(Fragment.prototype, "encrypted", { + get: function () { + return !!((this.decryptdata && this.decryptdata.uri !== null) && (this.decryptdata.key === null)); + }, + enumerable: true, + configurable: true + }); + /** + * @param {ElementaryStreamType} type + */ + Fragment.prototype.addElementaryStream = function (type) { + this._elementaryStreams[type] = true; + }; + /** + * @param {ElementaryStreamType} type + */ + Fragment.prototype.hasElementaryStream = function (type) { + return this._elementaryStreams[type] === true; + }; + /** + * Utility method for parseLevelPlaylist to create an initialization vector for a given segment + * @returns {Uint8Array} + */ + Fragment.prototype.createInitializationVector = function (segmentNumber) { + var uint8View = new Uint8Array(16); + for (var i = 12; i < 16; i++) { + uint8View[i] = (segmentNumber >> 8 * (15 - i)) & 0xff; + } + return uint8View; + }; + /** + * Utility method for parseLevelPlaylist to get a fragment's decryption data from the currently parsed encryption key data + * @param levelkey - a playlist's encryption info + * @param segmentNumber - the fragment's segment number + * @returns {*} - an object to be applied as a fragment's decryptdata + */ + Fragment.prototype.fragmentDecryptdataFromLevelkey = function (levelkey, segmentNumber) { + var decryptdata = levelkey; + if (levelkey && levelkey.method && levelkey.uri && !levelkey.iv) { + decryptdata = new level_key_1.default(); + decryptdata.method = levelkey.method; + decryptdata.baseuri = levelkey.baseuri; + decryptdata.reluri = levelkey.reluri; + decryptdata.iv = this.createInitializationVector(segmentNumber); + } + return decryptdata; + }; + return Fragment; +}()); +exports.default = Fragment; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/loader/key-loader.js": +/*!**********************************!*\ + !*** ./src/loader/key-loader.js ***! + \**********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * Decrypt key Loader +*/ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var KeyLoader = /** @class */ (function (_super) { + __extends(KeyLoader, _super); + function KeyLoader(hls) { + var _this = _super.call(this, hls, events_1.default.KEY_LOADING) || this; + _this.loaders = {}; + _this.decryptkey = null; + _this.decrypturl = null; + return _this; + } + KeyLoader.prototype.destroy = function () { + for (var loaderName in this.loaders) { + var loader = this.loaders[loaderName]; + if (loader) { + loader.destroy(); + } + } + this.loaders = {}; + event_handler_1.default.prototype.destroy.call(this); + }; + KeyLoader.prototype.onKeyLoading = function (data) { + var frag = data.frag, type = frag.type, loader = this.loaders[type], decryptdata = frag.decryptdata, uri = decryptdata.uri; + // if uri is different from previous one or if decrypt key not retrieved yet + if (uri !== this.decrypturl || this.decryptkey === null) { + var config = this.hls.config; + if (loader) { + logger_1.logger.warn("abort previous key loader for type:" + type); + loader.abort(); + } + frag.loader = this.loaders[type] = new config.loader(config); + this.decrypturl = uri; + this.decryptkey = null; + var loaderContext = void 0, loaderConfig = void 0, loaderCallbacks = void 0; + loaderContext = { url: uri, frag: frag, responseType: 'arraybuffer' }; + // maxRetry is 0 so that instead of retrying the same key on the same variant multiple times, + // key-loader will trigger an error and rely on stream-controller to handle retry logic. + // this will also align retry logic with fragment-loader + loaderConfig = { timeout: config.fragLoadingTimeOut, maxRetry: 0, retryDelay: config.fragLoadingRetryDelay, maxRetryDelay: config.fragLoadingMaxRetryTimeout }; + loaderCallbacks = { onSuccess: this.loadsuccess.bind(this), onError: this.loaderror.bind(this), onTimeout: this.loadtimeout.bind(this) }; + frag.loader.load(loaderContext, loaderConfig, loaderCallbacks); + } + else if (this.decryptkey) { + // we already loaded this key, return it + decryptdata.key = this.decryptkey; + this.hls.trigger(events_1.default.KEY_LOADED, { frag: frag }); + } + }; + KeyLoader.prototype.loadsuccess = function (response, stats, context) { + var frag = context.frag; + this.decryptkey = frag.decryptdata.key = new Uint8Array(response.data); + // detach fragment loader on load success + frag.loader = undefined; + this.loaders[frag.type] = undefined; + this.hls.trigger(events_1.default.KEY_LOADED, { frag: frag }); + }; + KeyLoader.prototype.loaderror = function (response, context) { + var frag = context.frag, loader = frag.loader; + if (loader) { + loader.abort(); + } + this.loaders[context.type] = undefined; + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.NETWORK_ERROR, details: errors_1.ErrorDetails.KEY_LOAD_ERROR, fatal: false, frag: frag, response: response }); + }; + KeyLoader.prototype.loadtimeout = function (stats, context) { + var frag = context.frag, loader = frag.loader; + if (loader) { + loader.abort(); + } + this.loaders[context.type] = undefined; + this.hls.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.NETWORK_ERROR, details: errors_1.ErrorDetails.KEY_LOAD_TIMEOUT, fatal: false, frag: frag }); + }; + return KeyLoader; +}(event_handler_1.default)); +exports.default = KeyLoader; + + +/***/ }), + +/***/ "./src/loader/level-key.js": +/*!*********************************!*\ + !*** ./src/loader/level-key.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var URLToolkit = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js"); +var LevelKey = /** @class */ (function () { + function LevelKey() { + this.method = null; + this.key = null; + this.iv = null; + this._uri = null; + } + Object.defineProperty(LevelKey.prototype, "uri", { + get: function () { + if (!this._uri && this.reluri) { + this._uri = URLToolkit.buildAbsoluteURL(this.baseuri, this.reluri, { alwaysNormalize: true }); + } + return this._uri; + }, + enumerable: true, + configurable: true + }); + return LevelKey; +}()); +exports.default = LevelKey; + + +/***/ }), + +/***/ "./src/loader/level.js": +/*!*****************************!*\ + !*** ./src/loader/level.js ***! + \*****************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var Level = /** @class */ (function () { + function Level(baseUrl) { + // Please keep properties in alphabetical order + this.endCC = 0; + this.endSN = 0; + this.fragments = []; + this.initSegment = null; + this.live = true; + this.needSidxRanges = false; + this.startCC = 0; + this.startSN = 0; + this.startTimeOffset = null; + this.targetduration = 0; + this.totalduration = 0; + this.type = null; + this.url = baseUrl; + this.version = null; + } + Object.defineProperty(Level.prototype, "hasProgramDateTime", { + get: function () { + return !!(this.fragments[0] && Number.isFinite(this.fragments[0].programDateTime)); + }, + enumerable: true, + configurable: true + }); + return Level; +}()); +exports.default = Level; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/loader/m3u8-parser.js": +/*!***********************************!*\ + !*** ./src/loader/m3u8-parser.js ***! + \***********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var URLToolkit = __webpack_require__(/*! url-toolkit */ "./node_modules/url-toolkit/src/url-toolkit.js"); +var fragment_1 = __webpack_require__(/*! ./fragment */ "./src/loader/fragment.js"); +var level_1 = __webpack_require__(/*! ./level */ "./src/loader/level.js"); +var level_key_1 = __webpack_require__(/*! ./level-key */ "./src/loader/level-key.js"); +var attr_list_1 = __webpack_require__(/*! ../utils/attr-list */ "./src/utils/attr-list.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var codecs_1 = __webpack_require__(/*! ../utils/codecs */ "./src/utils/codecs.js"); +/** + * M3U8 parser + * @module + */ +// https://regex101.com is your friend +var MASTER_PLAYLIST_REGEX = /#EXT-X-STREAM-INF:([^\n\r]*)[\r\n]+([^\r\n]+)/g; +var MASTER_PLAYLIST_MEDIA_REGEX = /#EXT-X-MEDIA:(.*)/g; +var LEVEL_PLAYLIST_REGEX_FAST = new RegExp([ + /#EXTINF:\s*(\d*(?:\.\d+)?)(?:,(.*)\s+)?/.source, + /|(?!#)([\S+ ?]+)/.source, + /|#EXT-X-BYTERANGE:*(.+)/.source, + /|#EXT-X-PROGRAM-DATE-TIME:(.+)/.source, + /|#.*/.source // All other non-segment oriented tags will match with all groups empty +].join(''), 'g'); +var LEVEL_PLAYLIST_REGEX_SLOW = /(?:(?:#(EXTM3U))|(?:#EXT-X-(PLAYLIST-TYPE):(.+))|(?:#EXT-X-(MEDIA-SEQUENCE): *(\d+))|(?:#EXT-X-(TARGETDURATION): *(\d+))|(?:#EXT-X-(KEY):(.+))|(?:#EXT-X-(START):(.+))|(?:#EXT-X-(ENDLIST))|(?:#EXT-X-(DISCONTINUITY-SEQ)UENCE:(\d+))|(?:#EXT-X-(DIS)CONTINUITY))|(?:#EXT-X-(VERSION):(\d+))|(?:#EXT-X-(MAP):(.+))|(?:(#)([^:]*):(.*))|(?:(#)(.*))(?:.*)\r?\n?/; +var MP4_REGEX_SUFFIX = /\.(mp4|m4s|m4v|m4a)$/i; +var M3U8Parser = /** @class */ (function () { + function M3U8Parser() { + } + M3U8Parser.findGroup = function (groups, mediaGroupId) { + if (!groups) { + return null; + } + var matchingGroup = null; + for (var i = 0; i < groups.length; i++) { + var group = groups[i]; + if (group.id === mediaGroupId) { + matchingGroup = group; + } + } + return matchingGroup; + }; + M3U8Parser.convertAVC1ToAVCOTI = function (codec) { + var result, avcdata = codec.split('.'); + if (avcdata.length > 2) { + result = avcdata.shift() + '.'; + result += parseInt(avcdata.shift()).toString(16); + result += ('000' + parseInt(avcdata.shift()).toString(16)).substr(-4); + } + else { + result = codec; + } + return result; + }; + M3U8Parser.resolve = function (url, baseUrl) { + return URLToolkit.buildAbsoluteURL(baseUrl, url, { alwaysNormalize: true }); + }; + M3U8Parser.parseMasterPlaylist = function (string, baseurl) { + var levels = [], result; + MASTER_PLAYLIST_REGEX.lastIndex = 0; + function setCodecs(codecs, level) { + ['video', 'audio'].forEach(function (type) { + var filtered = codecs.filter(function (codec) { return codecs_1.isCodecType(codec, type); }); + if (filtered.length) { + var preferred = filtered.filter(function (codec) { + return codec.lastIndexOf('avc1', 0) === 0 || codec.lastIndexOf('mp4a', 0) === 0; + }); + level[type + "Codec"] = preferred.length > 0 ? preferred[0] : filtered[0]; + // remove from list + codecs = codecs.filter(function (codec) { return filtered.indexOf(codec) === -1; }); + } + }); + level.unknownCodecs = codecs; + } + while ((result = MASTER_PLAYLIST_REGEX.exec(string)) != null) { + var level = {}; + var attrs = level.attrs = new attr_list_1.default(result[1]); + level.url = M3U8Parser.resolve(result[2], baseurl); + var resolution = attrs.decimalResolution('RESOLUTION'); + if (resolution) { + level.width = resolution.width; + level.height = resolution.height; + } + level.bitrate = attrs.decimalInteger('AVERAGE-BANDWIDTH') || attrs.decimalInteger('BANDWIDTH'); + level.name = attrs.NAME; + setCodecs([].concat((attrs.CODECS || '').split(/[ ,]+/)), level); + if (level.videoCodec && level.videoCodec.indexOf('avc1') !== -1) { + level.videoCodec = M3U8Parser.convertAVC1ToAVCOTI(level.videoCodec); + } + levels.push(level); + } + return levels; + }; + M3U8Parser.parseMasterPlaylistMedia = function (string, baseurl, type, audioGroups) { + if (audioGroups === void 0) { audioGroups = []; } + var result; + var medias = []; + var id = 0; + MASTER_PLAYLIST_MEDIA_REGEX.lastIndex = 0; + while ((result = MASTER_PLAYLIST_MEDIA_REGEX.exec(string)) !== null) { + var media = {}; + var attrs = new attr_list_1.default(result[1]); + if (attrs.TYPE === type) { + media.groupId = attrs['GROUP-ID']; + media.name = attrs.NAME; + media.type = type; + media.default = (attrs.DEFAULT === 'YES'); + media.autoselect = (attrs.AUTOSELECT === 'YES'); + media.forced = (attrs.FORCED === 'YES'); + if (attrs.URI) { + media.url = M3U8Parser.resolve(attrs.URI, baseurl); + } + media.lang = attrs.LANGUAGE; + if (!media.name) { + media.name = media.lang; + } + if (audioGroups.length) { + var groupCodec = M3U8Parser.findGroup(audioGroups, media.groupId); + media.audioCodec = groupCodec ? groupCodec.codec : audioGroups[0].codec; + } + media.id = id++; + medias.push(media); + } + } + return medias; + }; + M3U8Parser.parseLevelPlaylist = function (string, baseurl, id, type, levelUrlId) { + var currentSN = 0; + var totalduration = 0; + var level = new level_1.default(baseurl); + var levelkey = new level_key_1.default(); + var cc = 0; + var prevFrag = null; + var frag = new fragment_1.default(); + var result; + var i; + var firstPdtIndex = null; + LEVEL_PLAYLIST_REGEX_FAST.lastIndex = 0; + while ((result = LEVEL_PLAYLIST_REGEX_FAST.exec(string)) !== null) { + var duration = result[1]; + if (duration) { // INF + frag.duration = parseFloat(duration); + // avoid sliced strings https://github.com/video-dev/hls.js/issues/939 + var title = (' ' + result[2]).slice(1); + frag.title = title || null; + frag.tagList.push(title ? ['INF', duration, title] : ['INF', duration]); + } + else if (result[3]) { // url + if (Number.isFinite(frag.duration)) { + var sn = currentSN++; + frag.type = type; + frag.start = totalduration; + frag.levelkey = levelkey; + frag.sn = sn; + frag.level = id; + frag.cc = cc; + frag.urlId = levelUrlId; + frag.baseurl = baseurl; + // avoid sliced strings https://github.com/video-dev/hls.js/issues/939 + frag.relurl = (' ' + result[3]).slice(1); + assignProgramDateTime(frag, prevFrag); + level.fragments.push(frag); + prevFrag = frag; + totalduration += frag.duration; + frag = new fragment_1.default(); + } + } + else if (result[4]) { // X-BYTERANGE + frag.rawByteRange = (' ' + result[4]).slice(1); + if (prevFrag) { + var lastByteRangeEndOffset = prevFrag.byteRangeEndOffset; + if (lastByteRangeEndOffset) { + frag.lastByteRangeEndOffset = lastByteRangeEndOffset; + } + } + } + else if (result[5]) { // PROGRAM-DATE-TIME + // avoid sliced strings https://github.com/video-dev/hls.js/issues/939 + frag.rawProgramDateTime = (' ' + result[5]).slice(1); + frag.tagList.push(['PROGRAM-DATE-TIME', frag.rawProgramDateTime]); + if (firstPdtIndex === null) { + firstPdtIndex = level.fragments.length; + } + } + else { + result = result[0].match(LEVEL_PLAYLIST_REGEX_SLOW); + for (i = 1; i < result.length; i++) { + if (result[i] !== undefined) { + break; + } + } + // avoid sliced strings https://github.com/video-dev/hls.js/issues/939 + var value1 = (' ' + result[i + 1]).slice(1); + var value2 = (' ' + result[i + 2]).slice(1); + switch (result[i]) { + case '#': + frag.tagList.push(value2 ? [value1, value2] : [value1]); + break; + case 'PLAYLIST-TYPE': + level.type = value1.toUpperCase(); + break; + case 'MEDIA-SEQUENCE': + currentSN = level.startSN = parseInt(value1); + break; + case 'TARGETDURATION': + level.targetduration = parseFloat(value1); + break; + case 'VERSION': + level.version = parseInt(value1); + break; + case 'EXTM3U': + break; + case 'ENDLIST': + level.live = false; + break; + case 'DIS': + cc++; + frag.tagList.push(['DIS']); + break; + case 'DISCONTINUITY-SEQ': + cc = parseInt(value1); + break; + case 'KEY': + // https://tools.ietf.org/html/draft-pantos-http-live-streaming-08#section-3.4.4 + var decryptparams = value1; + var keyAttrs = new attr_list_1.default(decryptparams); + var decryptmethod = keyAttrs.enumeratedString('METHOD'), decrypturi = keyAttrs.URI, decryptiv = keyAttrs.hexadecimalInteger('IV'); + if (decryptmethod) { + levelkey = new level_key_1.default(); + if ((decrypturi) && (['AES-128', 'SAMPLE-AES', 'SAMPLE-AES-CENC'].indexOf(decryptmethod) >= 0)) { + levelkey.method = decryptmethod; + // URI to get the key + levelkey.baseuri = baseurl; + levelkey.reluri = decrypturi; + levelkey.key = null; + // Initialization Vector (IV) + levelkey.iv = decryptiv; + } + } + break; + case 'START': + var startParams = value1; + var startAttrs = new attr_list_1.default(startParams); + var startTimeOffset = startAttrs.decimalFloatingPoint('TIME-OFFSET'); + // TIME-OFFSET can be 0 + if (Number.isFinite(startTimeOffset)) { + level.startTimeOffset = startTimeOffset; + } + break; + case 'MAP': + var mapAttrs = new attr_list_1.default(value1); + frag.relurl = mapAttrs.URI; + frag.rawByteRange = mapAttrs.BYTERANGE; + frag.baseurl = baseurl; + frag.level = id; + frag.type = type; + frag.sn = 'initSegment'; + level.initSegment = frag; + frag = new fragment_1.default(); + frag.rawProgramDateTime = level.initSegment.rawProgramDateTime; + break; + default: + logger_1.logger.warn("line parsed but not handled: " + result); + break; + } + } + } + frag = prevFrag; + // logger.log('found ' + level.fragments.length + ' fragments'); + if (frag && !frag.relurl) { + level.fragments.pop(); + totalduration -= frag.duration; + } + level.totalduration = totalduration; + level.averagetargetduration = totalduration / level.fragments.length; + level.endSN = currentSN - 1; + level.startCC = level.fragments[0] ? level.fragments[0].cc : 0; + level.endCC = cc; + if (!level.initSegment && level.fragments.length) { + // this is a bit lurky but HLS really has no other way to tell us + // if the fragments are TS or MP4, except if we download them :/ + // but this is to be able to handle SIDX. + if (level.fragments.every(function (frag) { return MP4_REGEX_SUFFIX.test(frag.relurl); })) { + logger_1.logger.warn('MP4 fragments found but no init segment (probably no MAP, incomplete M3U8), trying to fetch SIDX'); + frag = new fragment_1.default(); + frag.relurl = level.fragments[0].relurl; + frag.baseurl = baseurl; + frag.level = id; + frag.type = type; + frag.sn = 'initSegment'; + level.initSegment = frag; + level.needSidxRanges = true; + } + } + /** + * Backfill any missing PDT values + "If the first EXT-X-PROGRAM-DATE-TIME tag in a Playlist appears after + one or more Media Segment URIs, the client SHOULD extrapolate + backward from that tag (using EXTINF durations and/or media + timestamps) to associate dates with those segments." + * We have already extrapolated forward, but all fragments up to the first instance of PDT do not have their PDTs + * computed. + */ + if (firstPdtIndex) { + backfillProgramDateTimes(level.fragments, firstPdtIndex); + } + return level; + }; + return M3U8Parser; +}()); +exports.default = M3U8Parser; +function backfillProgramDateTimes(fragments, startIndex) { + var fragPrev = fragments[startIndex]; + for (var i = startIndex - 1; i >= 0; i--) { + var frag = fragments[i]; + frag.programDateTime = fragPrev.programDateTime - (frag.duration * 1000); + fragPrev = frag; + } +} +function assignProgramDateTime(frag, prevFrag) { + if (frag.rawProgramDateTime) { + frag.programDateTime = Date.parse(frag.rawProgramDateTime); + } + else if (prevFrag && prevFrag.programDateTime) { + frag.programDateTime = prevFrag.endProgramDateTime; + } + if (!Number.isFinite(frag.programDateTime)) { + frag.programDateTime = null; + frag.rawProgramDateTime = null; + } +} + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/loader/playlist-loader.js": +/*!***************************************!*\ + !*** ./src/loader/playlist-loader.js ***! + \***************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +/** + * PlaylistLoader - delegate for media manifest/playlist loading tasks. Takes care of parsing media to internal data-models. + * + * Once loaded, dispatches events with parsed data-models of manifest/levels/audio/subtitle tracks. + * + * Uses loader(s) set in config to do actual internal loading of resource tasks. + * + * @module + * + */ +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var event_handler_1 = __webpack_require__(/*! ../event-handler */ "./src/event-handler.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var mp4demuxer_1 = __webpack_require__(/*! ../demux/mp4demuxer */ "./src/demux/mp4demuxer.js"); +var m3u8_parser_1 = __webpack_require__(/*! ./m3u8-parser */ "./src/loader/m3u8-parser.js"); +var performance = window.performance; +/** + * `type` property values for this loaders' context object + * @enum + * + */ +var ContextType = { + MANIFEST: 'manifest', + LEVEL: 'level', + AUDIO_TRACK: 'audioTrack', + SUBTITLE_TRACK: 'subtitleTrack' +}; +/** + * @enum {string} + */ +var LevelType = { + MAIN: 'main', + AUDIO: 'audio', + SUBTITLE: 'subtitle' +}; +/** + * @constructor + */ +var PlaylistLoader = /** @class */ (function (_super) { + __extends(PlaylistLoader, _super); + /** + * @constructs + * @param {Hls} hls + */ + function PlaylistLoader(hls) { + var _this = _super.call(this, hls, events_1.default.MANIFEST_LOADING, events_1.default.LEVEL_LOADING, events_1.default.AUDIO_TRACK_LOADING, events_1.default.SUBTITLE_TRACK_LOADING) || this; + _this.loaders = {}; + return _this; + } + Object.defineProperty(PlaylistLoader, "ContextType", { + get: function () { + return ContextType; + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(PlaylistLoader, "LevelType", { + get: function () { + return LevelType; + }, + enumerable: true, + configurable: true + }); + /** + * @param {ContextType} type + * @returns {boolean} + */ + PlaylistLoader.canHaveQualityLevels = function (type) { + return (type !== ContextType.AUDIO_TRACK && + type !== ContextType.SUBTITLE_TRACK); + }; + /** + * Map context.type to LevelType + * @param {{type: ContextType}} context + * @returns {LevelType} + */ + PlaylistLoader.mapContextToLevelType = function (context) { + var type = context.type; + switch (type) { + case ContextType.AUDIO_TRACK: + return LevelType.AUDIO; + case ContextType.SUBTITLE_TRACK: + return LevelType.SUBTITLE; + default: + return LevelType.MAIN; + } + }; + PlaylistLoader.getResponseUrl = function (response, context) { + var url = response.url; + // responseURL not supported on some browsers (it is used to detect URL redirection) + // data-uri mode also not supported (but no need to detect redirection) + if (url === undefined || url.indexOf('data:') === 0) { + // fallback to initial URL + url = context.url; + } + return url; + }; + /** + * Returns defaults or configured loader-type overloads (pLoader and loader config params) + * Default loader is XHRLoader (see utils) + * @param {object} context + * @returns {XHRLoader} or other compatible configured overload + */ + PlaylistLoader.prototype.createInternalLoader = function (context) { + var config = this.hls.config; + var PLoader = config.pLoader; + var Loader = config.loader; + var InternalLoader = PLoader || Loader; + var loader = new InternalLoader(config); + context.loader = loader; + this.loaders[context.type] = loader; + return loader; + }; + PlaylistLoader.prototype.getInternalLoader = function (context) { + return this.loaders[context.type]; + }; + PlaylistLoader.prototype.resetInternalLoader = function (contextType) { + if (this.loaders[contextType]) { + delete this.loaders[contextType]; + } + }; + /** + * Call `destroy` on all internal loader instances mapped (one per context type) + */ + PlaylistLoader.prototype.destroyInternalLoaders = function () { + for (var contextType in this.loaders) { + var loader = this.loaders[contextType]; + if (loader) { + loader.destroy(); + } + this.resetInternalLoader(contextType); + } + }; + PlaylistLoader.prototype.destroy = function () { + this.destroyInternalLoaders(); + _super.prototype.destroy.call(this); + }; + PlaylistLoader.prototype.onManifestLoading = function (data) { + this.load(data.url, { type: ContextType.MANIFEST, level: 0, id: null }); + }; + PlaylistLoader.prototype.onLevelLoading = function (data) { + this.load(data.url, { type: ContextType.LEVEL, level: data.level, id: data.id }); + }; + PlaylistLoader.prototype.onAudioTrackLoading = function (data) { + this.load(data.url, { type: ContextType.AUDIO_TRACK, level: null, id: data.id }); + }; + PlaylistLoader.prototype.onSubtitleTrackLoading = function (data) { + this.load(data.url, { type: ContextType.SUBTITLE_TRACK, level: null, id: data.id }); + }; + PlaylistLoader.prototype.load = function (url, context) { + var config = this.hls.config; + logger_1.logger.debug("Loading playlist of type " + context.type + ", level: " + context.level + ", id: " + context.id); + // Check if a loader for this context already exists + var loader = this.getInternalLoader(context); + if (loader) { + var loaderContext = loader.context; + if (loaderContext && loaderContext.url === url) { // same URL can't overlap + logger_1.logger.trace('playlist request ongoing'); + return false; + } + else { + logger_1.logger.warn("aborting previous loader for type: " + context.type); + loader.abort(); + } + } + var maxRetry, timeout, retryDelay, maxRetryDelay; + // apply different configs for retries depending on + // context (manifest, level, audio/subs playlist) + switch (context.type) { + case ContextType.MANIFEST: + maxRetry = config.manifestLoadingMaxRetry; + timeout = config.manifestLoadingTimeOut; + retryDelay = config.manifestLoadingRetryDelay; + maxRetryDelay = config.manifestLoadingMaxRetryTimeout; + break; + case ContextType.LEVEL: + // Disable internal loader retry logic, since we are managing retries in Level Controller + maxRetry = 0; + timeout = config.levelLoadingTimeOut; + // TODO Introduce retry settings for audio-track and subtitle-track, it should not use level retry config + break; + default: + maxRetry = config.levelLoadingMaxRetry; + timeout = config.levelLoadingTimeOut; + retryDelay = config.levelLoadingRetryDelay; + maxRetryDelay = config.levelLoadingMaxRetryTimeout; + break; + } + loader = this.createInternalLoader(context); + context.url = url; + context.responseType = context.responseType || ''; // FIXME: (should not be necessary to do this) + var loaderConfig = { + timeout: timeout, + maxRetry: maxRetry, + retryDelay: retryDelay, + maxRetryDelay: maxRetryDelay + }; + var loaderCallbacks = { + onSuccess: this.loadsuccess.bind(this), + onError: this.loaderror.bind(this), + onTimeout: this.loadtimeout.bind(this) + }; + logger_1.logger.debug("Calling internal loader delegate for URL: " + url); + loader.load(context, loaderConfig, loaderCallbacks); + return true; + }; + PlaylistLoader.prototype.loadsuccess = function (response, stats, context, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + if (context.isSidxRequest) { + this._handleSidxRequest(response, context); + this._handlePlaylistLoaded(response, stats, context, networkDetails); + return; + } + this.resetInternalLoader(context.type); + var string = response.data; + stats.tload = performance.now(); + // stats.mtime = new Date(target.getResponseHeader('Last-Modified')); + // Validate if it is an M3U8 at all + if (string.indexOf('#EXTM3U') !== 0) { + this._handleManifestParsingError(response, context, 'no EXTM3U delimiter', networkDetails); + return; + } + // Check if chunk-list or master. handle empty chunk list case (first EXTINF not signaled, but TARGETDURATION present) + if (string.indexOf('#EXTINF:') > 0 || string.indexOf('#EXT-X-TARGETDURATION:') > 0) { + this._handleTrackOrLevelPlaylist(response, stats, context, networkDetails); + } + else { + this._handleMasterPlaylist(response, stats, context, networkDetails); + } + }; + PlaylistLoader.prototype.loaderror = function (response, context, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + this._handleNetworkError(context, networkDetails, false, response); + }; + PlaylistLoader.prototype.loadtimeout = function (stats, context, networkDetails) { + if (networkDetails === void 0) { networkDetails = null; } + this._handleNetworkError(context, networkDetails, true); + }; + PlaylistLoader.prototype._handleMasterPlaylist = function (response, stats, context, networkDetails) { + var hls = this.hls; + var string = response.data; + var url = PlaylistLoader.getResponseUrl(response, context); + var levels = m3u8_parser_1.default.parseMasterPlaylist(string, url); + if (!levels.length) { + this._handleManifestParsingError(response, context, 'no level found in manifest', networkDetails); + return; + } + // multi level playlist, parse level info + var audioGroups = levels.map(function (level) { return ({ + id: level.attrs.AUDIO, + codec: level.audioCodec + }); }); + var audioTracks = m3u8_parser_1.default.parseMasterPlaylistMedia(string, url, 'AUDIO', audioGroups); + var subtitles = m3u8_parser_1.default.parseMasterPlaylistMedia(string, url, 'SUBTITLES'); + if (audioTracks.length) { + // check if we have found an audio track embedded in main playlist (audio track without URI attribute) + var embeddedAudioFound_1 = false; + audioTracks.forEach(function (audioTrack) { + if (!audioTrack.url) { + embeddedAudioFound_1 = true; + } + }); + // if no embedded audio track defined, but audio codec signaled in quality level, + // we need to signal this main audio track this could happen with playlists with + // alt audio rendition in which quality levels (main) + // contains both audio+video. but with mixed audio track not signaled + if (embeddedAudioFound_1 === false && levels[0].audioCodec && !levels[0].attrs.AUDIO) { + logger_1.logger.log('audio codec signaled in quality level, but no embedded audio track signaled, create one'); + audioTracks.unshift({ + type: 'main', + name: 'main' + }); + } + } + hls.trigger(events_1.default.MANIFEST_LOADED, { + levels: levels, + audioTracks: audioTracks, + subtitles: subtitles, + url: url, + stats: stats, + networkDetails: networkDetails + }); + }; + PlaylistLoader.prototype._handleTrackOrLevelPlaylist = function (response, stats, context, networkDetails) { + var hls = this.hls; + var id = context.id, level = context.level, type = context.type; + var url = PlaylistLoader.getResponseUrl(response, context); + var levelUrlId = Number.isFinite(id) ? id : 0; + var levelId = Number.isFinite(level) ? level : levelUrlId; + var levelType = PlaylistLoader.mapContextToLevelType(context); + var levelDetails = m3u8_parser_1.default.parseLevelPlaylist(response.data, url, levelId, levelType, levelUrlId); + // set stats on level structure + levelDetails.tload = stats.tload; + // We have done our first request (Manifest-type) and receive + // not a master playlist but a chunk-list (track/level) + // We fire the manifest-loaded event anyway with the parsed level-details + // by creating a single-level structure for it. + if (type === ContextType.MANIFEST) { + var singleLevel = { + url: url, + details: levelDetails + }; + hls.trigger(events_1.default.MANIFEST_LOADED, { + levels: [singleLevel], + audioTracks: [], + url: url, + stats: stats, + networkDetails: networkDetails + }); + } + // save parsing time + stats.tparsed = performance.now(); + // in case we need SIDX ranges + // return early after calling load for + // the SIDX box. + if (levelDetails.needSidxRanges) { + var sidxUrl = levelDetails.initSegment.url; + this.load(sidxUrl, { + isSidxRequest: true, + type: type, + level: level, + levelDetails: levelDetails, + id: id, + rangeStart: 0, + rangeEnd: 2048, + responseType: 'arraybuffer' + }); + return; + } + // extend the context with the new levelDetails property + context.levelDetails = levelDetails; + this._handlePlaylistLoaded(response, stats, context, networkDetails); + }; + PlaylistLoader.prototype._handleSidxRequest = function (response, context) { + var sidxInfo = mp4demuxer_1.default.parseSegmentIndex(new Uint8Array(response.data)); + // if provided fragment does not contain sidx, early return + if (!sidxInfo) { + return; + } + var sidxReferences = sidxInfo.references; + var levelDetails = context.levelDetails; + sidxReferences.forEach(function (segmentRef, index) { + var segRefInfo = segmentRef.info; + var frag = levelDetails.fragments[index]; + if (frag.byteRange.length === 0) { + frag.rawByteRange = String(1 + segRefInfo.end - segRefInfo.start) + '@' + String(segRefInfo.start); + } + }); + levelDetails.initSegment.rawByteRange = String(sidxInfo.moovEndOffset) + '@0'; + }; + PlaylistLoader.prototype._handleManifestParsingError = function (response, context, reason, networkDetails) { + this.hls.trigger(events_1.default.ERROR, { + type: errors_1.ErrorTypes.NETWORK_ERROR, + details: errors_1.ErrorDetails.MANIFEST_PARSING_ERROR, + fatal: true, + url: response.url, + reason: reason, + networkDetails: networkDetails + }); + }; + PlaylistLoader.prototype._handleNetworkError = function (context, networkDetails, timeout, response) { + if (timeout === void 0) { timeout = false; } + if (response === void 0) { response = null; } + logger_1.logger.info("A network error occured while loading a " + context.type + "-type playlist"); + var details; + var fatal; + var loader = this.getInternalLoader(context); + switch (context.type) { + case ContextType.MANIFEST: + details = (timeout ? errors_1.ErrorDetails.MANIFEST_LOAD_TIMEOUT : errors_1.ErrorDetails.MANIFEST_LOAD_ERROR); + fatal = true; + break; + case ContextType.LEVEL: + details = (timeout ? errors_1.ErrorDetails.LEVEL_LOAD_TIMEOUT : errors_1.ErrorDetails.LEVEL_LOAD_ERROR); + fatal = false; + break; + case ContextType.AUDIO_TRACK: + details = (timeout ? errors_1.ErrorDetails.AUDIO_TRACK_LOAD_TIMEOUT : errors_1.ErrorDetails.AUDIO_TRACK_LOAD_ERROR); + fatal = false; + break; + default: + // details = ...? + fatal = false; + } + if (loader) { + loader.abort(); + this.resetInternalLoader(context.type); + } + var errorData = { + type: errors_1.ErrorTypes.NETWORK_ERROR, + details: details, + fatal: fatal, + url: loader.url, + loader: loader, + context: context, + networkDetails: networkDetails + }; + if (response) { + errorData.response = response; + } + this.hls.trigger(events_1.default.ERROR, errorData); + }; + PlaylistLoader.prototype._handlePlaylistLoaded = function (response, stats, context, networkDetails) { + var type = context.type, level = context.level, id = context.id, levelDetails = context.levelDetails; + if (!levelDetails.targetduration) { + this._handleManifestParsingError(response, context, 'invalid target duration', networkDetails); + return; + } + var canHaveLevels = PlaylistLoader.canHaveQualityLevels(context.type); + if (canHaveLevels) { + this.hls.trigger(events_1.default.LEVEL_LOADED, { + details: levelDetails, + level: level || 0, + id: id || 0, + stats: stats, + networkDetails: networkDetails + }); + } + else { + switch (type) { + case ContextType.AUDIO_TRACK: + this.hls.trigger(events_1.default.AUDIO_TRACK_LOADED, { + details: levelDetails, + id: id, + stats: stats, + networkDetails: networkDetails + }); + break; + case ContextType.SUBTITLE_TRACK: + this.hls.trigger(events_1.default.SUBTITLE_TRACK_LOADED, { + details: levelDetails, + id: id, + stats: stats, + networkDetails: networkDetails + }); + break; + } + } + }; + return PlaylistLoader; +}(event_handler_1.default)); +exports.default = PlaylistLoader; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/observer.js": +/*!*************************!*\ + !*** ./src/observer.js ***! + \*************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var eventemitter3_1 = __webpack_require__(/*! eventemitter3 */ "./node_modules/eventemitter3/index.js"); +/** + * @class + * + * Simple adapter sub-class of Nodejs-like EventEmitter. + * + * We simply want to pass along the event-name itself + * in every call to a handler, which is the purpose of our `trigger` method + * extending the standard API. + * + */ +var Observer = /** @class */ (function (_super) { + __extends(Observer, _super); + function Observer() { + return _super !== null && _super.apply(this, arguments) || this; + } + /** + * + * @param {string} event + * @param {any} data + */ + Observer.prototype.trigger = function (event) { + var data = []; + for (var _i = 1; _i < arguments.length; _i++) { + data[_i - 1] = arguments[_i]; + } + this.emit.apply(this, [event, event].concat(data)); + }; + return Observer; +}(eventemitter3_1.EventEmitter)); +exports.Observer = Observer; + + +/***/ }), + +/***/ "./src/polyfills/number.js": +/*!*********************************!*\ + !*** ./src/polyfills/number.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var get_self_scope_1 = __webpack_require__(/*! ../utils/get-self-scope */ "./src/utils/get-self-scope.js"); +var self = get_self_scope_1.getSelfScope(); +var Number = self.Number; +exports.Number = Number; +// TODO: get rid of global polyfills and replace them with wrappers ("ponyfills") +Number.isFinite = Number.isFinite || function (value) { + return typeof value === 'number' && isFinite(value); +}; + + +/***/ }), + +/***/ "./src/remux/aac-helper.js": +/*!*********************************!*\ + !*** ./src/remux/aac-helper.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * AAC helper + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var AAC = /** @class */ (function () { + function AAC() { + } + AAC.getSilentFrame = function (codec, channelCount) { + switch (codec) { + case 'mp4a.40.2': + if (channelCount === 1) { + return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x23, 0x80]); + } + else if (channelCount === 2) { + return new Uint8Array([0x21, 0x00, 0x49, 0x90, 0x02, 0x19, 0x00, 0x23, 0x80]); + } + else if (channelCount === 3) { + return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x8e]); + } + else if (channelCount === 4) { + return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x80, 0x2c, 0x80, 0x08, 0x02, 0x38]); + } + else if (channelCount === 5) { + return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x82, 0x30, 0x04, 0x99, 0x00, 0x21, 0x90, 0x02, 0x38]); + } + else if (channelCount === 6) { + return new Uint8Array([0x00, 0xc8, 0x00, 0x80, 0x20, 0x84, 0x01, 0x26, 0x40, 0x08, 0x64, 0x00, 0x82, 0x30, 0x04, 0x99, 0x00, 0x21, 0x90, 0x02, 0x00, 0xb2, 0x00, 0x20, 0x08, 0xe0]); + } + break; + // handle HE-AAC below (mp4a.40.5 / mp4a.40.29) + default: + if (channelCount === 1) { + // ffmpeg -y -f lavfi -i "aevalsrc=0:d=0.05" -c:a libfdk_aac -profile:a aac_he -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac + return new Uint8Array([0x1, 0x40, 0x22, 0x80, 0xa3, 0x4e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x1c, 0x6, 0xf1, 0xc1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e]); + } + else if (channelCount === 2) { + // ffmpeg -y -f lavfi -i "aevalsrc=0|0:d=0.05" -c:a libfdk_aac -profile:a aac_he_v2 -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac + return new Uint8Array([0x1, 0x40, 0x22, 0x80, 0xa3, 0x5e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x0, 0x95, 0x0, 0x6, 0xf1, 0xa1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e]); + } + else if (channelCount === 3) { + // ffmpeg -y -f lavfi -i "aevalsrc=0|0|0:d=0.05" -c:a libfdk_aac -profile:a aac_he_v2 -b:a 4k output.aac && hexdump -v -e '16/1 "0x%x," "\n"' -v output.aac + return new Uint8Array([0x1, 0x40, 0x22, 0x80, 0xa3, 0x5e, 0xe6, 0x80, 0xba, 0x8, 0x0, 0x0, 0x0, 0x0, 0x95, 0x0, 0x6, 0xf1, 0xa1, 0xa, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5e]); + } + break; + } + return null; + }; + return AAC; +}()); +exports.default = AAC; + + +/***/ }), + +/***/ "./src/remux/mp4-generator.js": +/*!************************************!*\ + !*** ./src/remux/mp4-generator.js ***! + \************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * Generate MP4 Box +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var UINT32_MAX = Math.pow(2, 32) - 1; +var MP4 = /** @class */ (function () { + function MP4() { + } + MP4.init = function () { + MP4.types = { + avc1: [], + avcC: [], + btrt: [], + dinf: [], + dref: [], + esds: [], + ftyp: [], + hdlr: [], + mdat: [], + mdhd: [], + mdia: [], + mfhd: [], + minf: [], + moof: [], + moov: [], + mp4a: [], + '.mp3': [], + mvex: [], + mvhd: [], + pasp: [], + sdtp: [], + stbl: [], + stco: [], + stsc: [], + stsd: [], + stsz: [], + stts: [], + tfdt: [], + tfhd: [], + traf: [], + trak: [], + trun: [], + trex: [], + tkhd: [], + vmhd: [], + smhd: [] + }; + var i; + for (i in MP4.types) { + if (MP4.types.hasOwnProperty(i)) { + MP4.types[i] = [ + i.charCodeAt(0), + i.charCodeAt(1), + i.charCodeAt(2), + i.charCodeAt(3) + ]; + } + } + var videoHdlr = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x76, 0x69, 0x64, 0x65, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x56, 0x69, 0x64, 0x65, + 0x6f, 0x48, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x00 // name: 'VideoHandler' + ]); + var audioHdlr = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x73, 0x6f, 0x75, 0x6e, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x53, 0x6f, 0x75, 0x6e, + 0x64, 0x48, 0x61, 0x6e, + 0x64, 0x6c, 0x65, 0x72, 0x00 // name: 'SoundHandler' + ]); + MP4.HDLR_TYPES = { + 'video': videoHdlr, + 'audio': audioHdlr + }; + var dref = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01, + 0x00, 0x00, 0x00, 0x0c, + 0x75, 0x72, 0x6c, 0x20, + 0x00, + 0x00, 0x00, 0x01 // entry_flags + ]); + var stco = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 // entry_count + ]); + MP4.STTS = MP4.STSC = MP4.STCO = stco; + MP4.STSZ = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 // sample_count + ]); + MP4.VMHD = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x01, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00 // opcolor + ]); + MP4.SMHD = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00 // reserved + ]); + MP4.STSD = new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x01 + ]); // entry_count + var majorBrand = new Uint8Array([105, 115, 111, 109]); // isom + var avc1Brand = new Uint8Array([97, 118, 99, 49]); // avc1 + var minorVersion = new Uint8Array([0, 0, 0, 1]); + MP4.FTYP = MP4.box(MP4.types.ftyp, majorBrand, minorVersion, majorBrand, avc1Brand); + MP4.DINF = MP4.box(MP4.types.dinf, MP4.box(MP4.types.dref, dref)); + }; + MP4.box = function (type) { + var payload = Array.prototype.slice.call(arguments, 1), size = 8, i = payload.length, len = i, result; + // calculate the total size we need to allocate + while (i--) { + size += payload[i].byteLength; + } + result = new Uint8Array(size); + result[0] = (size >> 24) & 0xff; + result[1] = (size >> 16) & 0xff; + result[2] = (size >> 8) & 0xff; + result[3] = size & 0xff; + result.set(type, 4); + // copy the payload into the result + for (i = 0, size = 8; i < len; i++) { + // copy payload[i] array @ offset size + result.set(payload[i], size); + size += payload[i].byteLength; + } + return result; + }; + MP4.hdlr = function (type) { + return MP4.box(MP4.types.hdlr, MP4.HDLR_TYPES[type]); + }; + MP4.mdat = function (data) { + return MP4.box(MP4.types.mdat, data); + }; + MP4.mdhd = function (timescale, duration) { + duration *= timescale; + var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1)); + var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1)); + return MP4.box(MP4.types.mdhd, new Uint8Array([ + 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, + (timescale >> 24) & 0xFF, + (timescale >> 16) & 0xFF, + (timescale >> 8) & 0xFF, + timescale & 0xFF, + (upperWordDuration >> 24), + (upperWordDuration >> 16) & 0xFF, + (upperWordDuration >> 8) & 0xFF, + upperWordDuration & 0xFF, + (lowerWordDuration >> 24), + (lowerWordDuration >> 16) & 0xFF, + (lowerWordDuration >> 8) & 0xFF, + lowerWordDuration & 0xFF, + 0x55, 0xc4, + 0x00, 0x00 + ])); + }; + MP4.mdia = function (track) { + return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale, track.duration), MP4.hdlr(track.type), MP4.minf(track)); + }; + MP4.mfhd = function (sequenceNumber) { + return MP4.box(MP4.types.mfhd, new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + (sequenceNumber >> 24), + (sequenceNumber >> 16) & 0xFF, + (sequenceNumber >> 8) & 0xFF, + sequenceNumber & 0xFF // sequence_number + ])); + }; + MP4.minf = function (track) { + if (track.type === 'audio') { + return MP4.box(MP4.types.minf, MP4.box(MP4.types.smhd, MP4.SMHD), MP4.DINF, MP4.stbl(track)); + } + else { + return MP4.box(MP4.types.minf, MP4.box(MP4.types.vmhd, MP4.VMHD), MP4.DINF, MP4.stbl(track)); + } + }; + MP4.moof = function (sn, baseMediaDecodeTime, track) { + return MP4.box(MP4.types.moof, MP4.mfhd(sn), MP4.traf(track, baseMediaDecodeTime)); + }; + /** + * @param tracks... (optional) {array} the tracks associated with this movie + */ + MP4.moov = function (tracks) { + var i = tracks.length, boxes = []; + while (i--) { + boxes[i] = MP4.trak(tracks[i]); + } + return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale, tracks[0].duration)].concat(boxes).concat(MP4.mvex(tracks))); + }; + MP4.mvex = function (tracks) { + var i = tracks.length, boxes = []; + while (i--) { + boxes[i] = MP4.trex(tracks[i]); + } + return MP4.box.apply(null, [MP4.types.mvex].concat(boxes)); + }; + MP4.mvhd = function (timescale, duration) { + duration *= timescale; + var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1)); + var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1)); + var bytes = new Uint8Array([ + 0x01, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, + (timescale >> 24) & 0xFF, + (timescale >> 16) & 0xFF, + (timescale >> 8) & 0xFF, + timescale & 0xFF, + (upperWordDuration >> 24), + (upperWordDuration >> 16) & 0xFF, + (upperWordDuration >> 8) & 0xFF, + upperWordDuration & 0xFF, + (lowerWordDuration >> 24), + (lowerWordDuration >> 16) & 0xFF, + (lowerWordDuration >> 8) & 0xFF, + lowerWordDuration & 0xFF, + 0x00, 0x01, 0x00, 0x00, + 0x01, 0x00, + 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff // next_track_ID + ]); + return MP4.box(MP4.types.mvhd, bytes); + }; + MP4.sdtp = function (track) { + var samples = track.samples || [], bytes = new Uint8Array(4 + samples.length), flags, i; + // leave the full box header (4 bytes) all zero + // write the sample table + for (i = 0; i < samples.length; i++) { + flags = samples[i].flags; + bytes[i + 4] = (flags.dependsOn << 4) | + (flags.isDependedOn << 2) | + (flags.hasRedundancy); + } + return MP4.box(MP4.types.sdtp, bytes); + }; + MP4.stbl = function (track) { + return MP4.box(MP4.types.stbl, MP4.stsd(track), MP4.box(MP4.types.stts, MP4.STTS), MP4.box(MP4.types.stsc, MP4.STSC), MP4.box(MP4.types.stsz, MP4.STSZ), MP4.box(MP4.types.stco, MP4.STCO)); + }; + MP4.avc1 = function (track) { + var sps = [], pps = [], i, data, len; + // assemble the SPSs + for (i = 0; i < track.sps.length; i++) { + data = track.sps[i]; + len = data.byteLength; + sps.push((len >>> 8) & 0xFF); + sps.push((len & 0xFF)); + // SPS + sps = sps.concat(Array.prototype.slice.call(data)); + } + // assemble the PPSs + for (i = 0; i < track.pps.length; i++) { + data = track.pps[i]; + len = data.byteLength; + pps.push((len >>> 8) & 0xFF); + pps.push((len & 0xFF)); + pps = pps.concat(Array.prototype.slice.call(data)); + } + var avcc = MP4.box(MP4.types.avcC, new Uint8Array([ + 0x01, + sps[3], + sps[4], + sps[5], + 0xfc | 3, + 0xE0 | track.sps.length // 3bit reserved (111) + numOfSequenceParameterSets + ].concat(sps).concat([ + track.pps.length // numOfPictureParameterSets + ]).concat(pps))), // "PPS" + width = track.width, height = track.height, hSpacing = track.pixelRatio[0], vSpacing = track.pixelRatio[1]; + return MP4.box(MP4.types.avc1, new Uint8Array([ + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x01, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + (width >> 8) & 0xFF, + width & 0xff, + (height >> 8) & 0xFF, + height & 0xff, + 0x00, 0x48, 0x00, 0x00, + 0x00, 0x48, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, + 0x12, + 0x64, 0x61, 0x69, 0x6C, + 0x79, 0x6D, 0x6F, 0x74, + 0x69, 0x6F, 0x6E, 0x2F, + 0x68, 0x6C, 0x73, 0x2E, + 0x6A, 0x73, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x18, + 0x11, 0x11 + ]), // pre_defined = -1 + avcc, MP4.box(MP4.types.btrt, new Uint8Array([ + 0x00, 0x1c, 0x9c, 0x80, + 0x00, 0x2d, 0xc6, 0xc0, + 0x00, 0x2d, 0xc6, 0xc0 + ])), // avgBitrate + MP4.box(MP4.types.pasp, new Uint8Array([ + (hSpacing >> 24), + (hSpacing >> 16) & 0xFF, + (hSpacing >> 8) & 0xFF, + hSpacing & 0xFF, + (vSpacing >> 24), + (vSpacing >> 16) & 0xFF, + (vSpacing >> 8) & 0xFF, + vSpacing & 0xFF + ]))); + }; + MP4.esds = function (track) { + var configlen = track.config.length; + return new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + 0x03, + 0x17 + configlen, + 0x00, 0x01, + 0x00, + 0x04, + 0x0f + configlen, + 0x40, + 0x15, + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x05 // descriptor_type + ].concat([configlen]).concat(track.config).concat([0x06, 0x01, 0x02])); // GASpecificConfig)); // length + audio config descriptor + }; + MP4.mp4a = function (track) { + var samplerate = track.samplerate; + return MP4.box(MP4.types.mp4a, new Uint8Array([ + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x01, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, track.channelCount, + 0x00, 0x10, + 0x00, 0x00, 0x00, 0x00, + (samplerate >> 8) & 0xFF, + samplerate & 0xff, + 0x00, 0x00 + ]), MP4.box(MP4.types.esds, MP4.esds(track))); + }; + MP4.mp3 = function (track) { + var samplerate = track.samplerate; + return MP4.box(MP4.types['.mp3'], new Uint8Array([ + 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, + 0x00, 0x01, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, track.channelCount, + 0x00, 0x10, + 0x00, 0x00, 0x00, 0x00, + (samplerate >> 8) & 0xFF, + samplerate & 0xff, + 0x00, 0x00 + ])); + }; + MP4.stsd = function (track) { + if (track.type === 'audio') { + if (!track.isAAC && track.codec === 'mp3') { + return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track)); + } + return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track)); + } + else { + return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track)); + } + }; + MP4.tkhd = function (track) { + var id = track.id, duration = track.duration * track.timescale, width = track.width, height = track.height, upperWordDuration = Math.floor(duration / (UINT32_MAX + 1)), lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1)); + return MP4.box(MP4.types.tkhd, new Uint8Array([ + 0x01, + 0x00, 0x00, 0x07, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, + (id >> 24) & 0xFF, + (id >> 16) & 0xFF, + (id >> 8) & 0xFF, + id & 0xFF, + 0x00, 0x00, 0x00, 0x00, + (upperWordDuration >> 24), + (upperWordDuration >> 16) & 0xFF, + (upperWordDuration >> 8) & 0xFF, + upperWordDuration & 0xFF, + (lowerWordDuration >> 24), + (lowerWordDuration >> 16) & 0xFF, + (lowerWordDuration >> 8) & 0xFF, + lowerWordDuration & 0xFF, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, + (width >> 8) & 0xFF, + width & 0xFF, + 0x00, 0x00, + (height >> 8) & 0xFF, + height & 0xFF, + 0x00, 0x00 // height + ])); + }; + MP4.traf = function (track, baseMediaDecodeTime) { + var sampleDependencyTable = MP4.sdtp(track), id = track.id, upperWordBaseMediaDecodeTime = Math.floor(baseMediaDecodeTime / (UINT32_MAX + 1)), lowerWordBaseMediaDecodeTime = Math.floor(baseMediaDecodeTime % (UINT32_MAX + 1)); + return MP4.box(MP4.types.traf, MP4.box(MP4.types.tfhd, new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + (id >> 24), + (id >> 16) & 0XFF, + (id >> 8) & 0XFF, + (id & 0xFF) // track_ID + ])), MP4.box(MP4.types.tfdt, new Uint8Array([ + 0x01, + 0x00, 0x00, 0x00, + (upperWordBaseMediaDecodeTime >> 24), + (upperWordBaseMediaDecodeTime >> 16) & 0XFF, + (upperWordBaseMediaDecodeTime >> 8) & 0XFF, + (upperWordBaseMediaDecodeTime & 0xFF), + (lowerWordBaseMediaDecodeTime >> 24), + (lowerWordBaseMediaDecodeTime >> 16) & 0XFF, + (lowerWordBaseMediaDecodeTime >> 8) & 0XFF, + (lowerWordBaseMediaDecodeTime & 0xFF) + ])), MP4.trun(track, sampleDependencyTable.length + + 16 + // tfhd + 20 + // tfdt + 8 + // traf header + 16 + // mfhd + 8 + // moof header + 8), // mdat header + sampleDependencyTable); + }; + /** + * Generate a track box. + * @param track {object} a track definition + * @return {Uint8Array} the track box + */ + MP4.trak = function (track) { + track.duration = track.duration || 0xffffffff; + return MP4.box(MP4.types.trak, MP4.tkhd(track), MP4.mdia(track)); + }; + MP4.trex = function (track) { + var id = track.id; + return MP4.box(MP4.types.trex, new Uint8Array([ + 0x00, + 0x00, 0x00, 0x00, + (id >> 24), + (id >> 16) & 0XFF, + (id >> 8) & 0XFF, + (id & 0xFF), + 0x00, 0x00, 0x00, 0x01, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x01 // default_sample_flags + ])); + }; + MP4.trun = function (track, offset) { + var samples = track.samples || [], len = samples.length, arraylen = 12 + (16 * len), array = new Uint8Array(arraylen), i, sample, duration, size, flags, cts; + offset += 8 + arraylen; + array.set([ + 0x00, + 0x00, 0x0f, 0x01, + (len >>> 24) & 0xFF, + (len >>> 16) & 0xFF, + (len >>> 8) & 0xFF, + len & 0xFF, + (offset >>> 24) & 0xFF, + (offset >>> 16) & 0xFF, + (offset >>> 8) & 0xFF, + offset & 0xFF // data_offset + ], 0); + for (i = 0; i < len; i++) { + sample = samples[i]; + duration = sample.duration; + size = sample.size; + flags = sample.flags; + cts = sample.cts; + array.set([ + (duration >>> 24) & 0xFF, + (duration >>> 16) & 0xFF, + (duration >>> 8) & 0xFF, + duration & 0xFF, + (size >>> 24) & 0xFF, + (size >>> 16) & 0xFF, + (size >>> 8) & 0xFF, + size & 0xFF, + (flags.isLeading << 2) | flags.dependsOn, + (flags.isDependedOn << 6) | + (flags.hasRedundancy << 4) | + (flags.paddingValue << 1) | + flags.isNonSync, + flags.degradPrio & 0xF0 << 8, + flags.degradPrio & 0x0F, + (cts >>> 24) & 0xFF, + (cts >>> 16) & 0xFF, + (cts >>> 8) & 0xFF, + cts & 0xFF // sample_composition_time_offset + ], 12 + 16 * i); + } + return MP4.box(MP4.types.trun, array); + }; + MP4.initSegment = function (tracks) { + if (!MP4.types) { + MP4.init(); + } + var movie = MP4.moov(tracks), result; + result = new Uint8Array(MP4.FTYP.byteLength + movie.byteLength); + result.set(MP4.FTYP); + result.set(movie, MP4.FTYP.byteLength); + return result; + }; + return MP4; +}()); +exports.default = MP4; + + +/***/ }), + +/***/ "./src/remux/mp4-remuxer.js": +/*!**********************************!*\ + !*** ./src/remux/mp4-remuxer.js ***! + \**********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * fMP4 remuxer +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var aac_helper_1 = __webpack_require__(/*! ./aac-helper */ "./src/remux/aac-helper.js"); +var mp4_generator_1 = __webpack_require__(/*! ./mp4-generator */ "./src/remux/mp4-generator.js"); +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var errors_1 = __webpack_require__(/*! ../errors */ "./src/errors.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +// 10 seconds +var MAX_SILENT_FRAME_DURATION = 10 * 1000; +var MP4Remuxer = /** @class */ (function () { + function MP4Remuxer(observer, config, typeSupported, vendor) { + this.observer = observer; + this.config = config; + this.typeSupported = typeSupported; + var userAgent = navigator.userAgent; + this.isSafari = vendor && vendor.indexOf('Apple') > -1 && userAgent && !userAgent.match('CriOS'); + this.ISGenerated = false; + } + MP4Remuxer.prototype.destroy = function () { + }; + MP4Remuxer.prototype.resetTimeStamp = function (defaultTimeStamp) { + this._initPTS = this._initDTS = defaultTimeStamp; + }; + MP4Remuxer.prototype.resetInitSegment = function () { + this.ISGenerated = false; + }; + MP4Remuxer.prototype.remux = function (audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset) { + // generate Init Segment if needed + if (!this.ISGenerated) { + this.generateIS(audioTrack, videoTrack, timeOffset); + } + if (this.ISGenerated) { + var nbAudioSamples = audioTrack.samples.length; + var nbVideoSamples = videoTrack.samples.length; + var audioTimeOffset = timeOffset; + var videoTimeOffset = timeOffset; + if (nbAudioSamples && nbVideoSamples) { + // timeOffset is expected to be the offset of the first timestamp of this fragment (first DTS) + // if first audio DTS is not aligned with first video DTS then we need to take that into account + // when providing timeOffset to remuxAudio / remuxVideo. if we don't do that, there might be a permanent / small + // drift between audio and video streams + var audiovideoDeltaDts = (audioTrack.samples[0].pts - videoTrack.samples[0].pts) / videoTrack.inputTimeScale; + audioTimeOffset += Math.max(0, audiovideoDeltaDts); + videoTimeOffset += Math.max(0, -audiovideoDeltaDts); + } + // Purposefully remuxing audio before video, so that remuxVideo can use nextAudioPts, which is + // calculated in remuxAudio. + // logger.log('nb AAC samples:' + audioTrack.samples.length); + if (nbAudioSamples) { + // if initSegment was generated without video samples, regenerate it again + if (!audioTrack.timescale) { + logger_1.logger.warn('regenerate InitSegment as audio detected'); + this.generateIS(audioTrack, videoTrack, timeOffset); + } + var audioData = this.remuxAudio(audioTrack, audioTimeOffset, contiguous, accurateTimeOffset); + // logger.log('nb AVC samples:' + videoTrack.samples.length); + if (nbVideoSamples) { + var audioTrackLength = void 0; + if (audioData) { + audioTrackLength = audioData.endPTS - audioData.startPTS; + } + // if initSegment was generated without video samples, regenerate it again + if (!videoTrack.timescale) { + logger_1.logger.warn('regenerate InitSegment as video detected'); + this.generateIS(audioTrack, videoTrack, timeOffset); + } + this.remuxVideo(videoTrack, videoTimeOffset, contiguous, audioTrackLength, accurateTimeOffset); + } + } + else { + // logger.log('nb AVC samples:' + videoTrack.samples.length); + if (nbVideoSamples) { + var videoData = this.remuxVideo(videoTrack, videoTimeOffset, contiguous, 0, accurateTimeOffset); + if (videoData && audioTrack.codec) { + this.remuxEmptyAudio(audioTrack, audioTimeOffset, contiguous, videoData); + } + } + } + } + // logger.log('nb ID3 samples:' + audioTrack.samples.length); + if (id3Track.samples.length) { + this.remuxID3(id3Track, timeOffset); + } + // logger.log('nb ID3 samples:' + audioTrack.samples.length); + if (textTrack.samples.length) { + this.remuxText(textTrack, timeOffset); + } + // notify end of parsing + this.observer.trigger(events_1.default.FRAG_PARSED); + }; + MP4Remuxer.prototype.generateIS = function (audioTrack, videoTrack, timeOffset) { + var observer = this.observer, audioSamples = audioTrack.samples, videoSamples = videoTrack.samples, typeSupported = this.typeSupported, container = 'audio/mp4', tracks = {}, data = { tracks: tracks }, computePTSDTS = (this._initPTS === undefined), initPTS, initDTS; + if (computePTSDTS) { + initPTS = initDTS = Infinity; + } + if (audioTrack.config && audioSamples.length) { + // let's use audio sampling rate as MP4 time scale. + // rationale is that there is a integer nb of audio frames per audio sample (1024 for AAC) + // using audio sampling rate here helps having an integer MP4 frame duration + // this avoids potential rounding issue and AV sync issue + audioTrack.timescale = audioTrack.samplerate; + logger_1.logger.log("audio sampling rate : " + audioTrack.samplerate); + if (!audioTrack.isAAC) { + if (typeSupported.mpeg) { // Chrome and Safari + container = 'audio/mpeg'; + audioTrack.codec = ''; + } + else if (typeSupported.mp3) { // Firefox + audioTrack.codec = 'mp3'; + } + } + tracks.audio = { + container: container, + codec: audioTrack.codec, + initSegment: !audioTrack.isAAC && typeSupported.mpeg ? new Uint8Array() : mp4_generator_1.default.initSegment([audioTrack]), + metadata: { + channelCount: audioTrack.channelCount + } + }; + if (computePTSDTS) { + // remember first PTS of this demuxing context. for audio, PTS = DTS + initPTS = initDTS = audioSamples[0].pts - audioTrack.inputTimeScale * timeOffset; + } + } + if (videoTrack.sps && videoTrack.pps && videoSamples.length) { + // let's use input time scale as MP4 video timescale + // we use input time scale straight away to avoid rounding issues on frame duration / cts computation + var inputTimeScale = videoTrack.inputTimeScale; + videoTrack.timescale = inputTimeScale; + tracks.video = { + container: 'video/mp4', + codec: videoTrack.codec, + initSegment: mp4_generator_1.default.initSegment([videoTrack]), + metadata: { + width: videoTrack.width, + height: videoTrack.height + } + }; + if (computePTSDTS) { + initPTS = Math.min(initPTS, videoSamples[0].pts - inputTimeScale * timeOffset); + initDTS = Math.min(initDTS, videoSamples[0].dts - inputTimeScale * timeOffset); + this.observer.trigger(events_1.default.INIT_PTS_FOUND, { initPTS: initPTS }); + } + } + if (Object.keys(tracks).length) { + observer.trigger(events_1.default.FRAG_PARSING_INIT_SEGMENT, data); + this.ISGenerated = true; + if (computePTSDTS) { + this._initPTS = initPTS; + this._initDTS = initDTS; + } + } + else { + observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MEDIA_ERROR, details: errors_1.ErrorDetails.FRAG_PARSING_ERROR, fatal: false, reason: 'no audio/video samples found' }); + } + }; + MP4Remuxer.prototype.remuxVideo = function (track, timeOffset, contiguous, audioTrackLength, accurateTimeOffset) { + var offset = 8; + var mp4SampleDuration; + var mdat; + var moof; + var firstPTS; + var firstDTS; + var lastPTS; + var lastDTS; + var timeScale = track.timescale; + var inputSamples = track.samples; + var outputSamples = []; + var nbSamples = inputSamples.length; + var ptsNormalize = this._PTSNormalize; + var initPTS = this._initPTS; + // if parsed fragment is contiguous with last one, let's use last DTS value as reference + var nextAvcDts = this.nextAvcDts; + var isSafari = this.isSafari; + if (nbSamples === 0) { + return; + } + // Safari does not like overlapping DTS on consecutive fragments. let's use nextAvcDts to overcome this if fragments are consecutive + if (isSafari) { + // also consider consecutive fragments as being contiguous (even if a level switch occurs), + // for sake of clarity: + // consecutive fragments are frags with + // - less than 100ms gaps between new time offset (if accurate) and next expected PTS OR + // - less than 200 ms PTS gaps (timeScale/5) + contiguous |= (inputSamples.length && nextAvcDts && + ((accurateTimeOffset && Math.abs(timeOffset - nextAvcDts / timeScale) < 0.1) || + Math.abs((inputSamples[0].pts - nextAvcDts - initPTS)) < timeScale / 5)); + } + if (!contiguous) { + // if not contiguous, let's use target timeOffset + nextAvcDts = timeOffset * timeScale; + } + // PTS is coded on 33bits, and can loop from -2^32 to 2^32 + // ptsNormalize will make PTS/DTS value monotonic, we use last known DTS value as reference value + inputSamples.forEach(function (sample) { + sample.pts = ptsNormalize(sample.pts - initPTS, nextAvcDts); + sample.dts = ptsNormalize(sample.dts - initPTS, nextAvcDts); + }); + // sort video samples by DTS then PTS then demux id order + inputSamples.sort(function (a, b) { + var deltadts = a.dts - b.dts; + var deltapts = a.pts - b.pts; + return deltadts || (deltapts || (a.id - b.id)); + }); + // handle broken streams with PTS < DTS, tolerance up 200ms (18000 in 90kHz timescale) + var PTSDTSshift = inputSamples.reduce(function (prev, curr) { return Math.max(Math.min(prev, curr.pts - curr.dts), -18000); }, 0); + if (PTSDTSshift < 0) { + logger_1.logger.warn("PTS < DTS detected in video samples, shifting DTS by " + Math.round(PTSDTSshift / 90) + " ms to overcome this issue"); + for (var i = 0; i < inputSamples.length; i++) { + inputSamples[i].dts += PTSDTSshift; + } + } + // compute first DTS and last DTS, normalize them against reference value + var sample = inputSamples[0]; + firstDTS = Math.max(sample.dts, 0); + firstPTS = Math.max(sample.pts, 0); + // check timestamp continuity accross consecutive fragments (this is to remove inter-fragment gap/hole) + var delta = Math.round((firstDTS - nextAvcDts) / 90); + // if fragment are contiguous, detect hole/overlapping between fragments + if (contiguous) { + if (delta) { + if (delta > 1) { + logger_1.logger.log("AVC:" + delta + " ms hole between fragments detected,filling it"); + } + else if (delta < -1) { + logger_1.logger.log("AVC:" + (-delta) + " ms overlapping between fragments detected"); + } + // remove hole/gap : set DTS to next expected DTS + firstDTS = nextAvcDts; + inputSamples[0].dts = firstDTS; + // offset PTS as well, ensure that PTS is smaller or equal than new DTS + firstPTS = Math.max(firstPTS - delta, nextAvcDts); + inputSamples[0].pts = firstPTS; + logger_1.logger.log("Video/PTS/DTS adjusted: " + Math.round(firstPTS / 90) + "/" + Math.round(firstDTS / 90) + ",delta:" + delta + " ms"); + } + } + // compute lastPTS/lastDTS + sample = inputSamples[inputSamples.length - 1]; + lastDTS = Math.max(sample.dts, 0); + lastPTS = Math.max(sample.pts, 0, lastDTS); + // on Safari let's signal the same sample duration for all samples + // sample duration (as expected by trun MP4 boxes), should be the delta between sample DTS + // set this constant duration as being the avg delta between consecutive DTS. + if (isSafari) { + mp4SampleDuration = Math.round((lastDTS - firstDTS) / (inputSamples.length - 1)); + } + var nbNalu = 0, naluLen = 0; + for (var i = 0; i < nbSamples; i++) { + // compute total/avc sample length and nb of NAL units + var sample_1 = inputSamples[i], units = sample_1.units, nbUnits = units.length, sampleLen = 0; + for (var j = 0; j < nbUnits; j++) { + sampleLen += units[j].data.length; + } + naluLen += sampleLen; + nbNalu += nbUnits; + sample_1.length = sampleLen; + // normalize PTS/DTS + if (isSafari) { + // sample DTS is computed using a constant decoding offset (mp4SampleDuration) between samples + sample_1.dts = firstDTS + i * mp4SampleDuration; + } + else { + // ensure sample monotonic DTS + sample_1.dts = Math.max(sample_1.dts, firstDTS); + } + // ensure that computed value is greater or equal than sample DTS + sample_1.pts = Math.max(sample_1.pts, sample_1.dts); + } + /* concatenate the video data and construct the mdat in place + (need 8 more bytes to fill length and mpdat type) */ + var mdatSize = naluLen + (4 * nbNalu) + 8; + try { + mdat = new Uint8Array(mdatSize); + } + catch (err) { + this.observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MUX_ERROR, details: errors_1.ErrorDetails.REMUX_ALLOC_ERROR, fatal: false, bytes: mdatSize, reason: "fail allocating video mdat " + mdatSize }); + return; + } + var view = new DataView(mdat.buffer); + view.setUint32(0, mdatSize); + mdat.set(mp4_generator_1.default.types.mdat, 4); + for (var i = 0; i < nbSamples; i++) { + var avcSample = inputSamples[i], avcSampleUnits = avcSample.units, mp4SampleLength = 0, compositionTimeOffset = void 0; + // convert NALU bitstream to MP4 format (prepend NALU with size field) + for (var j = 0, nbUnits = avcSampleUnits.length; j < nbUnits; j++) { + var unit = avcSampleUnits[j], unitData = unit.data, unitDataLen = unit.data.byteLength; + view.setUint32(offset, unitDataLen); + offset += 4; + mdat.set(unitData, offset); + offset += unitDataLen; + mp4SampleLength += 4 + unitDataLen; + } + if (!isSafari) { + // expected sample duration is the Decoding Timestamp diff of consecutive samples + if (i < nbSamples - 1) { + mp4SampleDuration = inputSamples[i + 1].dts - avcSample.dts; + } + else { + var config = this.config, lastFrameDuration = avcSample.dts - inputSamples[i > 0 ? i - 1 : i].dts; + if (config.stretchShortVideoTrack) { + // In some cases, a segment's audio track duration may exceed the video track duration. + // Since we've already remuxed audio, and we know how long the audio track is, we look to + // see if the delta to the next segment is longer than maxBufferHole. + // If so, playback would potentially get stuck, so we artificially inflate + // the duration of the last frame to minimize any potential gap between segments. + var maxBufferHole = config.maxBufferHole, gapTolerance = Math.floor(maxBufferHole * timeScale), deltaToFrameEnd = (audioTrackLength ? firstPTS + audioTrackLength * timeScale : this.nextAudioPts) - avcSample.pts; + if (deltaToFrameEnd > gapTolerance) { + // We subtract lastFrameDuration from deltaToFrameEnd to try to prevent any video + // frame overlap. maxBufferHole should be >> lastFrameDuration anyway. + mp4SampleDuration = deltaToFrameEnd - lastFrameDuration; + if (mp4SampleDuration < 0) { + mp4SampleDuration = lastFrameDuration; + } + logger_1.logger.log("It is approximately " + deltaToFrameEnd / 90 + " ms to the next segment; using duration " + mp4SampleDuration / 90 + " ms for the last video frame."); + } + else { + mp4SampleDuration = lastFrameDuration; + } + } + else { + mp4SampleDuration = lastFrameDuration; + } + } + compositionTimeOffset = Math.round(avcSample.pts - avcSample.dts); + } + else { + compositionTimeOffset = Math.max(0, mp4SampleDuration * Math.round((avcSample.pts - avcSample.dts) / mp4SampleDuration)); + } + // console.log('PTS/DTS/initDTS/normPTS/normDTS/relative PTS : ${avcSample.pts}/${avcSample.dts}/${initDTS}/${ptsnorm}/${dtsnorm}/${(avcSample.pts/4294967296).toFixed(3)}'); + outputSamples.push({ + size: mp4SampleLength, + // constant duration + duration: mp4SampleDuration, + cts: compositionTimeOffset, + flags: { + isLeading: 0, + isDependedOn: 0, + hasRedundancy: 0, + degradPrio: 0, + dependsOn: avcSample.key ? 2 : 1, + isNonSync: avcSample.key ? 0 : 1 + } + }); + } + // next AVC sample DTS should be equal to last sample DTS + last sample duration (in PES timescale) + this.nextAvcDts = lastDTS + mp4SampleDuration; + var dropped = track.dropped; + track.len = 0; + track.nbNalu = 0; + track.dropped = 0; + if (outputSamples.length && navigator.userAgent.toLowerCase().indexOf('chrome') > -1) { + var flags = outputSamples[0].flags; + // chrome workaround, mark first sample as being a Random Access Point to avoid sourcebuffer append issue + // https://code.google.com/p/chromium/issues/detail?id=229412 + flags.dependsOn = 2; + flags.isNonSync = 0; + } + track.samples = outputSamples; + moof = mp4_generator_1.default.moof(track.sequenceNumber++, firstDTS, track); + track.samples = []; + var data = { + data1: moof, + data2: mdat, + startPTS: firstPTS / timeScale, + endPTS: (lastPTS + mp4SampleDuration) / timeScale, + startDTS: firstDTS / timeScale, + endDTS: this.nextAvcDts / timeScale, + type: 'video', + hasAudio: false, + hasVideo: true, + nb: outputSamples.length, + dropped: dropped + }; + this.observer.trigger(events_1.default.FRAG_PARSING_DATA, data); + return data; + }; + MP4Remuxer.prototype.remuxAudio = function (track, timeOffset, contiguous, accurateTimeOffset) { + var inputTimeScale = track.inputTimeScale; + var mp4timeScale = track.timescale; + var scaleFactor = inputTimeScale / mp4timeScale; + var mp4SampleDuration = track.isAAC ? 1024 : 1152; + var inputSampleDuration = mp4SampleDuration * scaleFactor; + var ptsNormalize = this._PTSNormalize; + var initPTS = this._initPTS; + var rawMPEG = !track.isAAC && this.typeSupported.mpeg; + var offset, mp4Sample, fillFrame, mdat, moof, firstPTS, lastPTS, inputSamples = track.samples, outputSamples = [], nextAudioPts = this.nextAudioPts; + // for audio samples, also consider consecutive fragments as being contiguous (even if a level switch occurs), + // for sake of clarity: + // consecutive fragments are frags with + // - less than 100ms gaps between new time offset (if accurate) and next expected PTS OR + // - less than 20 audio frames distance + // contiguous fragments are consecutive fragments from same quality level (same level, new SN = old SN + 1) + // this helps ensuring audio continuity + // and this also avoids audio glitches/cut when switching quality, or reporting wrong duration on first audio frame + contiguous |= (inputSamples.length && nextAudioPts && + ((accurateTimeOffset && Math.abs(timeOffset - nextAudioPts / inputTimeScale) < 0.1) || + Math.abs((inputSamples[0].pts - nextAudioPts - initPTS)) < 20 * inputSampleDuration)); + // compute normalized PTS + inputSamples.forEach(function (sample) { + sample.pts = sample.dts = ptsNormalize(sample.pts - initPTS, timeOffset * inputTimeScale); + }); + // filter out sample with negative PTS that are not playable anyway + // if we don't remove these negative samples, they will shift all audio samples forward. + // leading to audio overlap between current / next fragment + inputSamples = inputSamples.filter(function (sample) { + return sample.pts >= 0; + }); + // in case all samples have negative PTS, and have been filtered out, return now + if (inputSamples.length === 0) { + return; + } + if (!contiguous) { + if (!accurateTimeOffset) { + // if frag are mot contiguous and if we cant trust time offset, let's use first sample PTS as next audio PTS + nextAudioPts = inputSamples[0].pts; + } + else { + // if timeOffset is accurate, let's use it as predicted next audio PTS + nextAudioPts = timeOffset * inputTimeScale; + } + } + // If the audio track is missing samples, the frames seem to get "left-shifted" within the + // resulting mp4 segment, causing sync issues and leaving gaps at the end of the audio segment. + // In an effort to prevent this from happening, we inject frames here where there are gaps. + // When possible, we inject a silent frame; when that's not possible, we duplicate the last + // frame. + if (track.isAAC) { + var maxAudioFramesDrift = this.config.maxAudioFramesDrift; + for (var i = 0, nextPts = nextAudioPts; i < inputSamples.length;) { + // First, let's see how far off this frame is from where we expect it to be + var sample = inputSamples[i], delta; + var pts = sample.pts; + delta = pts - nextPts; + var duration = Math.abs(1000 * delta / inputTimeScale); + // If we're overlapping by more than a duration, drop this sample + if (delta <= -maxAudioFramesDrift * inputSampleDuration) { + logger_1.logger.warn("Dropping 1 audio frame @ " + (nextPts / inputTimeScale).toFixed(3) + "s due to " + Math.round(duration) + " ms overlap."); + inputSamples.splice(i, 1); + track.len -= sample.unit.length; + // Don't touch nextPtsNorm or i + } // eslint-disable-line brace-style + // Insert missing frames if: + // 1: We're more than maxAudioFramesDrift frame away + // 2: Not more than MAX_SILENT_FRAME_DURATION away + // 3: currentTime (aka nextPtsNorm) is not 0 + else if (delta >= maxAudioFramesDrift * inputSampleDuration && duration < MAX_SILENT_FRAME_DURATION && nextPts) { + var missing = Math.round(delta / inputSampleDuration); + logger_1.logger.warn("Injecting " + missing + " audio frame @ " + (nextPts / inputTimeScale).toFixed(3) + "s due to " + Math.round(1000 * delta / inputTimeScale) + " ms gap."); + for (var j = 0; j < missing; j++) { + var newStamp = Math.max(nextPts, 0); + fillFrame = aac_helper_1.default.getSilentFrame(track.manifestCodec || track.codec, track.channelCount); + if (!fillFrame) { + logger_1.logger.log('Unable to get silent frame for given audio codec; duplicating last frame instead.'); + fillFrame = sample.unit.subarray(); + } + inputSamples.splice(i, 0, { unit: fillFrame, pts: newStamp, dts: newStamp }); + track.len += fillFrame.length; + nextPts += inputSampleDuration; + i++; + } + // Adjust sample to next expected pts + sample.pts = sample.dts = nextPts; + nextPts += inputSampleDuration; + i++; + } + else { + // Otherwise, just adjust pts + if (Math.abs(delta) > (0.1 * inputSampleDuration)) { + // logger.log(`Invalid frame delta ${Math.round(delta + inputSampleDuration)} at PTS ${Math.round(pts / 90)} (should be ${Math.round(inputSampleDuration)}).`); + } + sample.pts = sample.dts = nextPts; + nextPts += inputSampleDuration; + i++; + } + } + } + for (var j = 0, nbSamples_1 = inputSamples.length; j < nbSamples_1; j++) { + var audioSample = inputSamples[j]; + var unit = audioSample.unit; + var pts = audioSample.pts; + // logger.log(`Audio/PTS:${Math.round(pts/90)}`); + // if not first sample + if (lastPTS !== undefined) { + mp4Sample.duration = Math.round((pts - lastPTS) / scaleFactor); + } + else { + var delta_1 = Math.round(1000 * (pts - nextAudioPts) / inputTimeScale), numMissingFrames = 0; + // if fragment are contiguous, detect hole/overlapping between fragments + // contiguous fragments are consecutive fragments from same quality level (same level, new SN = old SN + 1) + if (contiguous && track.isAAC) { + // log delta + if (delta_1) { + if (delta_1 > 0 && delta_1 < MAX_SILENT_FRAME_DURATION) { + numMissingFrames = Math.round((pts - nextAudioPts) / inputSampleDuration); + logger_1.logger.log(delta_1 + " ms hole between AAC samples detected,filling it"); + if (numMissingFrames > 0) { + fillFrame = aac_helper_1.default.getSilentFrame(track.manifestCodec || track.codec, track.channelCount); + if (!fillFrame) { + fillFrame = unit.subarray(); + } + track.len += numMissingFrames * fillFrame.length; + } + // if we have frame overlap, overlapping for more than half a frame duraion + } + else if (delta_1 < -12) { + // drop overlapping audio frames... browser will deal with it + logger_1.logger.log("drop overlapping AAC sample, expected/parsed/delta:" + (nextAudioPts / inputTimeScale).toFixed(3) + "s/" + (pts / inputTimeScale).toFixed(3) + "s/" + (-delta_1) + "ms"); + track.len -= unit.byteLength; + continue; + } + // set PTS/DTS to expected PTS/DTS + pts = nextAudioPts; + } + } + // remember first PTS of our audioSamples + firstPTS = pts; + if (track.len > 0) { + /* concatenate the audio data and construct the mdat in place + (need 8 more bytes to fill length and mdat type) */ + var mdatSize = rawMPEG ? track.len : track.len + 8; + offset = rawMPEG ? 0 : 8; + try { + mdat = new Uint8Array(mdatSize); + } + catch (err) { + this.observer.trigger(events_1.default.ERROR, { type: errors_1.ErrorTypes.MUX_ERROR, details: errors_1.ErrorDetails.REMUX_ALLOC_ERROR, fatal: false, bytes: mdatSize, reason: "fail allocating audio mdat " + mdatSize }); + return; + } + if (!rawMPEG) { + var view = new DataView(mdat.buffer); + view.setUint32(0, mdatSize); + mdat.set(mp4_generator_1.default.types.mdat, 4); + } + } + else { + // no audio samples + return; + } + for (var i = 0; i < numMissingFrames; i++) { + fillFrame = aac_helper_1.default.getSilentFrame(track.manifestCodec || track.codec, track.channelCount); + if (!fillFrame) { + logger_1.logger.log('Unable to get silent frame for given audio codec; duplicating this frame instead.'); + fillFrame = unit.subarray(); + } + mdat.set(fillFrame, offset); + offset += fillFrame.byteLength; + mp4Sample = { + size: fillFrame.byteLength, + cts: 0, + duration: 1024, + flags: { + isLeading: 0, + isDependedOn: 0, + hasRedundancy: 0, + degradPrio: 0, + dependsOn: 1 + } + }; + outputSamples.push(mp4Sample); + } + } + mdat.set(unit, offset); + var unitLen = unit.byteLength; + offset += unitLen; + // console.log('PTS/DTS/initDTS/normPTS/normDTS/relative PTS : ${audioSample.pts}/${audioSample.dts}/${initDTS}/${ptsnorm}/${dtsnorm}/${(audioSample.pts/4294967296).toFixed(3)}'); + mp4Sample = { + size: unitLen, + cts: 0, + duration: 0, + flags: { + isLeading: 0, + isDependedOn: 0, + hasRedundancy: 0, + degradPrio: 0, + dependsOn: 1 + } + }; + outputSamples.push(mp4Sample); + lastPTS = pts; + } + var lastSampleDuration = 0; + var nbSamples = outputSamples.length; + // set last sample duration as being identical to previous sample + if (nbSamples >= 2) { + lastSampleDuration = outputSamples[nbSamples - 2].duration; + mp4Sample.duration = lastSampleDuration; + } + if (nbSamples) { + // next audio sample PTS should be equal to last sample PTS + duration + this.nextAudioPts = nextAudioPts = lastPTS + scaleFactor * lastSampleDuration; + // logger.log('Audio/PTS/PTSend:' + audioSample.pts.toFixed(0) + '/' + this.nextAacDts.toFixed(0)); + track.len = 0; + track.samples = outputSamples; + if (rawMPEG) { + moof = new Uint8Array(); + } + else { + moof = mp4_generator_1.default.moof(track.sequenceNumber++, firstPTS / scaleFactor, track); + } + track.samples = []; + var start = firstPTS / inputTimeScale; + var end = nextAudioPts / inputTimeScale; + var audioData = { + data1: moof, + data2: mdat, + startPTS: start, + endPTS: end, + startDTS: start, + endDTS: end, + type: 'audio', + hasAudio: true, + hasVideo: false, + nb: nbSamples + }; + this.observer.trigger(events_1.default.FRAG_PARSING_DATA, audioData); + return audioData; + } + return null; + }; + MP4Remuxer.prototype.remuxEmptyAudio = function (track, timeOffset, contiguous, videoData) { + var inputTimeScale = track.inputTimeScale, mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale, scaleFactor = inputTimeScale / mp4timeScale, nextAudioPts = this.nextAudioPts, + // sync with video's timestamp + startDTS = (nextAudioPts !== undefined ? nextAudioPts : videoData.startDTS * inputTimeScale) + this._initDTS, endDTS = videoData.endDTS * inputTimeScale + this._initDTS, + // one sample's duration value + sampleDuration = 1024, frameDuration = scaleFactor * sampleDuration, + // samples count of this segment's duration + nbSamples = Math.ceil((endDTS - startDTS) / frameDuration), + // silent frame + silentFrame = aac_helper_1.default.getSilentFrame(track.manifestCodec || track.codec, track.channelCount); + logger_1.logger.warn('remux empty Audio'); + // Can't remux if we can't generate a silent frame... + if (!silentFrame) { + logger_1.logger.trace('Unable to remuxEmptyAudio since we were unable to get a silent frame for given audio codec!'); + return; + } + var samples = []; + for (var i = 0; i < nbSamples; i++) { + var stamp = startDTS + i * frameDuration; + samples.push({ unit: silentFrame, pts: stamp, dts: stamp }); + track.len += silentFrame.length; + } + track.samples = samples; + this.remuxAudio(track, timeOffset, contiguous); + }; + MP4Remuxer.prototype.remuxID3 = function (track) { + var length = track.samples.length, sample; + var inputTimeScale = track.inputTimeScale; + var initPTS = this._initPTS; + var initDTS = this._initDTS; + // consume samples + if (length) { + for (var index = 0; index < length; index++) { + sample = track.samples[index]; + // setting id3 pts, dts to relative time + // using this._initPTS and this._initDTS to calculate relative time + sample.pts = ((sample.pts - initPTS) / inputTimeScale); + sample.dts = ((sample.dts - initDTS) / inputTimeScale); + } + this.observer.trigger(events_1.default.FRAG_PARSING_METADATA, { + samples: track.samples + }); + } + track.samples = []; + }; + MP4Remuxer.prototype.remuxText = function (track) { + track.samples.sort(function (a, b) { + return (a.pts - b.pts); + }); + var length = track.samples.length, sample; + var inputTimeScale = track.inputTimeScale; + var initPTS = this._initPTS; + // consume samples + if (length) { + for (var index = 0; index < length; index++) { + sample = track.samples[index]; + // setting text pts, dts to relative time + // using this._initPTS and this._initDTS to calculate relative time + sample.pts = ((sample.pts - initPTS) / inputTimeScale); + } + this.observer.trigger(events_1.default.FRAG_PARSING_USERDATA, { + samples: track.samples + }); + } + track.samples = []; + }; + MP4Remuxer.prototype._PTSNormalize = function (value, reference) { + var offset; + if (reference === undefined) { + return value; + } + if (reference < value) { + // - 2^33 + offset = -8589934592; + } + else { + // + 2^33 + offset = 8589934592; + } + /* PTS is 33bit (from 0 to 2^33 -1) + if diff between value and reference is bigger than half of the amplitude (2^32) then it means that + PTS looping occured. fill the gap */ + while (Math.abs(value - reference) > 4294967296) { + value += offset; + } + return value; + }; + return MP4Remuxer; +}()); +exports.default = MP4Remuxer; + + +/***/ }), + +/***/ "./src/remux/passthrough-remuxer.js": +/*!******************************************!*\ + !*** ./src/remux/passthrough-remuxer.js ***! + \******************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +/** + * passthrough remuxer +*/ +var events_1 = __webpack_require__(/*! ../events */ "./src/events.js"); +var PassThroughRemuxer = /** @class */ (function () { + function PassThroughRemuxer(observer) { + this.observer = observer; + } + PassThroughRemuxer.prototype.destroy = function () { + }; + PassThroughRemuxer.prototype.resetTimeStamp = function () { + }; + PassThroughRemuxer.prototype.resetInitSegment = function () { + }; + PassThroughRemuxer.prototype.remux = function (audioTrack, videoTrack, id3Track, textTrack, timeOffset, contiguous, accurateTimeOffset, rawData) { + var observer = this.observer; + var streamType = ''; + if (audioTrack) { + streamType += 'audio'; + } + if (videoTrack) { + streamType += 'video'; + } + observer.trigger(events_1.default.FRAG_PARSING_DATA, { + data1: rawData, + startPTS: timeOffset, + startDTS: timeOffset, + type: streamType, + hasAudio: !!audioTrack, + hasVideo: !!videoTrack, + nb: 1, + dropped: 0 + }); + // notify end of parsing + observer.trigger(events_1.default.FRAG_PARSED); + }; + return PassThroughRemuxer; +}()); +exports.default = PassThroughRemuxer; + + +/***/ }), + +/***/ "./src/task-loop.js": +/*!**************************!*\ + !*** ./src/task-loop.js ***! + \**************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +var __extends = (this && this.__extends) || (function () { + var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +var event_handler_1 = __webpack_require__(/*! ./event-handler */ "./src/event-handler.js"); +/** + * Sub-class specialization of EventHandler base class. + * + * TaskLoop allows to schedule a task function being called (optionnaly repeatedly) on the main loop, + * scheduled asynchroneously, avoiding recursive calls in the same tick. + * + * The task itself is implemented in `doTick`. It can be requested and called for single execution + * using the `tick` method. + * + * It will be assured that the task execution method (`tick`) only gets called once per main loop "tick", + * no matter how often it gets requested for execution. Execution in further ticks will be scheduled accordingly. + * + * If further execution requests have already been scheduled on the next tick, it can be checked with `hasNextTick`, + * and cancelled with `clearNextTick`. + * + * The task can be scheduled as an interval repeatedly with a period as parameter (see `setInterval`, `clearInterval`). + * + * Sub-classes need to implement the `doTick` method which will effectively have the task execution routine. + * + * Further explanations: + * + * The baseclass has a `tick` method that will schedule the doTick call. It may be called synchroneously + * only for a stack-depth of one. On re-entrant calls, sub-sequent calls are scheduled for next main loop ticks. + * + * When the task execution (`tick` method) is called in re-entrant way this is detected and + * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further + * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo). + */ +var TaskLoop = /** @class */ (function (_super) { + __extends(TaskLoop, _super); + function TaskLoop(hls) { + var events = []; + for (var _i = 1; _i < arguments.length; _i++) { + events[_i - 1] = arguments[_i]; + } + var _this = _super.apply(this, [hls].concat(events)) || this; + _this._tickInterval = null; + _this._tickTimer = null; + _this._tickCallCount = 0; + _this._boundTick = _this.tick.bind(_this); + return _this; + } + /** + * @override + */ + TaskLoop.prototype.onHandlerDestroying = function () { + // clear all timers before unregistering from event bus + this.clearNextTick(); + this.clearInterval(); + }; + /** + * @returns {boolean} + */ + TaskLoop.prototype.hasInterval = function () { + return !!this._tickInterval; + }; + /** + * @returns {boolean} + */ + TaskLoop.prototype.hasNextTick = function () { + return !!this._tickTimer; + }; + /** + * @param {number} millis Interval time (ms) + * @returns {boolean} True when interval has been scheduled, false when already scheduled (no effect) + */ + TaskLoop.prototype.setInterval = function (millis) { + if (!this._tickInterval) { + this._tickInterval = setInterval(this._boundTick, millis); + return true; + } + return false; + }; + /** + * @returns {boolean} True when interval was cleared, false when none was set (no effect) + */ + TaskLoop.prototype.clearInterval = function () { + if (this._tickInterval) { + clearInterval(this._tickInterval); + this._tickInterval = null; + return true; + } + return false; + }; + /** + * @returns {boolean} True when timeout was cleared, false when none was set (no effect) + */ + TaskLoop.prototype.clearNextTick = function () { + if (this._tickTimer) { + clearTimeout(this._tickTimer); + this._tickTimer = null; + return true; + } + return false; + }; + /** + * Will call the subclass doTick implementation in this main loop tick + * or in the next one (via setTimeout(,0)) in case it has already been called + * in this tick (in case this is a re-entrant call). + */ + TaskLoop.prototype.tick = function () { + this._tickCallCount++; + if (this._tickCallCount === 1) { + this.doTick(); + // re-entrant call to tick from previous doTick call stack + // -> schedule a call on the next main loop iteration to process this task processing request + if (this._tickCallCount > 1) { + // make sure only one timer exists at any time at max + this.clearNextTick(); + this._tickTimer = setTimeout(this._boundTick, 0); + } + this._tickCallCount = 0; + } + }; + /** + * For subclass to implement task logic + * @abstract + */ + TaskLoop.prototype.doTick = function () { }; + return TaskLoop; +}(event_handler_1.default)); +exports.default = TaskLoop; + + +/***/ }), + +/***/ "./src/utils/attr-list.js": +/*!********************************!*\ + !*** ./src/utils/attr-list.js ***! + \********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var DECIMAL_RESOLUTION_REGEX = /^(\d+)x(\d+)$/; // eslint-disable-line no-useless-escape +var ATTR_LIST_REGEX = /\s*(.+?)\s*=((?:\".*?\")|.*?)(?:,|$)/g; // eslint-disable-line no-useless-escape +// adapted from https://github.com/kanongil/node-m3u8parse/blob/master/attrlist.js +var AttrList = /** @class */ (function () { + function AttrList(attrs) { + if (typeof attrs === 'string') { + attrs = AttrList.parseAttrList(attrs); + } + for (var attr in attrs) { + if (attrs.hasOwnProperty(attr)) { + this[attr] = attrs[attr]; + } + } + } + AttrList.prototype.decimalInteger = function (attrName) { + var intValue = parseInt(this[attrName], 10); + if (intValue > Number.MAX_SAFE_INTEGER) { + return Infinity; + } + return intValue; + }; + AttrList.prototype.hexadecimalInteger = function (attrName) { + if (this[attrName]) { + var stringValue = (this[attrName] || '0x').slice(2); + stringValue = ((stringValue.length & 1) ? '0' : '') + stringValue; + var value = new Uint8Array(stringValue.length / 2); + for (var i = 0; i < stringValue.length / 2; i++) { + value[i] = parseInt(stringValue.slice(i * 2, i * 2 + 2), 16); + } + return value; + } + else { + return null; + } + }; + AttrList.prototype.hexadecimalIntegerAsNumber = function (attrName) { + var intValue = parseInt(this[attrName], 16); + if (intValue > Number.MAX_SAFE_INTEGER) { + return Infinity; + } + return intValue; + }; + AttrList.prototype.decimalFloatingPoint = function (attrName) { + return parseFloat(this[attrName]); + }; + AttrList.prototype.enumeratedString = function (attrName) { + return this[attrName]; + }; + AttrList.prototype.decimalResolution = function (attrName) { + var res = DECIMAL_RESOLUTION_REGEX.exec(this[attrName]); + if (res === null) { + return undefined; + } + return { + width: parseInt(res[1], 10), + height: parseInt(res[2], 10) + }; + }; + AttrList.parseAttrList = function (input) { + var match, attrs = {}; + ATTR_LIST_REGEX.lastIndex = 0; + while ((match = ATTR_LIST_REGEX.exec(input)) !== null) { + var value = match[2], quote = '"'; + if (value.indexOf(quote) === 0 && + value.lastIndexOf(quote) === (value.length - 1)) { + value = value.slice(1, -1); + } + attrs[match[1]] = value; + } + return attrs; + }; + return AttrList; +}()); +exports.default = AttrList; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/utils/binary-search.js": +/*!************************************!*\ + !*** ./src/utils/binary-search.js ***! + \************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var BinarySearch = { + /** + * Searches for an item in an array which matches a certain condition. + * This requires the condition to only match one item in the array, + * and for the array to be ordered. + * + * @param {Array} list The array to search. + * @param {Function} comparisonFunction + * Called and provided a candidate item as the first argument. + * Should return: + * > -1 if the item should be located at a lower index than the provided item. + * > 1 if the item should be located at a higher index than the provided item. + * > 0 if the item is the item you're looking for. + * + * @return {*} The object if it is found or null otherwise. + */ + search: function (list, comparisonFunction) { + var minIndex = 0; + var maxIndex = list.length - 1; + var currentIndex = null; + var currentElement = null; + while (minIndex <= maxIndex) { + currentIndex = (minIndex + maxIndex) / 2 | 0; + currentElement = list[currentIndex]; + var comparisonResult = comparisonFunction(currentElement); + if (comparisonResult > 0) { + minIndex = currentIndex + 1; + } + else if (comparisonResult < 0) { + maxIndex = currentIndex - 1; + } + else { + return currentElement; + } + } + return null; + } +}; +exports.default = BinarySearch; + + +/***/ }), + +/***/ "./src/utils/buffer-helper.js": +/*!************************************!*\ + !*** ./src/utils/buffer-helper.js ***! + \************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * @module BufferHelper + * + * Providing methods dealing with buffer length retrieval for example. + * + * In general, a helper around HTML5 MediaElement TimeRanges gathered from `buffered` property. + * + * Also @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/buffered +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var BufferHelper = /** @class */ (function () { + function BufferHelper() { + } + /** + * Return true if `media`'s buffered include `position` + * @param {HTMLMediaElement|SourceBuffer} media + * @param {number} position + * @returns {boolean} + */ + BufferHelper.isBuffered = function (media, position) { + try { + if (media) { + var buffered = media.buffered; + for (var i = 0; i < buffered.length; i++) { + if (position >= buffered.start(i) && position <= buffered.end(i)) { + return true; + } + } + } + } + catch (error) { + // this is to catch + // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer': + // This SourceBuffer has been removed from the parent media source + } + return false; + }; + BufferHelper.bufferInfo = function (media, pos, maxHoleDuration) { + try { + if (media) { + var vbuffered = media.buffered, buffered = [], i = void 0; + for (i = 0; i < vbuffered.length; i++) { + buffered.push({ start: vbuffered.start(i), end: vbuffered.end(i) }); + } + return this.bufferedInfo(buffered, pos, maxHoleDuration); + } + } + catch (error) { + // this is to catch + // InvalidStateError: Failed to read the 'buffered' property from 'SourceBuffer': + // This SourceBuffer has been removed from the parent media source + } + return { len: 0, start: pos, end: pos, nextStart: undefined }; + }; + BufferHelper.bufferedInfo = function (buffered, pos, maxHoleDuration) { + var buffered2 = [], + // bufferStart and bufferEnd are buffer boundaries around current video position + bufferLen, bufferStart, bufferEnd, bufferStartNext, i; + // sort on buffer.start/smaller end (IE does not always return sorted buffered range) + buffered.sort(function (a, b) { + var diff = a.start - b.start; + if (diff) { + return diff; + } + else { + return b.end - a.end; + } + }); + // there might be some small holes between buffer time range + // consider that holes smaller than maxHoleDuration are irrelevant and build another + // buffer time range representations that discards those holes + for (i = 0; i < buffered.length; i++) { + var buf2len = buffered2.length; + if (buf2len) { + var buf2end = buffered2[buf2len - 1].end; + // if small hole (value between 0 or maxHoleDuration ) or overlapping (negative) + if ((buffered[i].start - buf2end) < maxHoleDuration) { + // merge overlapping time ranges + // update lastRange.end only if smaller than item.end + // e.g. [ 1, 15] with [ 2,8] => [ 1,15] (no need to modify lastRange.end) + // whereas [ 1, 8] with [ 2,15] => [ 1,15] ( lastRange should switch from [1,8] to [1,15]) + if (buffered[i].end > buf2end) { + buffered2[buf2len - 1].end = buffered[i].end; + } + } + else { + // big hole + buffered2.push(buffered[i]); + } + } + else { + // first value + buffered2.push(buffered[i]); + } + } + for (i = 0, bufferLen = 0, bufferStart = bufferEnd = pos; i < buffered2.length; i++) { + var start = buffered2[i].start, end = buffered2[i].end; + // logger.log('buf start/end:' + buffered.start(i) + '/' + buffered.end(i)); + if ((pos + maxHoleDuration) >= start && pos < end) { + // play position is inside this buffer TimeRange, retrieve end of buffer position and buffer length + bufferStart = start; + bufferEnd = end; + bufferLen = bufferEnd - pos; + } + else if ((pos + maxHoleDuration) < start) { + bufferStartNext = start; + break; + } + } + return { len: bufferLen, start: bufferStart, end: bufferEnd, nextStart: bufferStartNext }; + }; + return BufferHelper; +}()); +exports.BufferHelper = BufferHelper; + + +/***/ }), + +/***/ "./src/utils/cea-608-parser.js": +/*!*************************************!*\ + !*** ./src/utils/cea-608-parser.js ***! + \*************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * + * This code was ported from the dash.js project at: + * https://github.com/Dash-Industry-Forum/dash.js/blob/development/externals/cea608-parser.js + * https://github.com/Dash-Industry-Forum/dash.js/commit/8269b26a761e0853bb21d78780ed945144ecdd4d#diff-71bc295a2d6b6b7093a1d3290d53a4b2 + * + * The original copyright appears below: + * + * The copyright in this software is being made available under the BSD License, + * included below. This software may be subject to other third party and contributor + * rights, including patent rights, and no such rights are granted under this license. + * + * Copyright (c) 2015-2016, DASH Industry Forum. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * 2. Neither the name of Dash Industry Forum nor the names of its + * contributors may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +/** + * Exceptions from regular ASCII. CodePoints are mapped to UTF-16 codes + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var specialCea608CharsCodes = { + 0x2a: 0xe1, + 0x5c: 0xe9, + 0x5e: 0xed, + 0x5f: 0xf3, + 0x60: 0xfa, + 0x7b: 0xe7, + 0x7c: 0xf7, + 0x7d: 0xd1, + 0x7e: 0xf1, + 0x7f: 0x2588, + // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS + // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F + // THIS MEANS THAT \x50 MUST BE ADDED TO THE VALUES + 0x80: 0xae, + 0x81: 0xb0, + 0x82: 0xbd, + 0x83: 0xbf, + 0x84: 0x2122, + 0x85: 0xa2, + 0x86: 0xa3, + 0x87: 0x266a, + 0x88: 0xe0, + 0x89: 0x20, + 0x8a: 0xe8, + 0x8b: 0xe2, + 0x8c: 0xea, + 0x8d: 0xee, + 0x8e: 0xf4, + 0x8f: 0xfb, + // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS + // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F + 0x90: 0xc1, + 0x91: 0xc9, + 0x92: 0xd3, + 0x93: 0xda, + 0x94: 0xdc, + 0x95: 0xfc, + 0x96: 0x2018, + 0x97: 0xa1, + 0x98: 0x2a, + 0x99: 0x2019, + 0x9a: 0x2501, + 0x9b: 0xa9, + 0x9c: 0x2120, + 0x9d: 0x2022, + 0x9e: 0x201c, + 0x9f: 0x201d, + 0xa0: 0xc0, + 0xa1: 0xc2, + 0xa2: 0xc7, + 0xa3: 0xc8, + 0xa4: 0xca, + 0xa5: 0xcb, + 0xa6: 0xeb, + 0xa7: 0xce, + 0xa8: 0xcf, + 0xa9: 0xef, + 0xaa: 0xd4, + 0xab: 0xd9, + 0xac: 0xf9, + 0xad: 0xdb, + 0xae: 0xab, + 0xaf: 0xbb, + // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS + // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F + 0xb0: 0xc3, + 0xb1: 0xe3, + 0xb2: 0xcd, + 0xb3: 0xcc, + 0xb4: 0xec, + 0xb5: 0xd2, + 0xb6: 0xf2, + 0xb7: 0xd5, + 0xb8: 0xf5, + 0xb9: 0x7b, + 0xba: 0x7d, + 0xbb: 0x5c, + 0xbc: 0x5e, + 0xbd: 0x5f, + 0xbe: 0x7c, + 0xbf: 0x223c, + 0xc0: 0xc4, + 0xc1: 0xe4, + 0xc2: 0xd6, + 0xc3: 0xf6, + 0xc4: 0xdf, + 0xc5: 0xa5, + 0xc6: 0xa4, + 0xc7: 0x2503, + 0xc8: 0xc5, + 0xc9: 0xe5, + 0xca: 0xd8, + 0xcb: 0xf8, + 0xcc: 0x250f, + 0xcd: 0x2513, + 0xce: 0x2517, + 0xcf: 0x251b // Box drawings heavy up and left +}; +/** + * Utils + */ +var getCharForByte = function (byte) { + var charCode = byte; + if (specialCea608CharsCodes.hasOwnProperty(byte)) { + charCode = specialCea608CharsCodes[byte]; + } + return String.fromCharCode(charCode); +}; +var NR_ROWS = 15, NR_COLS = 100; +// Tables to look up row from PAC data +var rowsLowCh1 = { 0x11: 1, 0x12: 3, 0x15: 5, 0x16: 7, 0x17: 9, 0x10: 11, 0x13: 12, 0x14: 14 }; +var rowsHighCh1 = { 0x11: 2, 0x12: 4, 0x15: 6, 0x16: 8, 0x17: 10, 0x13: 13, 0x14: 15 }; +var rowsLowCh2 = { 0x19: 1, 0x1A: 3, 0x1D: 5, 0x1E: 7, 0x1F: 9, 0x18: 11, 0x1B: 12, 0x1C: 14 }; +var rowsHighCh2 = { 0x19: 2, 0x1A: 4, 0x1D: 6, 0x1E: 8, 0x1F: 10, 0x1B: 13, 0x1C: 15 }; +var backgroundColors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'black', 'transparent']; +/** + * Simple logger class to be able to write with time-stamps and filter on level. + */ +var logger = { + verboseFilter: { 'DATA': 3, 'DEBUG': 3, 'INFO': 2, 'WARNING': 2, 'TEXT': 1, 'ERROR': 0 }, + time: null, + verboseLevel: 0, + setTime: function (newTime) { + this.time = newTime; + }, + log: function (severity, msg) { + var minLevel = this.verboseFilter[severity]; + if (this.verboseLevel >= minLevel) { + // console.log(this.time + ' [' + severity + '] ' + msg); + } + } +}; +var numArrayToHexArray = function (numArray) { + var hexArray = []; + for (var j = 0; j < numArray.length; j++) { + hexArray.push(numArray[j].toString(16)); + } + return hexArray; +}; +var PenState = /** @class */ (function () { + function PenState(foreground, underline, italics, background, flash) { + this.foreground = foreground || 'white'; + this.underline = underline || false; + this.italics = italics || false; + this.background = background || 'black'; + this.flash = flash || false; + } + PenState.prototype.reset = function () { + this.foreground = 'white'; + this.underline = false; + this.italics = false; + this.background = 'black'; + this.flash = false; + }; + PenState.prototype.setStyles = function (styles) { + var attribs = ['foreground', 'underline', 'italics', 'background', 'flash']; + for (var i = 0; i < attribs.length; i++) { + var style = attribs[i]; + if (styles.hasOwnProperty(style)) { + this[style] = styles[style]; + } + } + }; + PenState.prototype.isDefault = function () { + return (this.foreground === 'white' && !this.underline && !this.italics && + this.background === 'black' && !this.flash); + }; + PenState.prototype.equals = function (other) { + return ((this.foreground === other.foreground) && + (this.underline === other.underline) && + (this.italics === other.italics) && + (this.background === other.background) && + (this.flash === other.flash)); + }; + PenState.prototype.copy = function (newPenState) { + this.foreground = newPenState.foreground; + this.underline = newPenState.underline; + this.italics = newPenState.italics; + this.background = newPenState.background; + this.flash = newPenState.flash; + }; + PenState.prototype.toString = function () { + return ('color=' + this.foreground + ', underline=' + this.underline + ', italics=' + this.italics + + ', background=' + this.background + ', flash=' + this.flash); + }; + return PenState; +}()); +/** + * Unicode character with styling and background. + * @constructor + */ +var StyledUnicodeChar = /** @class */ (function () { + function StyledUnicodeChar(uchar, foreground, underline, italics, background, flash) { + this.uchar = uchar || ' '; // unicode character + this.penState = new PenState(foreground, underline, italics, background, flash); + } + StyledUnicodeChar.prototype.reset = function () { + this.uchar = ' '; + this.penState.reset(); + }; + StyledUnicodeChar.prototype.setChar = function (uchar, newPenState) { + this.uchar = uchar; + this.penState.copy(newPenState); + }; + StyledUnicodeChar.prototype.setPenState = function (newPenState) { + this.penState.copy(newPenState); + }; + StyledUnicodeChar.prototype.equals = function (other) { + return this.uchar === other.uchar && this.penState.equals(other.penState); + }; + StyledUnicodeChar.prototype.copy = function (newChar) { + this.uchar = newChar.uchar; + this.penState.copy(newChar.penState); + }; + StyledUnicodeChar.prototype.isEmpty = function () { + return this.uchar === ' ' && this.penState.isDefault(); + }; + return StyledUnicodeChar; +}()); +/** + * CEA-608 row consisting of NR_COLS instances of StyledUnicodeChar. + * @constructor + */ +var Row = /** @class */ (function () { + function Row() { + this.chars = []; + for (var i = 0; i < NR_COLS; i++) { + this.chars.push(new StyledUnicodeChar()); + } + this.pos = 0; + this.currPenState = new PenState(); + } + Row.prototype.equals = function (other) { + var equal = true; + for (var i = 0; i < NR_COLS; i++) { + if (!this.chars[i].equals(other.chars[i])) { + equal = false; + break; + } + } + return equal; + }; + Row.prototype.copy = function (other) { + for (var i = 0; i < NR_COLS; i++) { + this.chars[i].copy(other.chars[i]); + } + }; + Row.prototype.isEmpty = function () { + var empty = true; + for (var i = 0; i < NR_COLS; i++) { + if (!this.chars[i].isEmpty()) { + empty = false; + break; + } + } + return empty; + }; + /** + * Set the cursor to a valid column. + */ + Row.prototype.setCursor = function (absPos) { + if (this.pos !== absPos) { + this.pos = absPos; + } + if (this.pos < 0) { + logger.log('ERROR', 'Negative cursor position ' + this.pos); + this.pos = 0; + } + else if (this.pos > NR_COLS) { + logger.log('ERROR', 'Too large cursor position ' + this.pos); + this.pos = NR_COLS; + } + }; + /** + * Move the cursor relative to current position. + */ + Row.prototype.moveCursor = function (relPos) { + var newPos = this.pos + relPos; + if (relPos > 1) { + for (var i = this.pos + 1; i < newPos + 1; i++) { + this.chars[i].setPenState(this.currPenState); + } + } + this.setCursor(newPos); + }; + /** + * Backspace, move one step back and clear character. + */ + Row.prototype.backSpace = function () { + this.moveCursor(-1); + this.chars[this.pos].setChar(' ', this.currPenState); + }; + Row.prototype.insertChar = function (byte) { + if (byte >= 0x90) { // Extended char + this.backSpace(); + } + var char = getCharForByte(byte); + if (this.pos >= NR_COLS) { + logger.log('ERROR', 'Cannot insert ' + byte.toString(16) + + ' (' + char + ') at position ' + this.pos + '. Skipping it!'); + return; + } + this.chars[this.pos].setChar(char, this.currPenState); + this.moveCursor(1); + }; + Row.prototype.clearFromPos = function (startPos) { + var i; + for (i = startPos; i < NR_COLS; i++) { + this.chars[i].reset(); + } + }; + Row.prototype.clear = function () { + this.clearFromPos(0); + this.pos = 0; + this.currPenState.reset(); + }; + Row.prototype.clearToEndOfRow = function () { + this.clearFromPos(this.pos); + }; + Row.prototype.getTextString = function () { + var chars = []; + var empty = true; + for (var i = 0; i < NR_COLS; i++) { + var char = this.chars[i].uchar; + if (char !== ' ') { + empty = false; + } + chars.push(char); + } + if (empty) { + return ''; + } + else { + return chars.join(''); + } + }; + Row.prototype.setPenStyles = function (styles) { + this.currPenState.setStyles(styles); + var currChar = this.chars[this.pos]; + currChar.setPenState(this.currPenState); + }; + return Row; +}()); +/** + * Keep a CEA-608 screen of 32x15 styled characters + * @constructor +*/ +var CaptionScreen = /** @class */ (function () { + function CaptionScreen() { + this.rows = []; + for (var i = 0; i < NR_ROWS; i++) { + this.rows.push(new Row()); + } // Note that we use zero-based numbering (0-14) + this.currRow = NR_ROWS - 1; + this.nrRollUpRows = null; + this.reset(); + } + CaptionScreen.prototype.reset = function () { + for (var i = 0; i < NR_ROWS; i++) { + this.rows[i].clear(); + } + this.currRow = NR_ROWS - 1; + }; + CaptionScreen.prototype.equals = function (other) { + var equal = true; + for (var i = 0; i < NR_ROWS; i++) { + if (!this.rows[i].equals(other.rows[i])) { + equal = false; + break; + } + } + return equal; + }; + CaptionScreen.prototype.copy = function (other) { + for (var i = 0; i < NR_ROWS; i++) { + this.rows[i].copy(other.rows[i]); + } + }; + CaptionScreen.prototype.isEmpty = function () { + var empty = true; + for (var i = 0; i < NR_ROWS; i++) { + if (!this.rows[i].isEmpty()) { + empty = false; + break; + } + } + return empty; + }; + CaptionScreen.prototype.backSpace = function () { + var row = this.rows[this.currRow]; + row.backSpace(); + }; + CaptionScreen.prototype.clearToEndOfRow = function () { + var row = this.rows[this.currRow]; + row.clearToEndOfRow(); + }; + /** + * Insert a character (without styling) in the current row. + */ + CaptionScreen.prototype.insertChar = function (char) { + var row = this.rows[this.currRow]; + row.insertChar(char); + }; + CaptionScreen.prototype.setPen = function (styles) { + var row = this.rows[this.currRow]; + row.setPenStyles(styles); + }; + CaptionScreen.prototype.moveCursor = function (relPos) { + var row = this.rows[this.currRow]; + row.moveCursor(relPos); + }; + CaptionScreen.prototype.setCursor = function (absPos) { + logger.log('INFO', 'setCursor: ' + absPos); + var row = this.rows[this.currRow]; + row.setCursor(absPos); + }; + CaptionScreen.prototype.setPAC = function (pacData) { + logger.log('INFO', 'pacData = ' + JSON.stringify(pacData)); + var newRow = pacData.row - 1; + if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) { + newRow = this.nrRollUpRows - 1; + } + // Make sure this only affects Roll-up Captions by checking this.nrRollUpRows + if (this.nrRollUpRows && this.currRow !== newRow) { + // clear all rows first + for (var i = 0; i < NR_ROWS; i++) { + this.rows[i].clear(); + } + // Copy this.nrRollUpRows rows from lastOutputScreen and place it in the newRow location + // topRowIndex - the start of rows to copy (inclusive index) + var topRowIndex = this.currRow + 1 - (this.nrRollUpRows); + // We only copy if the last position was already shown. + // We use the cueStartTime value to check this. + var lastOutputScreen = this.lastOutputScreen; + if (lastOutputScreen) { + var prevLineTime = lastOutputScreen.rows[topRowIndex].cueStartTime; + if (prevLineTime && prevLineTime < logger.time) { + for (var i = 0; i < this.nrRollUpRows; i++) { + this.rows[newRow - this.nrRollUpRows + i + 1].copy(lastOutputScreen.rows[topRowIndex + i]); + } + } + } + } + this.currRow = newRow; + var row = this.rows[this.currRow]; + if (pacData.indent !== null) { + var indent = pacData.indent; + var prevPos = Math.max(indent - 1, 0); + row.setCursor(pacData.indent); + pacData.color = row.chars[prevPos].penState.foreground; + } + var styles = { foreground: pacData.color, underline: pacData.underline, italics: pacData.italics, background: 'black', flash: false }; + this.setPen(styles); + }; + /** + * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility). + */ + CaptionScreen.prototype.setBkgData = function (bkgData) { + logger.log('INFO', 'bkgData = ' + JSON.stringify(bkgData)); + this.backSpace(); + this.setPen(bkgData); + this.insertChar(0x20); // Space + }; + CaptionScreen.prototype.setRollUpRows = function (nrRows) { + this.nrRollUpRows = nrRows; + }; + CaptionScreen.prototype.rollUp = function () { + if (this.nrRollUpRows === null) { + logger.log('DEBUG', 'roll_up but nrRollUpRows not set yet'); + return; // Not properly setup + } + logger.log('TEXT', this.getDisplayText()); + var topRowIndex = this.currRow + 1 - this.nrRollUpRows; + var topRow = this.rows.splice(topRowIndex, 1)[0]; + topRow.clear(); + this.rows.splice(this.currRow, 0, topRow); + logger.log('INFO', 'Rolling up'); + // logger.log('TEXT', this.get_display_text()) + }; + /** + * Get all non-empty rows with as unicode text. + */ + CaptionScreen.prototype.getDisplayText = function (asOneRow) { + asOneRow = asOneRow || false; + var displayText = []; + var text = ''; + var rowNr = -1; + for (var i = 0; i < NR_ROWS; i++) { + var rowText = this.rows[i].getTextString(); + if (rowText) { + rowNr = i + 1; + if (asOneRow) { + displayText.push('Row ' + rowNr + ': \'' + rowText + '\''); + } + else { + displayText.push(rowText.trim()); + } + } + } + if (displayText.length > 0) { + if (asOneRow) { + text = '[' + displayText.join(' | ') + ']'; + } + else { + text = displayText.join('\n'); + } + } + return text; + }; + CaptionScreen.prototype.getTextAndFormat = function () { + return this.rows; + }; + return CaptionScreen; +}()); +// var modes = ['MODE_ROLL-UP', 'MODE_POP-ON', 'MODE_PAINT-ON', 'MODE_TEXT']; +var Cea608Channel = /** @class */ (function () { + function Cea608Channel(channelNumber, outputFilter) { + this.chNr = channelNumber; + this.outputFilter = outputFilter; + this.mode = null; + this.verbose = 0; + this.displayedMemory = new CaptionScreen(); + this.nonDisplayedMemory = new CaptionScreen(); + this.lastOutputScreen = new CaptionScreen(); + this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1]; + this.writeScreen = this.displayedMemory; + this.mode = null; + this.cueStartTime = null; // Keeps track of where a cue started. + } + Cea608Channel.prototype.reset = function () { + this.mode = null; + this.displayedMemory.reset(); + this.nonDisplayedMemory.reset(); + this.lastOutputScreen.reset(); + this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1]; + this.writeScreen = this.displayedMemory; + this.mode = null; + this.cueStartTime = null; + this.lastCueEndTime = null; + }; + Cea608Channel.prototype.getHandler = function () { + return this.outputFilter; + }; + Cea608Channel.prototype.setHandler = function (newHandler) { + this.outputFilter = newHandler; + }; + Cea608Channel.prototype.setPAC = function (pacData) { + this.writeScreen.setPAC(pacData); + }; + Cea608Channel.prototype.setBkgData = function (bkgData) { + this.writeScreen.setBkgData(bkgData); + }; + Cea608Channel.prototype.setMode = function (newMode) { + if (newMode === this.mode) { + return; + } + this.mode = newMode; + logger.log('INFO', 'MODE=' + newMode); + if (this.mode === 'MODE_POP-ON') { + this.writeScreen = this.nonDisplayedMemory; + } + else { + this.writeScreen = this.displayedMemory; + this.writeScreen.reset(); + } + if (this.mode !== 'MODE_ROLL-UP') { + this.displayedMemory.nrRollUpRows = null; + this.nonDisplayedMemory.nrRollUpRows = null; + } + this.mode = newMode; + }; + Cea608Channel.prototype.insertChars = function (chars) { + for (var i = 0; i < chars.length; i++) { + this.writeScreen.insertChar(chars[i]); + } + var screen = this.writeScreen === this.displayedMemory ? 'DISP' : 'NON_DISP'; + logger.log('INFO', screen + ': ' + this.writeScreen.getDisplayText(true)); + if (this.mode === 'MODE_PAINT-ON' || this.mode === 'MODE_ROLL-UP') { + logger.log('TEXT', 'DISPLAYED: ' + this.displayedMemory.getDisplayText(true)); + this.outputDataUpdate(); + } + }; + Cea608Channel.prototype.ccRCL = function () { + logger.log('INFO', 'RCL - Resume Caption Loading'); + this.setMode('MODE_POP-ON'); + }; + Cea608Channel.prototype.ccBS = function () { + logger.log('INFO', 'BS - BackSpace'); + if (this.mode === 'MODE_TEXT') { + return; + } + this.writeScreen.backSpace(); + if (this.writeScreen === this.displayedMemory) { + this.outputDataUpdate(); + } + }; + Cea608Channel.prototype.ccAOF = function () { + }; + Cea608Channel.prototype.ccAON = function () { + }; + Cea608Channel.prototype.ccDER = function () { + logger.log('INFO', 'DER- Delete to End of Row'); + this.writeScreen.clearToEndOfRow(); + this.outputDataUpdate(); + }; + Cea608Channel.prototype.ccRU = function (nrRows) { + logger.log('INFO', 'RU(' + nrRows + ') - Roll Up'); + this.writeScreen = this.displayedMemory; + this.setMode('MODE_ROLL-UP'); + this.writeScreen.setRollUpRows(nrRows); + }; + Cea608Channel.prototype.ccFON = function () { + logger.log('INFO', 'FON - Flash On'); + this.writeScreen.setPen({ flash: true }); + }; + Cea608Channel.prototype.ccRDC = function () { + logger.log('INFO', 'RDC - Resume Direct Captioning'); + this.setMode('MODE_PAINT-ON'); + }; + Cea608Channel.prototype.ccTR = function () { + logger.log('INFO', 'TR'); + this.setMode('MODE_TEXT'); + }; + Cea608Channel.prototype.ccRTD = function () { + logger.log('INFO', 'RTD'); + this.setMode('MODE_TEXT'); + }; + Cea608Channel.prototype.ccEDM = function () { + logger.log('INFO', 'EDM - Erase Displayed Memory'); + this.displayedMemory.reset(); + this.outputDataUpdate(true); + }; + Cea608Channel.prototype.ccCR = function () { + logger.log('CR - Carriage Return'); + this.writeScreen.rollUp(); + this.outputDataUpdate(true); + }; + Cea608Channel.prototype.ccENM = function () { + logger.log('INFO', 'ENM - Erase Non-displayed Memory'); + this.nonDisplayedMemory.reset(); + }; + Cea608Channel.prototype.ccEOC = function () { + logger.log('INFO', 'EOC - End Of Caption'); + if (this.mode === 'MODE_POP-ON') { + var tmp = this.displayedMemory; + this.displayedMemory = this.nonDisplayedMemory; + this.nonDisplayedMemory = tmp; + this.writeScreen = this.nonDisplayedMemory; + logger.log('TEXT', 'DISP: ' + this.displayedMemory.getDisplayText()); + } + this.outputDataUpdate(true); + }; + Cea608Channel.prototype.ccTO = function (nrCols) { + logger.log('INFO', 'TO(' + nrCols + ') - Tab Offset'); + this.writeScreen.moveCursor(nrCols); + }; + Cea608Channel.prototype.ccMIDROW = function (secondByte) { + var styles = { flash: false }; + styles.underline = secondByte % 2 === 1; + styles.italics = secondByte >= 0x2e; + if (!styles.italics) { + var colorIndex = Math.floor(secondByte / 2) - 0x10; + var colors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta']; + styles.foreground = colors[colorIndex]; + } + else { + styles.foreground = 'white'; + } + logger.log('INFO', 'MIDROW: ' + JSON.stringify(styles)); + this.writeScreen.setPen(styles); + }; + Cea608Channel.prototype.outputDataUpdate = function (dispatch) { + if (dispatch === void 0) { dispatch = false; } + var t = logger.time; + if (t === null) { + return; + } + if (this.outputFilter) { + if (this.cueStartTime === null && !this.displayedMemory.isEmpty()) { // Start of a new cue + this.cueStartTime = t; + } + else { + if (!this.displayedMemory.equals(this.lastOutputScreen)) { + if (this.outputFilter.newCue) { + this.outputFilter.newCue(this.cueStartTime, t, this.lastOutputScreen); + if (dispatch === true && this.outputFilter.dispatchCue) { + this.outputFilter.dispatchCue(); + } + } + this.cueStartTime = this.displayedMemory.isEmpty() ? null : t; + } + } + this.lastOutputScreen.copy(this.displayedMemory); + } + }; + Cea608Channel.prototype.cueSplitAtTime = function (t) { + if (this.outputFilter) { + if (!this.displayedMemory.isEmpty()) { + if (this.outputFilter.newCue) { + this.outputFilter.newCue(this.cueStartTime, t, this.displayedMemory); + } + this.cueStartTime = t; + } + } + }; + return Cea608Channel; +}()); +var Cea608Parser = /** @class */ (function () { + function Cea608Parser(field, out1, out2) { + this.field = field || 1; + this.outputs = [out1, out2]; + this.channels = [new Cea608Channel(1, out1), new Cea608Channel(2, out2)]; + this.currChNr = -1; // Will be 1 or 2 + this.lastCmdA = null; // First byte of last command + this.lastCmdB = null; // Second byte of last command + this.bufferedData = []; + this.startTime = null; + this.lastTime = null; + this.dataCounters = { 'padding': 0, 'char': 0, 'cmd': 0, 'other': 0 }; + } + Cea608Parser.prototype.getHandler = function (index) { + return this.channels[index].getHandler(); + }; + Cea608Parser.prototype.setHandler = function (index, newHandler) { + this.channels[index].setHandler(newHandler); + }; + /** + * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs. + */ + Cea608Parser.prototype.addData = function (t, byteList) { + var cmdFound, a, b, charsFound = false; + this.lastTime = t; + logger.setTime(t); + for (var i = 0; i < byteList.length; i += 2) { + a = byteList[i] & 0x7f; + b = byteList[i + 1] & 0x7f; + if (a === 0 && b === 0) { + this.dataCounters.padding += 2; + continue; + } + else { + logger.log('DATA', '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')'); + } + cmdFound = this.parseCmd(a, b); + if (!cmdFound) { + cmdFound = this.parseMidrow(a, b); + } + if (!cmdFound) { + cmdFound = this.parsePAC(a, b); + } + if (!cmdFound) { + cmdFound = this.parseBackgroundAttributes(a, b); + } + if (!cmdFound) { + charsFound = this.parseChars(a, b); + if (charsFound) { + if (this.currChNr && this.currChNr >= 0) { + var channel = this.channels[this.currChNr - 1]; + channel.insertChars(charsFound); + } + else { + logger.log('WARNING', 'No channel found yet. TEXT-MODE?'); + } + } + } + if (cmdFound) { + this.dataCounters.cmd += 2; + } + else if (charsFound) { + this.dataCounters.char += 2; + } + else { + this.dataCounters.other += 2; + logger.log('WARNING', 'Couldn\'t parse cleaned data ' + numArrayToHexArray([a, b]) + + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]])); + } + } + }; + /** + * Parse Command. + * @returns {Boolean} Tells if a command was found + */ + Cea608Parser.prototype.parseCmd = function (a, b) { + var chNr = null; + var cond1 = (a === 0x14 || a === 0x1C) && (b >= 0x20 && b <= 0x2F); + var cond2 = (a === 0x17 || a === 0x1F) && (b >= 0x21 && b <= 0x23); + if (!(cond1 || cond2)) { + return false; + } + if (a === this.lastCmdA && b === this.lastCmdB) { + this.lastCmdA = null; + this.lastCmdB = null; // Repeated commands are dropped (once) + logger.log('DEBUG', 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped'); + return true; + } + if (a === 0x14 || a === 0x17) { + chNr = 1; + } + else { + chNr = 2; + } // (a === 0x1C || a=== 0x1f) + var channel = this.channels[chNr - 1]; + if (a === 0x14 || a === 0x1C) { + if (b === 0x20) { + channel.ccRCL(); + } + else if (b === 0x21) { + channel.ccBS(); + } + else if (b === 0x22) { + channel.ccAOF(); + } + else if (b === 0x23) { + channel.ccAON(); + } + else if (b === 0x24) { + channel.ccDER(); + } + else if (b === 0x25) { + channel.ccRU(2); + } + else if (b === 0x26) { + channel.ccRU(3); + } + else if (b === 0x27) { + channel.ccRU(4); + } + else if (b === 0x28) { + channel.ccFON(); + } + else if (b === 0x29) { + channel.ccRDC(); + } + else if (b === 0x2A) { + channel.ccTR(); + } + else if (b === 0x2B) { + channel.ccRTD(); + } + else if (b === 0x2C) { + channel.ccEDM(); + } + else if (b === 0x2D) { + channel.ccCR(); + } + else if (b === 0x2E) { + channel.ccENM(); + } + else if (b === 0x2F) { + channel.ccEOC(); + } + } + else { // a == 0x17 || a == 0x1F + channel.ccTO(b - 0x20); + } + this.lastCmdA = a; + this.lastCmdB = b; + this.currChNr = chNr; + return true; + }; + /** + * Parse midrow styling command + * @returns {Boolean} + */ + Cea608Parser.prototype.parseMidrow = function (a, b) { + var chNr = null; + if (((a === 0x11) || (a === 0x19)) && b >= 0x20 && b <= 0x2f) { + if (a === 0x11) { + chNr = 1; + } + else { + chNr = 2; + } + if (chNr !== this.currChNr) { + logger.log('ERROR', 'Mismatch channel in midrow parsing'); + return false; + } + var channel = this.channels[chNr - 1]; + channel.ccMIDROW(b); + logger.log('DEBUG', 'MIDROW (' + numArrayToHexArray([a, b]) + ')'); + return true; + } + return false; + }; + /** + * Parse Preable Access Codes (Table 53). + * @returns {Boolean} Tells if PAC found + */ + Cea608Parser.prototype.parsePAC = function (a, b) { + var chNr = null; + var row = null; + var case1 = ((a >= 0x11 && a <= 0x17) || (a >= 0x19 && a <= 0x1F)) && (b >= 0x40 && b <= 0x7F); + var case2 = (a === 0x10 || a === 0x18) && (b >= 0x40 && b <= 0x5F); + if (!(case1 || case2)) { + return false; + } + if (a === this.lastCmdA && b === this.lastCmdB) { + this.lastCmdA = null; + this.lastCmdB = null; + return true; // Repeated commands are dropped (once) + } + chNr = (a <= 0x17) ? 1 : 2; + if (b >= 0x40 && b <= 0x5F) { + row = (chNr === 1) ? rowsLowCh1[a] : rowsLowCh2[a]; + } + else { // 0x60 <= b <= 0x7F + row = (chNr === 1) ? rowsHighCh1[a] : rowsHighCh2[a]; + } + var pacData = this.interpretPAC(row, b); + var channel = this.channels[chNr - 1]; + channel.setPAC(pacData); + this.lastCmdA = a; + this.lastCmdB = b; + this.currChNr = chNr; + return true; + }; + /** + * Interpret the second byte of the pac, and return the information. + * @returns {Object} pacData with style parameters. + */ + Cea608Parser.prototype.interpretPAC = function (row, byte) { + var pacIndex = byte; + var pacData = { color: null, italics: false, indent: null, underline: false, row: row }; + if (byte > 0x5F) { + pacIndex = byte - 0x60; + } + else { + pacIndex = byte - 0x40; + } + pacData.underline = (pacIndex & 1) === 1; + if (pacIndex <= 0xd) { + pacData.color = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'white'][Math.floor(pacIndex / 2)]; + } + else if (pacIndex <= 0xf) { + pacData.italics = true; + pacData.color = 'white'; + } + else { + pacData.indent = (Math.floor((pacIndex - 0x10) / 2)) * 4; + } + return pacData; // Note that row has zero offset. The spec uses 1. + }; + /** + * Parse characters. + * @returns An array with 1 to 2 codes corresponding to chars, if found. null otherwise. + */ + Cea608Parser.prototype.parseChars = function (a, b) { + var channelNr = null, charCodes = null, charCode1 = null; + if (a >= 0x19) { + channelNr = 2; + charCode1 = a - 8; + } + else { + channelNr = 1; + charCode1 = a; + } + if (charCode1 >= 0x11 && charCode1 <= 0x13) { + // Special character + var oneCode = b; + if (charCode1 === 0x11) { + oneCode = b + 0x50; + } + else if (charCode1 === 0x12) { + oneCode = b + 0x70; + } + else { + oneCode = b + 0x90; + } + logger.log('INFO', 'Special char \'' + getCharForByte(oneCode) + '\' in channel ' + channelNr); + charCodes = [oneCode]; + } + else if (a >= 0x20 && a <= 0x7f) { + charCodes = (b === 0) ? [a] : [a, b]; + } + if (charCodes) { + var hexCodes = numArrayToHexArray(charCodes); + logger.log('DEBUG', 'Char codes = ' + hexCodes.join(',')); + this.lastCmdA = null; + this.lastCmdB = null; + } + return charCodes; + }; + /** + * Parse extended background attributes as well as new foreground color black. + * @returns{Boolean} Tells if background attributes are found + */ + Cea608Parser.prototype.parseBackgroundAttributes = function (a, b) { + var bkgData, index, chNr, channel; + var case1 = (a === 0x10 || a === 0x18) && (b >= 0x20 && b <= 0x2f); + var case2 = (a === 0x17 || a === 0x1f) && (b >= 0x2d && b <= 0x2f); + if (!(case1 || case2)) { + return false; + } + bkgData = {}; + if (a === 0x10 || a === 0x18) { + index = Math.floor((b - 0x20) / 2); + bkgData.background = backgroundColors[index]; + if (b % 2 === 1) { + bkgData.background = bkgData.background + '_semi'; + } + } + else if (b === 0x2d) { + bkgData.background = 'transparent'; + } + else { + bkgData.foreground = 'black'; + if (b === 0x2f) { + bkgData.underline = true; + } + } + chNr = (a < 0x18) ? 1 : 2; + channel = this.channels[chNr - 1]; + channel.setBkgData(bkgData); + this.lastCmdA = null; + this.lastCmdB = null; + return true; + }; + /** + * Reset state of parser and its channels. + */ + Cea608Parser.prototype.reset = function () { + for (var i = 0; i < this.channels.length; i++) { + if (this.channels[i]) { + this.channels[i].reset(); + } + } + this.lastCmdA = null; + this.lastCmdB = null; + }; + /** + * Trigger the generation of a cue, and the start of a new one if displayScreens are not empty. + */ + Cea608Parser.prototype.cueSplitAtTime = function (t) { + for (var i = 0; i < this.channels.length; i++) { + if (this.channels[i]) { + this.channels[i].cueSplitAtTime(t); + } + } + }; + return Cea608Parser; +}()); +exports.default = Cea608Parser; + + +/***/ }), + +/***/ "./src/utils/codecs.js": +/*!*****************************!*\ + !*** ./src/utils/codecs.js ***! + \*****************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +// from http://mp4ra.org/codecs.html +var sampleEntryCodesISO = { + audio: { + 'a3ds': true, + 'ac-3': true, + 'ac-4': true, + 'alac': true, + 'alaw': true, + 'dra1': true, + 'dts+': true, + 'dts-': true, + 'dtsc': true, + 'dtse': true, + 'dtsh': true, + 'ec-3': true, + 'enca': true, + 'g719': true, + 'g726': true, + 'm4ae': true, + 'mha1': true, + 'mha2': true, + 'mhm1': true, + 'mhm2': true, + 'mlpa': true, + 'mp4a': true, + 'raw ': true, + 'Opus': true, + 'samr': true, + 'sawb': true, + 'sawp': true, + 'sevc': true, + 'sqcp': true, + 'ssmv': true, + 'twos': true, + 'ulaw': true + }, + video: { + 'avc1': true, + 'avc2': true, + 'avc3': true, + 'avc4': true, + 'avcp': true, + 'drac': true, + 'dvav': true, + 'dvhe': true, + 'encv': true, + 'hev1': true, + 'hvc1': true, + 'mjp2': true, + 'mp4v': true, + 'mvc1': true, + 'mvc2': true, + 'mvc3': true, + 'mvc4': true, + 'resv': true, + 'rv60': true, + 's263': true, + 'svc1': true, + 'svc2': true, + 'vc-1': true, + 'vp08': true, + 'vp09': true + } +}; +function isCodecType(codec, type) { + var typeCodes = sampleEntryCodesISO[type]; + return !!typeCodes && typeCodes[codec.slice(0, 4)] === true; +} +exports.isCodecType = isCodecType; +function isCodecSupportedInMp4(codec, type) { + return window.MediaSource.isTypeSupported((type || 'video') + "/mp4;codecs=\"" + codec + "\""); +} +exports.isCodecSupportedInMp4 = isCodecSupportedInMp4; + + +/***/ }), + +/***/ "./src/utils/cues.js": +/*!***************************!*\ + !*** ./src/utils/cues.js ***! + \***************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var vttparser_1 = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.js"); +function newCue(track, startTime, endTime, captionScreen) { + var row; + var cue; + var indenting; + var indent; + var text; + var VTTCue = window.VTTCue || window.TextTrackCue; + for (var r = 0; r < captionScreen.rows.length; r++) { + row = captionScreen.rows[r]; + indenting = true; + indent = 0; + text = ''; + if (!row.isEmpty()) { + for (var c = 0; c < row.chars.length; c++) { + if (row.chars[c].uchar.match(/\s/) && indenting) { + indent++; + } + else { + text += row.chars[c].uchar; + indenting = false; + } + } + // To be used for cleaning-up orphaned roll-up captions + row.cueStartTime = startTime; + // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE + if (startTime === endTime) { + endTime += 0.0001; + } + cue = new VTTCue(startTime, endTime, vttparser_1.fixLineBreaks(text.trim())); + if (indent >= 16) { + indent--; + } + else { + indent++; + } + // VTTCue.line get's flakey when using controls, so let's now include line 13&14 + // also, drop line 1 since it's to close to the top + if (navigator.userAgent.match(/Firefox\//)) { + cue.line = r + 1; + } + else { + cue.line = (r > 7 ? r - 2 : r + 1); + } + cue.align = 'left'; + // Clamp the position between 0 and 100 - if out of these bounds, Firefox throws an exception and captions break + cue.position = Math.max(0, Math.min(100, 100 * (indent / 32) + (navigator.userAgent.match(/Firefox\//) ? 50 : 0))); + track.addCue(cue); + } + } +} +exports.newCue = newCue; + + +/***/ }), + +/***/ "./src/utils/discontinuities.js": +/*!**************************************!*\ + !*** ./src/utils/discontinuities.js ***! + \**************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var binary_search_1 = __webpack_require__(/*! ./binary-search */ "./src/utils/binary-search.js"); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +function findFirstFragWithCC(fragments, cc) { + var firstFrag = null; + for (var i = 0; i < fragments.length; i += 1) { + var currentFrag = fragments[i]; + if (currentFrag && currentFrag.cc === cc) { + firstFrag = currentFrag; + break; + } + } + return firstFrag; +} +exports.findFirstFragWithCC = findFirstFragWithCC; +function findFragWithCC(fragments, CC) { + return binary_search_1.default.search(fragments, function (candidate) { + if (candidate.cc < CC) { + return 1; + } + else if (candidate.cc > CC) { + return -1; + } + else { + return 0; + } + }); +} +exports.findFragWithCC = findFragWithCC; +function shouldAlignOnDiscontinuities(lastFrag, lastLevel, details) { + var shouldAlign = false; + if (lastLevel && lastLevel.details && details) { + if (details.endCC > details.startCC || (lastFrag && lastFrag.cc < details.startCC)) { + shouldAlign = true; + } + } + return shouldAlign; +} +exports.shouldAlignOnDiscontinuities = shouldAlignOnDiscontinuities; +// Find the first frag in the previous level which matches the CC of the first frag of the new level +function findDiscontinuousReferenceFrag(prevDetails, curDetails) { + var prevFrags = prevDetails.fragments; + var curFrags = curDetails.fragments; + if (!curFrags.length || !prevFrags.length) { + logger_1.logger.log('No fragments to align'); + return; + } + var prevStartFrag = findFirstFragWithCC(prevFrags, curFrags[0].cc); + if (!prevStartFrag || (prevStartFrag && !prevStartFrag.startPTS)) { + logger_1.logger.log('No frag in previous level to align on'); + return; + } + return prevStartFrag; +} +exports.findDiscontinuousReferenceFrag = findDiscontinuousReferenceFrag; +function adjustPts(sliding, details) { + details.fragments.forEach(function (frag) { + if (frag) { + var start = frag.start + sliding; + frag.start = frag.startPTS = start; + frag.endPTS = start + frag.duration; + } + }); + details.PTSKnown = true; +} +exports.adjustPts = adjustPts; +/** + * Using the parameters of the last level, this function computes PTS' of the new fragments so that they form a + * contiguous stream with the last fragments. + * The PTS of a fragment lets Hls.js know where it fits into a stream - by knowing every PTS, we know which fragment to + * download at any given time. PTS is normally computed when the fragment is demuxed, so taking this step saves us time + * and an extra download. + * @param lastFrag + * @param lastLevel + * @param details + */ +function alignStream(lastFrag, lastLevel, details) { + alignDiscontinuities(lastFrag, details, lastLevel); + if (!details.PTSKnown && lastLevel) { + // If the PTS wasn't figured out via discontinuity sequence that means there was no CC increase within the level. + // Aligning via Program Date Time should therefore be reliable, since PDT should be the same within the same + // discontinuity sequence. + alignPDT(details, lastLevel.details); + } +} +exports.alignStream = alignStream; +/** + * Computes the PTS if a new level's fragments using the PTS of a fragment in the last level which shares the same + * discontinuity sequence. + * @param lastLevel - The details of the last loaded level + * @param details - The details of the new level + */ +function alignDiscontinuities(lastFrag, details, lastLevel) { + if (shouldAlignOnDiscontinuities(lastFrag, lastLevel, details)) { + var referenceFrag = findDiscontinuousReferenceFrag(lastLevel.details, details); + if (referenceFrag) { + logger_1.logger.log('Adjusting PTS using last level due to CC increase within current level'); + adjustPts(referenceFrag.start, details); + } + } +} +exports.alignDiscontinuities = alignDiscontinuities; +/** + * Computes the PTS of a new level's fragments using the difference in Program Date Time from the last level. + * @param details - The details of the new level + * @param lastDetails - The details of the last loaded level + */ +function alignPDT(details, lastDetails) { + if (lastDetails && lastDetails.fragments.length) { + if (!details.hasProgramDateTime || !lastDetails.hasProgramDateTime) { + return; + } + // if last level sliding is 1000 and its first frag PROGRAM-DATE-TIME is 2017-08-20 1:10:00 AM + // and if new details first frag PROGRAM DATE-TIME is 2017-08-20 1:10:08 AM + // then we can deduce that playlist B sliding is 1000+8 = 1008s + var lastPDT = lastDetails.fragments[0].programDateTime; + var newPDT = details.fragments[0].programDateTime; + // date diff is in ms. frag.start is in seconds + var sliding = (newPDT - lastPDT) / 1000 + lastDetails.fragments[0].start; + if (Number.isFinite(sliding)) { + logger_1.logger.log("adjusting PTS using programDateTime delta, sliding:" + sliding.toFixed(3)); + adjustPts(sliding, details); + } + } +} +exports.alignPDT = alignPDT; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/utils/ewma-bandwidth-estimator.js": +/*!***********************************************!*\ + !*** ./src/utils/ewma-bandwidth-estimator.js ***! + \***********************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * EWMA Bandwidth Estimator + * - heavily inspired from shaka-player + * Tracks bandwidth samples and estimates available bandwidth. + * Based on the minimum of two exponentially-weighted moving averages with + * different half-lives. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var ewma_1 = __webpack_require__(/*! ../utils/ewma */ "./src/utils/ewma.js"); +var EwmaBandWidthEstimator = /** @class */ (function () { + function EwmaBandWidthEstimator(hls, slow, fast, defaultEstimate) { + this.hls = hls; + this.defaultEstimate_ = defaultEstimate; + this.minWeight_ = 0.001; + this.minDelayMs_ = 50; + this.slow_ = new ewma_1.default(slow); + this.fast_ = new ewma_1.default(fast); + } + EwmaBandWidthEstimator.prototype.sample = function (durationMs, numBytes) { + durationMs = Math.max(durationMs, this.minDelayMs_); + var bandwidth = 8000 * numBytes / durationMs, + // console.log('instant bw:'+ Math.round(bandwidth)); + // we weight sample using loading duration.... + weight = durationMs / 1000; + this.fast_.sample(weight, bandwidth); + this.slow_.sample(weight, bandwidth); + }; + EwmaBandWidthEstimator.prototype.canEstimate = function () { + var fast = this.fast_; + return (fast && fast.getTotalWeight() >= this.minWeight_); + }; + EwmaBandWidthEstimator.prototype.getEstimate = function () { + if (this.canEstimate()) { + // console.log('slow estimate:'+ Math.round(this.slow_.getEstimate())); + // console.log('fast estimate:'+ Math.round(this.fast_.getEstimate())); + // Take the minimum of these two estimates. This should have the effect of + // adapting down quickly, but up more slowly. + return Math.min(this.fast_.getEstimate(), this.slow_.getEstimate()); + } + else { + return this.defaultEstimate_; + } + }; + EwmaBandWidthEstimator.prototype.destroy = function () { + }; + return EwmaBandWidthEstimator; +}()); +exports.default = EwmaBandWidthEstimator; + + +/***/ }), + +/***/ "./src/utils/ewma.js": +/*!***************************!*\ + !*** ./src/utils/ewma.js ***! + \***************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * compute an Exponential Weighted moving average + * - https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average + * - heavily inspired from shaka-player + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var EWMA = /** @class */ (function () { + // About half of the estimated value will be from the last |halfLife| samples by weight. + function EWMA(halfLife) { + // Larger values of alpha expire historical data more slowly. + this.alpha_ = halfLife ? Math.exp(Math.log(0.5) / halfLife) : 0; + this.estimate_ = 0; + this.totalWeight_ = 0; + } + EWMA.prototype.sample = function (weight, value) { + var adjAlpha = Math.pow(this.alpha_, weight); + this.estimate_ = value * (1 - adjAlpha) + adjAlpha * this.estimate_; + this.totalWeight_ += weight; + }; + EWMA.prototype.getTotalWeight = function () { + return this.totalWeight_; + }; + EWMA.prototype.getEstimate = function () { + if (this.alpha_) { + var zeroFactor = 1 - Math.pow(this.alpha_, this.totalWeight_); + return this.estimate_ / zeroFactor; + } + else { + return this.estimate_; + } + }; + return EWMA; +}()); +exports.default = EWMA; + + +/***/ }), + +/***/ "./src/utils/get-self-scope.js": +/*!*************************************!*\ + !*** ./src/utils/get-self-scope.js ***! + \*************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +function getSelfScope() { + // see https://stackoverflow.com/a/11237259/589493 + if (typeof window === 'undefined') { + /* eslint-disable-next-line no-undef */ + return self; + } + else { + return window; + } +} +exports.getSelfScope = getSelfScope; + + +/***/ }), + +/***/ "./src/utils/logger.js": +/*!*****************************!*\ + !*** ./src/utils/logger.js ***! + \*****************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var get_self_scope_1 = __webpack_require__(/*! ./get-self-scope */ "./src/utils/get-self-scope.js"); +function noop() { } +var fakeLogger = { + trace: noop, + debug: noop, + log: noop, + warn: noop, + info: noop, + error: noop +}; +var exportedLogger = fakeLogger; +// let lastCallTime; +// function formatMsgWithTimeInfo(type, msg) { +// const now = Date.now(); +// const diff = lastCallTime ? '+' + (now - lastCallTime) : '0'; +// lastCallTime = now; +// msg = (new Date(now)).toISOString() + ' | [' + type + '] > ' + msg + ' ( ' + diff + ' ms )'; +// return msg; +// } +function formatMsg(type, msg) { + msg = '[' + type + '] > ' + msg; + return msg; +} +var global = get_self_scope_1.getSelfScope(); +function consolePrintFn(type) { + var func = global.console[type]; + if (func) { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + if (args[0]) { + args[0] = formatMsg(type, args[0]); + } + func.apply(global.console, args); + }; + } + return noop; +} +function exportLoggerFunctions(debugConfig) { + var functions = []; + for (var _i = 1; _i < arguments.length; _i++) { + functions[_i - 1] = arguments[_i]; + } + functions.forEach(function (type) { + exportedLogger[type] = debugConfig[type] ? debugConfig[type].bind(debugConfig) : consolePrintFn(type); + }); +} +exports.enableLogs = function (debugConfig) { + if (debugConfig === true || typeof debugConfig === 'object') { + exportLoggerFunctions(debugConfig, + // Remove out from list here to hard-disable a log-level + // 'trace', + 'debug', 'log', 'info', 'warn', 'error'); + // Some browsers don't allow to use bind on console object anyway + // fallback to default if needed + try { + exportedLogger.log(); + } + catch (e) { + exportedLogger = fakeLogger; + } + } + else { + exportedLogger = fakeLogger; + } +}; +exports.logger = exportedLogger; + + +/***/ }), + +/***/ "./src/utils/mediakeys-helper.js": +/*!***************************************!*\ + !*** ./src/utils/mediakeys-helper.js ***! + \***************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var requestMediaKeySystemAccess = (function () { + if (typeof window !== 'undefined' && window.navigator && window.navigator.requestMediaKeySystemAccess) { + return window.navigator.requestMediaKeySystemAccess.bind(window.navigator); + } + else { + return null; + } +})(); +exports.requestMediaKeySystemAccess = requestMediaKeySystemAccess; + + +/***/ }), + +/***/ "./src/utils/mediasource-helper.js": +/*!*****************************************!*\ + !*** ./src/utils/mediasource-helper.js ***! + \*****************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * MediaSource helper + */ +Object.defineProperty(exports, "__esModule", { value: true }); +function getMediaSource() { + if (typeof window !== 'undefined') { + return window.MediaSource || window.WebKitMediaSource; + } +} +exports.getMediaSource = getMediaSource; + + +/***/ }), + +/***/ "./src/utils/output-filter.js": +/*!************************************!*\ + !*** ./src/utils/output-filter.js ***! + \************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +var OutputFilter = /** @class */ (function () { + function OutputFilter(timelineController, trackName) { + this.timelineController = timelineController; + this.trackName = trackName; + this.startTime = null; + this.endTime = null; + this.screen = null; + } + OutputFilter.prototype.dispatchCue = function () { + if (this.startTime === null) { + return; + } + this.timelineController.addCues(this.trackName, this.startTime, this.endTime, this.screen); + this.startTime = null; + }; + OutputFilter.prototype.newCue = function (startTime, endTime, screen) { + if (this.startTime === null || this.startTime > startTime) { + this.startTime = startTime; + } + this.endTime = endTime; + this.screen = screen; + this.timelineController.createCaptionsTrack(this.trackName); + }; + return OutputFilter; +}()); +exports.default = OutputFilter; + + +/***/ }), + +/***/ "./src/utils/texttrack-utils.js": +/*!**************************************!*\ + !*** ./src/utils/texttrack-utils.js ***! + \**************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +Object.defineProperty(exports, "__esModule", { value: true }); +function sendAddTrackEvent(track, videoEl) { + var event = null; + try { + event = new window.Event('addtrack'); + } + catch (err) { + // for IE11 + event = document.createEvent('Event'); + event.initEvent('addtrack', false, false); + } + event.track = track; + videoEl.dispatchEvent(event); +} +exports.sendAddTrackEvent = sendAddTrackEvent; +function clearCurrentCues(track) { + if (track && track.cues) { + while (track.cues.length > 0) { + track.removeCue(track.cues[0]); + } + } +} +exports.clearCurrentCues = clearCurrentCues; + + +/***/ }), + +/***/ "./src/utils/time-ranges.js": +/*!**********************************!*\ + !*** ./src/utils/time-ranges.js ***! + \**********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * TimeRanges to string helper + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var TimeRanges = { + toString: function (r) { + var log = '', len = r.length; + for (var i = 0; i < len; i++) { + log += '[' + r.start(i).toFixed(3) + ',' + r.end(i).toFixed(3) + ']'; + } + return log; + } +}; +exports.default = TimeRanges; + + +/***/ }), + +/***/ "./src/utils/vttcue.js": +/*!*****************************!*\ + !*** ./src/utils/vttcue.js ***! + \*****************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * Copyright 2013 vtt.js Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = (function () { + if (typeof window !== 'undefined' && window.VTTCue) { + return window.VTTCue; + } + var autoKeyword = 'auto'; + var directionSetting = { + '': true, + lr: true, + rl: true + }; + var alignSetting = { + start: true, + middle: true, + end: true, + left: true, + right: true + }; + function findDirectionSetting(value) { + if (typeof value !== 'string') { + return false; + } + var dir = directionSetting[value.toLowerCase()]; + return dir ? value.toLowerCase() : false; + } + function findAlignSetting(value) { + if (typeof value !== 'string') { + return false; + } + var align = alignSetting[value.toLowerCase()]; + return align ? value.toLowerCase() : false; + } + function extend(obj) { + var i = 1; + for (; i < arguments.length; i++) { + var cobj = arguments[i]; + for (var p in cobj) { + obj[p] = cobj[p]; + } + } + return obj; + } + function VTTCue(startTime, endTime, text) { + var cue = this; + var isIE8 = (function () { + if (typeof navigator === 'undefined') { + return; + } + return (/MSIE\s8\.0/).test(navigator.userAgent); + })(); + var baseObj = {}; + if (isIE8) { + cue = document.createElement('custom'); + } + else { + baseObj.enumerable = true; + } + /** + * Shim implementation specific properties. These properties are not in + * the spec. + */ + // Lets us know when the VTTCue's data has changed in such a way that we need + // to recompute its display state. This lets us compute its display state + // lazily. + cue.hasBeenReset = false; + /** + * VTTCue and TextTrackCue properties + * http://dev.w3.org/html5/webvtt/#vttcue-interface + */ + var _id = ''; + var _pauseOnExit = false; + var _startTime = startTime; + var _endTime = endTime; + var _text = text; + var _region = null; + var _vertical = ''; + var _snapToLines = true; + var _line = 'auto'; + var _lineAlign = 'start'; + var _position = 50; + var _positionAlign = 'middle'; + var _size = 50; + var _align = 'middle'; + Object.defineProperty(cue, 'id', extend({}, baseObj, { + get: function () { + return _id; + }, + set: function (value) { + _id = '' + value; + } + })); + Object.defineProperty(cue, 'pauseOnExit', extend({}, baseObj, { + get: function () { + return _pauseOnExit; + }, + set: function (value) { + _pauseOnExit = !!value; + } + })); + Object.defineProperty(cue, 'startTime', extend({}, baseObj, { + get: function () { + return _startTime; + }, + set: function (value) { + if (typeof value !== 'number') { + throw new TypeError('Start time must be set to a number.'); + } + _startTime = value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'endTime', extend({}, baseObj, { + get: function () { + return _endTime; + }, + set: function (value) { + if (typeof value !== 'number') { + throw new TypeError('End time must be set to a number.'); + } + _endTime = value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'text', extend({}, baseObj, { + get: function () { + return _text; + }, + set: function (value) { + _text = '' + value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'region', extend({}, baseObj, { + get: function () { + return _region; + }, + set: function (value) { + _region = value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'vertical', extend({}, baseObj, { + get: function () { + return _vertical; + }, + set: function (value) { + var setting = findDirectionSetting(value); + // Have to check for false because the setting an be an empty string. + if (setting === false) { + throw new SyntaxError('An invalid or illegal string was specified.'); + } + _vertical = setting; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'snapToLines', extend({}, baseObj, { + get: function () { + return _snapToLines; + }, + set: function (value) { + _snapToLines = !!value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'line', extend({}, baseObj, { + get: function () { + return _line; + }, + set: function (value) { + if (typeof value !== 'number' && value !== autoKeyword) { + throw new SyntaxError('An invalid number or illegal string was specified.'); + } + _line = value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'lineAlign', extend({}, baseObj, { + get: function () { + return _lineAlign; + }, + set: function (value) { + var setting = findAlignSetting(value); + if (!setting) { + throw new SyntaxError('An invalid or illegal string was specified.'); + } + _lineAlign = setting; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'position', extend({}, baseObj, { + get: function () { + return _position; + }, + set: function (value) { + if (value < 0 || value > 100) { + throw new Error('Position must be between 0 and 100.'); + } + _position = value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'positionAlign', extend({}, baseObj, { + get: function () { + return _positionAlign; + }, + set: function (value) { + var setting = findAlignSetting(value); + if (!setting) { + throw new SyntaxError('An invalid or illegal string was specified.'); + } + _positionAlign = setting; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'size', extend({}, baseObj, { + get: function () { + return _size; + }, + set: function (value) { + if (value < 0 || value > 100) { + throw new Error('Size must be between 0 and 100.'); + } + _size = value; + this.hasBeenReset = true; + } + })); + Object.defineProperty(cue, 'align', extend({}, baseObj, { + get: function () { + return _align; + }, + set: function (value) { + var setting = findAlignSetting(value); + if (!setting) { + throw new SyntaxError('An invalid or illegal string was specified.'); + } + _align = setting; + this.hasBeenReset = true; + } + })); + /** + * Other spec defined properties + */ + // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#text-track-cue-display-state + cue.displayState = undefined; + if (isIE8) { + return cue; + } + } + /** + * VTTCue methods + */ + VTTCue.prototype.getCueAsHTML = function () { + // Assume WebVTT.convertCueToDOMTree is on the global. + var WebVTT = window.WebVTT; + return WebVTT.convertCueToDOMTree(window, this.text); + }; + return VTTCue; +})(); + + +/***/ }), + +/***/ "./src/utils/vttparser.js": +/*!********************************!*\ + !*** ./src/utils/vttparser.js ***! + \********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/* + * Source: https://github.com/mozilla/vtt.js/blob/master/dist/vtt.js#L1716 + */ +Object.defineProperty(exports, "__esModule", { value: true }); +var vttcue_1 = __webpack_require__(/*! ./vttcue */ "./src/utils/vttcue.js"); +var StringDecoder = function StringDecoder() { + return { + decode: function (data) { + if (!data) { + return ''; + } + if (typeof data !== 'string') { + throw new Error('Error - expected string data.'); + } + return decodeURIComponent(encodeURIComponent(data)); + } + }; +}; +function VTTParser() { + this.window = window; + this.state = 'INITIAL'; + this.buffer = ''; + this.decoder = new StringDecoder(); + this.regionList = []; +} +// Try to parse input as a time stamp. +function parseTimeStamp(input) { + function computeSeconds(h, m, s, f) { + return (h | 0) * 3600 + (m | 0) * 60 + (s | 0) + (f | 0) / 1000; + } + var m = input.match(/^(\d+):(\d{2})(:\d{2})?\.(\d{3})/); + if (!m) { + return null; + } + if (m[3]) { + // Timestamp takes the form of [hours]:[minutes]:[seconds].[milliseconds] + return computeSeconds(m[1], m[2], m[3].replace(':', ''), m[4]); + } + else if (m[1] > 59) { + // Timestamp takes the form of [hours]:[minutes].[milliseconds] + // First position is hours as it's over 59. + return computeSeconds(m[1], m[2], 0, m[4]); + } + else { + // Timestamp takes the form of [minutes]:[seconds].[milliseconds] + return computeSeconds(0, m[1], m[2], m[4]); + } +} +// A settings object holds key/value pairs and will ignore anything but the first +// assignment to a specific key. +function Settings() { + this.values = Object.create(null); +} +Settings.prototype = { + // Only accept the first assignment to any key. + set: function (k, v) { + if (!this.get(k) && v !== '') { + this.values[k] = v; + } + }, + // Return the value for a key, or a default value. + // If 'defaultKey' is passed then 'dflt' is assumed to be an object with + // a number of possible default values as properties where 'defaultKey' is + // the key of the property that will be chosen; otherwise it's assumed to be + // a single value. + get: function (k, dflt, defaultKey) { + if (defaultKey) { + return this.has(k) ? this.values[k] : dflt[defaultKey]; + } + return this.has(k) ? this.values[k] : dflt; + }, + // Check whether we have a value for a key. + has: function (k) { + return k in this.values; + }, + // Accept a setting if its one of the given alternatives. + alt: function (k, v, a) { + for (var n = 0; n < a.length; ++n) { + if (v === a[n]) { + this.set(k, v); + break; + } + } + }, + // Accept a setting if its a valid (signed) integer. + integer: function (k, v) { + if (/^-?\d+$/.test(v)) { // integer + this.set(k, parseInt(v, 10)); + } + }, + // Accept a setting if its a valid percentage. + percent: function (k, v) { + var m; + if ((m = v.match(/^([\d]{1,3})(\.[\d]*)?%$/))) { + v = parseFloat(v); + if (v >= 0 && v <= 100) { + this.set(k, v); + return true; + } + } + return false; + } +}; +// Helper function to parse input into groups separated by 'groupDelim', and +// interprete each group as a key/value pair separated by 'keyValueDelim'. +function parseOptions(input, callback, keyValueDelim, groupDelim) { + var groups = groupDelim ? input.split(groupDelim) : [input]; + for (var i in groups) { + if (typeof groups[i] !== 'string') { + continue; + } + var kv = groups[i].split(keyValueDelim); + if (kv.length !== 2) { + continue; + } + var k = kv[0]; + var v = kv[1]; + callback(k, v); + } +} +var defaults = new vttcue_1.default(0, 0, 0); +// 'middle' was changed to 'center' in the spec: https://github.com/w3c/webvtt/pull/244 +// Safari doesn't yet support this change, but FF and Chrome do. +var center = defaults.align === 'middle' ? 'middle' : 'center'; +function parseCue(input, cue, regionList) { + // Remember the original input if we need to throw an error. + var oInput = input; + // 4.1 WebVTT timestamp + function consumeTimeStamp() { + var ts = parseTimeStamp(input); + if (ts === null) { + throw new Error('Malformed timestamp: ' + oInput); + } + // Remove time stamp from input. + input = input.replace(/^[^\sa-zA-Z-]+/, ''); + return ts; + } + // 4.4.2 WebVTT cue settings + function consumeCueSettings(input, cue) { + var settings = new Settings(); + parseOptions(input, function (k, v) { + switch (k) { + case 'region': + // Find the last region we parsed with the same region id. + for (var i = regionList.length - 1; i >= 0; i--) { + if (regionList[i].id === v) { + settings.set(k, regionList[i].region); + break; + } + } + break; + case 'vertical': + settings.alt(k, v, ['rl', 'lr']); + break; + case 'line': + var vals = v.split(','), vals0 = vals[0]; + settings.integer(k, vals0); + if (settings.percent(k, vals0)) { + settings.set('snapToLines', false); + } + settings.alt(k, vals0, ['auto']); + if (vals.length === 2) { + settings.alt('lineAlign', vals[1], ['start', center, 'end']); + } + break; + case 'position': + vals = v.split(','); + settings.percent(k, vals[0]); + if (vals.length === 2) { + settings.alt('positionAlign', vals[1], ['start', center, 'end', 'line-left', 'line-right', 'auto']); + } + break; + case 'size': + settings.percent(k, v); + break; + case 'align': + settings.alt(k, v, ['start', center, 'end', 'left', 'right']); + break; + } + }, /:/, /\s/); + // Apply default values for any missing fields. + cue.region = settings.get('region', null); + cue.vertical = settings.get('vertical', ''); + var line = settings.get('line', 'auto'); + if (line === 'auto' && defaults.line === -1) { + // set numeric line number for Safari + line = -1; + } + cue.line = line; + cue.lineAlign = settings.get('lineAlign', 'start'); + cue.snapToLines = settings.get('snapToLines', true); + cue.size = settings.get('size', 100); + cue.align = settings.get('align', center); + var position = settings.get('position', 'auto'); + if (position === 'auto' && defaults.position === 50) { + // set numeric position for Safari + position = cue.align === 'start' || cue.align === 'left' ? 0 : cue.align === 'end' || cue.align === 'right' ? 100 : 50; + } + cue.position = position; + } + function skipWhitespace() { + input = input.replace(/^\s+/, ''); + } + // 4.1 WebVTT cue timings. + skipWhitespace(); + cue.startTime = consumeTimeStamp(); // (1) collect cue start time + skipWhitespace(); + if (input.substr(0, 3) !== '-->') { // (3) next characters must match '-->' + throw new Error('Malformed time stamp (time stamps must be separated by \'-->\'): ' + + oInput); + } + input = input.substr(3); + skipWhitespace(); + cue.endTime = consumeTimeStamp(); // (5) collect cue end time + // 4.1 WebVTT cue settings list. + skipWhitespace(); + consumeCueSettings(input, cue); +} +function fixLineBreaks(input) { + return input.replace(//gi, '\n'); +} +exports.fixLineBreaks = fixLineBreaks; +VTTParser.prototype = { + parse: function (data) { + var self = this; + // If there is no data then we won't decode it, but will just try to parse + // whatever is in buffer already. This may occur in circumstances, for + // example when flush() is called. + if (data) { + // Try to decode the data that we received. + self.buffer += self.decoder.decode(data, { stream: true }); + } + function collectNextLine() { + var buffer = self.buffer; + var pos = 0; + buffer = fixLineBreaks(buffer); + while (pos < buffer.length && buffer[pos] !== '\r' && buffer[pos] !== '\n') { + ++pos; + } + var line = buffer.substr(0, pos); + // Advance the buffer early in case we fail below. + if (buffer[pos] === '\r') { + ++pos; + } + if (buffer[pos] === '\n') { + ++pos; + } + self.buffer = buffer.substr(pos); + return line; + } + // 3.2 WebVTT metadata header syntax + function parseHeader(input) { + parseOptions(input, function (k, v) { + switch (k) { + case 'Region': + // 3.3 WebVTT region metadata header syntax + // console.log('parse region', v); + // parseRegion(v); + break; + } + }, /:/); + } + // 5.1 WebVTT file parsing. + try { + var line = void 0; + if (self.state === 'INITIAL') { + // We can't start parsing until we have the first line. + if (!/\r\n|\n/.test(self.buffer)) { + return this; + } + line = collectNextLine(); + // strip of UTF-8 BOM if any + // https://en.wikipedia.org/wiki/Byte_order_mark#UTF-8 + var m = line.match(/^()?WEBVTT([ \t].*)?$/); + if (!m || !m[0]) { + throw new Error('Malformed WebVTT signature.'); + } + self.state = 'HEADER'; + } + var alreadyCollectedLine = false; + while (self.buffer) { + // We can't parse a line until we have the full line. + if (!/\r\n|\n/.test(self.buffer)) { + return this; + } + if (!alreadyCollectedLine) { + line = collectNextLine(); + } + else { + alreadyCollectedLine = false; + } + switch (self.state) { + case 'HEADER': + // 13-18 - Allow a header (metadata) under the WEBVTT line. + if (/:/.test(line)) { + parseHeader(line); + } + else if (!line) { + // An empty line terminates the header and starts the body (cues). + self.state = 'ID'; + } + continue; + case 'NOTE': + // Ignore NOTE blocks. + if (!line) { + self.state = 'ID'; + } + continue; + case 'ID': + // Check for the start of NOTE blocks. + if (/^NOTE($|[ \t])/.test(line)) { + self.state = 'NOTE'; + break; + } + // 19-29 - Allow any number of line terminators, then initialize new cue values. + if (!line) { + continue; + } + self.cue = new vttcue_1.default(0, 0, ''); + self.state = 'CUE'; + // 30-39 - Check if self line contains an optional identifier or timing data. + if (line.indexOf('-->') === -1) { + self.cue.id = line; + continue; + } + // Process line as start of a cue. + /* falls through */ + case 'CUE': + // 40 - Collect cue timings and settings. + try { + parseCue(line, self.cue, self.regionList); + } + catch (e) { + // In case of an error ignore rest of the cue. + self.cue = null; + self.state = 'BADCUE'; + continue; + } + self.state = 'CUETEXT'; + continue; + case 'CUETEXT': + var hasSubstring = line.indexOf('-->') !== -1; + // 34 - If we have an empty line then report the cue. + // 35 - If we have the special substring '-->' then report the cue, + // but do not collect the line as we need to process the current + // one as a new cue. + if (!line || hasSubstring && (alreadyCollectedLine = true)) { + // We are done parsing self cue. + if (self.oncue) { + self.oncue(self.cue); + } + self.cue = null; + self.state = 'ID'; + continue; + } + if (self.cue.text) { + self.cue.text += '\n'; + } + self.cue.text += line; + continue; + case 'BADCUE': // BADCUE + // 54-62 - Collect and discard the remaining cue. + if (!line) { + self.state = 'ID'; + } + continue; + } + } + } + catch (e) { + // If we are currently parsing a cue, report what we have. + if (self.state === 'CUETEXT' && self.cue && self.oncue) { + self.oncue(self.cue); + } + self.cue = null; + // Enter BADWEBVTT state if header was not parsed correctly otherwise + // another exception occurred so enter BADCUE state. + self.state = self.state === 'INITIAL' ? 'BADWEBVTT' : 'BADCUE'; + } + return this; + }, + flush: function () { + var self = this; + try { + // Finish decoding the stream. + self.buffer += self.decoder.decode(); + // Synthesize the end of the current cue or region. + if (self.cue || self.state === 'HEADER') { + self.buffer += '\n\n'; + self.parse(); + } + // If we've flushed, parsed, and we're still on the INITIAL state then + // that means we don't have enough of the stream to parse the first + // line. + if (self.state === 'INITIAL') { + throw new Error('Malformed WebVTT signature.'); + } + } + catch (e) { + throw e; + } + if (self.onflush) { + self.onflush(); + } + return this; + } +}; +exports.default = VTTParser; + + +/***/ }), + +/***/ "./src/utils/webvtt-parser.js": +/*!************************************!*\ + !*** ./src/utils/webvtt-parser.js ***! + \************************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(Number) { +Object.defineProperty(exports, "__esModule", { value: true }); +var vttparser_1 = __webpack_require__(/*! ./vttparser */ "./src/utils/vttparser.js"); +var id3_1 = __webpack_require__(/*! ../demux/id3 */ "./src/demux/id3.js"); +// String.prototype.startsWith is not supported in IE11 +var startsWith = function (inputString, searchString, position) { + return inputString.substr(position || 0, searchString.length) === searchString; +}; +var cueString2millis = function (timeString) { + var ts = parseInt(timeString.substr(-3)); + var secs = parseInt(timeString.substr(-6, 2)); + var mins = parseInt(timeString.substr(-9, 2)); + var hours = timeString.length > 9 ? parseInt(timeString.substr(0, timeString.indexOf(':'))) : 0; + if (!Number.isFinite(ts) || !Number.isFinite(secs) || !Number.isFinite(mins) || !Number.isFinite(hours)) { + return -1; + } + ts += 1000 * secs; + ts += 60 * 1000 * mins; + ts += 60 * 60 * 1000 * hours; + return ts; +}; +// From https://github.com/darkskyapp/string-hash +var hash = function (text) { + var hash = 5381; + var i = text.length; + while (i) { + hash = (hash * 33) ^ text.charCodeAt(--i); + } + return (hash >>> 0).toString(); +}; +var calculateOffset = function (vttCCs, cc, presentationTime) { + var currCC = vttCCs[cc]; + var prevCC = vttCCs[currCC.prevCC]; + // This is the first discontinuity or cues have been processed since the last discontinuity + // Offset = current discontinuity time + if (!prevCC || (!prevCC.new && currCC.new)) { + vttCCs.ccOffset = vttCCs.presentationOffset = currCC.start; + currCC.new = false; + return; + } + // There have been discontinuities since cues were last parsed. + // Offset = time elapsed + while (prevCC && prevCC.new) { + vttCCs.ccOffset += currCC.start - prevCC.start; + currCC.new = false; + currCC = prevCC; + prevCC = vttCCs[currCC.prevCC]; + } + vttCCs.presentationOffset = presentationTime; +}; +var WebVTTParser = { + parse: function (vttByteArray, syncPTS, vttCCs, cc, callBack, errorCallBack) { + // Convert byteArray into string, replacing any somewhat exotic linefeeds with "\n", then split on that character. + var re = /\r\n|\n\r|\n|\r/g; + // Uint8Array.prototype.reduce is not implemented in IE11 + var vttLines = id3_1.utf8ArrayToStr(new Uint8Array(vttByteArray)).trim().replace(re, '\n').split('\n'); + var cueTime = '00:00.000'; + var mpegTs = 0; + var localTime = 0; + var presentationTime = 0; + var cues = []; + var parsingError; + var inHeader = true; + // let VTTCue = VTTCue || window.TextTrackCue; + // Create parser object using VTTCue with TextTrackCue fallback on certain browsers. + var parser = new vttparser_1.default(); + parser.oncue = function (cue) { + // Adjust cue timing; clamp cues to start no earlier than - and drop cues that don't end after - 0 on timeline. + var currCC = vttCCs[cc]; + var cueOffset = vttCCs.ccOffset; + // Update offsets for new discontinuities + if (currCC && currCC.new) { + if (localTime !== undefined) { + // When local time is provided, offset = discontinuity start time - local time + cueOffset = vttCCs.ccOffset = currCC.start; + } + else { + calculateOffset(vttCCs, cc, presentationTime); + } + } + if (presentationTime) { + // If we have MPEGTS, offset = presentation time + discontinuity offset + cueOffset = presentationTime - vttCCs.presentationOffset; + } + cue.startTime += cueOffset - localTime; + cue.endTime += cueOffset - localTime; + // Create a unique hash id for a cue based on start/end times and text. + // This helps timeline-controller to avoid showing repeated captions. + cue.id = hash(cue.startTime.toString()) + hash(cue.endTime.toString()) + hash(cue.text); + // Fix encoding of special characters. TODO: Test with all sorts of weird characters. + cue.text = decodeURIComponent(encodeURIComponent(cue.text)); + if (cue.endTime > 0) { + cues.push(cue); + } + }; + parser.onparsingerror = function (e) { + parsingError = e; + }; + parser.onflush = function () { + if (parsingError && errorCallBack) { + errorCallBack(parsingError); + return; + } + callBack(cues); + }; + // Go through contents line by line. + vttLines.forEach(function (line) { + if (inHeader) { + // Look for X-TIMESTAMP-MAP in header. + if (startsWith(line, 'X-TIMESTAMP-MAP=')) { + // Once found, no more are allowed anyway, so stop searching. + inHeader = false; + // Extract LOCAL and MPEGTS. + line.substr(16).split(',').forEach(function (timestamp) { + if (startsWith(timestamp, 'LOCAL:')) { + cueTime = timestamp.substr(6); + } + else if (startsWith(timestamp, 'MPEGTS:')) { + mpegTs = parseInt(timestamp.substr(7)); + } + }); + try { + // Calculate subtitle offset in milliseconds. + if (syncPTS + ((vttCCs[cc].start * 90000) || 0) < 0) { + syncPTS += 8589934592; + } + // Adjust MPEGTS by sync PTS. + mpegTs -= syncPTS; + // Convert cue time to seconds + localTime = cueString2millis(cueTime) / 1000; + // Convert MPEGTS to seconds from 90kHz. + presentationTime = mpegTs / 90000; + if (localTime === -1) { + parsingError = new Error("Malformed X-TIMESTAMP-MAP: " + line); + } + } + catch (e) { + parsingError = new Error("Malformed X-TIMESTAMP-MAP: " + line); + } + // Return without parsing X-TIMESTAMP-MAP line. + return; + } + else if (line === '') { + inHeader = false; + } + } + // Parse line by default. + parser.parse(line + '\n'); + }); + parser.flush(); + } +}; +exports.default = WebVTTParser; + +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./src/polyfills/number */ "./src/polyfills/number.js")["Number"])) + +/***/ }), + +/***/ "./src/utils/xhr-loader.js": +/*!*********************************!*\ + !*** ./src/utils/xhr-loader.js ***! + \*********************************/ +/*! no static exports found */ +/*! ModuleConcatenation bailout: Module is not an ECMAScript module */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +/** + * XHR based logger +*/ +Object.defineProperty(exports, "__esModule", { value: true }); +var logger_1 = __webpack_require__(/*! ../utils/logger */ "./src/utils/logger.js"); +var performance = window.performance, XMLHttpRequest = window.XMLHttpRequest; +var XhrLoader = /** @class */ (function () { + function XhrLoader(config) { + if (config && config.xhrSetup) { + this.xhrSetup = config.xhrSetup; + } + } + XhrLoader.prototype.destroy = function () { + this.abort(); + this.loader = null; + }; + XhrLoader.prototype.abort = function () { + var loader = this.loader; + if (loader && loader.readyState !== 4) { + this.stats.aborted = true; + loader.abort(); + } + window.clearTimeout(this.requestTimeout); + this.requestTimeout = null; + window.clearTimeout(this.retryTimeout); + this.retryTimeout = null; + }; + XhrLoader.prototype.load = function (context, config, callbacks) { + this.context = context; + this.config = config; + this.callbacks = callbacks; + this.stats = { trequest: performance.now(), retry: 0 }; + this.retryDelay = config.retryDelay; + this.loadInternal(); + }; + XhrLoader.prototype.loadInternal = function () { + var xhr, context = this.context; + xhr = this.loader = new XMLHttpRequest(); + var stats = this.stats; + stats.tfirst = 0; + stats.loaded = 0; + var xhrSetup = this.xhrSetup; + try { + if (xhrSetup) { + try { + xhrSetup(xhr, context.url); + } + catch (e) { + // fix xhrSetup: (xhr, url) => {xhr.setRequestHeader("Content-Language", "test");} + // not working, as xhr.setRequestHeader expects xhr.readyState === OPEN + xhr.open('GET', context.url, true); + xhrSetup(xhr, context.url); + } + } + if (!xhr.readyState) { + xhr.open('GET', context.url, true); + } + } + catch (e) { + // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS + this.callbacks.onError({ code: xhr.status, text: e.message }, context, xhr); + return; + } + if (context.rangeEnd) { + xhr.setRequestHeader('Range', 'bytes=' + context.rangeStart + '-' + (context.rangeEnd - 1)); + } + xhr.onreadystatechange = this.readystatechange.bind(this); + xhr.onprogress = this.loadprogress.bind(this); + xhr.responseType = context.responseType; + // setup timeout before we perform request + this.requestTimeout = window.setTimeout(this.loadtimeout.bind(this), this.config.timeout); + xhr.send(); + }; + XhrLoader.prototype.readystatechange = function (event) { + var xhr = event.currentTarget, readyState = xhr.readyState, stats = this.stats, context = this.context, config = this.config; + // don't proceed if xhr has been aborted + if (stats.aborted) { + return; + } + // >= HEADERS_RECEIVED + if (readyState >= 2) { + // clear xhr timeout and rearm it if readyState less than 4 + window.clearTimeout(this.requestTimeout); + if (stats.tfirst === 0) { + stats.tfirst = Math.max(performance.now(), stats.trequest); + } + if (readyState === 4) { + var status_1 = xhr.status; + // http status between 200 to 299 are all successful + if (status_1 >= 200 && status_1 < 300) { + stats.tload = Math.max(stats.tfirst, performance.now()); + var data = void 0, len = void 0; + if (context.responseType === 'arraybuffer') { + data = xhr.response; + len = data.byteLength; + } + else { + data = xhr.responseText; + len = data.length; + } + stats.loaded = stats.total = len; + var response = { url: xhr.responseURL, data: data }; + this.callbacks.onSuccess(response, stats, context, xhr); + } + else { + // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error + if (stats.retry >= config.maxRetry || (status_1 >= 400 && status_1 < 499)) { + logger_1.logger.error(status_1 + " while loading " + context.url); + this.callbacks.onError({ code: status_1, text: xhr.statusText }, context, xhr); + } + else { + // retry + logger_1.logger.warn(status_1 + " while loading " + context.url + ", retrying in " + this.retryDelay + "..."); + // aborts and resets internal state + this.destroy(); + // schedule retry + this.retryTimeout = window.setTimeout(this.loadInternal.bind(this), this.retryDelay); + // set exponential backoff + this.retryDelay = Math.min(2 * this.retryDelay, config.maxRetryDelay); + stats.retry++; + } + } + } + else { + // readyState >= 2 AND readyState !==4 (readyState = HEADERS_RECEIVED || LOADING) rearm timeout as xhr not finished yet + this.requestTimeout = window.setTimeout(this.loadtimeout.bind(this), config.timeout); + } + } + }; + XhrLoader.prototype.loadtimeout = function () { + logger_1.logger.warn("timeout while loading " + this.context.url); + this.callbacks.onTimeout(this.stats, this.context, null); + }; + XhrLoader.prototype.loadprogress = function (event) { + var xhr = event.currentTarget, stats = this.stats; + stats.loaded = event.loaded; + if (event.lengthComputable) { + stats.total = event.total; + } + var onProgress = this.callbacks.onProgress; + if (onProgress) { + // third arg is to provide on progress data + onProgress(stats, this.context, null, xhr); + } + }; + return XhrLoader; +}()); +exports.default = XhrLoader; + + +/***/ }) + +/******/ })["default"]; +}); +//# sourceMappingURL=hls.js.map + +/***/ }), + +/***/ "./node_modules/node-libs-browser/node_modules/process/browser.js": +/*!************************************************************************!*\ + !*** ./node_modules/node-libs-browser/node_modules/process/browser.js ***! + \************************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +// shim for using process in browser +var process = module.exports = {}; + +// cached from whatever global is present so that test runners that stub it +// don't break things. But we need to wrap it in a try catch in case it is +// wrapped in strict mode code which doesn't define any globals. It's inside a +// function because try/catches deoptimize in certain engines. + +var cachedSetTimeout; +var cachedClearTimeout; + +function defaultSetTimout() { + throw new Error('setTimeout has not been defined'); +} +function defaultClearTimeout () { + throw new Error('clearTimeout has not been defined'); +} +(function () { + try { + if (typeof setTimeout === 'function') { + cachedSetTimeout = setTimeout; + } else { + cachedSetTimeout = defaultSetTimout; + } + } catch (e) { + cachedSetTimeout = defaultSetTimout; + } + try { + if (typeof clearTimeout === 'function') { + cachedClearTimeout = clearTimeout; + } else { + cachedClearTimeout = defaultClearTimeout; + } + } catch (e) { + cachedClearTimeout = defaultClearTimeout; + } +} ()) +function runTimeout(fun) { + if (cachedSetTimeout === setTimeout) { + //normal enviroments in sane situations + return setTimeout(fun, 0); + } + // if setTimeout wasn't available but was latter defined + if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) { + cachedSetTimeout = setTimeout; + return setTimeout(fun, 0); + } + try { + // when when somebody has screwed with setTimeout but no I.E. maddness + return cachedSetTimeout(fun, 0); + } catch(e){ + try { + // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally + return cachedSetTimeout.call(null, fun, 0); + } catch(e){ + // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error + return cachedSetTimeout.call(this, fun, 0); + } + } + + +} +function runClearTimeout(marker) { + if (cachedClearTimeout === clearTimeout) { + //normal enviroments in sane situations + return clearTimeout(marker); + } + // if clearTimeout wasn't available but was latter defined + if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) { + cachedClearTimeout = clearTimeout; + return clearTimeout(marker); + } + try { + // when when somebody has screwed with setTimeout but no I.E. maddness + return cachedClearTimeout(marker); + } catch (e){ + try { + // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally + return cachedClearTimeout.call(null, marker); + } catch (e){ + // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error. + // Some versions of I.E. have different rules for clearTimeout vs setTimeout + return cachedClearTimeout.call(this, marker); + } + } + + + +} +var queue = []; +var draining = false; +var currentQueue; +var queueIndex = -1; + +function cleanUpNextTick() { + if (!draining || !currentQueue) { + return; + } + draining = false; + if (currentQueue.length) { + queue = currentQueue.concat(queue); + } else { + queueIndex = -1; + } + if (queue.length) { + drainQueue(); + } +} + +function drainQueue() { + if (draining) { + return; + } + var timeout = runTimeout(cleanUpNextTick); + draining = true; + + var len = queue.length; + while(len) { + currentQueue = queue; + queue = []; + while (++queueIndex < len) { + if (currentQueue) { + currentQueue[queueIndex].run(); + } + } + queueIndex = -1; + len = queue.length; + } + currentQueue = null; + draining = false; + runClearTimeout(timeout); +} + +process.nextTick = function (fun) { + var args = new Array(arguments.length - 1); + if (arguments.length > 1) { + for (var i = 1; i < arguments.length; i++) { + args[i - 1] = arguments[i]; + } + } + queue.push(new Item(fun, args)); + if (queue.length === 1 && !draining) { + runTimeout(drainQueue); + } +}; + +// v8 likes predictible objects +function Item(fun, array) { + this.fun = fun; + this.array = array; +} +Item.prototype.run = function () { + this.fun.apply(null, this.array); +}; +process.title = 'browser'; +process.browser = true; +process.env = {}; +process.argv = []; +process.version = ''; // empty string to avoid regexp issues +process.versions = {}; + +function noop() {} + +process.on = noop; +process.addListener = noop; +process.once = noop; +process.off = noop; +process.removeListener = noop; +process.removeAllListeners = noop; +process.emit = noop; + +process.binding = function (name) { + throw new Error('process.binding is not supported'); +}; + +process.cwd = function () { return '/' }; +process.chdir = function (dir) { + throw new Error('process.chdir is not supported'); +}; +process.umask = function() { return 0; }; + + +/***/ }), + +/***/ "./node_modules/style-loader/lib/addStyles.js": +/*!****************************************************!*\ + !*** ./node_modules/style-loader/lib/addStyles.js ***! + \****************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +/* + MIT License http://www.opensource.org/licenses/mit-license.php + Author Tobias Koppers @sokra +*/ + +var stylesInDom = {}; + +var memoize = function (fn) { + var memo; + + return function () { + if (typeof memo === "undefined") memo = fn.apply(this, arguments); + return memo; + }; +}; + +var isOldIE = memoize(function () { + // Test for IE <= 9 as proposed by Browserhacks + // @see http://browserhacks.com/#hack-e71d8692f65334173fee715c222cb805 + // Tests for existence of standard globals is to allow style-loader + // to operate correctly into non-standard environments + // @see https://github.com/webpack-contrib/style-loader/issues/177 + return window && document && document.all && !window.atob; +}); + +var getTarget = function (target) { + return document.querySelector(target); +}; + +var getElement = (function (fn) { + var memo = {}; + + return function(target) { + // If passing function in options, then use it for resolve "head" element. + // Useful for Shadow Root style i.e + // { + // insertInto: function () { return document.querySelector("#foo").shadowRoot } + // } + if (typeof target === 'function') { + return target(); + } + if (typeof memo[target] === "undefined") { + var styleTarget = getTarget.call(this, target); + // Special case to return head of iframe instead of iframe itself + if (window.HTMLIFrameElement && styleTarget instanceof window.HTMLIFrameElement) { + try { + // This will throw an exception if access to iframe is blocked + // due to cross-origin restrictions + styleTarget = styleTarget.contentDocument.head; + } catch(e) { + styleTarget = null; + } + } + memo[target] = styleTarget; + } + return memo[target] + }; +})(); + +var singleton = null; +var singletonCounter = 0; +var stylesInsertedAtTop = []; + +var fixUrls = __webpack_require__(/*! ./urls */ "./node_modules/style-loader/lib/urls.js"); + +module.exports = function(list, options) { + if (typeof DEBUG !== "undefined" && DEBUG) { + if (typeof document !== "object") throw new Error("The style-loader cannot be used in a non-browser environment"); + } + + options = options || {}; + + options.attrs = typeof options.attrs === "object" ? options.attrs : {}; + + // Force single-tag solution on IE6-9, which has a hard limit on the # of ').html((0, _template2.default)(style.toString())(options)); + } +}; + +exports.default = Styler; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/base/template.js": +/*!******************************!*\ + !*** ./src/base/template.js ***! + \******************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +/* eslint-disable no-var */ +// Simple JavaScript Templating +// Paul Miller (http://paulmillr.com) +// http://underscorejs.org +// (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors + +// By default, Underscore uses ERB-style template delimiters, change the +// following template settings to use alternative delimiters. +var settings = { + evaluate: /<%([\s\S]+?)%>/g, + interpolate: /<%=([\s\S]+?)%>/g, + escape: /<%-([\s\S]+?)%>/g + + // When customizing `templateSettings`, if you don't want to define an + // interpolation, evaluation or escaping regex, we need one that is + // guaranteed not to match. +};var noMatch = /(.)^/; + +// Certain characters need to be escaped so that they can be put into a +// string literal. +var escapes = { + '\'': '\'', + '\\': '\\', + '\r': 'r', + '\n': 'n', + '\t': 't', + '\u2028': 'u2028', + '\u2029': 'u2029' +}; + +var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g; + +// List of HTML entities for escaping. +var htmlEntities = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + '\'': ''' +}; + +var entityRe = new RegExp('[&<>"\']', 'g'); + +var escapeExpr = function escapeExpr(string) { + if (string === null) return ''; + return ('' + string).replace(entityRe, function (match) { + return htmlEntities[match]; + }); +}; + +var counter = 0; + +// JavaScript micro-templating, similar to John Resig's implementation. +// Underscore templating handles arbitrary delimiters, preserves whitespace, +// and correctly escapes quotes within interpolated code. +var tmpl = function tmpl(text, data) { + var render; + + // Combine delimiters into one regular expression via alternation. + var matcher = new RegExp([(settings.escape || noMatch).source, (settings.interpolate || noMatch).source, (settings.evaluate || noMatch).source].join('|') + '|$', 'g'); + + // Compile the template source, escaping string literals appropriately. + var index = 0; + var source = '__p+=\''; + text.replace(matcher, function (match, escape, interpolate, evaluate, offset) { + source += text.slice(index, offset).replace(escaper, function (match) { + return '\\' + escapes[match]; + }); + + if (escape) source += '\'+\n((__t=(' + escape + '))==null?\'\':escapeExpr(__t))+\n\''; + + if (interpolate) source += '\'+\n((__t=(' + interpolate + '))==null?\'\':__t)+\n\''; + + if (evaluate) source += '\';\n' + evaluate + '\n__p+=\''; + + index = offset + match.length; + return match; + }); + source += '\';\n'; + + // If a variable is not specified, place data values in local scope. + if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; + + source = 'var __t,__p=\'\',__j=Array.prototype.join,' + 'print=function(){__p+=__j.call(arguments,\'\');};\n' + source + 'return __p;\n//# sourceURL=/microtemplates/source[' + counter++ + ']'; + + try { + /*jshint -W054 */ + // TODO: find a way to avoid eval + render = new Function(settings.variable || 'obj', 'escapeExpr', source); + } catch (e) { + e.source = source; + throw e; + } + + if (data) return render(data, escapeExpr); + var template = function template(data) { + return render.call(this, data, escapeExpr); + }; + + // Provide the compiled function source as a convenience for precompilation. + template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}'; + + return template; +}; +tmpl.settings = settings; + +exports.default = tmpl; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/base/ui_container_plugin.js": +/*!*****************************************!*\ + !*** ./src/base/ui_container_plugin.js ***! + \*****************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _assign = __webpack_require__(/*! babel-runtime/core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _utils = __webpack_require__(/*! ./utils */ "./src/base/utils.js"); + +var _ui_object = __webpack_require__(/*! ./ui_object */ "./src/base/ui_object.js"); + +var _ui_object2 = _interopRequireDefault(_ui_object); + +var _error_mixin = __webpack_require__(/*! ./error_mixin */ "./src/base/error_mixin.js"); + +var _error_mixin2 = _interopRequireDefault(_error_mixin); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/** + * The base class for an ui container plugin + * @class UIContainerPlugin + * @constructor + * @extends UIObject + * @module base + */ +var UIContainerPlugin = function (_UIObject) { + (0, _inherits3.default)(UIContainerPlugin, _UIObject); + (0, _createClass3.default)(UIContainerPlugin, [{ + key: 'playerError', + get: function get() { + return this.container.playerError; + } + }]); + + function UIContainerPlugin(container) { + (0, _classCallCheck3.default)(this, UIContainerPlugin); + + var _this = (0, _possibleConstructorReturn3.default)(this, _UIObject.call(this, container.options)); + + _this.container = container; + _this.enabled = true; + _this.bindEvents(); + return _this; + } + + UIContainerPlugin.prototype.enable = function enable() { + if (!this.enabled) { + this.bindEvents(); + this.$el.show(); + this.enabled = true; + } + }; + + UIContainerPlugin.prototype.disable = function disable() { + this.stopListening(); + this.$el.hide(); + this.enabled = false; + }; + + UIContainerPlugin.prototype.bindEvents = function bindEvents() {}; + + return UIContainerPlugin; +}(_ui_object2.default); // Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +exports.default = UIContainerPlugin; + + +(0, _assign2.default)(UIContainerPlugin.prototype, _error_mixin2.default); + +UIContainerPlugin.extend = function (properties) { + return (0, _utils.extend)(UIContainerPlugin, properties); +}; + +UIContainerPlugin.type = 'container'; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/base/ui_core_plugin.js": +/*!************************************!*\ + !*** ./src/base/ui_core_plugin.js ***! + \************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _assign = __webpack_require__(/*! babel-runtime/core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _utils = __webpack_require__(/*! ./utils */ "./src/base/utils.js"); + +var _ui_object = __webpack_require__(/*! ./ui_object */ "./src/base/ui_object.js"); + +var _ui_object2 = _interopRequireDefault(_ui_object); + +var _error_mixin = __webpack_require__(/*! ./error_mixin */ "./src/base/error_mixin.js"); + +var _error_mixin2 = _interopRequireDefault(_error_mixin); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var UICorePlugin = function (_UIObject) { + (0, _inherits3.default)(UICorePlugin, _UIObject); + (0, _createClass3.default)(UICorePlugin, [{ + key: 'playerError', + get: function get() { + return this.core.playerError; + } + }]); + + function UICorePlugin(core) { + (0, _classCallCheck3.default)(this, UICorePlugin); + + var _this = (0, _possibleConstructorReturn3.default)(this, _UIObject.call(this, core.options)); + + _this.core = core; + _this.enabled = true; + _this.bindEvents(); + _this.render(); + return _this; + } + + UICorePlugin.prototype.bindEvents = function bindEvents() {}; + + UICorePlugin.prototype.getExternalInterface = function getExternalInterface() { + return {}; + }; + + UICorePlugin.prototype.enable = function enable() { + if (!this.enabled) { + this.bindEvents(); + this.$el.show(); + this.enabled = true; + } + }; + + UICorePlugin.prototype.disable = function disable() { + this.stopListening(); + this.$el.hide(); + this.enabled = false; + }; + + UICorePlugin.prototype.render = function render() { + return this; + }; + + return UICorePlugin; +}(_ui_object2.default); + +exports.default = UICorePlugin; + + +(0, _assign2.default)(UICorePlugin.prototype, _error_mixin2.default); + +UICorePlugin.extend = function (properties) { + return (0, _utils.extend)(UICorePlugin, properties); +}; + +UICorePlugin.type = 'core'; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/base/ui_object.js": +/*!*******************************!*\ + !*** ./src/base/ui_object.js ***! + \*******************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +var _utils = __webpack_require__(/*! ./utils */ "./src/base/utils.js"); + +var _base_object = __webpack_require__(/*! ./base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var delegateEventSplitter = /^(\S+)\s*(.*)$/; + +/** + * A base class to create ui object. + * @class UIObject + * @constructor + * @extends BaseObject + * @module base + */ +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var UIObject = function (_BaseObject) { + (0, _inherits3.default)(UIObject, _BaseObject); + (0, _createClass3.default)(UIObject, [{ + key: 'tagName', + + /** + * a unique id prefixed with `'c'`, `c1, c232` + * + * @property cid + * @type String + */ + /** + * the dom element itself + * + * @property el + * @type HTMLElement + */ + /** + * the dom element wrapped by `$` + * + * @property $el + * @type HTMLElement + */ + + /** + * gets the tag name for the ui component + * @method tagName + * @default div + * @return {String} tag's name + */ + get: function get() { + return 'div'; + } + /** + * a literal object mapping element's events to methods + * @property events + * @type Object + * @example + * + *```javascript + * + * class MyButton extends UIObject { + * constructor(options) { + * super(options) + * this.myId = 0 + * } + * get events() { return { 'click': 'myClick' } } + * myClick(){ this.myId = 42 } + * } + * + * // when you click on MyButton the method `myClick` will be called + *``` + */ + + }, { + key: 'events', + get: function get() { + return {}; + } + /** + * a literal object mapping attributes and values to the element + * element's attribute name and the value the attribute value + * @property attributes + * @type Object + * @example + * + *```javascript + * + * class MyButton extends UIObject { + * constructor(options) { super(options) } + * get attributes() { return { class: 'my-button'} } + * } + * + * // MyButton.el.className will be 'my-button' + * ``` + */ + + }, { + key: 'attributes', + get: function get() { + return {}; + } + + /** + * it builds an ui component by: + * * creating an id for the component `cid` + * * making sure the element is created `$el` + * * delegating all `events` to the element + * @method constructor + * @param {Object} options the options object + */ + + }]); + + function UIObject(options) { + (0, _classCallCheck3.default)(this, UIObject); + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseObject.call(this, options)); + + _this.cid = (0, _utils.uniqueId)('c'); + _this._ensureElement(); + _this.delegateEvents(); + return _this; + } + + /** + * selects within the component. + * @method $ + * @param {String} selector a selector to find within the component. + * @return {HTMLElement} an element, if it exists. + * @example + * ```javascript + * fullScreenBarUIComponent.$('.button-full') //will return only `.button-full` within the component + * ``` + */ + + + UIObject.prototype.$ = function $(selector) { + return this.$el.find(selector); + }; + + /** + * render the component, usually attach it to a real existent `element` + * @method render + * @return {UIObject} itself + */ + + + UIObject.prototype.render = function render() { + return this; + }; + + /** + * removes the ui component from DOM + * @method destroy + * @return {UIObject} itself + */ + + + UIObject.prototype.destroy = function destroy() { + this.$el.remove(); + this.stopListening(); + this.undelegateEvents(); + return this; + }; + + /** + * set element to `el` and `$el` + * @method setElement + * @param {HTMLElement} element + * @param {Boolean} delegate whether is delegate or not + * @return {UIObject} itself + */ + + + UIObject.prototype.setElement = function setElement(element, delegate) { + if (this.$el) this.undelegateEvents(); + this.$el = _clapprZepto2.default.zepto.isZ(element) ? element : (0, _clapprZepto2.default)(element); + this.el = this.$el[0]; + if (delegate !== false) this.delegateEvents(); + return this; + }; + + /** + * delegates all the original `events` on `element` to its callbacks + * @method delegateEvents + * @param {Object} events + * @return {UIObject} itself + */ + + + UIObject.prototype.delegateEvents = function delegateEvents(events) { + if (!(events || (events = this.events))) return this; + this.undelegateEvents(); + for (var key in events) { + var method = events[key]; + if (method && method.constructor !== Function) method = this[events[key]]; + if (!method) continue; + + var match = key.match(delegateEventSplitter); + var eventName = match[1], + selector = match[2]; + eventName += '.delegateEvents' + this.cid; + if (selector === '') this.$el.on(eventName, method.bind(this));else this.$el.on(eventName, selector, method.bind(this)); + } + return this; + }; + + /** + * undelegats all the `events` + * @method undelegateEvents + * @return {UIObject} itself + */ + + + UIObject.prototype.undelegateEvents = function undelegateEvents() { + this.$el.off('.delegateEvents' + this.cid); + return this; + }; + + /** + * ensures the creation of this ui component + * @method _ensureElement + * @private + */ + + + UIObject.prototype._ensureElement = function _ensureElement() { + if (!this.el) { + var attrs = _clapprZepto2.default.extend({}, this.attributes); + if (this.id) attrs.id = this.id; + if (this.className) attrs['class'] = this.className; + var $el = _utils.DomRecycler.create(this.tagName).attr(attrs); + this.setElement($el, false); + } else { + this.setElement(this.el, false); + } + }; + + return UIObject; +}(_base_object2.default); + +exports.default = UIObject; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/base/utils.js": +/*!***************************!*\ + !*** ./src/base/utils.js ***! + \***************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.DoubleEventHandler = exports.DomRecycler = exports.cancelAnimationFrame = exports.requestAnimationFrame = exports.QueryString = exports.Config = exports.Fullscreen = undefined; + +var _assign = __webpack_require__(/*! babel-runtime/core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _defineProperty = __webpack_require__(/*! babel-runtime/core-js/object/define-property */ "./node_modules/babel-runtime/core-js/object/define-property.js"); + +var _defineProperty2 = _interopRequireDefault(_defineProperty); + +var _getOwnPropertyDescriptor = __webpack_require__(/*! babel-runtime/core-js/object/get-own-property-descriptor */ "./node_modules/babel-runtime/core-js/object/get-own-property-descriptor.js"); + +var _getOwnPropertyDescriptor2 = _interopRequireDefault(_getOwnPropertyDescriptor); + +exports.assign = assign; +exports.extend = extend; +exports.formatTime = formatTime; +exports.seekStringToSeconds = seekStringToSeconds; +exports.uniqueId = uniqueId; +exports.isNumber = isNumber; +exports.currentScriptUrl = currentScriptUrl; +exports.getBrowserLanguage = getBrowserLanguage; +exports.now = now; +exports.removeArrayItem = removeArrayItem; +exports.listContainsIgnoreCase = listContainsIgnoreCase; +exports.canAutoPlayMedia = canAutoPlayMedia; + +__webpack_require__(/*! ./polyfills */ "./src/base/polyfills.js"); + +var _browser = __webpack_require__(/*! ../components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +var _media = __webpack_require__(/*! ./media */ "./src/base/media.js"); + +var _media2 = _interopRequireDefault(_media); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. +/*jshint -W079 */ + +function assign(obj, source) { + if (source) { + for (var prop in source) { + var propDescriptor = (0, _getOwnPropertyDescriptor2.default)(source, prop); + propDescriptor ? (0, _defineProperty2.default)(obj, prop, propDescriptor) : obj[prop] = source[prop]; + } + } + return obj; +} + +function extend(parent, properties) { + var Surrogate = function (_parent) { + (0, _inherits3.default)(Surrogate, _parent); + + function Surrogate() { + (0, _classCallCheck3.default)(this, Surrogate); + + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + var _this = (0, _possibleConstructorReturn3.default)(this, _parent.call.apply(_parent, [this].concat(args))); + + if (properties.initialize) properties.initialize.apply(_this, args); + + return _this; + } + + return Surrogate; + }(parent); + + assign(Surrogate.prototype, properties); + return Surrogate; +} + +function formatTime(time, paddedHours) { + if (!isFinite(time)) return '--:--'; + + time = time * 1000; + time = parseInt(time / 1000); + var seconds = time % 60; + time = parseInt(time / 60); + var minutes = time % 60; + time = parseInt(time / 60); + var hours = time % 24; + var days = parseInt(time / 24); + var out = ''; + if (days && days > 0) { + out += days + ':'; + if (hours < 1) out += '00:'; + } + if (hours && hours > 0 || paddedHours) out += ('0' + hours).slice(-2) + ':'; + out += ('0' + minutes).slice(-2) + ':'; + out += ('0' + seconds).slice(-2); + return out.trim(); +} + +var Fullscreen = exports.Fullscreen = { + isFullscreen: function isFullscreen() { + return !!(document.webkitFullscreenElement || document.webkitIsFullScreen || document.mozFullScreen || document.msFullscreenElement); + }, + requestFullscreen: function requestFullscreen(el) { + if (el.requestFullscreen) el.requestFullscreen();else if (el.webkitRequestFullscreen) el.webkitRequestFullscreen();else if (el.mozRequestFullScreen) el.mozRequestFullScreen();else if (el.msRequestFullscreen) el.msRequestFullscreen();else if (el.querySelector && el.querySelector('video') && el.querySelector('video').webkitEnterFullScreen) el.querySelector('video').webkitEnterFullScreen();else if (el.webkitEnterFullScreen) el.webkitEnterFullScreen(); + }, + cancelFullscreen: function cancelFullscreen() { + var el = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : document; + + if (el.exitFullscreen) el.exitFullscreen();else if (el.webkitCancelFullScreen) el.webkitCancelFullScreen();else if (el.webkitExitFullscreen) el.webkitExitFullscreen();else if (el.mozCancelFullScreen) el.mozCancelFullScreen();else if (el.msExitFullscreen) el.msExitFullscreen(); + }, + fullscreenEnabled: function fullscreenEnabled() { + return !!(document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled); + } +}; + +var Config = exports.Config = function () { + function Config() { + (0, _classCallCheck3.default)(this, Config); + } + + Config._defaultConfig = function _defaultConfig() { + return { + volume: { + value: 100, + parse: parseInt + } + }; + }; + + Config._defaultValueFor = function _defaultValueFor(key) { + try { + return this._defaultConfig()[key].parse(this._defaultConfig()[key].value); + } catch (e) { + return undefined; + } + }; + + Config._createKeyspace = function _createKeyspace(key) { + return 'clappr.' + document.domain + '.' + key; + }; + + Config.restore = function restore(key) { + if (_browser2.default.hasLocalstorage && localStorage[this._createKeyspace(key)]) return this._defaultConfig()[key].parse(localStorage[this._createKeyspace(key)]); + + return this._defaultValueFor(key); + }; + + Config.persist = function persist(key, value) { + if (_browser2.default.hasLocalstorage) { + try { + localStorage[this._createKeyspace(key)] = value; + return true; + } catch (e) { + return false; + } + } + }; + + return Config; +}(); + +var QueryString = exports.QueryString = function () { + function QueryString() { + (0, _classCallCheck3.default)(this, QueryString); + } + + QueryString.parse = function parse(paramsString) { + var match = void 0; + var pl = /\+/g, + // Regex for replacing addition symbol with a space + search = /([^&=]+)=?([^&]*)/g, + decode = function decode(s) { + return decodeURIComponent(s.replace(pl, ' ')); + }, + params = {}; + while (match = search.exec(paramsString)) { + // eslint-disable-line no-cond-assign + params[decode(match[1]).toLowerCase()] = decode(match[2]); + } + return params; + }; + + (0, _createClass3.default)(QueryString, null, [{ + key: 'params', + get: function get() { + var query = window.location.search.substring(1); + if (query !== this.query) { + this._urlParams = this.parse(query); + this.query = query; + } + return this._urlParams; + } + }, { + key: 'hashParams', + get: function get() { + var hash = window.location.hash.substring(1); + if (hash !== this.hash) { + this._hashParams = this.parse(hash); + this.hash = hash; + } + return this._hashParams; + } + }]); + return QueryString; +}(); + +function seekStringToSeconds() { + var paramName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 't'; + + var seconds = 0; + var seekString = QueryString.params[paramName] || QueryString.hashParams[paramName] || ''; + var parts = seekString.match(/[0-9]+[hms]+/g) || []; + if (parts.length > 0) { + var factor = { 'h': 3600, 'm': 60, 's': 1 }; + parts.forEach(function (el) { + if (el) { + var suffix = el[el.length - 1]; + var time = parseInt(el.slice(0, el.length - 1), 10); + seconds += time * factor[suffix]; + } + }); + } else if (seekString) { + seconds = parseInt(seekString, 10); + } + + return seconds; +} + +var idsCounter = {}; + +function uniqueId(prefix) { + idsCounter[prefix] || (idsCounter[prefix] = 0); + var id = ++idsCounter[prefix]; + return prefix + id; +} + +function isNumber(value) { + return value - parseFloat(value) + 1 >= 0; +} + +function currentScriptUrl() { + var scripts = document.getElementsByTagName('script'); + return scripts.length ? scripts[scripts.length - 1].src : ''; +} + +var requestAnimationFrame = exports.requestAnimationFrame = (window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || function (fn) { + window.setTimeout(fn, 1000 / 60); +}).bind(window); + +var cancelAnimationFrame = exports.cancelAnimationFrame = (window.cancelAnimationFrame || window.mozCancelAnimationFrame || window.webkitCancelAnimationFrame || window.clearTimeout).bind(window); + +function getBrowserLanguage() { + return window.navigator && window.navigator.language; +} + +function now() { + if (window.performance && window.performance.now) return performance.now(); + + return Date.now(); +} + +// remove the item from the array if it exists in the array +function removeArrayItem(arr, item) { + var i = arr.indexOf(item); + if (i >= 0) arr.splice(i, 1); +} + +// find an item regardless of its letter case +function listContainsIgnoreCase(item, items) { + if (item === undefined || items === undefined) return false; + return items.find(function (itemEach) { + return item.toLowerCase() === itemEach.toLowerCase(); + }) !== undefined; +} + +// https://github.com/video-dev/can-autoplay +function canAutoPlayMedia(cb, options) { + options = (0, _assign2.default)({ + inline: false, + muted: false, + timeout: 250, + type: 'video', + source: _media2.default.mp4, + element: null + }, options); + + var element = options.element ? options.element : document.createElement(options.type); + + element.muted = options.muted; + if (options.muted === true) element.setAttribute('muted', 'muted'); + + if (options.inline === true) element.setAttribute('playsinline', 'playsinline'); + + element.src = options.source; + + var promise = element.play(); + + var timeoutId = setTimeout(function () { + setResult(false, new Error('Timeout ' + options.timeout + ' ms has been reached')); + }, options.timeout); + + var setResult = function setResult(result) { + var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; + + clearTimeout(timeoutId); + cb(result, error); + }; + + if (promise !== undefined) { + promise.then(function () { + return setResult(true); + }).catch(function (err) { + return setResult(false, err); + }); + } else { + setResult(true); + } +} + +// Simple Zepto element factory with video recycle feature. +var videoStack = []; + +var DomRecycler = exports.DomRecycler = function () { + function DomRecycler() { + (0, _classCallCheck3.default)(this, DomRecycler); + } + + DomRecycler.configure = function configure(options) { + this.options = _clapprZepto2.default.extend(this.options, options); + }; + + DomRecycler.create = function create(name) { + if (this.options.recycleVideo && name === 'video' && videoStack.length > 0) return videoStack.shift(); + + return (0, _clapprZepto2.default)('<' + name + '>'); + }; + + DomRecycler.garbage = function garbage($el) { + // Expect Zepto collection with single element (does not iterate!) + if (!this.options.recycleVideo || $el[0].tagName.toUpperCase() !== 'VIDEO') return; + $el.children().remove(); + videoStack.push($el); + }; + + return DomRecycler; +}(); + +DomRecycler.options = { recycleVideo: false }; + +var DoubleEventHandler = exports.DoubleEventHandler = function () { + function DoubleEventHandler() { + var delay = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 500; + (0, _classCallCheck3.default)(this, DoubleEventHandler); + + this.delay = delay; + this.lastTime = 0; + } + + DoubleEventHandler.prototype.handle = function handle(event, cb) { + var prevented = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true; + + // Based on http://jsfiddle.net/brettwp/J4djY/ + var currentTime = new Date().getTime(); + var diffTime = currentTime - this.lastTime; + + if (diffTime < this.delay && diffTime > 0) { + cb(); + prevented && event.preventDefault(); + } + + this.lastTime = currentTime; + }; + + return DoubleEventHandler; +}(); + +exports.default = { + Config: Config, + Fullscreen: Fullscreen, + QueryString: QueryString, + DomRecycler: DomRecycler, + extend: extend, + formatTime: formatTime, + seekStringToSeconds: seekStringToSeconds, + uniqueId: uniqueId, + currentScriptUrl: currentScriptUrl, + isNumber: isNumber, + requestAnimationFrame: requestAnimationFrame, + cancelAnimationFrame: cancelAnimationFrame, + getBrowserLanguage: getBrowserLanguage, + now: now, + removeArrayItem: removeArrayItem, + canAutoPlayMedia: canAutoPlayMedia, + Media: _media2.default, + DoubleEventHandler: DoubleEventHandler +}; + +/***/ }), + +/***/ "./src/components/browser/browser.js": +/*!*******************************************!*\ + !*** ./src/components/browser/browser.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.getDevice = exports.getViewportSize = exports.getOsData = exports.getBrowserData = exports.getBrowserInfo = undefined; + +var _getIterator2 = __webpack_require__(/*! babel-runtime/core-js/get-iterator */ "./node_modules/babel-runtime/core-js/get-iterator.js"); + +var _getIterator3 = _interopRequireDefault(_getIterator2); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +var _browser_data = __webpack_require__(/*! ./browser_data */ "./src/components/browser/browser_data.js"); + +var _browser_data2 = _interopRequireDefault(_browser_data); + +var _os_data = __webpack_require__(/*! ./os_data */ "./src/components/browser/os_data.js"); + +var _os_data2 = _interopRequireDefault(_os_data); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var Browser = {}; + +var hasLocalstorage = function hasLocalstorage() { + try { + localStorage.setItem('clappr', 'clappr'); + localStorage.removeItem('clappr'); + return true; + } catch (e) { + return false; + } +}; + +var hasFlash = function hasFlash() { + try { + var fo = new ActiveXObject('ShockwaveFlash.ShockwaveFlash'); + return !!fo; + } catch (e) { + return !!(navigator.mimeTypes && navigator.mimeTypes['application/x-shockwave-flash'] !== undefined && navigator.mimeTypes['application/x-shockwave-flash'].enabledPlugin); + } +}; + +var getBrowserInfo = exports.getBrowserInfo = function getBrowserInfo(ua) { + var parts = ua.match(/\b(playstation 4|nx|opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [], + extra = void 0; + if (/trident/i.test(parts[1])) { + extra = /\brv[ :]+(\d+)/g.exec(ua) || []; + return { + name: 'IE', + version: parseInt(extra[1] || '') + }; + } else if (parts[1] === 'Chrome') { + extra = ua.match(/\bOPR\/(\d+)/); + if (extra != null) return { name: 'Opera', version: parseInt(extra[1]) }; + + extra = ua.match(/\bEdge\/(\d+)/); + if (extra != null) return { name: 'Edge', version: parseInt(extra[1]) }; + } else if (/android/i.test(ua) && (extra = ua.match(/version\/(\d+)/i))) { + parts.splice(1, 1, 'Android WebView'); + parts.splice(2, 1, extra[1]); + } + parts = parts[2] ? [parts[1], parts[2]] : [navigator.appName, navigator.appVersion, '-?']; + + return { + name: parts[0], + version: parseInt(parts[1]) + }; +}; + +// Get browser data +var getBrowserData = exports.getBrowserData = function getBrowserData() { + var browserObject = {}; + var userAgent = Browser.userAgent.toLowerCase(); + + // Check browser type + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = (0, _getIterator3.default)(_browser_data2.default), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var browser = _step.value; + + var browserRegExp = new RegExp(browser.identifier.toLowerCase()); + var browserRegExpResult = browserRegExp.exec(userAgent); + + if (browserRegExpResult != null && browserRegExpResult[1]) { + browserObject.name = browser.name; + browserObject.group = browser.group; + + // Check version + if (browser.versionIdentifier) { + var versionRegExp = new RegExp(browser.versionIdentifier.toLowerCase()); + var versionRegExpResult = versionRegExp.exec(userAgent); + + if (versionRegExpResult != null && versionRegExpResult[1]) setBrowserVersion(versionRegExpResult[1], browserObject); + } else { + setBrowserVersion(browserRegExpResult[1], browserObject); + } + break; + } + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } + + return browserObject; +}; + +// Set browser version +var setBrowserVersion = function setBrowserVersion(version, browserObject) { + var splitVersion = version.split('.', 2); + browserObject.fullVersion = version; + + // Major version + if (splitVersion[0]) browserObject.majorVersion = parseInt(splitVersion[0]); + + // Minor version + if (splitVersion[1]) browserObject.minorVersion = parseInt(splitVersion[1]); +}; + +// Get OS data +var getOsData = exports.getOsData = function getOsData() { + var osObject = {}; + var userAgent = Browser.userAgent.toLowerCase(); + + // Check browser type + var _iteratorNormalCompletion2 = true; + var _didIteratorError2 = false; + var _iteratorError2 = undefined; + + try { + for (var _iterator2 = (0, _getIterator3.default)(_os_data2.default), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + var os = _step2.value; + + var osRegExp = new RegExp(os.identifier.toLowerCase()); + var osRegExpResult = osRegExp.exec(userAgent); + + if (osRegExpResult != null) { + osObject.name = os.name; + osObject.group = os.group; + + // Version defined + if (os.version) { + setOsVersion(os.version, os.versionSeparator ? os.versionSeparator : '.', osObject); + + // Version detected + } else if (osRegExpResult[1]) { + setOsVersion(osRegExpResult[1], os.versionSeparator ? os.versionSeparator : '.', osObject); + + // Version identifier + } else if (os.versionIdentifier) { + var versionRegExp = new RegExp(os.versionIdentifier.toLowerCase()); + var versionRegExpResult = versionRegExp.exec(userAgent); + + if (versionRegExpResult != null && versionRegExpResult[1]) setOsVersion(versionRegExpResult[1], os.versionSeparator ? os.versionSeparator : '.', osObject); + } + break; + } + } + } catch (err) { + _didIteratorError2 = true; + _iteratorError2 = err; + } finally { + try { + if (!_iteratorNormalCompletion2 && _iterator2.return) { + _iterator2.return(); + } + } finally { + if (_didIteratorError2) { + throw _iteratorError2; + } + } + } + + return osObject; +}; + +// Set OS version +var setOsVersion = function setOsVersion(version, separator, osObject) { + var finalSeparator = separator.substr(0, 1) == '[' ? new RegExp(separator, 'g') : separator; + var splitVersion = version.split(finalSeparator, 2); + + if (separator != '.') version = version.replace(new RegExp(separator, 'g'), '.'); + + osObject.fullVersion = version; + + // Major version + if (splitVersion && splitVersion[0]) osObject.majorVersion = parseInt(splitVersion[0]); + + // Minor version + if (splitVersion && splitVersion[1]) osObject.minorVersion = parseInt(splitVersion[1]); +}; + +// Set viewport size +var getViewportSize = exports.getViewportSize = function getViewportSize() { + var viewportObject = {}; + + viewportObject.width = (0, _clapprZepto2.default)(window).width(); + viewportObject.height = (0, _clapprZepto2.default)(window).height(); + + return viewportObject; +}; + +// Set viewport orientation +var setViewportOrientation = function setViewportOrientation() { + switch (window.orientation) { + case -90: + case 90: + Browser.viewport.orientation = 'landscape'; + break; + default: + Browser.viewport.orientation = 'portrait'; + break; + } +}; + +var getDevice = exports.getDevice = function getDevice(ua) { + var platformRegExp = /\((iP(?:hone|ad|od))?(?:[^;]*; ){0,2}([^)]+(?=\)))/; + var matches = platformRegExp.exec(ua); + var device = matches && (matches[1] || matches[2]) || ''; + return device; +}; + +var browserInfo = getBrowserInfo(navigator.userAgent); + +Browser.isEdge = /edge/i.test(navigator.userAgent); +Browser.isChrome = /chrome|CriOS/i.test(navigator.userAgent) && !Browser.isEdge; +Browser.isSafari = /safari/i.test(navigator.userAgent) && !Browser.isChrome && !Browser.isEdge; +Browser.isFirefox = /firefox/i.test(navigator.userAgent); +Browser.isLegacyIE = !!window.ActiveXObject; +Browser.isIE = Browser.isLegacyIE || /trident.*rv:1\d/i.test(navigator.userAgent); +Browser.isIE11 = /trident.*rv:11/i.test(navigator.userAgent); +Browser.isChromecast = Browser.isChrome && /CrKey/i.test(navigator.userAgent); +Browser.isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone|IEMobile|Mobile Safari|Opera Mini/i.test(navigator.userAgent); +Browser.isiOS = /iPad|iPhone|iPod/i.test(navigator.userAgent); +Browser.isAndroid = /Android/i.test(navigator.userAgent); +Browser.isWindowsPhone = /Windows Phone/i.test(navigator.userAgent); +Browser.isWin8App = /MSAppHost/i.test(navigator.userAgent); +Browser.isWiiU = /WiiU/i.test(navigator.userAgent); +Browser.isPS4 = /PlayStation 4/i.test(navigator.userAgent); +Browser.hasLocalstorage = hasLocalstorage(); +Browser.hasFlash = hasFlash(); + +/** +* @deprecated +* This parameter currently exists for retrocompatibility reasons. +* Use Browser.data.name instead. +*/ +Browser.name = browserInfo.name; + +/** +* @deprecated +* This parameter currently exists for retrocompatibility reasons. +* Use Browser.data.fullVersion instead. +*/ +Browser.version = browserInfo.version; + +Browser.userAgent = navigator.userAgent; +Browser.data = getBrowserData(); +Browser.os = getOsData(); +Browser.viewport = getViewportSize(); +Browser.device = getDevice(Browser.userAgent); +typeof window.orientation !== 'undefined' && setViewportOrientation(); + +exports.default = Browser; + +/***/ }), + +/***/ "./src/components/browser/browser_data.js": +/*!************************************************!*\ + !*** ./src/components/browser/browser_data.js ***! + \************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +/* eslint-disable no-useless-escape */ +// The order of the following arrays is important, be careful if you change it. + +var BROWSER_DATA = [{ + name: 'Chromium', + group: 'Chrome', + identifier: 'Chromium/([0-9\.]*)' +}, { + name: 'Chrome Mobile', + group: 'Chrome', + identifier: 'Chrome/([0-9\.]*) Mobile', + versionIdentifier: 'Chrome/([0-9\.]*)' +}, { + name: 'Chrome', + group: 'Chrome', + identifier: 'Chrome/([0-9\.]*)' +}, { + name: 'Chrome for iOS', + group: 'Chrome', + identifier: 'CriOS/([0-9\.]*)' +}, { + name: 'Android Browser', + group: 'Chrome', + identifier: 'CrMo/([0-9\.]*)' +}, { + name: 'Firefox', + group: 'Firefox', + identifier: 'Firefox/([0-9\.]*)' +}, { + name: 'Opera Mini', + group: 'Opera', + identifier: 'Opera Mini/([0-9\.]*)' +}, { + name: 'Opera', + group: 'Opera', + identifier: 'Opera ([0-9\.]*)' +}, { + name: 'Opera', + group: 'Opera', + identifier: 'Opera/([0-9\.]*)', + versionIdentifier: 'Version/([0-9\.]*)' +}, { + name: 'IEMobile', + group: 'Explorer', + identifier: 'IEMobile/([0-9\.]*)' +}, { + name: 'Internet Explorer', + group: 'Explorer', + identifier: 'MSIE ([a-zA-Z0-9\.]*)' +}, { + name: 'Internet Explorer', + group: 'Explorer', + identifier: 'Trident/([0-9\.]*)', + versionIdentifier: 'rv:([0-9\.]*)' +}, { + name: 'Spartan', + group: 'Spartan', + identifier: 'Edge/([0-9\.]*)', + versionIdentifier: 'Edge/([0-9\.]*)' +}, { + name: 'Safari', + group: 'Safari', + identifier: 'Safari/([0-9\.]*)', + versionIdentifier: 'Version/([0-9\.]*)' +}]; + +exports.default = BROWSER_DATA; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/browser/index.js": +/*!*****************************************!*\ + !*** ./src/components/browser/index.js ***! + \*****************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _browser = __webpack_require__(/*! ./browser */ "./src/components/browser/browser.js"); + +var _browser2 = _interopRequireDefault(_browser); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _browser2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/browser/os_data.js": +/*!*******************************************!*\ + !*** ./src/components/browser/os_data.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +/* eslint-disable no-useless-escape */ +// The order of the following arrays is important, be careful if you change it. + +var OS_DATA = [{ + name: 'Windows 2000', + group: 'Windows', + identifier: 'Windows NT 5.0', + version: '5.0' +}, { + name: 'Windows XP', + group: 'Windows', + identifier: 'Windows NT 5.1', + version: '5.1' +}, { + name: 'Windows Vista', + group: 'Windows', + identifier: 'Windows NT 6.0', + version: '6.0' +}, { + name: 'Windows 7', + group: 'Windows', + identifier: 'Windows NT 6.1', + version: '7.0' +}, { + name: 'Windows 8', + group: 'Windows', + identifier: 'Windows NT 6.2', + version: '8.0' +}, { + name: 'Windows 8.1', + group: 'Windows', + identifier: 'Windows NT 6.3', + version: '8.1' +}, { + name: 'Windows 10', + group: 'Windows', + identifier: 'Windows NT 10.0', + version: '10.0' +}, { + name: 'Windows Phone', + group: 'Windows Phone', + identifier: 'Windows Phone ([0-9\.]*)' +}, { + name: 'Windows Phone', + group: 'Windows Phone', + identifier: 'Windows Phone OS ([0-9\.]*)' +}, { + name: 'Windows', + group: 'Windows', + identifier: 'Windows' +}, { + name: 'Chrome OS', + group: 'Chrome OS', + identifier: 'CrOS' +}, { + name: 'Android', + group: 'Android', + identifier: 'Android', + versionIdentifier: 'Android ([a-zA-Z0-9\.-]*)' +}, { + name: 'iPad', + group: 'iOS', + identifier: 'iPad', + versionIdentifier: 'OS ([0-9_]*)', + versionSeparator: '[_|\.]' +}, { + name: 'iPod', + group: 'iOS', + identifier: 'iPod', + versionIdentifier: 'OS ([0-9_]*)', + versionSeparator: '[_|\.]' +}, { + name: 'iPhone', + group: 'iOS', + identifier: 'iPhone OS', + versionIdentifier: 'OS ([0-9_]*)', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X High Sierra', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])13([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Sierra', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])12([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X El Capitan', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])11([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Yosemite', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])10([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Mavericks', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])9([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Mountain Lion', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])8([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Lion', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])7([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Snow Leopard', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])6([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Leopard', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])5([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Tiger', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])4([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Panther', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])3([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Jaguar', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])2([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Puma', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])1([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS X Cheetah', + group: 'Mac OS', + identifier: 'Mac OS X (10([_|\.])0([0-9_\.]*))', + versionSeparator: '[_|\.]' +}, { + name: 'Mac OS', + group: 'Mac OS', + identifier: 'Mac OS' +}, { + name: 'Ubuntu', + group: 'Linux', + identifier: 'Ubuntu', + versionIdentifier: 'Ubuntu/([0-9\.]*)' +}, { + name: 'Debian', + group: 'Linux', + identifier: 'Debian' +}, { + name: 'Gentoo', + group: 'Linux', + identifier: 'Gentoo' +}, { + name: 'Linux', + group: 'Linux', + identifier: 'Linux' +}, { + name: 'BlackBerry', + group: 'BlackBerry', + identifier: 'BlackBerry' +}]; + +exports.default = OS_DATA; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/container/container.js": +/*!***********************************************!*\ + !*** ./src/components/container/container.js ***! + \***********************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _assign = __webpack_require__(/*! babel-runtime/core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _ui_object = __webpack_require__(/*! ../../base/ui_object */ "./src/base/ui_object.js"); + +var _ui_object2 = _interopRequireDefault(_ui_object); + +var _error_mixin = __webpack_require__(/*! ../../base/error_mixin */ "./src/base/error_mixin.js"); + +var _error_mixin2 = _interopRequireDefault(_error_mixin); + +var _utils = __webpack_require__(/*! ../../base/utils */ "./src/base/utils.js"); + +__webpack_require__(/*! ./public/style.scss */ "./src/components/container/public/style.scss"); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/** + * An abstraction to represent a container for a given playback + * TODO: describe its responsabilities + * @class Container + * @constructor + * @extends UIObject + * @module base + */ +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +/** + * Container is responsible for the video rendering and state + */ + +var Container = function (_UIObject) { + (0, _inherits3.default)(Container, _UIObject); + (0, _createClass3.default)(Container, [{ + key: 'name', + + /** + * container's name + * @method name + * @default Container + * @return {String} container's name + */ + get: function get() { + return 'Container'; + } + }, { + key: 'attributes', + get: function get() { + return { class: 'container', 'data-container': '' }; + } + }, { + key: 'events', + get: function get() { + return { + 'click': 'clicked', + 'dblclick': 'dblClicked', + 'touchend': 'dblTap', + 'contextmenu': 'onContextMenu', + 'mouseenter': 'mouseEnter', + 'mouseleave': 'mouseLeave' + }; + } + + /** + * Determine if the playback has ended. + * @property ended + * @type Boolean + */ + + }, { + key: 'ended', + get: function get() { + return this.playback.ended; + } + + /** + * Determine if the playback is having to buffer in order for + * playback to be smooth. + * (i.e if a live stream is playing smoothly, this will be false) + * @property buffering + * @type Boolean + */ + + }, { + key: 'buffering', + get: function get() { + return this.playback.buffering; + } + + /** + * The internationalization plugin. + * @property i18n + * @type {Strings} + */ + + }, { + key: 'i18n', + get: function get() { + return this._i18n; + } + + /** + * checks if has closed caption tracks. + * @property hasClosedCaptionsTracks + * @type {Boolean} + */ + + }, { + key: 'hasClosedCaptionsTracks', + get: function get() { + return this.playback.hasClosedCaptionsTracks; + } + + /** + * gets the available closed caption tracks. + * @property closedCaptionsTracks + * @type {Array} an array of objects with at least 'id' and 'name' properties + */ + + }, { + key: 'closedCaptionsTracks', + get: function get() { + return this.playback.closedCaptionsTracks; + } + + /** + * gets the selected closed caption track index. (-1 is disabled) + * @property closedCaptionsTrackId + * @type {Number} + */ + + }, { + key: 'closedCaptionsTrackId', + get: function get() { + return this.playback.closedCaptionsTrackId; + } + + /** + * sets the selected closed caption track index. (-1 is disabled) + * @property closedCaptionsTrackId + * @type {Number} + */ + , + set: function set(trackId) { + this.playback.closedCaptionsTrackId = trackId; + } + + /** + * it builds a container + * @method constructor + * @param {Object} options the options object + * @param {Strings} i18n the internationalization component + */ + + }]); + + function Container(options, i18n, playerError) { + (0, _classCallCheck3.default)(this, Container); + + var _this = (0, _possibleConstructorReturn3.default)(this, _UIObject.call(this, options)); + + _this._i18n = i18n; + _this.currentTime = 0; + _this.volume = 100; + _this.playback = options.playback; + _this.playerError = playerError; + _this.settings = _clapprZepto2.default.extend({}, _this.playback.settings); + _this.isReady = false; + _this.mediaControlDisabled = false; + _this.plugins = [_this.playback]; + _this.dblTapHandler = new _utils.DoubleEventHandler(500); + _this.clickTimer = null; + _this.clickDelay = 200; // FIXME: could be a player option + _this.bindEvents(); + return _this; + } + + /** + * binds playback events to the methods of the container. + * it listens to playback's events and triggers them as container events. + * + * | Playback | + * |----------| + * | progress | + * | timeupdate | + * | ready | + * | buffering | + * | bufferfull | + * | settingsupdate | + * | loadedmetadata | + * | highdefinitionupdate | + * | bitrate | + * | playbackstate | + * | dvr | + * | mediacontrol_disable | + * | mediacontrol_enable | + * | ended | + * | play | + * | pause | + * | error | + * + * ps: the events usually translate from PLABACK_x to CONTAINER_x, you can check all the events at `Event` class. + * + * @method bindEvents + */ + + + Container.prototype.bindEvents = function bindEvents() { + this.listenTo(this.playback, _events2.default.PLAYBACK_PROGRESS, this.onProgress); + this.listenTo(this.playback, _events2.default.PLAYBACK_TIMEUPDATE, this.timeUpdated); + this.listenTo(this.playback, _events2.default.PLAYBACK_READY, this.ready); + this.listenTo(this.playback, _events2.default.PLAYBACK_BUFFERING, this.onBuffering); + this.listenTo(this.playback, _events2.default.PLAYBACK_BUFFERFULL, this.bufferfull); + this.listenTo(this.playback, _events2.default.PLAYBACK_SETTINGSUPDATE, this.settingsUpdate); + this.listenTo(this.playback, _events2.default.PLAYBACK_LOADEDMETADATA, this.loadedMetadata); + this.listenTo(this.playback, _events2.default.PLAYBACK_HIGHDEFINITIONUPDATE, this.highDefinitionUpdate); + this.listenTo(this.playback, _events2.default.PLAYBACK_BITRATE, this.updateBitrate); + this.listenTo(this.playback, _events2.default.PLAYBACK_PLAYBACKSTATE, this.playbackStateChanged); + this.listenTo(this.playback, _events2.default.PLAYBACK_DVR, this.playbackDvrStateChanged); + this.listenTo(this.playback, _events2.default.PLAYBACK_MEDIACONTROL_DISABLE, this.disableMediaControl); + this.listenTo(this.playback, _events2.default.PLAYBACK_MEDIACONTROL_ENABLE, this.enableMediaControl); + this.listenTo(this.playback, _events2.default.PLAYBACK_SEEKED, this.onSeeked); + this.listenTo(this.playback, _events2.default.PLAYBACK_ENDED, this.onEnded); + this.listenTo(this.playback, _events2.default.PLAYBACK_PLAY, this.playing); + this.listenTo(this.playback, _events2.default.PLAYBACK_PAUSE, this.paused); + this.listenTo(this.playback, _events2.default.PLAYBACK_STOP, this.stopped); + this.listenTo(this.playback, _events2.default.PLAYBACK_ERROR, this.error); + this.listenTo(this.playback, _events2.default.PLAYBACK_SUBTITLE_AVAILABLE, this.subtitleAvailable); + this.listenTo(this.playback, _events2.default.PLAYBACK_SUBTITLE_CHANGED, this.subtitleChanged); + }; + + Container.prototype.subtitleAvailable = function subtitleAvailable() { + this.trigger(_events2.default.CONTAINER_SUBTITLE_AVAILABLE); + }; + + Container.prototype.subtitleChanged = function subtitleChanged(track) { + this.trigger(_events2.default.CONTAINER_SUBTITLE_CHANGED, track); + }; + + Container.prototype.playbackStateChanged = function playbackStateChanged(state) { + this.trigger(_events2.default.CONTAINER_PLAYBACKSTATE, state); + }; + + Container.prototype.playbackDvrStateChanged = function playbackDvrStateChanged(dvrInUse) { + this.settings = this.playback.settings; + this.dvrInUse = dvrInUse; + this.trigger(_events2.default.CONTAINER_PLAYBACKDVRSTATECHANGED, dvrInUse); + }; + + Container.prototype.updateBitrate = function updateBitrate(newBitrate) { + this.trigger(_events2.default.CONTAINER_BITRATE, newBitrate); + }; + + Container.prototype.statsReport = function statsReport(metrics) { + this.trigger(_events2.default.CONTAINER_STATS_REPORT, metrics); + }; + + Container.prototype.getPlaybackType = function getPlaybackType() { + return this.playback.getPlaybackType(); + }; + + /** + * returns `true` if DVR is enable otherwise `false`. + * @method isDvrEnabled + * @return {Boolean} + */ + + + Container.prototype.isDvrEnabled = function isDvrEnabled() { + return !!this.playback.dvrEnabled; + }; + + /** + * returns `true` if DVR is in use otherwise `false`. + * @method isDvrInUse + * @return {Boolean} + */ + + + Container.prototype.isDvrInUse = function isDvrInUse() { + return !!this.dvrInUse; + }; + + /** + * destroys the container + * @method destroy + */ + + + Container.prototype.destroy = function destroy() { + this.trigger(_events2.default.CONTAINER_DESTROYED, this, this.name); + this.stopListening(); + this.plugins.forEach(function (plugin) { + return plugin.destroy(); + }); + this.$el.remove(); + }; + + Container.prototype.setStyle = function setStyle(style) { + this.$el.css(style); + }; + + Container.prototype.animate = function animate(style, duration) { + return this.$el.animate(style, duration).promise(); + }; + + Container.prototype.ready = function ready() { + this.isReady = true; + this.trigger(_events2.default.CONTAINER_READY, this.name); + }; + + Container.prototype.isPlaying = function isPlaying() { + return this.playback.isPlaying(); + }; + + Container.prototype.getStartTimeOffset = function getStartTimeOffset() { + return this.playback.getStartTimeOffset(); + }; + + Container.prototype.getCurrentTime = function getCurrentTime() { + return this.currentTime; + }; + + Container.prototype.getDuration = function getDuration() { + return this.playback.getDuration(); + }; + + Container.prototype.error = function error(_error) { + if (!this.isReady) this.ready(); + + this.trigger(_events2.default.CONTAINER_ERROR, _error, this.name); + }; + + Container.prototype.loadedMetadata = function loadedMetadata(metadata) { + this.trigger(_events2.default.CONTAINER_LOADEDMETADATA, metadata); + }; + + Container.prototype.timeUpdated = function timeUpdated(timeProgress) { + this.currentTime = timeProgress.current; + this.trigger(_events2.default.CONTAINER_TIMEUPDATE, timeProgress, this.name); + }; + + Container.prototype.onProgress = function onProgress() { + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + this.trigger.apply(this, [_events2.default.CONTAINER_PROGRESS].concat(args, [this.name])); + }; + + Container.prototype.playing = function playing() { + this.trigger(_events2.default.CONTAINER_PLAY, this.name); + }; + + Container.prototype.paused = function paused() { + this.trigger(_events2.default.CONTAINER_PAUSE, this.name); + }; + + /** + * plays the playback + * @method play + */ + + + Container.prototype.play = function play() { + this.playback.play(); + }; + + /** + * stops the playback + * @method stop + */ + + + Container.prototype.stop = function stop() { + this.playback.stop(); + this.currentTime = 0; + }; + + /** + * pauses the playback + * @method pause + */ + + + Container.prototype.pause = function pause() { + this.playback.pause(); + }; + + Container.prototype.onEnded = function onEnded() { + this.trigger(_events2.default.CONTAINER_ENDED, this, this.name); + this.currentTime = 0; + }; + + Container.prototype.stopped = function stopped() { + this.trigger(_events2.default.CONTAINER_STOP); + }; + + Container.prototype.clicked = function clicked() { + var _this2 = this; + + if (!this.options.chromeless || this.options.allowUserInteraction) { + // The event is delayed because it can be canceled by a double-click event + // An example of use is to prevent playback from pausing when switching to full screen + this.clickTimer = setTimeout(function () { + _this2.clickTimer && _this2.trigger(_events2.default.CONTAINER_CLICK, _this2, _this2.name); + }, this.clickDelay); + } + }; + + Container.prototype.cancelClicked = function cancelClicked() { + clearTimeout(this.clickTimer); + this.clickTimer = null; + }; + + Container.prototype.dblClicked = function dblClicked() { + if (!this.options.chromeless || this.options.allowUserInteraction) { + this.cancelClicked(); + this.trigger(_events2.default.CONTAINER_DBLCLICK, this, this.name); + } + }; + + Container.prototype.dblTap = function dblTap(evt) { + var _this3 = this; + + if (!this.options.chromeless || this.options.allowUserInteraction) { + this.dblTapHandler.handle(evt, function () { + _this3.cancelClicked(); + _this3.trigger(_events2.default.CONTAINER_DBLCLICK, _this3, _this3.name); + }); + } + }; + + Container.prototype.onContextMenu = function onContextMenu(event) { + if (!this.options.chromeless || this.options.allowUserInteraction) this.trigger(_events2.default.CONTAINER_CONTEXTMENU, event, this.name); + }; + + Container.prototype.seek = function seek(time) { + this.trigger(_events2.default.CONTAINER_SEEK, time, this.name); + this.playback.seek(time); + }; + + Container.prototype.onSeeked = function onSeeked() { + this.trigger(_events2.default.CONTAINER_SEEKED, this.name); + }; + + Container.prototype.seekPercentage = function seekPercentage(percentage) { + var duration = this.getDuration(); + if (percentage >= 0 && percentage <= 100) { + var time = duration * (percentage / 100); + this.seek(time); + } + }; + + Container.prototype.setVolume = function setVolume(value) { + this.volume = parseInt(value, 10); + this.trigger(_events2.default.CONTAINER_VOLUME, value, this.name); + this.playback.volume(value); + }; + + Container.prototype.fullscreen = function fullscreen() { + this.trigger(_events2.default.CONTAINER_FULLSCREEN, this.name); + }; + + Container.prototype.onBuffering = function onBuffering() { + this.trigger(_events2.default.CONTAINER_STATE_BUFFERING, this.name); + }; + + Container.prototype.bufferfull = function bufferfull() { + this.trigger(_events2.default.CONTAINER_STATE_BUFFERFULL, this.name); + }; + + /** + * adds plugin to the container + * @method addPlugin + * @param {Object} plugin + */ + + + Container.prototype.addPlugin = function addPlugin(plugin) { + this.plugins.push(plugin); + }; + + /** + * checks if a plugin, given its name, exist + * @method hasPlugin + * @param {String} name + * @return {Boolean} + */ + + + Container.prototype.hasPlugin = function hasPlugin(name) { + return !!this.getPlugin(name); + }; + + /** + * get the plugin given its name + * @method getPlugin + * @param {String} name + */ + + + Container.prototype.getPlugin = function getPlugin(name) { + return this.plugins.filter(function (plugin) { + return plugin.name === name; + })[0]; + }; + + Container.prototype.mouseEnter = function mouseEnter() { + if (!this.options.chromeless || this.options.allowUserInteraction) this.trigger(_events2.default.CONTAINER_MOUSE_ENTER); + }; + + Container.prototype.mouseLeave = function mouseLeave() { + if (!this.options.chromeless || this.options.allowUserInteraction) this.trigger(_events2.default.CONTAINER_MOUSE_LEAVE); + }; + + Container.prototype.settingsUpdate = function settingsUpdate() { + this.settings = this.playback.settings; + this.trigger(_events2.default.CONTAINER_SETTINGSUPDATE); + }; + + Container.prototype.highDefinitionUpdate = function highDefinitionUpdate(isHD) { + this.trigger(_events2.default.CONTAINER_HIGHDEFINITIONUPDATE, isHD); + }; + + Container.prototype.isHighDefinitionInUse = function isHighDefinitionInUse() { + return this.playback.isHighDefinitionInUse(); + }; + + Container.prototype.disableMediaControl = function disableMediaControl() { + if (!this.mediaControlDisabled) { + this.mediaControlDisabled = true; + this.trigger(_events2.default.CONTAINER_MEDIACONTROL_DISABLE); + } + }; + + Container.prototype.enableMediaControl = function enableMediaControl() { + if (this.mediaControlDisabled) { + this.mediaControlDisabled = false; + this.trigger(_events2.default.CONTAINER_MEDIACONTROL_ENABLE); + } + }; + + Container.prototype.updateStyle = function updateStyle() { + if (!this.options.chromeless || this.options.allowUserInteraction) this.$el.removeClass('chromeless');else this.$el.addClass('chromeless'); + }; + + /** + * enables to configure the container after its creation + * @method configure + * @param {Object} options all the options to change in form of a javascript object + */ + + + Container.prototype.configure = function configure(options) { + this._options = _clapprZepto2.default.extend(this._options, options); + this.updateStyle(); + this.playback.configure(this.options); + this.trigger(_events2.default.CONTAINER_OPTIONS_CHANGE); + }; + + Container.prototype.render = function render() { + this.$el.append(this.playback.render().el); + this.updateStyle(); + return this; + }; + + return Container; +}(_ui_object2.default); + +exports.default = Container; + + +(0, _assign2.default)(Container.prototype, _error_mixin2.default); +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/container/index.js": +/*!*******************************************!*\ + !*** ./src/components/container/index.js ***! + \*******************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _container = __webpack_require__(/*! ./container */ "./src/components/container/container.js"); + +var _container2 = _interopRequireDefault(_container); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _container2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/container/public/style.scss": +/*!****************************************************!*\ + !*** ./src/components/container/public/style.scss ***! + \****************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + + +var content = __webpack_require__(/*! !../../../../node_modules/css-loader!../../../../node_modules/postcss-loader/lib!../../../../node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./style.scss */ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/components/container/public/style.scss"); + +if(typeof content === 'string') content = [[module.i, content, '']]; + +var transform; +var insertInto; + + + +var options = {"singleton":true,"hmr":true} + +options.transform = transform +options.insertInto = undefined; + +var update = __webpack_require__(/*! ../../../../node_modules/style-loader/lib/addStyles.js */ "./node_modules/style-loader/lib/addStyles.js")(content, options); + +if(content.locals) module.exports = content.locals; + +if(false) {} + +/***/ }), + +/***/ "./src/components/container_factory/container_factory.js": +/*!***************************************************************!*\ + !*** ./src/components/container_factory/container_factory.js ***! + \***************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _typeof2 = __webpack_require__(/*! babel-runtime/helpers/typeof */ "./node_modules/babel-runtime/helpers/typeof.js"); + +var _typeof3 = _interopRequireDefault(_typeof2); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _base_object = __webpack_require__(/*! ../../base/base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _container = __webpack_require__(/*! ../../components/container */ "./src/components/container/index.js"); + +var _container2 = _interopRequireDefault(_container); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +/** + * The ContainerFactory is responsible for manage playback bootstrap and create containers. + */ + +var ContainerFactory = function (_BaseObject) { + (0, _inherits3.default)(ContainerFactory, _BaseObject); + (0, _createClass3.default)(ContainerFactory, [{ + key: 'options', + get: function get() { + return this._options; + }, + set: function set(options) { + this._options = options; + } + }]); + + function ContainerFactory(options, loader, i18n, playerError) { + (0, _classCallCheck3.default)(this, ContainerFactory); + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseObject.call(this, options)); + + _this._i18n = i18n; + _this.loader = loader; + _this.playerError = playerError; + return _this; + } + + ContainerFactory.prototype.createContainers = function createContainers() { + var _this2 = this; + + return _clapprZepto2.default.Deferred(function (promise) { + promise.resolve(_this2.options.sources.map(function (source) { + return _this2.createContainer(source); + })); + }); + }; + + ContainerFactory.prototype.findPlaybackPlugin = function findPlaybackPlugin(source, mimeType) { + return this.loader.playbackPlugins.filter(function (p) { + return p.canPlay(source, mimeType); + })[0]; + }; + + ContainerFactory.prototype.createContainer = function createContainer(source) { + var resolvedSource = null, + mimeType = this.options.mimeType; + if ((typeof source === 'undefined' ? 'undefined' : (0, _typeof3.default)(source)) === 'object') { + resolvedSource = source.source.toString(); + if (source.mimeType) mimeType = source.mimeType; + } else { + resolvedSource = source.toString(); + } + + if (resolvedSource.match(/^\/\//)) resolvedSource = window.location.protocol + resolvedSource; + + var options = _clapprZepto2.default.extend({}, this.options, { + src: resolvedSource, + mimeType: mimeType + }); + var playbackPlugin = this.findPlaybackPlugin(resolvedSource, mimeType); + var playback = new playbackPlugin(options, this._i18n, this.playerError); + + options = _clapprZepto2.default.extend({}, options, { playback: playback }); + + var container = new _container2.default(options, this._i18n, this.playerError); + var defer = _clapprZepto2.default.Deferred(); + defer.promise(container); + this.addContainerPlugins(container); + this.listenToOnce(container, _events2.default.CONTAINER_READY, function () { + return defer.resolve(container); + }); + return container; + }; + + ContainerFactory.prototype.addContainerPlugins = function addContainerPlugins(container) { + this.loader.containerPlugins.forEach(function (Plugin) { + container.addPlugin(new Plugin(container)); + }); + }; + + return ContainerFactory; +}(_base_object2.default); + +exports.default = ContainerFactory; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/container_factory/index.js": +/*!***************************************************!*\ + !*** ./src/components/container_factory/index.js ***! + \***************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _container_factory = __webpack_require__(/*! ./container_factory */ "./src/components/container_factory/container_factory.js"); + +var _container_factory2 = _interopRequireDefault(_container_factory); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _container_factory2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/core/core.js": +/*!*************************************!*\ + !*** ./src/components/core/core.js ***! + \*************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _assign = __webpack_require__(/*! babel-runtime/core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _utils = __webpack_require__(/*! ../../base/utils */ "./src/base/utils.js"); + +var _styler = __webpack_require__(/*! ../../base/styler */ "./src/base/styler.js"); + +var _styler2 = _interopRequireDefault(_styler); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _ui_object = __webpack_require__(/*! ../../base/ui_object */ "./src/base/ui_object.js"); + +var _ui_object2 = _interopRequireDefault(_ui_object); + +var _ui_core_plugin = __webpack_require__(/*! ../../base/ui_core_plugin */ "./src/base/ui_core_plugin.js"); + +var _ui_core_plugin2 = _interopRequireDefault(_ui_core_plugin); + +var _browser = __webpack_require__(/*! ../../components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _container_factory = __webpack_require__(/*! ../../components/container_factory */ "./src/components/container_factory/index.js"); + +var _container_factory2 = _interopRequireDefault(_container_factory); + +var _mediator = __webpack_require__(/*! ../../components/mediator */ "./src/components/mediator.js"); + +var _mediator2 = _interopRequireDefault(_mediator); + +var _player_info = __webpack_require__(/*! ../../components/player_info */ "./src/components/player_info.js"); + +var _player_info2 = _interopRequireDefault(_player_info); + +var _error = __webpack_require__(/*! ../../components/error */ "./src/components/error/index.js"); + +var _error2 = _interopRequireDefault(_error); + +var _error_mixin = __webpack_require__(/*! ../../base/error_mixin */ "./src/base/error_mixin.js"); + +var _error_mixin2 = _interopRequireDefault(_error_mixin); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +__webpack_require__(/*! ./public/style.scss */ "./src/components/core/public/style.scss"); + +var _fonts = __webpack_require__(/*! ./public/fonts.css */ "./src/components/core/public/fonts.css"); + +var _fonts2 = _interopRequireDefault(_fonts); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var style = void 0; + +/** + * The Core is responsible to manage Containers, the mediator, MediaControl + * and the player state. + * @class Core + * @constructor + * @extends UIObject + * @module components + */ + +var Core = function (_UIObject) { + (0, _inherits3.default)(Core, _UIObject); + (0, _createClass3.default)(Core, [{ + key: 'events', + get: function get() { + return { + 'webkitfullscreenchange': 'handleFullscreenChange', + 'mousemove': 'onMouseMove', + 'mouseleave': 'onMouseLeave' + }; + } + }, { + key: 'attributes', + get: function get() { + return { + 'data-player': '', + tabindex: 9999 + }; + } + + /** + * checks if the core is ready. + * @property isReady + * @type {Boolean} `true` if the core is ready, otherwise `false` + */ + + }, { + key: 'isReady', + get: function get() { + return !!this.ready; + } + + /** + * The internationalization plugin. + * @property i18n + * @type {Strings} + */ + + }, { + key: 'i18n', + get: function get() { + return this.getPlugin('strings') || { t: function t(key) { + return key; + } }; + } + + /** + * @deprecated + * This property currently exists for retrocompatibility reasons. + * If you want to access the media control instance, use the method getPlugin('media_control'). + */ + + }, { + key: 'mediaControl', + get: function get() { + return this.getPlugin('media_control') || this.dummyMediaControl; + } + }, { + key: 'dummyMediaControl', + get: function get() { + if (this._dummyMediaControl) return this._dummyMediaControl; + this._dummyMediaControl = new _ui_core_plugin2.default(this); + return this._dummyMediaControl; + } + + /** + * gets the active container reference. + * @property activeContainer + * @type {Object} + */ + + }, { + key: 'activeContainer', + get: function get() { + return this._activeContainer; + } + + /** + * sets the active container reference and trigger a event with the new reference. + * @property activeContainer + * @type {Object} + */ + , + set: function set(container) { + this._activeContainer = container; + this.trigger(_events2.default.CORE_ACTIVE_CONTAINER_CHANGED, this._activeContainer); + } + + /** + * gets the active playback reference. + * @property activePlayback + * @type {Object} + */ + + }, { + key: 'activePlayback', + get: function get() { + return this.activeContainer && this.activeContainer.playback; + } + }]); + + function Core(options) { + (0, _classCallCheck3.default)(this, Core); + + var _this = (0, _possibleConstructorReturn3.default)(this, _UIObject.call(this, options)); + + _this.playerError = new _error2.default(options, _this); + _this.configureDomRecycler(); + _this.playerInfo = _player_info2.default.getInstance(options.playerId); + _this.firstResize = true; + _this.plugins = []; + _this.containers = []; + //FIXME fullscreen api sucks + _this._boundFullscreenHandler = function () { + return _this.handleFullscreenChange(); + }; + (0, _clapprZepto2.default)(document).bind('fullscreenchange', _this._boundFullscreenHandler); + (0, _clapprZepto2.default)(document).bind('MSFullscreenChange', _this._boundFullscreenHandler); + (0, _clapprZepto2.default)(document).bind('mozfullscreenchange', _this._boundFullscreenHandler); + _browser2.default.isMobile && (0, _clapprZepto2.default)(window).bind('resize', function (o) { + _this.handleWindowResize(o); + }); + return _this; + } + + Core.prototype.configureDomRecycler = function configureDomRecycler() { + var recycleVideo = this.options && this.options.playback && this.options.playback.recycleVideo; + _utils.DomRecycler.configure({ recycleVideo: recycleVideo }); + }; + + Core.prototype.createContainers = function createContainers(options) { + this.defer = _clapprZepto2.default.Deferred(); + this.defer.promise(this); + this.containerFactory = new _container_factory2.default(options, options.loader, this.i18n, this.playerError); + this.prepareContainers(); + }; + + Core.prototype.prepareContainers = function prepareContainers() { + var _this2 = this; + + this.containerFactory.createContainers().then(function (containers) { + return _this2.setupContainers(containers); + }).then(function (containers) { + return _this2.resolveOnContainersReady(containers); + }); + }; + + Core.prototype.updateSize = function updateSize() { + _utils.Fullscreen.isFullscreen() ? this.setFullscreen() : this.setPlayerSize(); + }; + + Core.prototype.setFullscreen = function setFullscreen() { + if (!_browser2.default.isiOS) { + this.$el.addClass('fullscreen'); + this.$el.removeAttr('style'); + this.playerInfo.previousSize = { width: this.options.width, height: this.options.height }; + this.playerInfo.currentSize = { width: (0, _clapprZepto2.default)(window).width(), height: (0, _clapprZepto2.default)(window).height() }; + } + }; + + Core.prototype.setPlayerSize = function setPlayerSize() { + this.$el.removeClass('fullscreen'); + this.playerInfo.currentSize = this.playerInfo.previousSize; + this.playerInfo.previousSize = { width: (0, _clapprZepto2.default)(window).width(), height: (0, _clapprZepto2.default)(window).height() }; + this.resize(this.playerInfo.currentSize); + }; + + Core.prototype.resize = function resize(options) { + if (!(0, _utils.isNumber)(options.height) && !(0, _utils.isNumber)(options.width)) { + this.el.style.height = '' + options.height; + this.el.style.width = '' + options.width; + } else { + this.el.style.height = options.height + 'px'; + this.el.style.width = options.width + 'px'; + } + this.playerInfo.previousSize = { width: this.options.width, height: this.options.height }; + this.options.width = options.width; + this.options.height = options.height; + this.playerInfo.currentSize = options; + this.triggerResize(this.playerInfo.currentSize); + }; + + Core.prototype.enableResizeObserver = function enableResizeObserver() { + var _this3 = this; + + var checkSizeCallback = function checkSizeCallback() { + _this3.triggerResize({ width: _this3.el.clientWidth, height: _this3.el.clientHeight }); + }; + this.resizeObserverInterval = setInterval(checkSizeCallback, 500); + }; + + Core.prototype.triggerResize = function triggerResize(newSize) { + var thereWasChange = this.firstResize || this.oldHeight !== newSize.height || this.oldWidth !== newSize.width; + if (thereWasChange) { + this.oldHeight = newSize.height; + this.oldWidth = newSize.width; + this.playerInfo.computedSize = newSize; + this.firstResize = false; + _mediator2.default.trigger(this.options.playerId + ':' + _events2.default.PLAYER_RESIZE, newSize); + this.trigger(_events2.default.CORE_RESIZE, newSize); + } + }; + + Core.prototype.disableResizeObserver = function disableResizeObserver() { + this.resizeObserverInterval && clearInterval(this.resizeObserverInterval); + }; + + Core.prototype.resolveOnContainersReady = function resolveOnContainersReady(containers) { + var _this4 = this; + + _clapprZepto2.default.when.apply(_clapprZepto2.default, containers).done(function () { + _this4.defer.resolve(_this4); + _this4.ready = true; + _this4.trigger(_events2.default.CORE_READY); + }); + }; + + Core.prototype.addPlugin = function addPlugin(plugin) { + this.plugins.push(plugin); + }; + + Core.prototype.hasPlugin = function hasPlugin(name) { + return !!this.getPlugin(name); + }; + + Core.prototype.getPlugin = function getPlugin(name) { + return this.plugins.filter(function (plugin) { + return plugin.name === name; + })[0]; + }; + + Core.prototype.load = function load(sources, mimeType) { + this.options.mimeType = mimeType; + sources = sources && sources.constructor === Array ? sources : [sources]; + this.options.sources = sources; + this.containers.forEach(function (container) { + return container.destroy(); + }); + this.containerFactory.options = _clapprZepto2.default.extend(this.options, { sources: sources }); + this.prepareContainers(); + }; + + Core.prototype.destroy = function destroy() { + this.disableResizeObserver(); + this.containers.forEach(function (container) { + return container.destroy(); + }); + this.plugins.forEach(function (plugin) { + return plugin.destroy(); + }); + this.$el.remove(); + (0, _clapprZepto2.default)(document).unbind('fullscreenchange', this._boundFullscreenHandler); + (0, _clapprZepto2.default)(document).unbind('MSFullscreenChange', this._boundFullscreenHandler); + (0, _clapprZepto2.default)(document).unbind('mozfullscreenchange', this._boundFullscreenHandler); + this.stopListening(); + }; + + Core.prototype.handleFullscreenChange = function handleFullscreenChange() { + this.trigger(_events2.default.CORE_FULLSCREEN, _utils.Fullscreen.isFullscreen()); + this.updateSize(); + }; + + Core.prototype.handleWindowResize = function handleWindowResize(event) { + var orientation = window.innerWidth > window.innerHeight ? 'landscape' : 'portrait'; + if (this._screenOrientation === orientation) return; + this._screenOrientation = orientation; + this.triggerResize({ width: this.el.clientWidth, height: this.el.clientHeight }); + this.trigger(_events2.default.CORE_SCREEN_ORIENTATION_CHANGED, { + event: event, + orientation: this._screenOrientation + }); + }; + + Core.prototype.removeContainer = function removeContainer(container) { + this.stopListening(container); + this.containers = this.containers.filter(function (c) { + return c !== container; + }); + }; + + Core.prototype.setupContainer = function setupContainer(container) { + this.listenTo(container, _events2.default.CONTAINER_DESTROYED, this.removeContainer); + this.containers.push(container); + }; + + Core.prototype.setupContainers = function setupContainers(containers) { + containers.forEach(this.setupContainer.bind(this)); + this.trigger(_events2.default.CORE_CONTAINERS_CREATED); + this.renderContainers(); + this.activeContainer = containers[0]; + this.render(); + this.appendToParent(); + return this.containers; + }; + + Core.prototype.renderContainers = function renderContainers() { + var _this5 = this; + + this.containers.forEach(function (container) { + return _this5.el.appendChild(container.render().el); + }); + }; + + Core.prototype.createContainer = function createContainer(source, options) { + var container = this.containerFactory.createContainer(source, options); + this.setupContainer(container); + this.el.appendChild(container.render().el); + return container; + }; + + /** + * @deprecated + * This method currently exists for retrocompatibility reasons. + * If you want the current container reference, use the activeContainer getter. + */ + + + Core.prototype.getCurrentContainer = function getCurrentContainer() { + return this.activeContainer; + }; + + /** + * @deprecated + * This method currently exists for retrocompatibility reasons. + * If you want the current playback reference, use the activePlayback getter. + */ + + + Core.prototype.getCurrentPlayback = function getCurrentPlayback() { + return this.activePlayback; + }; + + Core.prototype.getPlaybackType = function getPlaybackType() { + return this.activeContainer && this.activeContainer.getPlaybackType(); + }; + + Core.prototype.toggleFullscreen = function toggleFullscreen() { + if (!_utils.Fullscreen.isFullscreen()) { + _utils.Fullscreen.requestFullscreen(_browser2.default.isiOS ? this.activeContainer.el : this.el); + !_browser2.default.isiOS && this.$el.addClass('fullscreen'); + } else { + _utils.Fullscreen.cancelFullscreen(); + !_browser2.default.isiOS && this.$el.removeClass('fullscreen nocursor'); + } + }; + + Core.prototype.onMouseMove = function onMouseMove(event) { + this.trigger(_events2.default.CORE_MOUSE_MOVE, event); + }; + + Core.prototype.onMouseLeave = function onMouseLeave(event) { + this.trigger(_events2.default.CORE_MOUSE_LEAVE, event); + }; + + /** + * enables to configure the container after its creation + * @method configure + * @param {Object} options all the options to change in form of a javascript object + */ + + + Core.prototype.configure = function configure(options) { + var _this6 = this; + + this._options = _clapprZepto2.default.extend(this._options, options); + this.configureDomRecycler(); + + var sources = options.source || options.sources; + sources && this.load(sources, options.mimeType || this.options.mimeType); + + this.trigger(_events2.default.CORE_OPTIONS_CHANGE); + this.containers.forEach(function (container) { + return container.configure(_this6.options); + }); + }; + + Core.prototype.appendToParent = function appendToParent() { + var hasCoreParent = this.$el.parent() && this.$el.parent().length; + !hasCoreParent && this.$el.appendTo(this.options.parentElement); + }; + + Core.prototype.render = function render() { + if (!style) style = _styler2.default.getStyleFor(_fonts2.default, { baseUrl: this.options.baseUrl }); + + (0, _clapprZepto2.default)('head').append(style); + + this.options.width = this.options.width || this.$el.width(); + this.options.height = this.options.height || this.$el.height(); + var size = { width: this.options.width, height: this.options.height }; + this.playerInfo.previousSize = this.playerInfo.currentSize = this.playerInfo.computedSize = size; + this.updateSize(); + + this.previousSize = { width: this.$el.width(), height: this.$el.height() }; + + this.enableResizeObserver(); + + return this; + }; + + return Core; +}(_ui_object2.default); + +exports.default = Core; + + +(0, _assign2.default)(Core.prototype, _error_mixin2.default); +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/core/index.js": +/*!**************************************!*\ + !*** ./src/components/core/index.js ***! + \**************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _core = __webpack_require__(/*! ./core */ "./src/components/core/core.js"); + +var _core2 = _interopRequireDefault(_core); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _core2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/core/public/Roboto.ttf": +/*!***********************************************!*\ + !*** ./src/components/core/public/Roboto.ttf ***! + \***********************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "<%=baseUrl%>/38861cba61c66739c1452c3a71e39852.ttf"; + +/***/ }), + +/***/ "./src/components/core/public/fonts.css": +/*!**********************************************!*\ + !*** ./src/components/core/public/fonts.css ***! + \**********************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +var escape = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/url/escape.js */ "./node_modules/css-loader/lib/url/escape.js"); +exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-loader/lib/css-base.js */ "./node_modules/css-loader/lib/css-base.js")(false); +// imports + + +// module +exports.push([module.i, "@font-face {\n font-family: \"Roboto\";\n font-style: normal;\n font-weight: 400;\n src: local(\"Roboto\"), local(\"Roboto-Regular\"), url(" + escape(__webpack_require__(/*! ./Roboto.ttf */ "./src/components/core/public/Roboto.ttf")) + ") format(\"truetype\");\n}\n", ""]); + +// exports + + +/***/ }), + +/***/ "./src/components/core/public/style.scss": +/*!***********************************************!*\ + !*** ./src/components/core/public/style.scss ***! + \***********************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + + +var content = __webpack_require__(/*! !../../../../node_modules/css-loader!../../../../node_modules/postcss-loader/lib!../../../../node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./style.scss */ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/components/core/public/style.scss"); + +if(typeof content === 'string') content = [[module.i, content, '']]; + +var transform; +var insertInto; + + + +var options = {"singleton":true,"hmr":true} + +options.transform = transform +options.insertInto = undefined; + +var update = __webpack_require__(/*! ../../../../node_modules/style-loader/lib/addStyles.js */ "./node_modules/style-loader/lib/addStyles.js")(content, options); + +if(content.locals) module.exports = content.locals; + +if(false) {} + +/***/ }), + +/***/ "./src/components/core_factory/core_factory.js": +/*!*****************************************************!*\ + !*** ./src/components/core_factory/core_factory.js ***! + \*****************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _base_object = __webpack_require__(/*! ../../base/base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +var _core = __webpack_require__(/*! ../core */ "./src/components/core/index.js"); + +var _core2 = _interopRequireDefault(_core); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/** + * The Core Factory is responsible for instantiate the core and it's plugins. + * @class CoreFactory + * @constructor + * @extends BaseObject + * @module components + */ +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var CoreFactory = function (_BaseObject) { + (0, _inherits3.default)(CoreFactory, _BaseObject); + (0, _createClass3.default)(CoreFactory, [{ + key: 'loader', + get: function get() { + return this.player.loader; + } + + /** + * it builds the core factory + * @method constructor + * @param {Player} player the player object + */ + + }]); + + function CoreFactory(player) { + (0, _classCallCheck3.default)(this, CoreFactory); + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseObject.call(this)); + + _this.player = player; + _this._options = player.options; + return _this; + } + + /** + * creates a core and its plugins + * @method create + * @return {Core} created core + */ + + + CoreFactory.prototype.create = function create() { + this.options.loader = this.loader; + this.core = new _core2.default(this.options); + this.addCorePlugins(); + this.core.createContainers(this.options); + return this.core; + }; + + /** + * given the core plugins (`loader.corePlugins`) it builds each one + * @method addCorePlugins + * @return {Core} the core with all plugins + */ + + + CoreFactory.prototype.addCorePlugins = function addCorePlugins() { + var _this2 = this; + + this.loader.corePlugins.forEach(function (Plugin) { + var plugin = new Plugin(_this2.core); + _this2.core.addPlugin(plugin); + _this2.setupExternalInterface(plugin); + }); + return this.core; + }; + + CoreFactory.prototype.setupExternalInterface = function setupExternalInterface(plugin) { + var externalFunctions = plugin.getExternalInterface(); + for (var key in externalFunctions) { + this.player[key] = externalFunctions[key].bind(plugin); + this.core[key] = externalFunctions[key].bind(plugin); + } + }; + + return CoreFactory; +}(_base_object2.default); + +exports.default = CoreFactory; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/core_factory/index.js": +/*!**********************************************!*\ + !*** ./src/components/core_factory/index.js ***! + \**********************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _core_factory = __webpack_require__(/*! ./core_factory */ "./src/components/core_factory/core_factory.js"); + +var _core_factory2 = _interopRequireDefault(_core_factory); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _core_factory2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/error/error.js": +/*!***************************************!*\ + !*** ./src/components/error/error.js ***! + \***************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _base_object = __webpack_require__(/*! ../../base/base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +var _log = __webpack_require__(/*! ../../plugins/log */ "./src/plugins/log/index.js"); + +var _log2 = _interopRequireDefault(_log); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/** + * The PlayerError is responsible to receive and propagate errors. + * @class PlayerError + * @constructor + * @extends BaseObject + * @module components + */ +var PlayerError = function (_BaseObject) { + (0, _inherits3.default)(PlayerError, _BaseObject); + (0, _createClass3.default)(PlayerError, [{ + key: 'name', + get: function get() { + return 'error'; + } + + /** + * @property Levels + * @type {Object} object with error levels + */ + + }], [{ + key: 'Levels', + get: function get() { + return { + FATAL: 'FATAL', + WARN: 'WARN', + INFO: 'INFO' + }; + } + }]); + + function PlayerError() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + var core = arguments[1]; + (0, _classCallCheck3.default)(this, PlayerError); + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseObject.call(this, options)); + + _this.core = core; + return _this; + } + + /** + * creates and trigger an error. + * @method createError + * @param {Object} err should be an object with code, description, level, origin, scope and raw error. + */ + + + PlayerError.prototype.createError = function createError(err) { + if (!this.core) { + _log2.default.warn(this.name, 'Core is not set. Error: ', err); + return; + } + this.core.trigger(_events2.default.ERROR, err); + }; + + return PlayerError; +}(_base_object2.default); + +exports.default = PlayerError; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/error/index.js": +/*!***************************************!*\ + !*** ./src/components/error/index.js ***! + \***************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _error = __webpack_require__(/*! ./error */ "./src/components/error/error.js"); + +var _error2 = _interopRequireDefault(_error); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _error2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/loader/index.js": +/*!****************************************!*\ + !*** ./src/components/loader/index.js ***! + \****************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _loader = __webpack_require__(/*! ./loader */ "./src/components/loader/loader.js"); + +var _loader2 = _interopRequireDefault(_loader); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _loader2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/loader/loader.js": +/*!*****************************************!*\ + !*** ./src/components/loader/loader.js ***! + \*****************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _create = __webpack_require__(/*! babel-runtime/core-js/object/create */ "./node_modules/babel-runtime/core-js/object/create.js"); + +var _create2 = _interopRequireDefault(_create); + +var _toConsumableArray2 = __webpack_require__(/*! babel-runtime/helpers/toConsumableArray */ "./node_modules/babel-runtime/helpers/toConsumableArray.js"); + +var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _base_object = __webpack_require__(/*! ../../base/base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +var _player_info = __webpack_require__(/*! ../player_info */ "./src/components/player_info.js"); + +var _player_info2 = _interopRequireDefault(_player_info); + +var _html5_video = __webpack_require__(/*! ../../playbacks/html5_video */ "./src/playbacks/html5_video/index.js"); + +var _html5_video2 = _interopRequireDefault(_html5_video); + +var _flash = __webpack_require__(/*! ../../playbacks/flash */ "./src/playbacks/flash/index.js"); + +var _flash2 = _interopRequireDefault(_flash); + +var _html5_audio = __webpack_require__(/*! ../../playbacks/html5_audio */ "./src/playbacks/html5_audio/index.js"); + +var _html5_audio2 = _interopRequireDefault(_html5_audio); + +var _flashls = __webpack_require__(/*! ../../playbacks/flashls */ "./src/playbacks/flashls/index.js"); + +var _flashls2 = _interopRequireDefault(_flashls); + +var _hls = __webpack_require__(/*! ../../playbacks/hls */ "./src/playbacks/hls/index.js"); + +var _hls2 = _interopRequireDefault(_hls); + +var _html_img = __webpack_require__(/*! ../../playbacks/html_img */ "./src/playbacks/html_img/index.js"); + +var _html_img2 = _interopRequireDefault(_html_img); + +var _no_op = __webpack_require__(/*! ../../playbacks/no_op */ "./src/playbacks/no_op/index.js"); + +var _no_op2 = _interopRequireDefault(_no_op); + +var _spinner_three_bounce = __webpack_require__(/*! ../../plugins/spinner_three_bounce */ "./src/plugins/spinner_three_bounce/index.js"); + +var _spinner_three_bounce2 = _interopRequireDefault(_spinner_three_bounce); + +var _stats = __webpack_require__(/*! ../../plugins/stats */ "./src/plugins/stats/index.js"); + +var _stats2 = _interopRequireDefault(_stats); + +var _watermark = __webpack_require__(/*! ../../plugins/watermark */ "./src/plugins/watermark/index.js"); + +var _watermark2 = _interopRequireDefault(_watermark); + +var _poster = __webpack_require__(/*! ../../plugins/poster */ "./src/plugins/poster/index.js"); + +var _poster2 = _interopRequireDefault(_poster); + +var _google_analytics = __webpack_require__(/*! ../../plugins/google_analytics */ "./src/plugins/google_analytics/index.js"); + +var _google_analytics2 = _interopRequireDefault(_google_analytics); + +var _click_to_pause = __webpack_require__(/*! ../../plugins/click_to_pause */ "./src/plugins/click_to_pause/index.js"); + +var _click_to_pause2 = _interopRequireDefault(_click_to_pause); + +var _media_control = __webpack_require__(/*! ../../plugins/media_control */ "./src/plugins/media_control/index.js"); + +var _media_control2 = _interopRequireDefault(_media_control); + +var _dvr_controls = __webpack_require__(/*! ../../plugins/dvr_controls */ "./src/plugins/dvr_controls/index.js"); + +var _dvr_controls2 = _interopRequireDefault(_dvr_controls); + +var _closed_captions = __webpack_require__(/*! ../../plugins/closed_captions */ "./src/plugins/closed_captions/index.js"); + +var _closed_captions2 = _interopRequireDefault(_closed_captions); + +var _favicon = __webpack_require__(/*! ../../plugins/favicon */ "./src/plugins/favicon/index.js"); + +var _favicon2 = _interopRequireDefault(_favicon); + +var _seek_time = __webpack_require__(/*! ../../plugins/seek_time */ "./src/plugins/seek_time/index.js"); + +var _seek_time2 = _interopRequireDefault(_seek_time); + +var _sources = __webpack_require__(/*! ../../plugins/sources */ "./src/plugins/sources.js"); + +var _sources2 = _interopRequireDefault(_sources); + +var _end_video = __webpack_require__(/*! ../../plugins/end_video */ "./src/plugins/end_video.js"); + +var _end_video2 = _interopRequireDefault(_end_video); + +var _strings = __webpack_require__(/*! ../../plugins/strings */ "./src/plugins/strings.js"); + +var _strings2 = _interopRequireDefault(_strings); + +var _error_screen = __webpack_require__(/*! ../../plugins/error_screen */ "./src/plugins/error_screen/index.js"); + +var _error_screen2 = _interopRequireDefault(_error_screen); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/** + * It keeps a list of the default plugins (playback, container, core) and it merges external plugins with its internals. + * @class Loader + * @constructor + * @extends BaseObject + * @module components + */ + + +/* Playback Plugins */ +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var Loader = function (_BaseObject) { + (0, _inherits3.default)(Loader, _BaseObject); + + /** + * builds the loader + * @method constructor + * @param {Object} externalPlugins the external plugins + * @param {Number} playerId you can embed multiple instances of clappr, therefore this is the unique id of each one. + */ + function Loader() { + var externalPlugins = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; + var playerId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0; + var useOnlyPlainHtml5Plugins = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false; + (0, _classCallCheck3.default)(this, Loader); + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseObject.call(this)); + + _this.playerId = playerId; + _this.playbackPlugins = []; + + if (!useOnlyPlainHtml5Plugins) { + _this.playbackPlugins = [].concat((0, _toConsumableArray3.default)(_this.playbackPlugins), [_hls2.default]); + } + + _this.playbackPlugins = [].concat((0, _toConsumableArray3.default)(_this.playbackPlugins), [_html5_video2.default, _html5_audio2.default]); + + if (!useOnlyPlainHtml5Plugins) { + _this.playbackPlugins = [].concat((0, _toConsumableArray3.default)(_this.playbackPlugins), [_flash2.default, _flashls2.default]); + } + + _this.playbackPlugins = [].concat((0, _toConsumableArray3.default)(_this.playbackPlugins), [_html_img2.default, _no_op2.default]); + + _this.containerPlugins = [_spinner_three_bounce2.default, _watermark2.default, _poster2.default, _stats2.default, _google_analytics2.default, _click_to_pause2.default]; + _this.corePlugins = [_media_control2.default, _dvr_controls2.default, _closed_captions2.default, _favicon2.default, _seek_time2.default, _sources2.default, _end_video2.default, _error_screen2.default, _strings2.default]; + + if (!Array.isArray(externalPlugins)) _this.validateExternalPluginsType(externalPlugins); + + _this.addExternalPlugins(externalPlugins); + return _this; + } + + /** + * groups by type the external plugins that were passed through `options.plugins` it they're on a flat array + * @method addExternalPlugins + * @private + * @param {Object} an config object or an array of plugins + * @return {Object} plugins the config object with the plugins separated by type + */ + + + Loader.prototype.groupPluginsByType = function groupPluginsByType(plugins) { + if (Array.isArray(plugins)) { + plugins = plugins.reduce(function (memo, plugin) { + memo[plugin.type] || (memo[plugin.type] = []); + memo[plugin.type].push(plugin); + return memo; + }, {}); + } + return plugins; + }; + + Loader.prototype.removeDups = function removeDups(list) { + var groupUp = function groupUp(plugins, plugin) { + plugins[plugin.prototype.name] && delete plugins[plugin.prototype.name]; + plugins[plugin.prototype.name] = plugin; + return plugins; + }; + var pluginsMap = list.reduceRight(groupUp, (0, _create2.default)(null)); + + var plugins = []; + for (var key in pluginsMap) { + plugins.unshift(pluginsMap[key]); + }return plugins; + }; + + /** + * adds all the external plugins that were passed through `options.plugins` + * @method addExternalPlugins + * @private + * @param {Object} plugins the config object with all plugins + */ + + + Loader.prototype.addExternalPlugins = function addExternalPlugins(plugins) { + plugins = this.groupPluginsByType(plugins); + if (plugins.playback) this.playbackPlugins = this.removeDups(plugins.playback.concat(this.playbackPlugins)); + + if (plugins.container) this.containerPlugins = this.removeDups(plugins.container.concat(this.containerPlugins)); + + if (plugins.core) this.corePlugins = this.removeDups(plugins.core.concat(this.corePlugins)); + + _player_info2.default.getInstance(this.playerId).playbackPlugins = this.playbackPlugins; + }; + + /** + * validate if the external plugins that were passed through `options.plugins` are associated to the correct type + * @method validateExternalPluginsType + * @private + * @param {Object} plugins the config object with all plugins + */ + + + Loader.prototype.validateExternalPluginsType = function validateExternalPluginsType(plugins) { + var plugintypes = ['playback', 'container', 'core']; + plugintypes.forEach(function (type) { + (plugins[type] || []).forEach(function (el) { + var errorMessage = 'external ' + el.type + ' plugin on ' + type + ' array'; + if (el.type !== type) throw new ReferenceError(errorMessage); + }); + }); + }; + + return Loader; +}(_base_object2.default); + +/* Core Plugins */ + + +/* Container Plugins */ + + +exports.default = Loader; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/mediator.js": +/*!************************************!*\ + !*** ./src/components/mediator.js ***! + \************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _events = __webpack_require__(/*! ../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var events = new _events2.default(); // Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +/** + * The mediator is a singleton for handling global events. + */ + +var Mediator = function Mediator() { + (0, _classCallCheck3.default)(this, Mediator); +}; + +exports.default = Mediator; + + +Mediator.on = function (name, callback, context) { + events.on(name, callback, context); + return; +}; + +Mediator.once = function (name, callback, context) { + events.once(name, callback, context); + return; +}; + +Mediator.off = function (name, callback, context) { + events.off(name, callback, context); + return; +}; + +Mediator.trigger = function (name) { + for (var _len = arguments.length, opts = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { + opts[_key - 1] = arguments[_key]; + } + + events.trigger.apply(events, [name].concat(opts)); + return; +}; + +Mediator.stopListening = function (obj, name, callback) { + events.stopListening(obj, name, callback); + return; +}; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/player.js": +/*!**********************************!*\ + !*** ./src/components/player.js ***! + \**********************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _assign = __webpack_require__(/*! babel-runtime/core-js/object/assign */ "./node_modules/babel-runtime/core-js/object/assign.js"); + +var _assign2 = _interopRequireDefault(_assign); + +var _keys = __webpack_require__(/*! babel-runtime/core-js/object/keys */ "./node_modules/babel-runtime/core-js/object/keys.js"); + +var _keys2 = _interopRequireDefault(_keys); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _utils = __webpack_require__(/*! ../base/utils */ "./src/base/utils.js"); + +var _base_object = __webpack_require__(/*! ../base/base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +var _events = __webpack_require__(/*! ../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _browser = __webpack_require__(/*! ./browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _core_factory = __webpack_require__(/*! ./core_factory */ "./src/components/core_factory/index.js"); + +var _core_factory2 = _interopRequireDefault(_core_factory); + +var _loader = __webpack_require__(/*! ./loader */ "./src/components/loader/index.js"); + +var _loader2 = _interopRequireDefault(_loader); + +var _player_info = __webpack_require__(/*! ./player_info */ "./src/components/player_info.js"); + +var _player_info2 = _interopRequireDefault(_player_info); + +var _error_mixin = __webpack_require__(/*! ../base/error_mixin */ "./src/base/error_mixin.js"); + +var _error_mixin2 = _interopRequireDefault(_error_mixin); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var baseUrl = (0, _utils.currentScriptUrl)().replace(/\/[^/]+$/, ''); + +/** + * @class Player + * @constructor + * @extends BaseObject + * @module components + * @example + * ### Using the Player + * + * Add the following script on your HTML: + * ```html + * + * + * + * ``` + * Now, create the player: + * ```html + * + *
    + * + * + * ``` + */ +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var Player = function (_BaseObject) { + (0, _inherits3.default)(Player, _BaseObject); + (0, _createClass3.default)(Player, [{ + key: 'loader', + set: function set(loader) { + this._loader = loader; + }, + get: function get() { + if (!this._loader) this._loader = new _loader2.default(this.options.plugins || {}, this.options.playerId); + + return this._loader; + } + + /** + * Determine if the playback has ended. + * @property ended + * @type Boolean + */ + + }, { + key: 'ended', + get: function get() { + return this.core.activeContainer.ended; + } + + /** + * Determine if the playback is having to buffer in order for + * playback to be smooth. + * (i.e if a live stream is playing smoothly, this will be false) + * @property buffering + * @type Boolean + */ + + }, { + key: 'buffering', + get: function get() { + return this.core.activeContainer.buffering; + } + + /* + * determine if the player is ready. + * @property isReady + * @type {Boolean} `true` if the player is ready. ie PLAYER_READY event has fired + */ + + }, { + key: 'isReady', + get: function get() { + return !!this._ready; + } + + /** + * An events map that allows the user to add custom callbacks in player's options. + * @property eventsMapping + * @type {Object} + */ + + }, { + key: 'eventsMapping', + get: function get() { + return { + onReady: _events2.default.PLAYER_READY, + onResize: _events2.default.PLAYER_RESIZE, + onPlay: _events2.default.PLAYER_PLAY, + onPause: _events2.default.PLAYER_PAUSE, + onStop: _events2.default.PLAYER_STOP, + onEnded: _events2.default.PLAYER_ENDED, + onSeek: _events2.default.PLAYER_SEEK, + onError: _events2.default.PLAYER_ERROR, + onTimeUpdate: _events2.default.PLAYER_TIMEUPDATE, + onVolumeUpdate: _events2.default.PLAYER_VOLUMEUPDATE, + onSubtitleAvailable: _events2.default.PLAYER_SUBTITLE_AVAILABLE + }; + } + + /** + * @typedef {Object} PlaybackConfig + * @prop {boolean} disableContextMenu + * disables the context menu (right click) on the video element if a HTML5Video playback is used. + * @prop {boolean} preload + * video will be preloaded according to `preload` attribute options **default**: `'metadata'` + * @prop {boolean} controls + * enabled/disables displaying controls + * @prop {boolean} crossOrigin + * enables cross-origin capability for media-resources + * @prop {boolean} playInline + * enables in-line video elements + * @prop {boolean} audioOnly + * enforce audio-only playback (when possible) + * @prop {Object} externalTracks + * pass externaly loaded track to playback + * @prop {Number} [maxBufferLength] + * The default behavior for the **HLS playback** is to keep buffering indefinitely, even on VoD. + * This replicates the behavior for progressive download, which continues buffering when pausing the video, thus making the video available for playback even on slow networks. + * To change this behavior use `maxBufferLength` where **value is in seconds**. + * @prop {Number} [maxBackBufferLength] + * After how much distance of the playhead data should be pruned from the buffer (influences memory consumption + * of adaptive media-engines like Hls.js or Shaka) + * @prop {Number} [minBufferLength] + * After how much data in the buffer at least we attempt to consume it (influences QoS-related behavior + * of adaptive media-engines like Hls.js or Shaka). If this is too low, and the available bandwidth is varying a lot + * and too close to the streamed bitrate, we may continuously hit under-runs. + * @prop {Number} [initialBandwidthEstimate] + * define an initial bandwidth "guess" (or previously stored/established value) for underlying adaptive-bitreate engines + * of adaptive playback implementations, like Hls.js or Shaka + * @prop {Number} [maxAdaptiveBitrate] + * Limits the streamed bitrate (for adaptive media-engines in underlying playback implementations) + * @prop {Object} [maxAdaptiveVideoDimensions] + * Limits the video dimensions in adaptive media-engines. Should be a literal object with `height` and `width`. + * @prop {Boolean}[enableAutomaticABR] **default**: `true` + * Allows to enable/disable automatic bitrate switching in adaptive media-engines + * @prop {String} [preferredTextLanguage] **default**: `'pt-BR'` + * Allows to set a preferred text language, that may be enabled by the media-engine if available. + * @prop {String} [preferredAudioLanguage] **default**: `'pt-BR'` + * Allows to set a preferred audio language, that may be enabled by the media-engine if available. + */ + + /** + * ## Player's constructor + * + * You might pass the options object to build the player. + * ```javascript + * var options = {source: "http://example.com/video.mp4", param1: "val1"}; + * var player = new Clappr.Player(options); + * ``` + * + * @method constructor + * @param {Object} options Data + * options to build a player instance + * @param {Number} [options.width] + * player's width **default**: `640` + * @param {Number} [options.height] + * player's height **default**: `360` + * @param {String} [options.parentId] + * the id of the element on the page that the player should be inserted into + * @param {Object} [options.parent] + * a reference to a dom element that the player should be inserted into + * @param {String} [options.source] + * The media source URL, or {source: <>, mimeType: <>} + * @param {Object} [options.sources] + * An array of media source URL's, or an array of {source: <>, mimeType: <>} + * @param {Boolean} [options.autoPlay] + * automatically play after page load **default**: `false` + * @param {Boolean} [options.loop] + * automatically replay after it ends **default**: `false` + * @param {Boolean} [options.chromeless] + * player acts in chromeless mode **default**: `false` + * @param {Boolean} [options.allowUserInteraction] + * whether or not the player should handle click events when in chromeless mode **default**: `false` on desktops browsers, `true` on mobile. + * @param {Boolean} [options.disableKeyboardShortcuts] + * disable keyboard shortcuts. **default**: `false`. `true` if `allowUserInteraction` is `false`. + * @param {Boolean} [options.mute] + * start the video muted **default**: `false` + * @param {String} [options.mimeType] + * add `mimeType: "application/vnd.apple.mpegurl"` if you need to use a url without extension. + * @param {Boolean} [options.actualLiveTime] + * show duration and seek time relative to actual time. + * @param {String} [options.actualLiveServerTime] + * specify server time as a string, format: "2015/11/26 06:01:03". This option is meant to be used with actualLiveTime. + * @param {Boolean} [options.persistConfig] + * persist player's settings (volume) through the same domain **default**: `true` + * @param {String} [options.preload] @deprecated + * video will be preloaded according to `preload` attribute options **default**: `'metadata'` + * @param {Number} [options.maxBufferLength] @deprecated + * the default behavior for the **HLS playback** is to keep buffering indefinitely, even on VoD. + * This replicates the behavior for progressive download, which continues buffering when pausing the video, thus making the video available for playback even on slow networks. + * To change this behavior use `maxBufferLength` where **value is in seconds**. + * @param {String} [options.gaAccount] + * enable Google Analytics events dispatch **(play/pause/stop/buffering/etc)** by adding your `gaAccount` + * @param {String} [options.gaTrackerName] + * besides `gaAccount` you can optionally, pass your favorite trackerName as `gaTrackerName` + * @param {Object} [options.mediacontrol] + * customize control bar colors, example: `mediacontrol: {seekbar: "#E113D3", buttons: "#66B2FF"}` + * @param {Boolean} [options.hideMediaControl] + * control media control auto hide **default**: `true` + * @param {Boolean} [options.hideVolumeBar] + * when embedded with width less than 320, volume bar will hide. You can force this behavior for all sizes by adding `true` **default**: `false` + * @param {String} [options.watermark] + * put `watermark: 'http://url/img.png'` on your embed parameters to automatically add watermark on your video. + * You can customize corner position by defining position parameter. Positions can be `bottom-left`, `bottom-right`, `top-left` and `top-right`. + * @param {String} [options.watermarkLink] + * `watermarkLink: 'http://example.net/'` - define URL to open when the watermark is clicked. If not provided watermark will not be clickable. + * @param {Boolean} [options.disableVideoTagContextMenu] @deprecated + * disables the context menu (right click) on the video element if a HTML5Video playback is used. + * @param {Boolean} [options.autoSeekFromUrl] + * Automatically seek to the seconds provided in the url (e.g example.com?t=100) **default**: `true` + * @param {Boolean} [options.exitFullscreenOnEnd] + * Automatically exit full screen when the media finishes. **default**: `true` + * @param {String} [options.poster] + * define a poster by adding its address `poster: 'http://url/img.png'`. It will appear after video embed, disappear on play and go back when user stops the video. + * @param {String} [options.playbackNotSupportedMessage] + * define a custom message to be displayed when a playback is not supported. + * @param {Object} [options.events] + * Specify listeners which will be registered with their corresponding player events. + * E.g. onReady -> "PLAYER_READY", onTimeUpdate -> "PLAYER_TIMEUPDATE" + * @param {PlaybackConfig} [options.playback] + * Generic `Playback` component related configuration + * @param {Boolean} [options.disableErrorScreen] + * disables the error screen plugin. + * @param {Number} [options.autoPlayTimeout] + * autoplay check timeout. + */ + + }]); + + function Player(options) { + (0, _classCallCheck3.default)(this, Player); + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseObject.call(this, options)); + + var playbackDefaultOptions = { recycleVideo: true }; + var defaultOptions = { + playerId: (0, _utils.uniqueId)(''), + persistConfig: true, + width: 640, + height: 360, + baseUrl: baseUrl, + allowUserInteraction: _browser2.default.isMobile, + playback: playbackDefaultOptions + }; + _this._options = _clapprZepto2.default.extend(defaultOptions, options); + _this.options.sources = _this._normalizeSources(options); + if (!_this.options.chromeless) { + // "allowUserInteraction" cannot be false if not in chromeless mode. + _this.options.allowUserInteraction = true; + } + if (!_this.options.allowUserInteraction) { + // if user iteraction is not allowed ensure keyboard shortcuts are disabled + _this.options.disableKeyboardShortcuts = true; + } + _this._registerOptionEventListeners(_this.options.events); + _this._coreFactory = new _core_factory2.default(_this); + _this.playerInfo = _player_info2.default.getInstance(_this.options.playerId); + _this.playerInfo.currentSize = { width: options.width, height: options.height }; + _this.playerInfo.options = _this.options; + if (_this.options.parentId) _this.setParentId(_this.options.parentId);else if (_this.options.parent) _this.attachTo(_this.options.parent); + + return _this; + } + + /** + * Specify a `parentId` to the player. + * @method setParentId + * @param {String} parentId the element parent id. + * @return {Player} itself + */ + + + Player.prototype.setParentId = function setParentId(parentId) { + var el = document.querySelector(parentId); + if (el) this.attachTo(el); + + return this; + }; + + /** + * You can use this method to attach the player to a given element. You don't need to do this when you specify it during the player instantiation passing the `parentId` param. + * @method attachTo + * @param {Object} element a given element. + * @return {Player} itself + */ + + + Player.prototype.attachTo = function attachTo(element) { + this.options.parentElement = element; + this.core = this._coreFactory.create(); + this._addEventListeners(); + return this; + }; + + Player.prototype._addEventListeners = function _addEventListeners() { + if (!this.core.isReady) this.listenToOnce(this.core, _events2.default.CORE_READY, this._onReady);else this._onReady(); + + this.listenTo(this.core, _events2.default.CORE_ACTIVE_CONTAINER_CHANGED, this._containerChanged); + this.listenTo(this.core, _events2.default.CORE_FULLSCREEN, this._onFullscreenChange); + this.listenTo(this.core, _events2.default.CORE_RESIZE, this._onResize); + return this; + }; + + Player.prototype._addContainerEventListeners = function _addContainerEventListeners() { + var container = this.core.activeContainer; + if (container) { + this.listenTo(container, _events2.default.CONTAINER_PLAY, this._onPlay); + this.listenTo(container, _events2.default.CONTAINER_PAUSE, this._onPause); + this.listenTo(container, _events2.default.CONTAINER_STOP, this._onStop); + this.listenTo(container, _events2.default.CONTAINER_ENDED, this._onEnded); + this.listenTo(container, _events2.default.CONTAINER_SEEK, this._onSeek); + this.listenTo(container, _events2.default.CONTAINER_ERROR, this._onError); + this.listenTo(container, _events2.default.CONTAINER_TIMEUPDATE, this._onTimeUpdate); + this.listenTo(container, _events2.default.CONTAINER_VOLUME, this._onVolumeUpdate); + this.listenTo(container, _events2.default.CONTAINER_SUBTITLE_AVAILABLE, this._onSubtitleAvailable); + } + return this; + }; + + Player.prototype._registerOptionEventListeners = function _registerOptionEventListeners() { + var _this2 = this; + + var newEvents = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + var events = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; + + var hasNewEvents = (0, _keys2.default)(newEvents).length > 0; + hasNewEvents && (0, _keys2.default)(events).forEach(function (userEvent) { + var eventType = _this2.eventsMapping[userEvent]; + eventType && _this2.off(eventType, events[userEvent]); + }); + + (0, _keys2.default)(newEvents).forEach(function (userEvent) { + var eventType = _this2.eventsMapping[userEvent]; + if (eventType) { + var eventFunction = newEvents[userEvent]; + eventFunction = typeof eventFunction === 'function' && eventFunction; + eventFunction && _this2.on(eventType, eventFunction); + } + }); + return this; + }; + + Player.prototype._containerChanged = function _containerChanged() { + this.stopListening(); + this._addEventListeners(); + }; + + Player.prototype._onReady = function _onReady() { + this._ready = true; + this._addContainerEventListeners(); + this.trigger(_events2.default.PLAYER_READY); + }; + + Player.prototype._onFullscreenChange = function _onFullscreenChange(fullscreen) { + this.trigger(_events2.default.PLAYER_FULLSCREEN, fullscreen); + }; + + Player.prototype._onVolumeUpdate = function _onVolumeUpdate(volume) { + this.trigger(_events2.default.PLAYER_VOLUMEUPDATE, volume); + }; + + Player.prototype._onSubtitleAvailable = function _onSubtitleAvailable() { + this.trigger(_events2.default.PLAYER_SUBTITLE_AVAILABLE); + }; + + Player.prototype._onResize = function _onResize(size) { + this.trigger(_events2.default.PLAYER_RESIZE, size); + }; + + Player.prototype._onPlay = function _onPlay() { + this.trigger(_events2.default.PLAYER_PLAY); + }; + + Player.prototype._onPause = function _onPause() { + this.trigger(_events2.default.PLAYER_PAUSE); + }; + + Player.prototype._onStop = function _onStop() { + this.trigger(_events2.default.PLAYER_STOP, this.getCurrentTime()); + }; + + Player.prototype._onEnded = function _onEnded() { + this.trigger(_events2.default.PLAYER_ENDED); + }; + + Player.prototype._onSeek = function _onSeek(time) { + this.trigger(_events2.default.PLAYER_SEEK, time); + }; + + Player.prototype._onTimeUpdate = function _onTimeUpdate(timeProgress) { + this.trigger(_events2.default.PLAYER_TIMEUPDATE, timeProgress); + }; + + Player.prototype._onError = function _onError(error) { + this.trigger(_events2.default.PLAYER_ERROR, error); + }; + + Player.prototype._normalizeSources = function _normalizeSources(options) { + var sources = options.sources || (options.source !== undefined ? [options.source] : []); + return sources.length === 0 ? [{ source: '', mimeType: '' }] : sources; + }; + + /** + * resizes the current player canvas. + * @method resize + * @param {Object} size should be a literal object with `height` and `width`. + * @return {Player} itself + * @example + * ```javascript + * player.resize({height: 360, width: 640}) + * ``` + */ + + + Player.prototype.resize = function resize(size) { + this.core.resize(size); + return this; + }; + + /** + * loads a new source. + * @method load + * @param {Array|String} sources source or sources of video. + * An array item can be a string or {source: <>, mimeType: <>} + * @param {String} mimeType a mime type, example: `'application/vnd.apple.mpegurl'` + * @param {Boolean} [autoPlay=false] whether playing should be started immediately + * @return {Player} itself + */ + + + Player.prototype.load = function load(sources, mimeType, autoPlay) { + if (autoPlay !== undefined) this.configure({ autoPlay: !!autoPlay }); + + this.core.load(sources, mimeType); + return this; + }; + + /** + * destroys the current player and removes it from the DOM. + * @method destroy + * @return {Player} itself + */ + + + Player.prototype.destroy = function destroy() { + this.stopListening(); + this.core.destroy(); + return this; + }; + + /** + * Gives user consent to playback. Required by mobile device after a click event before Player.load(). + * @method consent + * @return {Player} itself + */ + + + Player.prototype.consent = function consent() { + this.core.getCurrentPlayback().consent(); + return this; + }; + + /** + * plays the current video (`source`). + * @method play + * @return {Player} itself + */ + + + Player.prototype.play = function play() { + this.core.activeContainer.play(); + return this; + }; + + /** + * pauses the current video (`source`). + * @method pause + * @return {Player} itself + */ + + + Player.prototype.pause = function pause() { + this.core.activeContainer.pause(); + return this; + }; + + /** + * stops the current video (`source`). + * @method stop + * @return {Player} itself + */ + + + Player.prototype.stop = function stop() { + this.core.activeContainer.stop(); + return this; + }; + + /** + * seeks the current video (`source`). For example, `player.seek(120)` will seek to second 120 (2minutes) of the current video. + * @method seek + * @param {Number} time should be a number between 0 and the video duration. + * @return {Player} itself + */ + + + Player.prototype.seek = function seek(time) { + this.core.activeContainer.seek(time); + return this; + }; + + /** + * seeks the current video (`source`). For example, `player.seek(50)` will seek to the middle of the current video. + * @method seekPercentage + * @param {Number} time should be a number between 0 and 100. + * @return {Player} itself + */ + + + Player.prototype.seekPercentage = function seekPercentage(percentage) { + this.core.activeContainer.seekPercentage(percentage); + return this; + }; + + /** + * mutes the current video (`source`). + * @method mute + * @return {Player} itself + */ + + + Player.prototype.mute = function mute() { + this._mutedVolume = this.getVolume(); + this.setVolume(0); + return this; + }; + + /** + * unmutes the current video (`source`). + * @method unmute + * @return {Player} itself + */ + + + Player.prototype.unmute = function unmute() { + this.setVolume(typeof this._mutedVolume === 'number' ? this._mutedVolume : 100); + this._mutedVolume = null; + return this; + }; + + /** + * checks if the player is playing. + * @method isPlaying + * @return {Boolean} `true` if the current source is playing, otherwise `false` + */ + + + Player.prototype.isPlaying = function isPlaying() { + return this.core.activeContainer.isPlaying(); + }; + + /** + * returns `true` if DVR is enable otherwise `false`. + * @method isDvrEnabled + * @return {Boolean} + */ + + + Player.prototype.isDvrEnabled = function isDvrEnabled() { + return this.core.activeContainer.isDvrEnabled(); + }; + + /** + * returns `true` if DVR is in use otherwise `false`. + * @method isDvrInUse + * @return {Boolean} + */ + + + Player.prototype.isDvrInUse = function isDvrInUse() { + return this.core.activeContainer.isDvrInUse(); + }; + + /** + * enables to configure a player after its creation + * @method configure + * @param {Object} options all the options to change in form of a javascript object + * @return {Player} itself + */ + + + Player.prototype.configure = function configure() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + + this._registerOptionEventListeners(options.events, this.options.events); + this.core.configure(options); + return this; + }; + + /** + * get a plugin by its name. + * @method getPlugin + * @param {String} name of the plugin. + * @return {Object} the plugin instance + * @example + * ```javascript + * var poster = player.getPlugin('poster'); + * poster.hidePlayButton(); + * ``` + */ + + + Player.prototype.getPlugin = function getPlugin(name) { + var plugins = this.core.plugins.concat(this.core.activeContainer.plugins); + return plugins.filter(function (plugin) { + return plugin.name === name; + })[0]; + }; + + /** + * the current time in seconds. + * @method getCurrentTime + * @return {Number} current time (in seconds) of the current source + */ + + + Player.prototype.getCurrentTime = function getCurrentTime() { + return this.core.activeContainer.getCurrentTime(); + }; + + /** + * The time that "0" now represents relative to when playback started. + * For a stream with a sliding window this will increase as content is + * removed from the beginning. + * @method getStartTimeOffset + * @return {Number} time (in seconds) that time "0" represents. + */ + + + Player.prototype.getStartTimeOffset = function getStartTimeOffset() { + return this.core.activeContainer.getStartTimeOffset(); + }; + + /** + * the duration time in seconds. + * @method getDuration + * @return {Number} duration time (in seconds) of the current source + */ + + + Player.prototype.getDuration = function getDuration() { + return this.core.activeContainer.getDuration(); + }; + + return Player; +}(_base_object2.default); + +exports.default = Player; + + +(0, _assign2.default)(Player.prototype, _error_mixin2.default); +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/components/player_info.js": +/*!***************************************!*\ + !*** ./src/components/player_info.js ***! + \***************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var PlayerInfo = function PlayerInfo() { + (0, _classCallCheck3.default)(this, PlayerInfo); + + this.options = {}; + this.playbackPlugins = []; + this.currentSize = { width: 0, height: 0 }; +}; + +PlayerInfo._players = {}; + +PlayerInfo.getInstance = function (playerId) { + return PlayerInfo._players[playerId] || (PlayerInfo._players[playerId] = new PlayerInfo()); +}; + +exports.default = PlayerInfo; +module.exports = exports["default"]; + +/***/ }), + +/***/ "./src/icons/01-play.svg": +/*!*******************************!*\ + !*** ./src/icons/01-play.svg ***! + \*******************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/02-pause.svg": +/*!********************************!*\ + !*** ./src/icons/02-pause.svg ***! + \********************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/03-stop.svg": +/*!*******************************!*\ + !*** ./src/icons/03-stop.svg ***! + \*******************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/04-volume.svg": +/*!*********************************!*\ + !*** ./src/icons/04-volume.svg ***! + \*********************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/05-mute.svg": +/*!*******************************!*\ + !*** ./src/icons/05-mute.svg ***! + \*******************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/06-expand.svg": +/*!*********************************!*\ + !*** ./src/icons/06-expand.svg ***! + \*********************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/07-shrink.svg": +/*!*********************************!*\ + !*** ./src/icons/07-shrink.svg ***! + \*********************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/08-hd.svg": +/*!*****************************!*\ + !*** ./src/icons/08-hd.svg ***! + \*****************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/09-cc.svg": +/*!*****************************!*\ + !*** ./src/icons/09-cc.svg ***! + \*****************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/icons/10-reload.svg": +/*!*********************************!*\ + !*** ./src/icons/10-reload.svg ***! + \*********************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "" + +/***/ }), + +/***/ "./src/main.js": +/*!*********************!*\ + !*** ./src/main.js ***! + \*********************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _player = __webpack_require__(/*! ./components/player */ "./src/components/player.js"); + +var _player2 = _interopRequireDefault(_player); + +var _utils = __webpack_require__(/*! ./base/utils */ "./src/base/utils.js"); + +var _utils2 = _interopRequireDefault(_utils); + +var _events = __webpack_require__(/*! ./base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _playback = __webpack_require__(/*! ./base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _container_plugin = __webpack_require__(/*! ./base/container_plugin */ "./src/base/container_plugin.js"); + +var _container_plugin2 = _interopRequireDefault(_container_plugin); + +var _core_plugin = __webpack_require__(/*! ./base/core_plugin */ "./src/base/core_plugin.js"); + +var _core_plugin2 = _interopRequireDefault(_core_plugin); + +var _ui_core_plugin = __webpack_require__(/*! ./base/ui_core_plugin */ "./src/base/ui_core_plugin.js"); + +var _ui_core_plugin2 = _interopRequireDefault(_ui_core_plugin); + +var _ui_container_plugin = __webpack_require__(/*! ./base/ui_container_plugin */ "./src/base/ui_container_plugin.js"); + +var _ui_container_plugin2 = _interopRequireDefault(_ui_container_plugin); + +var _base_object = __webpack_require__(/*! ./base/base_object */ "./src/base/base_object.js"); + +var _base_object2 = _interopRequireDefault(_base_object); + +var _ui_object = __webpack_require__(/*! ./base/ui_object */ "./src/base/ui_object.js"); + +var _ui_object2 = _interopRequireDefault(_ui_object); + +var _browser = __webpack_require__(/*! ./components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _container = __webpack_require__(/*! ./components/container */ "./src/components/container/index.js"); + +var _container2 = _interopRequireDefault(_container); + +var _core = __webpack_require__(/*! ./components/core */ "./src/components/core/index.js"); + +var _core2 = _interopRequireDefault(_core); + +var _error = __webpack_require__(/*! ./components/error */ "./src/components/error/index.js"); + +var _error2 = _interopRequireDefault(_error); + +var _loader = __webpack_require__(/*! ./components/loader */ "./src/components/loader/index.js"); + +var _loader2 = _interopRequireDefault(_loader); + +var _mediator = __webpack_require__(/*! ./components/mediator */ "./src/components/mediator.js"); + +var _mediator2 = _interopRequireDefault(_mediator); + +var _player_info = __webpack_require__(/*! ./components/player_info */ "./src/components/player_info.js"); + +var _player_info2 = _interopRequireDefault(_player_info); + +var _base_flash_playback = __webpack_require__(/*! ./playbacks/base_flash_playback */ "./src/playbacks/base_flash_playback/index.js"); + +var _base_flash_playback2 = _interopRequireDefault(_base_flash_playback); + +var _flash = __webpack_require__(/*! ./playbacks/flash */ "./src/playbacks/flash/index.js"); + +var _flash2 = _interopRequireDefault(_flash); + +var _flashls = __webpack_require__(/*! ./playbacks/flashls */ "./src/playbacks/flashls/index.js"); + +var _flashls2 = _interopRequireDefault(_flashls); + +var _hls = __webpack_require__(/*! ./playbacks/hls */ "./src/playbacks/hls/index.js"); + +var _hls2 = _interopRequireDefault(_hls); + +var _html5_audio = __webpack_require__(/*! ./playbacks/html5_audio */ "./src/playbacks/html5_audio/index.js"); + +var _html5_audio2 = _interopRequireDefault(_html5_audio); + +var _html5_video = __webpack_require__(/*! ./playbacks/html5_video */ "./src/playbacks/html5_video/index.js"); + +var _html5_video2 = _interopRequireDefault(_html5_video); + +var _html_img = __webpack_require__(/*! ./playbacks/html_img */ "./src/playbacks/html_img/index.js"); + +var _html_img2 = _interopRequireDefault(_html_img); + +var _no_op = __webpack_require__(/*! ./playbacks/no_op */ "./src/playbacks/no_op/index.js"); + +var _no_op2 = _interopRequireDefault(_no_op); + +var _media_control = __webpack_require__(/*! ./plugins/media_control */ "./src/plugins/media_control/index.js"); + +var _media_control2 = _interopRequireDefault(_media_control); + +var _click_to_pause = __webpack_require__(/*! ./plugins/click_to_pause */ "./src/plugins/click_to_pause/index.js"); + +var _click_to_pause2 = _interopRequireDefault(_click_to_pause); + +var _dvr_controls = __webpack_require__(/*! ./plugins/dvr_controls */ "./src/plugins/dvr_controls/index.js"); + +var _dvr_controls2 = _interopRequireDefault(_dvr_controls); + +var _favicon = __webpack_require__(/*! ./plugins/favicon */ "./src/plugins/favicon/index.js"); + +var _favicon2 = _interopRequireDefault(_favicon); + +var _log = __webpack_require__(/*! ./plugins/log */ "./src/plugins/log/index.js"); + +var _log2 = _interopRequireDefault(_log); + +var _poster = __webpack_require__(/*! ./plugins/poster */ "./src/plugins/poster/index.js"); + +var _poster2 = _interopRequireDefault(_poster); + +var _spinner_three_bounce = __webpack_require__(/*! ./plugins/spinner_three_bounce */ "./src/plugins/spinner_three_bounce/index.js"); + +var _spinner_three_bounce2 = _interopRequireDefault(_spinner_three_bounce); + +var _watermark = __webpack_require__(/*! ./plugins/watermark */ "./src/plugins/watermark/index.js"); + +var _watermark2 = _interopRequireDefault(_watermark); + +var _styler = __webpack_require__(/*! ./base/styler */ "./src/base/styler.js"); + +var _styler2 = _interopRequireDefault(_styler); + +var _vendor = __webpack_require__(/*! ./vendor */ "./src/vendor/index.js"); + +var _vendor2 = _interopRequireDefault(_vendor); + +var _template = __webpack_require__(/*! ./base/template */ "./src/base/template.js"); + +var _template2 = _interopRequireDefault(_template); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var version = "0.3.7"; // Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +exports.default = { + Player: _player2.default, + Mediator: _mediator2.default, + Events: _events2.default, + Browser: _browser2.default, + PlayerInfo: _player_info2.default, + MediaControl: _media_control2.default, + ContainerPlugin: _container_plugin2.default, + UIContainerPlugin: _ui_container_plugin2.default, + CorePlugin: _core_plugin2.default, + UICorePlugin: _ui_core_plugin2.default, + Playback: _playback2.default, + Container: _container2.default, + Core: _core2.default, + PlayerError: _error2.default, + Loader: _loader2.default, + BaseObject: _base_object2.default, + UIObject: _ui_object2.default, + Utils: _utils2.default, + BaseFlashPlayback: _base_flash_playback2.default, + Flash: _flash2.default, + FlasHLS: _flashls2.default, + HLS: _hls2.default, + HTML5Audio: _html5_audio2.default, + HTML5Video: _html5_video2.default, + HTMLImg: _html_img2.default, + NoOp: _no_op2.default, + ClickToPausePlugin: _click_to_pause2.default, + DVRControls: _dvr_controls2.default, + Favicon: _favicon2.default, + Log: _log2.default, + Poster: _poster2.default, + SpinnerThreeBouncePlugin: _spinner_three_bounce2.default, + WaterMarkPlugin: _watermark2.default, + Styler: _styler2.default, + Vendor: _vendor2.default, + version: version, + template: _template2.default, + $: _clapprZepto2.default +}; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/base_flash_playback/base_flash_playback.js": +/*!******************************************************************!*\ + !*** ./src/playbacks/base_flash_playback/base_flash_playback.js ***! + \******************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _playback = __webpack_require__(/*! ../../base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _template = __webpack_require__(/*! ../../base/template */ "./src/base/template.js"); + +var _template2 = _interopRequireDefault(_template); + +var _browser = __webpack_require__(/*! ../../components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _flash = __webpack_require__(/*! ./public/flash.html */ "./src/playbacks/base_flash_playback/public/flash.html"); + +var _flash2 = _interopRequireDefault(_flash); + +__webpack_require__(/*! ./public/flash.scss */ "./src/playbacks/base_flash_playback/public/flash.scss"); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var IE_CLASSID = 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000'; // Copyright 2015 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var BaseFlashPlayback = function (_Playback) { + (0, _inherits3.default)(BaseFlashPlayback, _Playback); + + function BaseFlashPlayback() { + (0, _classCallCheck3.default)(this, BaseFlashPlayback); + return (0, _possibleConstructorReturn3.default)(this, _Playback.apply(this, arguments)); + } + + BaseFlashPlayback.prototype.setElement = function setElement(element) { + this.$el = element; + this.el = element[0]; + }; + + BaseFlashPlayback.prototype.render = function render() { + this.$el.attr('data', this.swfPath); + this.$el.html(this.template({ + cid: this.cid, + swfPath: this.swfPath, + baseUrl: this.baseUrl, + playbackId: this.uniqueId, + wmode: this.wmode, + callbackName: 'window.Clappr.flashlsCallbacks.' + this.cid })); + + if (_browser2.default.isIE) { + this.$('embed').remove(); + + if (_browser2.default.isLegacyIE) this.$el.attr('classid', IE_CLASSID); + } + + this.el.id = this.cid; + + return this; + }; + + (0, _createClass3.default)(BaseFlashPlayback, [{ + key: 'tagName', + get: function get() { + return 'object'; + } + }, { + key: 'swfPath', + get: function get() { + return ''; + } + }, { + key: 'wmode', + get: function get() { + return 'transparent'; + } + }, { + key: 'template', + get: function get() { + return (0, _template2.default)(_flash2.default); + } + }, { + key: 'attributes', + get: function get() { + var type = 'application/x-shockwave-flash'; + + if (_browser2.default.isLegacyIE) type = ''; + + return { + class: 'clappr-flash-playback', + type: type, + width: '100%', + height: '100%', + data: this.swfPath, + 'data-flash-playback': this.name + }; + } + }]); + return BaseFlashPlayback; +}(_playback2.default); + +exports.default = BaseFlashPlayback; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/base_flash_playback/index.js": +/*!****************************************************!*\ + !*** ./src/playbacks/base_flash_playback/index.js ***! + \****************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.default = __webpack_require__(/*! ./base_flash_playback */ "./src/playbacks/base_flash_playback/base_flash_playback.js"); +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/base_flash_playback/public/flash.html": +/*!*************************************************************!*\ + !*** ./src/playbacks/base_flash_playback/public/flash.html ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "\">\n\n\n\n\n\n\">\n\n&callback=<%= callbackName %>\">\n\"\n type=\"application/x-shockwave-flash\"\n disabled=\"disabled\"\n tabindex=\"-1\"\n enablecontextmenu=\"false\"\n allowScriptAccess=\"always\"\n quality=\"autohigh\"\n pluginspage=\"http://www.macromedia.com/go/getflashplayer\"\n wmode=\"<%= wmode %>\"\n swliveconnect=\"true\"\n allowfullscreen=\"false\"\n bgcolor=\"#000000\"\n FlashVars=\"playbackId=<%= playbackId %>&callback=<%= callbackName %>\"\n data=\"<%= swfPath %>\"\n src=\"<%= swfPath %>\"\n width=\"100%\"\n height=\"100%\">\n\n"; + +/***/ }), + +/***/ "./src/playbacks/base_flash_playback/public/flash.scss": +/*!*************************************************************!*\ + !*** ./src/playbacks/base_flash_playback/public/flash.scss ***! + \*************************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + + +var content = __webpack_require__(/*! !../../../../node_modules/css-loader!../../../../node_modules/postcss-loader/lib!../../../../node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./flash.scss */ "./node_modules/css-loader/index.js!./node_modules/postcss-loader/lib/index.js!./node_modules/sass-loader/lib/loader.js?includePaths[]=/Users/bruno/workspace/clappr/clappr/src/base/scss!./src/playbacks/base_flash_playback/public/flash.scss"); + +if(typeof content === 'string') content = [[module.i, content, '']]; + +var transform; +var insertInto; + + + +var options = {"singleton":true,"hmr":true} + +options.transform = transform +options.insertInto = undefined; + +var update = __webpack_require__(/*! ../../../../node_modules/style-loader/lib/addStyles.js */ "./node_modules/style-loader/lib/addStyles.js")(content, options); + +if(content.locals) module.exports = content.locals; + +if(false) {} + +/***/ }), + +/***/ "./src/playbacks/flash/flash.js": +/*!**************************************!*\ + !*** ./src/playbacks/flash/flash.js ***! + \**************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _utils = __webpack_require__(/*! ../../base/utils */ "./src/base/utils.js"); + +var _base_flash_playback = __webpack_require__(/*! ../../playbacks/base_flash_playback */ "./src/playbacks/base_flash_playback/index.js"); + +var _base_flash_playback2 = _interopRequireDefault(_base_flash_playback); + +var _browser = __webpack_require__(/*! ../../components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _mediator = __webpack_require__(/*! ../../components/mediator */ "./src/components/mediator.js"); + +var _mediator2 = _interopRequireDefault(_mediator); + +var _template = __webpack_require__(/*! ../../base/template */ "./src/base/template.js"); + +var _template2 = _interopRequireDefault(_template); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _playback = __webpack_require__(/*! ../../base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _Player = __webpack_require__(/*! ./public/Player.swf */ "./src/playbacks/flash/public/Player.swf"); + +var _Player2 = _interopRequireDefault(_Player); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var MAX_ATTEMPTS = 60; // Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var Flash = function (_BaseFlashPlayback) { + (0, _inherits3.default)(Flash, _BaseFlashPlayback); + (0, _createClass3.default)(Flash, [{ + key: 'name', + get: function get() { + return 'flash'; + } + }, { + key: 'swfPath', + get: function get() { + return (0, _template2.default)(_Player2.default)({ baseUrl: this._baseUrl }); + } + + /** + * Determine if the playback has ended. + * @property ended + * @type Boolean + */ + + }, { + key: 'ended', + get: function get() { + return this._currentState === 'ENDED'; + } + + /** + * Determine if the playback is buffering. + * This is related to the PLAYBACK_BUFFERING and PLAYBACK_BUFFERFULL events + * @property buffering + * @type Boolean + */ + + }, { + key: 'buffering', + get: function get() { + return !!this._bufferingState && this._currentState !== 'ENDED'; + } + }]); + + function Flash() { + (0, _classCallCheck3.default)(this, Flash); + + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseFlashPlayback.call.apply(_BaseFlashPlayback, [this].concat(args))); + + _this._src = _this.options.src; + _this._baseUrl = _this.options.baseUrl; + _this._autoPlay = _this.options.autoPlay; + _this.settings = { default: ['seekbar'] }; + _this.settings.left = ['playpause', 'position', 'duration']; + _this.settings.right = ['fullscreen', 'volume']; + _this.settings.seekEnabled = true; + _this._isReadyState = false; + _this._addListeners(); + return _this; + } + + Flash.prototype._bootstrap = function _bootstrap() { + var _this2 = this; + + if (this.el.playerPlay) { + this.el.width = '100%'; + this.el.height = '100%'; + if (this._currentState === 'PLAYING') { + this._firstPlay(); + } else { + this._currentState = 'IDLE'; + this._autoPlay && this.play(); + } + (0, _clapprZepto2.default)('
    ').insertAfter(this.$el); + if (this.getDuration() > 0) this._metadataLoaded();else _mediator2.default.once(this.uniqueId + ':timeupdate', this._metadataLoaded, this); + } else { + this._attempts = this._attempts || 0; + if (++this._attempts <= MAX_ATTEMPTS) setTimeout(function () { + return _this2._bootstrap(); + }, 50);else this.trigger(_events2.default.PLAYBACK_ERROR, { message: 'Max number of attempts reached' }, this.name); + } + }; + + Flash.prototype._metadataLoaded = function _metadataLoaded() { + this._isReadyState = true; + this.trigger(_events2.default.PLAYBACK_READY, this.name); + this.trigger(_events2.default.PLAYBACK_SETTINGSUPDATE, this.name); + }; + + Flash.prototype.getPlaybackType = function getPlaybackType() { + return _playback2.default.VOD; + }; + + Flash.prototype.isHighDefinitionInUse = function isHighDefinitionInUse() { + return false; + }; + + Flash.prototype._updateTime = function _updateTime() { + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: this.el.getPosition(), total: this.el.getDuration() }, this.name); + }; + + Flash.prototype._addListeners = function _addListeners() { + _mediator2.default.on(this.uniqueId + ':progress', this._progress, this); + _mediator2.default.on(this.uniqueId + ':timeupdate', this._updateTime, this); + _mediator2.default.on(this.uniqueId + ':statechanged', this._checkState, this); + _mediator2.default.on(this.uniqueId + ':flashready', this._bootstrap, this); + }; + + Flash.prototype.stopListening = function stopListening() { + _BaseFlashPlayback.prototype.stopListening.call(this); + _mediator2.default.off(this.uniqueId + ':progress'); + _mediator2.default.off(this.uniqueId + ':timeupdate'); + _mediator2.default.off(this.uniqueId + ':statechanged'); + _mediator2.default.off(this.uniqueId + ':flashready'); + }; + + Flash.prototype._checkState = function _checkState() { + if (this._isIdle || this._currentState === 'PAUSED') { + return; + } else if (this._currentState !== 'PLAYING_BUFFERING' && this.el.getState() === 'PLAYING_BUFFERING') { + this._bufferingState = true; + this.trigger(_events2.default.PLAYBACK_BUFFERING, this.name); + this._currentState = 'PLAYING_BUFFERING'; + } else if (this.el.getState() === 'PLAYING') { + this._bufferingState = false; + this.trigger(_events2.default.PLAYBACK_BUFFERFULL, this.name); + this._currentState = 'PLAYING'; + } else if (this.el.getState() === 'IDLE') { + this._currentState = 'IDLE'; + } else if (this.el.getState() === 'ENDED') { + this.trigger(_events2.default.PLAYBACK_ENDED, this.name); + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: 0, total: this.el.getDuration() }, this.name); + this._currentState = 'ENDED'; + this._isIdle = true; + } + }; + + Flash.prototype._progress = function _progress() { + if (this._currentState !== 'IDLE' && this._currentState !== 'ENDED') { + this.trigger(_events2.default.PLAYBACK_PROGRESS, { + start: 0, + current: this.el.getBytesLoaded(), + total: this.el.getBytesTotal() + }); + } + }; + + Flash.prototype._firstPlay = function _firstPlay() { + var _this3 = this; + + if (this.el.playerPlay) { + this._isIdle = false; + this.el.playerPlay(this._src); + this.listenToOnce(this, _events2.default.PLAYBACK_BUFFERFULL, function () { + return _this3._checkInitialSeek(); + }); + this._currentState = 'PLAYING'; + } else { + this.listenToOnce(this, _events2.default.PLAYBACK_READY, this._firstPlay); + } + }; + + Flash.prototype._checkInitialSeek = function _checkInitialSeek() { + var seekTime = (0, _utils.seekStringToSeconds)(window.location.href); + if (seekTime !== 0) this.seekSeconds(seekTime); + }; + + Flash.prototype.play = function play() { + this.trigger(_events2.default.PLAYBACK_PLAY_INTENT); + if (this._currentState === 'PAUSED' || this._currentState === 'PLAYING_BUFFERING') { + this._currentState = 'PLAYING'; + this.el.playerResume(); + this.trigger(_events2.default.PLAYBACK_PLAY, this.name); + } else if (this._currentState !== 'PLAYING') { + this._firstPlay(); + this.trigger(_events2.default.PLAYBACK_PLAY, this.name); + } + }; + + Flash.prototype.volume = function volume(value) { + var _this4 = this; + + if (this.isReady) this.el.playerVolume(value);else this.listenToOnce(this, _events2.default.PLAYBACK_BUFFERFULL, function () { + return _this4.volume(value); + }); + }; + + Flash.prototype.pause = function pause() { + this._currentState = 'PAUSED'; + this.el.playerPause(); + this.trigger(_events2.default.PLAYBACK_PAUSE, this.name); + }; + + Flash.prototype.stop = function stop() { + this.el.playerStop(); + this.trigger(_events2.default.PLAYBACK_STOP); + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: 0, total: 0 }, this.name); + }; + + Flash.prototype.isPlaying = function isPlaying() { + return !!(this.isReady && this._currentState.indexOf('PLAYING') > -1); + }; + + Flash.prototype.getDuration = function getDuration() { + return this.el.getDuration(); + }; + + Flash.prototype.seekPercentage = function seekPercentage(percentage) { + var _this5 = this; + + if (this.el.getDuration() > 0) { + var seekSeconds = this.el.getDuration() * (percentage / 100); + this.seek(seekSeconds); + } else { + this.listenToOnce(this, _events2.default.PLAYBACK_BUFFERFULL, function () { + return _this5.seekPercentage(percentage); + }); + } + }; + + Flash.prototype.seek = function seek(time) { + var _this6 = this; + + if (this.isReady && this.el.playerSeek) { + this.el.playerSeek(time); + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: time, total: this.el.getDuration() }, this.name); + if (this._currentState === 'PAUSED') this.el.playerPause(); + } else { + this.listenToOnce(this, _events2.default.PLAYBACK_BUFFERFULL, function () { + return _this6.seek(time); + }); + } + }; + + Flash.prototype.destroy = function destroy() { + clearInterval(this.bootstrapId); + _BaseFlashPlayback.prototype.stopListening.call(this); + this.$el.remove(); + }; + + (0, _createClass3.default)(Flash, [{ + key: 'isReady', + get: function get() { + return this._isReadyState; + } + }]); + return Flash; +}(_base_flash_playback2.default); + +exports.default = Flash; + + +Flash.canPlay = function (resource) { + if (!_browser2.default.hasFlash || !resource || resource.constructor !== String) { + return false; + } else { + var resourceParts = resource.split('?')[0].match(/.*\.(.*)$/) || []; + return resourceParts.length > 1 && !_browser2.default.isMobile && resourceParts[1].toLowerCase().match(/^(mp4|mov|f4v|3gpp|3gp)$/); + } +}; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/flash/index.js": +/*!**************************************!*\ + !*** ./src/playbacks/flash/index.js ***! + \**************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _flash = __webpack_require__(/*! ./flash */ "./src/playbacks/flash/flash.js"); + +var _flash2 = _interopRequireDefault(_flash); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _flash2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/flash/public/Player.swf": +/*!***********************************************!*\ + !*** ./src/playbacks/flash/public/Player.swf ***! + \***********************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "<%=baseUrl%>/4b76590b32dab62bc95c1b7951efae78.swf"; + +/***/ }), + +/***/ "./src/playbacks/flashls/flashls.js": +/*!******************************************!*\ + !*** ./src/playbacks/flashls/flashls.js ***! + \******************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _base_flash_playback = __webpack_require__(/*! ../../playbacks/base_flash_playback */ "./src/playbacks/base_flash_playback/index.js"); + +var _base_flash_playback2 = _interopRequireDefault(_base_flash_playback); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _template = __webpack_require__(/*! ../../base/template */ "./src/base/template.js"); + +var _template2 = _interopRequireDefault(_template); + +var _playback = __webpack_require__(/*! ../../base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _mediator = __webpack_require__(/*! ../../components/mediator */ "./src/components/mediator.js"); + +var _mediator2 = _interopRequireDefault(_mediator); + +var _browser = __webpack_require__(/*! ../../components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _error = __webpack_require__(/*! ../../components/error */ "./src/components/error/index.js"); + +var _error2 = _interopRequireDefault(_error); + +var _flashls_events = __webpack_require__(/*! ./flashls_events */ "./src/playbacks/flashls/flashls_events.js"); + +var _flashls_events2 = _interopRequireDefault(_flashls_events); + +var _HLSPlayer = __webpack_require__(/*! ./public/HLSPlayer.swf */ "./src/playbacks/flashls/public/HLSPlayer.swf"); + +var _HLSPlayer2 = _interopRequireDefault(_HLSPlayer); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var MAX_ATTEMPTS = 60; +var AUTO = -1; + +var FlasHLS = function (_BaseFlashPlayback) { + (0, _inherits3.default)(FlasHLS, _BaseFlashPlayback); + (0, _createClass3.default)(FlasHLS, [{ + key: 'name', + get: function get() { + return 'flashls'; + } + }, { + key: 'swfPath', + get: function get() { + return (0, _template2.default)(_HLSPlayer2.default)({ baseUrl: this._baseUrl }); + } + }, { + key: 'levels', + get: function get() { + return this._levels || []; + } + }, { + key: 'currentLevel', + get: function get() { + if (this._currentLevel === null || this._currentLevel === undefined) return AUTO;else return this._currentLevel; //0 is a valid level ID + }, + set: function set(id) { + this._currentLevel = id; + this.trigger(_events2.default.PLAYBACK_LEVEL_SWITCH_START); + this.el.playerSetCurrentLevel(id); + } + + /** + * Determine if the playback has ended. + * @property ended + * @type Boolean + */ + + }, { + key: 'ended', + get: function get() { + return this._hasEnded; + } + + /** + * Determine if the playback is buffering. + * This is related to the PLAYBACK_BUFFERING and PLAYBACK_BUFFERFULL events + * @property buffering + * @type Boolean + */ + + }, { + key: 'buffering', + get: function get() { + return !!this._bufferingState && !this._hasEnded; + } + }]); + + function FlasHLS() { + (0, _classCallCheck3.default)(this, FlasHLS); + + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + var _this = (0, _possibleConstructorReturn3.default)(this, _BaseFlashPlayback.call.apply(_BaseFlashPlayback, [this].concat(args))); + + _this._src = _this.options.src; + _this._baseUrl = _this.options.baseUrl; + _this._initHlsParameters(_this.options); + // TODO can this be private? + _this.highDefinition = false; + _this._autoPlay = _this.options.autoPlay; + _this._loop = _this.options.loop; + _this._defaultSettings = { + left: ['playstop'], + default: ['seekbar'], + right: ['fullscreen', 'volume', 'hd-indicator'], + seekEnabled: false + }; + _this.settings = _clapprZepto2.default.extend({}, _this._defaultSettings); + _this._playbackType = _playback2.default.LIVE; + _this._hasEnded = false; + _this._addListeners(); + return _this; + } + + FlasHLS.prototype._initHlsParameters = function _initHlsParameters(options) { + this._autoStartLoad = options.autoStartLoad === undefined ? true : options.autoStartLoad; + this._capLevelToStage = options.capLevelToStage === undefined ? false : options.capLevelToStage; + this._maxLevelCappingMode = options.maxLevelCappingMode === undefined ? 'downscale' : options.maxLevelCappingMode; + this._minBufferLength = options.minBufferLength === undefined ? -1 : options.minBufferLength; + this._minBufferLengthCapping = options.minBufferLengthCapping === undefined ? -1 : options.minBufferLengthCapping; + this._maxBufferLength = options.maxBufferLength === undefined ? 120 : options.maxBufferLength; + this._maxBackBufferLength = options.maxBackBufferLength === undefined ? 30 : options.maxBackBufferLength; + this._lowBufferLength = options.lowBufferLength === undefined ? 3 : options.lowBufferLength; + this._mediaTimePeriod = options.mediaTimePeriod === undefined ? 100 : options.mediaTimePeriod; + this._fpsDroppedMonitoringPeriod = options.fpsDroppedMonitoringPeriod === undefined ? 5000 : options.fpsDroppedMonitoringPeriod; + this._fpsDroppedMonitoringThreshold = options.fpsDroppedMonitoringThreshold === undefined ? 0.2 : options.fpsDroppedMonitoringThreshold; + this._capLevelonFPSDrop = options.capLevelonFPSDrop === undefined ? false : options.capLevelonFPSDrop; + this._smoothAutoSwitchonFPSDrop = options.smoothAutoSwitchonFPSDrop === undefined ? this.capLevelonFPSDrop : options.smoothAutoSwitchonFPSDrop; + this._switchDownOnLevelError = options.switchDownOnLevelError === undefined ? true : options.switchDownOnLevelError; + this._seekMode = options.seekMode === undefined ? 'ACCURATE' : options.seekMode; + this._keyLoadMaxRetry = options.keyLoadMaxRetry === undefined ? 3 : options.keyLoadMaxRetry; + this._keyLoadMaxRetryTimeout = options.keyLoadMaxRetryTimeout === undefined ? 64000 : options.keyLoadMaxRetryTimeout; + this._fragmentLoadMaxRetry = options.fragmentLoadMaxRetry === undefined ? 3 : options.fragmentLoadMaxRetry; + this._fragmentLoadMaxRetryTimeout = options.fragmentLoadMaxRetryTimeout === undefined ? 4000 : options.fragmentLoadMaxRetryTimeout; + this._fragmentLoadSkipAfterMaxRetry = options.fragmentLoadSkipAfterMaxRetry === undefined ? true : options.fragmentLoadSkipAfterMaxRetry; + this._maxSkippedFragments = options.maxSkippedFragments === undefined ? 5 : options.maxSkippedFragments; + this._flushLiveURLCache = options.flushLiveURLCache === undefined ? false : options.flushLiveURLCache; + this._initialLiveManifestSize = options.initialLiveManifestSize === undefined ? 1 : options.initialLiveManifestSize; + this._manifestLoadMaxRetry = options.manifestLoadMaxRetry === undefined ? 3 : options.manifestLoadMaxRetry; + this._manifestLoadMaxRetryTimeout = options.manifestLoadMaxRetryTimeout === undefined ? 64000 : options.manifestLoadMaxRetryTimeout; + this._manifestRedundantLoadmaxRetry = options.manifestRedundantLoadmaxRetry === undefined ? 3 : options.manifestRedundantLoadmaxRetry; + this._startFromBitrate = options.startFromBitrate === undefined ? -1 : options.startFromBitrate; + this._startFromLevel = options.startFromLevel === undefined ? -1 : options.startFromLevel; + this._autoStartMaxDuration = options.autoStartMaxDuration === undefined ? -1 : options.autoStartMaxDuration; + this._seekFromLevel = options.seekFromLevel === undefined ? -1 : options.seekFromLevel; + this._useHardwareVideoDecoder = options.useHardwareVideoDecoder === undefined ? false : options.useHardwareVideoDecoder; + this._hlsLogEnabled = options.hlsLogEnabled === undefined ? true : options.hlsLogEnabled; + this._logDebug = options.logDebug === undefined ? false : options.logDebug; + this._logDebug2 = options.logDebug2 === undefined ? false : options.logDebug2; + this._logWarn = options.logWarn === undefined ? true : options.logWarn; + this._logError = options.logError === undefined ? true : options.logError; + this._hlsMinimumDvrSize = options.hlsMinimumDvrSize === undefined ? 60 : options.hlsMinimumDvrSize; + }; + + FlasHLS.prototype._addListeners = function _addListeners() { + var _this2 = this; + + _mediator2.default.on(this.cid + ':flashready', function () { + return _this2._bootstrap(); + }); + _mediator2.default.on(this.cid + ':timeupdate', function (timeMetrics) { + return _this2._updateTime(timeMetrics); + }); + _mediator2.default.on(this.cid + ':playbackstate', function (state) { + return _this2._setPlaybackState(state); + }); + _mediator2.default.on(this.cid + ':levelchanged', function (level) { + return _this2._levelChanged(level); + }); + _mediator2.default.on(this.cid + ':error', function (code, url, message) { + return _this2._flashPlaybackError(code, url, message); + }); + _mediator2.default.on(this.cid + ':fragmentloaded', function (loadmetrics) { + return _this2._onFragmentLoaded(loadmetrics); + }); + _mediator2.default.on(this.cid + ':levelendlist', function (level) { + return _this2._onLevelEndlist(level); + }); + }; + + FlasHLS.prototype.stopListening = function stopListening() { + _BaseFlashPlayback.prototype.stopListening.call(this); + _mediator2.default.off(this.cid + ':flashready'); + _mediator2.default.off(this.cid + ':timeupdate'); + _mediator2.default.off(this.cid + ':playbackstate'); + _mediator2.default.off(this.cid + ':levelchanged'); + _mediator2.default.off(this.cid + ':playbackerror'); + _mediator2.default.off(this.cid + ':fragmentloaded'); + _mediator2.default.off(this.cid + ':manifestloaded'); + _mediator2.default.off(this.cid + ':levelendlist'); + }; + + FlasHLS.prototype._bootstrap = function _bootstrap() { + var _this3 = this; + + if (this.el.playerLoad) { + this.el.width = '100%'; + this.el.height = '100%'; + this._isReadyState = true; + this._srcLoaded = false; + this._currentState = 'IDLE'; + this._setFlashSettings(); + this._updatePlaybackType(); + if (this._autoPlay || this._shouldPlayOnManifestLoaded) this.play(); + + this.trigger(_events2.default.PLAYBACK_READY, this.name); + } else { + this._bootstrapAttempts = this._bootstrapAttempts || 0; + if (++this._bootstrapAttempts <= MAX_ATTEMPTS) { + setTimeout(function () { + return _this3._bootstrap(); + }, 50); + } else { + var formattedError = this.createError({ + code: 'playerLoadFail_maxNumberAttemptsReached', + description: this.name + ' error: Max number of attempts reached', + level: _error2.default.Levels.FATAL, + raw: {} + }); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + } + } + }; + + FlasHLS.prototype._setFlashSettings = function _setFlashSettings() { + this.el.playerSetAutoStartLoad(this._autoStartLoad); + this.el.playerSetCapLevelToStage(this._capLevelToStage); + this.el.playerSetMaxLevelCappingMode(this._maxLevelCappingMode); + this.el.playerSetMinBufferLength(this._minBufferLength); + this.el.playerSetMinBufferLengthCapping(this._minBufferLengthCapping); + this.el.playerSetMaxBufferLength(this._maxBufferLength); + this.el.playerSetMaxBackBufferLength(this._maxBackBufferLength); + this.el.playerSetLowBufferLength(this._lowBufferLength); + this.el.playerSetMediaTimePeriod(this._mediaTimePeriod); + this.el.playerSetFpsDroppedMonitoringPeriod(this._fpsDroppedMonitoringPeriod); + this.el.playerSetFpsDroppedMonitoringThreshold(this._fpsDroppedMonitoringThreshold); + this.el.playerSetCapLevelonFPSDrop(this._capLevelonFPSDrop); + this.el.playerSetSmoothAutoSwitchonFPSDrop(this._smoothAutoSwitchonFPSDrop); + this.el.playerSetSwitchDownOnLevelError(this._switchDownOnLevelError); + this.el.playerSetSeekMode(this._seekMode); + this.el.playerSetKeyLoadMaxRetry(this._keyLoadMaxRetry); + this.el.playerSetKeyLoadMaxRetryTimeout(this._keyLoadMaxRetryTimeout); + this.el.playerSetFragmentLoadMaxRetry(this._fragmentLoadMaxRetry); + this.el.playerSetFragmentLoadMaxRetryTimeout(this._fragmentLoadMaxRetryTimeout); + this.el.playerSetFragmentLoadSkipAfterMaxRetry(this._fragmentLoadSkipAfterMaxRetry); + this.el.playerSetMaxSkippedFragments(this._maxSkippedFragments); + this.el.playerSetFlushLiveURLCache(this._flushLiveURLCache); + this.el.playerSetInitialLiveManifestSize(this._initialLiveManifestSize); + this.el.playerSetManifestLoadMaxRetry(this._manifestLoadMaxRetry); + this.el.playerSetManifestLoadMaxRetryTimeout(this._manifestLoadMaxRetryTimeout); + this.el.playerSetManifestRedundantLoadmaxRetry(this._manifestRedundantLoadmaxRetry); + this.el.playerSetStartFromBitrate(this._startFromBitrate); + this.el.playerSetStartFromLevel(this._startFromLevel); + this.el.playerSetAutoStartMaxDuration(this._autoStartMaxDuration); + this.el.playerSetSeekFromLevel(this._seekFromLevel); + this.el.playerSetUseHardwareVideoDecoder(this._useHardwareVideoDecoder); + this.el.playerSetLogInfo(this._hlsLogEnabled); + this.el.playerSetLogDebug(this._logDebug); + this.el.playerSetLogDebug2(this._logDebug2); + this.el.playerSetLogWarn(this._logWarn); + this.el.playerSetLogError(this._logError); + }; + + FlasHLS.prototype.setAutoStartLoad = function setAutoStartLoad(autoStartLoad) { + this._autoStartLoad = autoStartLoad; + this.el.playerSetAutoStartLoad(this._autoStartLoad); + }; + + FlasHLS.prototype.setCapLevelToStage = function setCapLevelToStage(capLevelToStage) { + this._capLevelToStage = capLevelToStage; + this.el.playerSetCapLevelToStage(this._capLevelToStage); + }; + + FlasHLS.prototype.setMaxLevelCappingMode = function setMaxLevelCappingMode(maxLevelCappingMode) { + this._maxLevelCappingMode = maxLevelCappingMode; + this.el.playerSetMaxLevelCappingMode(this._maxLevelCappingMode); + }; + + FlasHLS.prototype.setSetMinBufferLength = function setSetMinBufferLength(minBufferLength) { + this._minBufferLength = minBufferLength; + this.el.playerSetMinBufferLength(this._minBufferLength); + }; + + FlasHLS.prototype.setMinBufferLengthCapping = function setMinBufferLengthCapping(minBufferLengthCapping) { + this._minBufferLengthCapping = minBufferLengthCapping; + this.el.playerSetMinBufferLengthCapping(this._minBufferLengthCapping); + }; + + FlasHLS.prototype.setMaxBufferLength = function setMaxBufferLength(maxBufferLength) { + this._maxBufferLength = maxBufferLength; + this.el.playerSetMaxBufferLength(this._maxBufferLength); + }; + + FlasHLS.prototype.setMaxBackBufferLength = function setMaxBackBufferLength(maxBackBufferLength) { + this._maxBackBufferLength = maxBackBufferLength; + this.el.playerSetMaxBackBufferLength(this._maxBackBufferLength); + }; + + FlasHLS.prototype.setLowBufferLength = function setLowBufferLength(lowBufferLength) { + this._lowBufferLength = lowBufferLength; + this.el.playerSetLowBufferLength(this._lowBufferLength); + }; + + FlasHLS.prototype.setMediaTimePeriod = function setMediaTimePeriod(mediaTimePeriod) { + this._mediaTimePeriod = mediaTimePeriod; + this.el.playerSetMediaTimePeriod(this._mediaTimePeriod); + }; + + FlasHLS.prototype.setFpsDroppedMonitoringPeriod = function setFpsDroppedMonitoringPeriod(fpsDroppedMonitoringPeriod) { + this._fpsDroppedMonitoringPeriod = fpsDroppedMonitoringPeriod; + this.el.playerSetFpsDroppedMonitoringPeriod(this._fpsDroppedMonitoringPeriod); + }; + + FlasHLS.prototype.setFpsDroppedMonitoringThreshold = function setFpsDroppedMonitoringThreshold(fpsDroppedMonitoringThreshold) { + this._fpsDroppedMonitoringThreshold = fpsDroppedMonitoringThreshold; + this.el.playerSetFpsDroppedMonitoringThreshold(this._fpsDroppedMonitoringThreshold); + }; + + FlasHLS.prototype.setCapLevelonFPSDrop = function setCapLevelonFPSDrop(capLevelonFPSDrop) { + this._capLevelonFPSDrop = capLevelonFPSDrop; + this.el.playerSetCapLevelonFPSDrop(this._capLevelonFPSDrop); + }; + + FlasHLS.prototype.setSmoothAutoSwitchonFPSDrop = function setSmoothAutoSwitchonFPSDrop(smoothAutoSwitchonFPSDrop) { + this._smoothAutoSwitchonFPSDrop = smoothAutoSwitchonFPSDrop; + this.el.playerSetSmoothAutoSwitchonFPSDrop(this._smoothAutoSwitchonFPSDrop); + }; + + FlasHLS.prototype.setSwitchDownOnLevelError = function setSwitchDownOnLevelError(switchDownOnLevelError) { + this._switchDownOnLevelError = switchDownOnLevelError; + this.el.playerSetSwitchDownOnLevelError(this._switchDownOnLevelError); + }; + + FlasHLS.prototype.setSeekMode = function setSeekMode(seekMode) { + this._seekMode = seekMode; + this.el.playerSetSeekMode(this._seekMode); + }; + + FlasHLS.prototype.setKeyLoadMaxRetry = function setKeyLoadMaxRetry(keyLoadMaxRetry) { + this._keyLoadMaxRetry = keyLoadMaxRetry; + this.el.playerSetKeyLoadMaxRetry(this._keyLoadMaxRetry); + }; + + FlasHLS.prototype.setKeyLoadMaxRetryTimeout = function setKeyLoadMaxRetryTimeout(keyLoadMaxRetryTimeout) { + this._keyLoadMaxRetryTimeout = keyLoadMaxRetryTimeout; + this.el.playerSetKeyLoadMaxRetryTimeout(this._keyLoadMaxRetryTimeout); + }; + + FlasHLS.prototype.setFragmentLoadMaxRetry = function setFragmentLoadMaxRetry(fragmentLoadMaxRetry) { + this._fragmentLoadMaxRetry = fragmentLoadMaxRetry; + this.el.playerSetFragmentLoadMaxRetry(this._fragmentLoadMaxRetry); + }; + + FlasHLS.prototype.setFragmentLoadMaxRetryTimeout = function setFragmentLoadMaxRetryTimeout(fragmentLoadMaxRetryTimeout) { + this._fragmentLoadMaxRetryTimeout = fragmentLoadMaxRetryTimeout; + this.el.playerSetFragmentLoadMaxRetryTimeout(this._fragmentLoadMaxRetryTimeout); + }; + + FlasHLS.prototype.setFragmentLoadSkipAfterMaxRetry = function setFragmentLoadSkipAfterMaxRetry(fragmentLoadSkipAfterMaxRetry) { + this._fragmentLoadSkipAfterMaxRetry = fragmentLoadSkipAfterMaxRetry; + this.el.playerSetFragmentLoadSkipAfterMaxRetry(this._fragmentLoadSkipAfterMaxRetry); + }; + + FlasHLS.prototype.setMaxSkippedFragments = function setMaxSkippedFragments(maxSkippedFragments) { + this._maxSkippedFragments = maxSkippedFragments; + this.el.playerSetMaxSkippedFragments(this._maxSkippedFragments); + }; + + FlasHLS.prototype.setFlushLiveURLCache = function setFlushLiveURLCache(flushLiveURLCache) { + this._flushLiveURLCache = flushLiveURLCache; + this.el.playerSetFlushLiveURLCache(this._flushLiveURLCache); + }; + + FlasHLS.prototype.setInitialLiveManifestSize = function setInitialLiveManifestSize(initialLiveManifestSize) { + this._initialLiveManifestSize = initialLiveManifestSize; + this.el.playerSetInitialLiveManifestSize(this._initialLiveManifestSize); + }; + + FlasHLS.prototype.setManifestLoadMaxRetry = function setManifestLoadMaxRetry(manifestLoadMaxRetry) { + this._manifestLoadMaxRetry = manifestLoadMaxRetry; + this.el.playerSetManifestLoadMaxRetry(this._manifestLoadMaxRetry); + }; + + FlasHLS.prototype.setManifestLoadMaxRetryTimeout = function setManifestLoadMaxRetryTimeout(manifestLoadMaxRetryTimeout) { + this._manifestLoadMaxRetryTimeout = manifestLoadMaxRetryTimeout; + this.el.playerSetManifestLoadMaxRetryTimeout(this._manifestLoadMaxRetryTimeout); + }; + + FlasHLS.prototype.setManifestRedundantLoadmaxRetry = function setManifestRedundantLoadmaxRetry(manifestRedundantLoadmaxRetry) { + this._manifestRedundantLoadmaxRetry = manifestRedundantLoadmaxRetry; + this.el.playerSetManifestRedundantLoadmaxRetry(this._manifestRedundantLoadmaxRetry); + }; + + FlasHLS.prototype.setStartFromBitrate = function setStartFromBitrate(startFromBitrate) { + this._startFromBitrate = startFromBitrate; + this.el.playerSetStartFromBitrate(this._startFromBitrate); + }; + + FlasHLS.prototype.setStartFromLevel = function setStartFromLevel(startFromLevel) { + this._startFromLevel = startFromLevel; + this.el.playerSetStartFromLevel(this._startFromLevel); + }; + + FlasHLS.prototype.setAutoStartMaxDuration = function setAutoStartMaxDuration(autoStartMaxDuration) { + this._autoStartMaxDuration = autoStartMaxDuration; + this.el.playerSetAutoStartMaxDuration(this._autoStartMaxDuration); + }; + + FlasHLS.prototype.setSeekFromLevel = function setSeekFromLevel(seekFromLevel) { + this._seekFromLevel = seekFromLevel; + this.el.playerSetSeekFromLevel(this._seekFromLevel); + }; + + FlasHLS.prototype.setUseHardwareVideoDecoder = function setUseHardwareVideoDecoder(useHardwareVideoDecoder) { + this._useHardwareVideoDecoder = useHardwareVideoDecoder; + this.el.playerSetUseHardwareVideoDecoder(this._useHardwareVideoDecoder); + }; + + FlasHLS.prototype.setSetLogInfo = function setSetLogInfo(hlsLogEnabled) { + this._hlsLogEnabled = hlsLogEnabled; + this.el.playerSetLogInfo(this._hlsLogEnabled); + }; + + FlasHLS.prototype.setLogDebug = function setLogDebug(logDebug) { + this._logDebug = logDebug; + this.el.playerSetLogDebug(this._logDebug); + }; + + FlasHLS.prototype.setLogDebug2 = function setLogDebug2(logDebug2) { + this._logDebug2 = logDebug2; + this.el.playerSetLogDebug2(this._logDebug2); + }; + + FlasHLS.prototype.setLogWarn = function setLogWarn(logWarn) { + this._logWarn = logWarn; + this.el.playerSetLogWarn(this._logWarn); + }; + + FlasHLS.prototype.setLogError = function setLogError(logError) { + this._logError = logError; + this.el.playerSetLogError(this._logError); + }; + + FlasHLS.prototype._levelChanged = function _levelChanged(level) { + var currentLevel = this.el.getLevels()[level]; + if (currentLevel) { + this.highDefinition = currentLevel.height >= 720 || currentLevel.bitrate / 1000 >= 2000; + this.trigger(_events2.default.PLAYBACK_HIGHDEFINITIONUPDATE, this.highDefinition); + + if (!this._levels || this._levels.length === 0) this._fillLevels(); + + this.trigger(_events2.default.PLAYBACK_BITRATE, { + height: currentLevel.height, + width: currentLevel.width, + bandwidth: currentLevel.bitrate, + bitrate: currentLevel.bitrate, + level: level + }); + this.trigger(_events2.default.PLAYBACK_LEVEL_SWITCH_END); + } + }; + + FlasHLS.prototype._updateTime = function _updateTime(timeMetrics) { + if (this._currentState === 'IDLE') return; + + var duration = this._normalizeDuration(timeMetrics.duration); + var position = Math.min(Math.max(timeMetrics.position, 0), duration); + var previousDVRStatus = this._dvrEnabled; + var livePlayback = this._playbackType === _playback2.default.LIVE; + this._dvrEnabled = livePlayback && duration > this._hlsMinimumDvrSize; + + if (duration === 100 || livePlayback === undefined) return; + + if (this._dvrEnabled !== previousDVRStatus) { + this._updateSettings(); + this.trigger(_events2.default.PLAYBACK_SETTINGSUPDATE, this.name); + } + + if (livePlayback && !this._dvrEnabled) position = duration; + + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: position, total: duration }, this.name); + }; + + FlasHLS.prototype.play = function play() { + this.trigger(_events2.default.PLAYBACK_PLAY_INTENT); + if (this._currentState === 'PAUSED') this.el.playerResume();else if (!this._srcLoaded && this._currentState !== 'PLAYING') this._firstPlay();else this.el.playerPlay(); + }; + + FlasHLS.prototype.getPlaybackType = function getPlaybackType() { + return this._playbackType ? this._playbackType : null; + }; + + FlasHLS.prototype.getCurrentTime = function getCurrentTime() { + return this.el.getPosition(); + }; + + FlasHLS.prototype.getCurrentLevelIndex = function getCurrentLevelIndex() { + return this._currentLevel; + }; + + FlasHLS.prototype.getCurrentLevel = function getCurrentLevel() { + return this.levels[this.currentLevel]; + }; + + FlasHLS.prototype.getCurrentBitrate = function getCurrentBitrate() { + return this.levels[this.currentLevel].bitrate; + }; + + FlasHLS.prototype.setCurrentLevel = function setCurrentLevel(level) { + this.currentLevel = level; + }; + + FlasHLS.prototype.isHighDefinitionInUse = function isHighDefinitionInUse() { + return this.highDefinition; + }; + + FlasHLS.prototype.getLevels = function getLevels() { + return this.levels; + }; + + FlasHLS.prototype._setPlaybackState = function _setPlaybackState(state) { + if (['PLAYING_BUFFERING', 'PAUSED_BUFFERING'].indexOf(state) >= 0) { + this._bufferingState = true; + this.trigger(_events2.default.PLAYBACK_BUFFERING, this.name); + this._updateCurrentState(state); + } else if (['PLAYING', 'PAUSED'].indexOf(state) >= 0) { + if (['PLAYING_BUFFERING', 'PAUSED_BUFFERING', 'IDLE'].indexOf(this._currentState) >= 0) { + this._bufferingState = false; + this.trigger(_events2.default.PLAYBACK_BUFFERFULL, this.name); + } + this._updateCurrentState(state); + } else if (state === 'IDLE') { + this._srcLoaded = false; + if (this._loop && ['PLAYING_BUFFERING', 'PLAYING'].indexOf(this._currentState) >= 0) { + this.play(); + this.seek(0); + } else { + this._updateCurrentState(state); + this._hasEnded = true; + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: 0, total: this.getDuration() }, this.name); + this.trigger(_events2.default.PLAYBACK_ENDED, this.name); + } + } + }; + + FlasHLS.prototype._updateCurrentState = function _updateCurrentState(state) { + this._currentState = state; + if (state !== 'IDLE') this._hasEnded = false; + + this._updatePlaybackType(); + if (state === 'PLAYING') this.trigger(_events2.default.PLAYBACK_PLAY, this.name);else if (state === 'PAUSED') this.trigger(_events2.default.PLAYBACK_PAUSE, this.name); + }; + + FlasHLS.prototype._updatePlaybackType = function _updatePlaybackType() { + this._playbackType = this.el.getType(); + if (this._playbackType) { + this._playbackType = this._playbackType.toLowerCase(); + if (this._playbackType === _playback2.default.VOD) this._startReportingProgress();else this._stopReportingProgress(); + } + this.trigger(_events2.default.PLAYBACK_PLAYBACKSTATE, { type: this._playbackType }); + }; + + FlasHLS.prototype._startReportingProgress = function _startReportingProgress() { + if (!this._reportingProgress) this._reportingProgress = true; + }; + + FlasHLS.prototype._stopReportingProgress = function _stopReportingProgress() { + this._reportingProgress = false; + }; + + FlasHLS.prototype._onFragmentLoaded = function _onFragmentLoaded(loadmetrics) { + this.trigger(_events2.default.PLAYBACK_FRAGMENT_LOADED, loadmetrics); + if (this._reportingProgress && this.getCurrentTime()) { + var buffered = this.getCurrentTime() + this.el.getbufferLength(); + this.trigger(_events2.default.PLAYBACK_PROGRESS, { + start: this.getCurrentTime(), + current: buffered, + total: this.el.getDuration() + }); + } + }; + + FlasHLS.prototype._onLevelEndlist = function _onLevelEndlist() { + this._updatePlaybackType(); + }; + + FlasHLS.prototype._firstPlay = function _firstPlay() { + var _this4 = this; + + this._shouldPlayOnManifestLoaded = true; + if (this.el.playerLoad) { + _mediator2.default.once(this.cid + ':manifestloaded', function (duration, loadmetrics) { + return _this4._manifestLoaded(duration, loadmetrics); + }); + this._setFlashSettings(); //ensure flushLiveURLCache will work (#327) + this.el.playerLoad(this._src); + this._srcLoaded = true; + } + }; + + FlasHLS.prototype.volume = function volume(value) { + var _this5 = this; + + if (this.isReady) this.el.playerVolume(value);else this.listenToOnce(this, _events2.default.PLAYBACK_BUFFERFULL, function () { + return _this5.volume(value); + }); + }; + + FlasHLS.prototype.pause = function pause() { + if (this._playbackType !== _playback2.default.LIVE || this._dvrEnabled) { + this.el.playerPause(); + if (this._playbackType === _playback2.default.LIVE && this._dvrEnabled) this._updateDvr(true); + } + }; + + FlasHLS.prototype.stop = function stop() { + this._srcLoaded = false; + this.el.playerStop(); + this.trigger(_events2.default.PLAYBACK_STOP); + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: 0, total: 0 }, this.name); + }; + + FlasHLS.prototype.isPlaying = function isPlaying() { + if (this._currentState) return !!this._currentState.match(/playing/i); + + return false; + }; + + FlasHLS.prototype.getDuration = function getDuration() { + return this._normalizeDuration(this.el.getDuration()); + }; + + FlasHLS.prototype._normalizeDuration = function _normalizeDuration(duration) { + if (this._playbackType === _playback2.default.LIVE) { + // estimate 10 seconds of buffer time for live streams for seek positions + duration = Math.max(0, duration - 10); + } + return duration; + }; + + FlasHLS.prototype.seekPercentage = function seekPercentage(percentage) { + var duration = this.el.getDuration(); + var time = 0; + if (percentage > 0) time = duration * percentage / 100; + + this.seek(time); + }; + + FlasHLS.prototype.seek = function seek(time) { + var duration = this.getDuration(); + if (this._playbackType === _playback2.default.LIVE) { + // seek operations to a time within 3 seconds from live stream will position playhead back to live + var dvrInUse = duration - time > 3; + this._updateDvr(dvrInUse); + } + this.el.playerSeek(time); + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, { current: time, total: duration }, this.name); + }; + + FlasHLS.prototype._updateDvr = function _updateDvr(dvrInUse) { + var previousDvrInUse = !!this._dvrInUse; + this._dvrInUse = dvrInUse; + if (this._dvrInUse !== previousDvrInUse) { + this._updateSettings(); + this.trigger(_events2.default.PLAYBACK_DVR, this._dvrInUse); + this.trigger(_events2.default.PLAYBACK_STATS_ADD, { 'dvr': this._dvrInUse }); + } + }; + + FlasHLS.prototype._flashPlaybackError = function _flashPlaybackError(code, url, message) { + var error = { + code: code, + description: message, + level: _error2.default.Levels.FATAL, + raw: { code: code, url: url, message: message } + }; + var formattedError = this.createError(error); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + this.trigger(_events2.default.PLAYBACK_STOP); + }; + + FlasHLS.prototype._manifestLoaded = function _manifestLoaded(duration, loadmetrics) { + if (this._shouldPlayOnManifestLoaded) { + this._shouldPlayOnManifestLoaded = false; + // this method initialises the player (and starts playback) + // this needs to happen before PLAYBACK_LOADEDMETADATA is fired + // as the user may call seek() in a LOADEDMETADATA listener. + /// when playerPlay() is called the player seeks to 0 + this.el.playerPlay(); + } + + this._fillLevels(); + this.trigger(_events2.default.PLAYBACK_LOADEDMETADATA, { duration: duration, data: loadmetrics }); + }; + + FlasHLS.prototype._fillLevels = function _fillLevels() { + var levels = this.el.getLevels(); + var levelsLength = levels.length; + this._levels = []; + + for (var index = 0; index < levelsLength; index++) { + this._levels.push({ id: index, label: levels[index].height + 'p', level: levels[index] }); + }this.trigger(_events2.default.PLAYBACK_LEVELS_AVAILABLE, this._levels); + }; + + FlasHLS.prototype.destroy = function destroy() { + this.stopListening(); + this.$el.remove(); + }; + + FlasHLS.prototype._updateSettings = function _updateSettings() { + this.settings = _clapprZepto2.default.extend({}, this._defaultSettings); + if (this._playbackType === _playback2.default.VOD || this._dvrInUse) { + this.settings.left = ['playpause', 'position', 'duration']; + this.settings.seekEnabled = true; + } else if (this._dvrEnabled) { + this.settings.left = ['playpause']; + this.settings.seekEnabled = true; + } else { + this.settings.seekEnabled = false; + } + }; + + FlasHLS.prototype._createCallbacks = function _createCallbacks() { + var _this6 = this; + + if (!window.Clappr) window.Clappr = {}; + + if (!window.Clappr.flashlsCallbacks) window.Clappr.flashlsCallbacks = {}; + + this.flashlsEvents = new _flashls_events2.default(this.cid); + window.Clappr.flashlsCallbacks[this.cid] = function (eventName, args) { + _this6.flashlsEvents[eventName].apply(_this6.flashlsEvents, args); + }; + }; + + FlasHLS.prototype.render = function render() { + _BaseFlashPlayback.prototype.render.call(this); + this._createCallbacks(); + return this; + }; + + (0, _createClass3.default)(FlasHLS, [{ + key: 'isReady', + get: function get() { + return this._isReadyState; + } + }, { + key: 'dvrEnabled', + get: function get() { + return !!this._dvrEnabled; + } + }]); + return FlasHLS; +}(_base_flash_playback2.default); + +exports.default = FlasHLS; + + +FlasHLS.canPlay = function (resource, mimeType) { + var resourceParts = resource.split('?')[0].match(/.*\.(.*)$/) || []; + return _browser2.default.hasFlash && (resourceParts.length > 1 && resourceParts[1].toLowerCase() === 'm3u8' || mimeType === 'application/x-mpegURL' || mimeType === 'application/vnd.apple.mpegurl'); +}; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/flashls/flashls_events.js": +/*!*************************************************!*\ + !*** ./src/playbacks/flashls/flashls_events.js ***! + \*************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _mediator = __webpack_require__(/*! ../../components/mediator */ "./src/components/mediator.js"); + +var _mediator2 = _interopRequireDefault(_mediator); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var HLSEvents = function () { + function HLSEvents(instanceId) { + (0, _classCallCheck3.default)(this, HLSEvents); + + this.instanceId = instanceId; + } + + HLSEvents.prototype.ready = function ready() { + _mediator2.default.trigger(this.instanceId + ':flashready'); + }; + + HLSEvents.prototype.videoSize = function videoSize(width, height) { + _mediator2.default.trigger(this.instanceId + ':videosizechanged', width, height); + }; + + HLSEvents.prototype.complete = function complete() { + _mediator2.default.trigger(this.instanceId + ':complete'); + }; + + HLSEvents.prototype.error = function error(code, url, message) { + _mediator2.default.trigger(this.instanceId + ':error', code, url, message); + }; + + HLSEvents.prototype.manifest = function manifest(duration, loadmetrics) { + _mediator2.default.trigger(this.instanceId + ':manifestloaded', duration, loadmetrics); + }; + + HLSEvents.prototype.audioLevelLoaded = function audioLevelLoaded(loadmetrics) { + _mediator2.default.trigger(this.instanceId + ':audiolevelloaded', loadmetrics); + }; + + HLSEvents.prototype.levelLoaded = function levelLoaded(loadmetrics) { + _mediator2.default.trigger(this.instanceId + ':levelloaded', loadmetrics); + }; + + HLSEvents.prototype.levelEndlist = function levelEndlist(level) { + _mediator2.default.trigger(this.instanceId + ':levelendlist', level); + }; + + HLSEvents.prototype.fragmentLoaded = function fragmentLoaded(loadmetrics) { + _mediator2.default.trigger(this.instanceId + ':fragmentloaded', loadmetrics); + }; + + HLSEvents.prototype.fragmentPlaying = function fragmentPlaying(playmetrics) { + _mediator2.default.trigger(this.instanceId + ':fragmentplaying', playmetrics); + }; + + HLSEvents.prototype.position = function position(timemetrics) { + _mediator2.default.trigger(this.instanceId + ':timeupdate', timemetrics); + }; + + HLSEvents.prototype.state = function state(newState) { + _mediator2.default.trigger(this.instanceId + ':playbackstate', newState); + }; + + HLSEvents.prototype.seekState = function seekState(newState) { + _mediator2.default.trigger(this.instanceId + ':seekstate', newState); + }; + + HLSEvents.prototype.switch = function _switch(newLevel) { + _mediator2.default.trigger(this.instanceId + ':levelchanged', newLevel); + }; + + HLSEvents.prototype.audioTracksListChange = function audioTracksListChange(trackList) { + _mediator2.default.trigger(this.instanceId + ':audiotracklistchanged', trackList); + }; + + HLSEvents.prototype.audioTrackChange = function audioTrackChange(trackId) { + _mediator2.default.trigger(this.instanceId + ':audiotrackchanged', trackId); + }; + + return HLSEvents; +}(); + +exports.default = HLSEvents; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/flashls/index.js": +/*!****************************************!*\ + !*** ./src/playbacks/flashls/index.js ***! + \****************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _flashls = __webpack_require__(/*! ./flashls */ "./src/playbacks/flashls/flashls.js"); + +var _flashls2 = _interopRequireDefault(_flashls); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _flashls2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/flashls/public/HLSPlayer.swf": +/*!****************************************************!*\ + !*** ./src/playbacks/flashls/public/HLSPlayer.swf ***! + \****************************************************/ +/*! no static exports found */ +/***/ (function(module, exports) { + +module.exports = "<%=baseUrl%>/8fa12a459188502b9f0d39b8a67d9e6c.swf"; + +/***/ }), + +/***/ "./src/playbacks/hls/hls.js": +/*!**********************************!*\ + !*** ./src/playbacks/hls/hls.js ***! + \**********************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _toConsumableArray2 = __webpack_require__(/*! babel-runtime/helpers/toConsumableArray */ "./node_modules/babel-runtime/helpers/toConsumableArray.js"); + +var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); + +var _stringify = __webpack_require__(/*! babel-runtime/core-js/json/stringify */ "./node_modules/babel-runtime/core-js/json/stringify.js"); + +var _stringify2 = _interopRequireDefault(_stringify); + +var _extends2 = __webpack_require__(/*! babel-runtime/helpers/extends */ "./node_modules/babel-runtime/helpers/extends.js"); + +var _extends3 = _interopRequireDefault(_extends2); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _html5_video = __webpack_require__(/*! ../../playbacks/html5_video */ "./src/playbacks/html5_video/index.js"); + +var _html5_video2 = _interopRequireDefault(_html5_video); + +var _hls = __webpack_require__(/*! hls.js */ "./node_modules/hls.js/dist/hls.js"); + +var _hls2 = _interopRequireDefault(_hls); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _playback = __webpack_require__(/*! ../../base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _utils = __webpack_require__(/*! ../../base/utils */ "./src/base/utils.js"); + +var _log = __webpack_require__(/*! ../../plugins/log */ "./src/plugins/log/index.js"); + +var _log2 = _interopRequireDefault(_log); + +var _error = __webpack_require__(/*! ../../components/error */ "./src/components/error/index.js"); + +var _error2 = _interopRequireDefault(_error); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var AUTO = -1; // Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var HLS = function (_HTML5VideoPlayback) { + (0, _inherits3.default)(HLS, _HTML5VideoPlayback); + (0, _createClass3.default)(HLS, [{ + key: 'name', + get: function get() { + return 'hls'; + } + }, { + key: 'levels', + get: function get() { + return this._levels || []; + } + }, { + key: 'currentLevel', + get: function get() { + if (this._currentLevel === null || this._currentLevel === undefined) return AUTO;else return this._currentLevel; //0 is a valid level ID + }, + set: function set(id) { + this._currentLevel = id; + this.trigger(_events2.default.PLAYBACK_LEVEL_SWITCH_START); + if (this.options.playback.hlsUseNextLevel) this._hls.nextLevel = this._currentLevel;else this._hls.currentLevel = this._currentLevel; + } + }, { + key: 'isReady', + get: function get() { + return this._isReadyState; + } + }, { + key: '_startTime', + get: function get() { + if (this._playbackType === _playback2.default.LIVE && this._playlistType !== 'EVENT') return this._extrapolatedStartTime; + + return this._playableRegionStartTime; + } + }, { + key: '_now', + get: function get() { + return (0, _utils.now)(); + } + + // the time in the video element which should represent the start of the sliding window + // extrapolated to increase in real time (instead of jumping as the early segments are removed) + + }, { + key: '_extrapolatedStartTime', + get: function get() { + if (!this._localStartTimeCorrelation) return this._playableRegionStartTime; + + var corr = this._localStartTimeCorrelation; + var timePassed = this._now - corr.local; + var extrapolatedWindowStartTime = (corr.remote + timePassed) / 1000; + // cap at the end of the extrapolated window duration + return Math.min(extrapolatedWindowStartTime, this._playableRegionStartTime + this._extrapolatedWindowDuration); + } + + // the time in the video element which should represent the end of the content + // extrapolated to increase in real time (instead of jumping as segments are added) + + }, { + key: '_extrapolatedEndTime', + get: function get() { + var actualEndTime = this._playableRegionStartTime + this._playableRegionDuration; + if (!this._localEndTimeCorrelation) return actualEndTime; + + var corr = this._localEndTimeCorrelation; + var timePassed = this._now - corr.local; + var extrapolatedEndTime = (corr.remote + timePassed) / 1000; + return Math.max(actualEndTime - this._extrapolatedWindowDuration, Math.min(extrapolatedEndTime, actualEndTime)); + } + }, { + key: '_duration', + get: function get() { + return this._extrapolatedEndTime - this._startTime; + } + + // Returns the duration (seconds) of the window that the extrapolated start time is allowed + // to move in before being capped. + // The extrapolated start time should never reach the cap at the end of the window as the + // window should slide as chunks are removed from the start. + // This also applies to the extrapolated end time in the same way. + // + // If chunks aren't being removed for some reason that the start time will reach and remain fixed at + // playableRegionStartTime + extrapolatedWindowDuration + // + // <-- window duration --> + // I.e playableRegionStartTime |-----------------------| + // | --> . . . + // . --> | --> . . + // . . --> | --> . + // . . . --> | + // . . . . + // extrapolatedStartTime + + }, { + key: '_extrapolatedWindowDuration', + get: function get() { + if (this._segmentTargetDuration === null) return 0; + + return this._extrapolatedWindowNumSegments * this._segmentTargetDuration; + } + }], [{ + key: 'HLSJS', + get: function get() { + return _hls2.default; + } + }]); + + function HLS() { + (0, _classCallCheck3.default)(this, HLS); + + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + // backwards compatibility (TODO: remove on 0.3.0) + var _this = (0, _possibleConstructorReturn3.default)(this, _HTML5VideoPlayback.call.apply(_HTML5VideoPlayback, [this].concat(args))); + + _this.options.playback = (0, _extends3.default)({}, _this.options, _this.options.playback); + _this._minDvrSize = typeof _this.options.hlsMinimumDvrSize === 'undefined' ? 60 : _this.options.hlsMinimumDvrSize; + // The size of the start time extrapolation window measured as a multiple of segments. + // Should be 2 or higher, or 0 to disable. Should only need to be increased above 2 if more than one segment is + // removed from the start of the playlist at a time. E.g if the playlist is cached for 10 seconds and new chunks are + // added/removed every 5. + _this._extrapolatedWindowNumSegments = !_this.options.playback || typeof _this.options.playback.extrapolatedWindowNumSegments === 'undefined' ? 2 : _this.options.playback.extrapolatedWindowNumSegments; + + _this._playbackType = _playback2.default.VOD; + _this._lastTimeUpdate = { current: 0, total: 0 }; + _this._lastDuration = null; + // for hls streams which have dvr with a sliding window, + // the content at the start of the playlist is removed as new + // content is appended at the end. + // this means the actual playable start time will increase as the + // start content is deleted + // For streams with dvr where the entire recording is kept from the + // beginning this should stay as 0 + _this._playableRegionStartTime = 0; + // {local, remote} remote is the time in the video element that should represent 0 + // local is the system time when the 'remote' measurment took place + _this._localStartTimeCorrelation = null; + // {local, remote} remote is the time in the video element that should represents the end + // local is the system time when the 'remote' measurment took place + _this._localEndTimeCorrelation = null; + // if content is removed from the beginning then this empty area should + // be ignored. "playableRegionDuration" excludes the empty area + _this._playableRegionDuration = 0; + // #EXT-X-PROGRAM-DATE-TIME + _this._programDateTime = 0; + // true when the actual duration is longer than hlsjs's live sync point + // when this is false playableRegionDuration will be the actual duration + // when this is true playableRegionDuration will exclude the time after the sync point + _this._durationExcludesAfterLiveSyncPoint = false; + // #EXT-X-TARGETDURATION + _this._segmentTargetDuration = null; + // #EXT-X-PLAYLIST-TYPE + _this._playlistType = null; + _this._recoverAttemptsRemaining = _this.options.hlsRecoverAttempts || 16; + return _this; + } + + HLS.prototype._setup = function _setup() { + var _this2 = this; + + this._ccIsSetup = false; + this._ccTracksUpdated = false; + this._hls = new _hls2.default((0, _utils.assign)({}, this.options.playback.hlsjsConfig)); + this._hls.on(_hls2.default.Events.MEDIA_ATTACHED, function () { + return _this2._hls.loadSource(_this2.options.src); + }); + this._hls.on(_hls2.default.Events.LEVEL_LOADED, function (evt, data) { + return _this2._updatePlaybackType(evt, data); + }); + this._hls.on(_hls2.default.Events.LEVEL_UPDATED, function (evt, data) { + return _this2._onLevelUpdated(evt, data); + }); + this._hls.on(_hls2.default.Events.LEVEL_SWITCHING, function (evt, data) { + return _this2._onLevelSwitch(evt, data); + }); + this._hls.on(_hls2.default.Events.FRAG_LOADED, function (evt, data) { + return _this2._onFragmentLoaded(evt, data); + }); + this._hls.on(_hls2.default.Events.ERROR, function (evt, data) { + return _this2._onHLSJSError(evt, data); + }); + this._hls.on(_hls2.default.Events.SUBTITLE_TRACK_LOADED, function (evt, data) { + return _this2._onSubtitleLoaded(evt, data); + }); + this._hls.on(_hls2.default.Events.SUBTITLE_TRACKS_UPDATED, function () { + return _this2._ccTracksUpdated = true; + }); + this._hls.attachMedia(this.el); + }; + + HLS.prototype.render = function render() { + this._ready(); + return _HTML5VideoPlayback.prototype.render.call(this); + }; + + HLS.prototype._ready = function _ready() { + this._isReadyState = true; + this.trigger(_events2.default.PLAYBACK_READY, this.name); + }; + + HLS.prototype._recover = function _recover(evt, data, error) { + if (!this._recoveredDecodingError) { + this._recoveredDecodingError = true; + this._hls.recoverMediaError(); + } else if (!this._recoveredAudioCodecError) { + this._recoveredAudioCodecError = true; + this._hls.swapAudioCodec(); + this._hls.recoverMediaError(); + } else { + _log2.default.error('hlsjs: failed to recover', { evt: evt, data: data }); + error.level = _error2.default.Levels.FATAL; + var formattedError = this.createError(error); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + this.stop(); + } + }; + + // override + + + HLS.prototype._setupSrc = function _setupSrc(srcUrl) {// eslint-disable-line no-unused-vars + // this playback manages the src on the video element itself + }; + + HLS.prototype._startTimeUpdateTimer = function _startTimeUpdateTimer() { + var _this3 = this; + + if (this._timeUpdateTimer) return; + + this._timeUpdateTimer = setInterval(function () { + _this3._onDurationChange(); + _this3._onTimeUpdate(); + }, 100); + }; + + HLS.prototype._stopTimeUpdateTimer = function _stopTimeUpdateTimer() { + if (!this._timeUpdateTimer) return; + + clearInterval(this._timeUpdateTimer); + this._timeUpdateTimer = null; + }; + + HLS.prototype.getProgramDateTime = function getProgramDateTime() { + return this._programDateTime; + }; + // the duration on the video element itself should not be used + // as this does not necesarily represent the duration of the stream + // https://github.com/clappr/clappr/issues/668#issuecomment-157036678 + + + HLS.prototype.getDuration = function getDuration() { + return this._duration; + }; + + HLS.prototype.getCurrentTime = function getCurrentTime() { + // e.g. can be < 0 if user pauses near the start + // eventually they will then be kicked to the end by hlsjs if they run out of buffer + // before the official start time + return Math.max(0, this.el.currentTime - this._startTime); + }; + + // the time that "0" now represents relative to when playback started + // for a stream with a sliding window this will increase as content is + // removed from the beginning + + + HLS.prototype.getStartTimeOffset = function getStartTimeOffset() { + return this._startTime; + }; + + HLS.prototype.seekPercentage = function seekPercentage(percentage) { + var seekTo = this._duration; + if (percentage > 0) seekTo = this._duration * (percentage / 100); + + this.seek(seekTo); + }; + + HLS.prototype.seek = function seek(time) { + if (time < 0) { + _log2.default.warn('Attempt to seek to a negative time. Resetting to live point. Use seekToLivePoint() to seek to the live point.'); + time = this.getDuration(); + } + // assume live if time within 3 seconds of end of stream + this.dvrEnabled && this._updateDvr(time < this.getDuration() - 3); + time += this._startTime; + _HTML5VideoPlayback.prototype.seek.call(this, time); + }; + + HLS.prototype.seekToLivePoint = function seekToLivePoint() { + this.seek(this.getDuration()); + }; + + HLS.prototype._updateDvr = function _updateDvr(status) { + this.trigger(_events2.default.PLAYBACK_DVR, status); + this.trigger(_events2.default.PLAYBACK_STATS_ADD, { 'dvr': status }); + }; + + HLS.prototype._updateSettings = function _updateSettings() { + if (this._playbackType === _playback2.default.VOD) this.settings.left = ['playpause', 'position', 'duration'];else if (this.dvrEnabled) this.settings.left = ['playpause'];else this.settings.left = ['playstop']; + + this.settings.seekEnabled = this.isSeekEnabled(); + this.trigger(_events2.default.PLAYBACK_SETTINGSUPDATE); + }; + + HLS.prototype._onHLSJSError = function _onHLSJSError(evt, data) { + var error = { + code: data.type + '_' + data.details, + description: this.name + ' error: type: ' + data.type + ', details: ' + data.details, + raw: data + }; + var formattedError = void 0; + if (data.response) error.description += ', response: ' + (0, _stringify2.default)(data.response); + // only report/handle errors if they are fatal + // hlsjs should automatically handle non fatal errors + if (data.fatal) { + if (this._recoverAttemptsRemaining > 0) { + this._recoverAttemptsRemaining -= 1; + switch (data.type) { + case _hls2.default.ErrorTypes.NETWORK_ERROR: + switch (data.details) { + // The following network errors cannot be recovered with HLS.startLoad() + // For more details, see https://github.com/video-dev/hls.js/blob/master/doc/design.md#error-detection-and-handling + // For "level load" fatal errors, see https://github.com/video-dev/hls.js/issues/1138 + case _hls2.default.ErrorDetails.MANIFEST_LOAD_ERROR: + case _hls2.default.ErrorDetails.MANIFEST_LOAD_TIMEOUT: + case _hls2.default.ErrorDetails.MANIFEST_PARSING_ERROR: + case _hls2.default.ErrorDetails.LEVEL_LOAD_ERROR: + case _hls2.default.ErrorDetails.LEVEL_LOAD_TIMEOUT: + _log2.default.error('hlsjs: unrecoverable network fatal error.', { evt: evt, data: data }); + formattedError = this.createError(error); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + this.stop(); + break; + default: + _log2.default.warn('hlsjs: trying to recover from network error.', { evt: evt, data: data }); + error.level = _error2.default.Levels.WARN; + this.createError(error); + this._hls.startLoad(); + break; + } + break; + case _hls2.default.ErrorTypes.MEDIA_ERROR: + _log2.default.warn('hlsjs: trying to recover from media error.', { evt: evt, data: data }); + error.level = _error2.default.Levels.WARN; + this.createError(error); + this._recover(evt, data, error); + break; + default: + _log2.default.error('hlsjs: could not recover from error.', { evt: evt, data: data }); + formattedError = this.createError(error); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + this.stop(); + break; + } + } else { + _log2.default.error('hlsjs: could not recover from error after maximum number of attempts.', { evt: evt, data: data }); + formattedError = this.createError(error); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + this.stop(); + } + } else { + // Transforms HLSJS.ErrorDetails.KEY_LOAD_ERROR non-fatal error to + // playback fatal error if triggerFatalErrorOnResourceDenied playback + // option is set. HLSJS.ErrorTypes.KEY_SYSTEM_ERROR are fatal errors + // and therefore already handled. + if (this.options.playback.triggerFatalErrorOnResourceDenied && this._keyIsDenied(data)) { + _log2.default.error('hlsjs: could not load decrypt key.', { evt: evt, data: data }); + formattedError = this.createError(error); + this.trigger(_events2.default.PLAYBACK_ERROR, formattedError); + this.stop(); + return; + } + + error.level = _error2.default.Levels.WARN; + this.createError(error); + _log2.default.warn('hlsjs: non-fatal error occurred', { evt: evt, data: data }); + } + }; + + HLS.prototype._keyIsDenied = function _keyIsDenied(data) { + return data.type === _hls2.default.ErrorTypes.NETWORK_ERROR && data.details === _hls2.default.ErrorDetails.KEY_LOAD_ERROR && data.response && data.response.code >= 400; + }; + + HLS.prototype._onTimeUpdate = function _onTimeUpdate() { + var update = { current: this.getCurrentTime(), total: this.getDuration(), firstFragDateTime: this.getProgramDateTime() }; + var isSame = this._lastTimeUpdate && update.current === this._lastTimeUpdate.current && update.total === this._lastTimeUpdate.total; + if (isSame) return; + + this._lastTimeUpdate = update; + this.trigger(_events2.default.PLAYBACK_TIMEUPDATE, update, this.name); + }; + + HLS.prototype._onDurationChange = function _onDurationChange() { + var duration = this.getDuration(); + if (this._lastDuration === duration) return; + + this._lastDuration = duration; + _HTML5VideoPlayback.prototype._onDurationChange.call(this); + }; + + HLS.prototype._onProgress = function _onProgress() { + if (!this.el.buffered.length) return; + + var buffered = []; + var bufferedPos = 0; + for (var i = 0; i < this.el.buffered.length; i++) { + buffered = [].concat((0, _toConsumableArray3.default)(buffered), [{ + // for a stream with sliding window dvr something that is buffered my slide off the start of the timeline + start: Math.max(0, this.el.buffered.start(i) - this._playableRegionStartTime), + end: Math.max(0, this.el.buffered.end(i) - this._playableRegionStartTime) + }]); + if (this.el.currentTime >= buffered[i].start && this.el.currentTime <= buffered[i].end) bufferedPos = i; + } + var progress = { + start: buffered[bufferedPos].start, + current: buffered[bufferedPos].end, + total: this.getDuration() + }; + this.trigger(_events2.default.PLAYBACK_PROGRESS, progress, buffered); + }; + + HLS.prototype.play = function play() { + if (!this._hls) this._setup(); + + _HTML5VideoPlayback.prototype.play.call(this); + this._startTimeUpdateTimer(); + }; + + HLS.prototype.pause = function pause() { + if (!this._hls) return; + + _HTML5VideoPlayback.prototype.pause.call(this); + if (this.dvrEnabled) this._updateDvr(true); + }; + + HLS.prototype.stop = function stop() { + this._stopTimeUpdateTimer(); + if (this._hls) { + _HTML5VideoPlayback.prototype.stop.call(this); + this._hls.destroy(); + delete this._hls; + } + }; + + HLS.prototype.destroy = function destroy() { + this._stopTimeUpdateTimer(); + if (this._hls) { + this._hls.destroy(); + delete this._hls; + } + _HTML5VideoPlayback.prototype.destroy.call(this); + }; + + HLS.prototype._updatePlaybackType = function _updatePlaybackType(evt, data) { + this._playbackType = data.details.live ? _playback2.default.LIVE : _playback2.default.VOD; + this._onLevelUpdated(evt, data); + + // Live stream subtitle tracks detection hack (may not immediately available) + if (this._ccTracksUpdated && this._playbackType === _playback2.default.LIVE && this.hasClosedCaptionsTracks) this._onSubtitleLoaded(); + }; + + HLS.prototype._fillLevels = function _fillLevels() { + this._levels = this._hls.levels.map(function (level, index) { + return { id: index, level: level, label: level.bitrate / 1000 + 'Kbps' }; + }); + this.trigger(_events2.default.PLAYBACK_LEVELS_AVAILABLE, this._levels); + }; + + HLS.prototype._onLevelUpdated = function _onLevelUpdated(evt, data) { + this._segmentTargetDuration = data.details.targetduration; + this._playlistType = data.details.type || null; + + var startTimeChanged = false; + var durationChanged = false; + var fragments = data.details.fragments; + var previousPlayableRegionStartTime = this._playableRegionStartTime; + var previousPlayableRegionDuration = this._playableRegionDuration; + + if (fragments.length === 0) return; + + // #EXT-X-PROGRAM-DATE-TIME + if (fragments[0].rawProgramDateTime) this._programDateTime = fragments[0].rawProgramDateTime; + + if (this._playableRegionStartTime !== fragments[0].start) { + startTimeChanged = true; + this._playableRegionStartTime = fragments[0].start; + } + + if (startTimeChanged) { + if (!this._localStartTimeCorrelation) { + // set the correlation to map to middle of the extrapolation window + this._localStartTimeCorrelation = { + local: this._now, + remote: (fragments[0].start + this._extrapolatedWindowDuration / 2) * 1000 + }; + } else { + // check if the correlation still works + var corr = this._localStartTimeCorrelation; + var timePassed = this._now - corr.local; + // this should point to a time within the extrapolation window + var startTime = (corr.remote + timePassed) / 1000; + if (startTime < fragments[0].start) { + // our start time is now earlier than the first chunk + // (maybe the chunk was removed early) + // reset correlation so that it sits at the beginning of the first available chunk + this._localStartTimeCorrelation = { + local: this._now, + remote: fragments[0].start * 1000 + }; + } else if (startTime > previousPlayableRegionStartTime + this._extrapolatedWindowDuration) { + // start time was past the end of the old extrapolation window (so would have been capped) + // see if now that time would be inside the window, and if it would be set the correlation + // so that it resumes from the time it was at at the end of the old window + // update the correlation so that the time starts counting again from the value it's on now + this._localStartTimeCorrelation = { + local: this._now, + remote: Math.max(fragments[0].start, previousPlayableRegionStartTime + this._extrapolatedWindowDuration) * 1000 + }; + } + } + } + + var newDuration = data.details.totalduration; + // if it's a live stream then shorten the duration to remove access + // to the area after hlsjs's live sync point + // seeks to areas after this point sometimes have issues + if (this._playbackType === _playback2.default.LIVE) { + var fragmentTargetDuration = data.details.targetduration; + var hlsjsConfig = this.options.playback.hlsjsConfig || {}; + var liveSyncDurationCount = hlsjsConfig.liveSyncDurationCount || _hls2.default.DefaultConfig.liveSyncDurationCount; + var hiddenAreaDuration = fragmentTargetDuration * liveSyncDurationCount; + if (hiddenAreaDuration <= newDuration) { + newDuration -= hiddenAreaDuration; + this._durationExcludesAfterLiveSyncPoint = true; + } else { + this._durationExcludesAfterLiveSyncPoint = false; + } + } + + if (newDuration !== this._playableRegionDuration) { + durationChanged = true; + this._playableRegionDuration = newDuration; + } + + // Note the end time is not the playableRegionDuration + // The end time will always increase even if content is removed from the beginning + var endTime = fragments[0].start + newDuration; + var previousEndTime = previousPlayableRegionStartTime + previousPlayableRegionDuration; + var endTimeChanged = endTime !== previousEndTime; + if (endTimeChanged) { + if (!this._localEndTimeCorrelation) { + // set the correlation to map to the end + this._localEndTimeCorrelation = { + local: this._now, + remote: endTime * 1000 + }; + } else { + // check if the correlation still works + var _corr = this._localEndTimeCorrelation; + var _timePassed = this._now - _corr.local; + // this should point to a time within the extrapolation window from the end + var extrapolatedEndTime = (_corr.remote + _timePassed) / 1000; + if (extrapolatedEndTime > endTime) { + this._localEndTimeCorrelation = { + local: this._now, + remote: endTime * 1000 + }; + } else if (extrapolatedEndTime < endTime - this._extrapolatedWindowDuration) { + // our extrapolated end time is now earlier than the extrapolation window from the actual end time + // (maybe a chunk became available early) + // reset correlation so that it sits at the beginning of the extrapolation window from the end time + this._localEndTimeCorrelation = { + local: this._now, + remote: (endTime - this._extrapolatedWindowDuration) * 1000 + }; + } else if (extrapolatedEndTime > previousEndTime) { + // end time was past the old end time (so would have been capped) + // set the correlation so that it resumes from the time it was at at the end of the old window + this._localEndTimeCorrelation = { + local: this._now, + remote: previousEndTime * 1000 + }; + } + } + } + + // now that the values have been updated call any methods that use on them so they get the updated values + // immediately + durationChanged && this._onDurationChange(); + startTimeChanged && this._onProgress(); + }; + + HLS.prototype._onFragmentLoaded = function _onFragmentLoaded(evt, data) { + this.trigger(_events2.default.PLAYBACK_FRAGMENT_LOADED, data); + }; + + HLS.prototype._onSubtitleLoaded = function _onSubtitleLoaded() { + // This event may be triggered multiple times + // Setup CC only once (disable CC by default) + if (!this._ccIsSetup) { + this.trigger(_events2.default.PLAYBACK_SUBTITLE_AVAILABLE); + var trackId = this._playbackType === _playback2.default.LIVE ? -1 : this.closedCaptionsTrackId; + this.closedCaptionsTrackId = trackId; + this._ccIsSetup = true; + } + }; + + HLS.prototype._onLevelSwitch = function _onLevelSwitch(evt, data) { + if (!this.levels.length) this._fillLevels(); + + this.trigger(_events2.default.PLAYBACK_LEVEL_SWITCH_END); + this.trigger(_events2.default.PLAYBACK_LEVEL_SWITCH, data); + var currentLevel = this._hls.levels[data.level]; + if (currentLevel) { + // TODO should highDefinition be private and maybe have a read only accessor if it's used somewhere + this.highDefinition = currentLevel.height >= 720 || currentLevel.bitrate / 1000 >= 2000; + this.trigger(_events2.default.PLAYBACK_HIGHDEFINITIONUPDATE, this.highDefinition); + this.trigger(_events2.default.PLAYBACK_BITRATE, { + height: currentLevel.height, + width: currentLevel.width, + bandwidth: currentLevel.bitrate, + bitrate: currentLevel.bitrate, + level: data.level + }); + } + }; + + HLS.prototype.getPlaybackType = function getPlaybackType() { + return this._playbackType; + }; + + HLS.prototype.isSeekEnabled = function isSeekEnabled() { + return this._playbackType === _playback2.default.VOD || this.dvrEnabled; + }; + + (0, _createClass3.default)(HLS, [{ + key: 'dvrEnabled', + get: function get() { + // enabled when: + // - the duration does not include content after hlsjs's live sync point + // - the playable region duration is longer than the configured duration to enable dvr after + // - the playback type is LIVE. + return this._durationExcludesAfterLiveSyncPoint && this._duration >= this._minDvrSize && this.getPlaybackType() === _playback2.default.LIVE; + } + }]); + return HLS; +}(_html5_video2.default); + +exports.default = HLS; + + +HLS.canPlay = function (resource, mimeType) { + var resourceParts = resource.split('?')[0].match(/.*\.(.*)$/) || []; + var isHls = resourceParts.length > 1 && resourceParts[1].toLowerCase() === 'm3u8' || (0, _utils.listContainsIgnoreCase)(mimeType, ['application/vnd.apple.mpegurl', 'application/x-mpegURL']); + + return !!(_hls2.default.isSupported() && isHls); +}; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/hls/index.js": +/*!************************************!*\ + !*** ./src/playbacks/hls/index.js ***! + \************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _hls = __webpack_require__(/*! ./hls */ "./src/playbacks/hls/hls.js"); + +var _hls2 = _interopRequireDefault(_hls); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _hls2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/html5_audio/html5_audio.js": +/*!**************************************************!*\ + !*** ./src/playbacks/html5_audio/html5_audio.js ***! + \**************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _playback = __webpack_require__(/*! ../../base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _html5_video = __webpack_require__(/*! ../../playbacks/html5_video */ "./src/playbacks/html5_video/index.js"); + +var _html5_video2 = _interopRequireDefault(_html5_video); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// TODO: remove this playback and change HTML5Video to HTML5Playback (breaking change, only after 0.3.0) +var HTML5Audio = function (_HTML5Video) { + (0, _inherits3.default)(HTML5Audio, _HTML5Video); + + function HTML5Audio() { + (0, _classCallCheck3.default)(this, HTML5Audio); + return (0, _possibleConstructorReturn3.default)(this, _HTML5Video.apply(this, arguments)); + } + + HTML5Audio.prototype.updateSettings = function updateSettings() { + this.settings.left = ['playpause', 'position', 'duration']; + this.settings.seekEnabled = this.isSeekEnabled(); + this.trigger(_events2.default.PLAYBACK_SETTINGSUPDATE); + }; + + HTML5Audio.prototype.getPlaybackType = function getPlaybackType() { + return _playback2.default.AOD; + }; + + (0, _createClass3.default)(HTML5Audio, [{ + key: 'name', + get: function get() { + return 'html5_audio'; + } + }, { + key: 'tagName', + get: function get() { + return 'audio'; + } + }, { + key: 'isAudioOnly', + get: function get() { + return true; + } + }]); + return HTML5Audio; +}(_html5_video2.default); // Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +exports.default = HTML5Audio; + + +HTML5Audio.canPlay = function (resourceUrl, mimeType) { + var mimetypes = { + 'wav': ['audio/wav'], + 'mp3': ['audio/mp3', 'audio/mpeg;codecs="mp3"'], + 'aac': ['audio/mp4;codecs="mp4a.40.5"'], + 'oga': ['audio/ogg'] + }; + return _html5_video2.default._canPlay('audio', mimetypes, resourceUrl, mimeType); +}; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/html5_audio/index.js": +/*!********************************************!*\ + !*** ./src/playbacks/html5_audio/index.js ***! + \********************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _html5_audio = __webpack_require__(/*! ./html5_audio */ "./src/playbacks/html5_audio/html5_audio.js"); + +var _html5_audio2 = _interopRequireDefault(_html5_audio); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +exports.default = _html5_audio2.default; +module.exports = exports['default']; + +/***/ }), + +/***/ "./src/playbacks/html5_video/html5_video.js": +/*!**************************************************!*\ + !*** ./src/playbacks/html5_video/html5_video.js ***! + \**************************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(process) { + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _from = __webpack_require__(/*! babel-runtime/core-js/array/from */ "./node_modules/babel-runtime/core-js/array/from.js"); + +var _from2 = _interopRequireDefault(_from); + +var _classCallCheck2 = __webpack_require__(/*! babel-runtime/helpers/classCallCheck */ "./node_modules/babel-runtime/helpers/classCallCheck.js"); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _possibleConstructorReturn2 = __webpack_require__(/*! babel-runtime/helpers/possibleConstructorReturn */ "./node_modules/babel-runtime/helpers/possibleConstructorReturn.js"); + +var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2); + +var _createClass2 = __webpack_require__(/*! babel-runtime/helpers/createClass */ "./node_modules/babel-runtime/helpers/createClass.js"); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _inherits2 = __webpack_require__(/*! babel-runtime/helpers/inherits */ "./node_modules/babel-runtime/helpers/inherits.js"); + +var _inherits3 = _interopRequireDefault(_inherits2); + +var _toConsumableArray2 = __webpack_require__(/*! babel-runtime/helpers/toConsumableArray */ "./node_modules/babel-runtime/helpers/toConsumableArray.js"); + +var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); + +var _keys = __webpack_require__(/*! babel-runtime/core-js/object/keys */ "./node_modules/babel-runtime/core-js/object/keys.js"); + +var _keys2 = _interopRequireDefault(_keys); + +var _utils = __webpack_require__(/*! ../../base/utils */ "./src/base/utils.js"); + +var _playback = __webpack_require__(/*! ../../base/playback */ "./src/base/playback.js"); + +var _playback2 = _interopRequireDefault(_playback); + +var _browser = __webpack_require__(/*! ../../components/browser */ "./src/components/browser/index.js"); + +var _browser2 = _interopRequireDefault(_browser); + +var _error = __webpack_require__(/*! ../../components/error */ "./src/components/error/index.js"); + +var _error2 = _interopRequireDefault(_error); + +var _events = __webpack_require__(/*! ../../base/events */ "./src/base/events.js"); + +var _events2 = _interopRequireDefault(_events); + +var _log = __webpack_require__(/*! ../../plugins/log */ "./src/plugins/log/index.js"); + +var _log2 = _interopRequireDefault(_log); + +var _clapprZepto = __webpack_require__(/*! clappr-zepto */ "./node_modules/clappr-zepto/zepto.js"); + +var _clapprZepto2 = _interopRequireDefault(_clapprZepto); + +var _template = __webpack_require__(/*! ../../base/template */ "./src/base/template.js"); + +var _template2 = _interopRequireDefault(_template); + +var _tracks = __webpack_require__(/*! ./public/tracks.html */ "./src/playbacks/html5_video/public/tracks.html"); + +var _tracks2 = _interopRequireDefault(_tracks); + +__webpack_require__(/*! ./public/style.scss */ "./src/playbacks/html5_video/public/style.scss"); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +// Copyright 2014 Globo.com Player authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +var MIMETYPES = { + 'mp4': ['avc1.42E01E', 'avc1.58A01E', 'avc1.4D401E', 'avc1.64001E', 'mp4v.20.8', 'mp4v.20.240', 'mp4a.40.2'].map(function (codec) { + return 'video/mp4; codecs="' + codec + ', mp4a.40.2"'; + }), + 'ogg': ['video/ogg; codecs="theora, vorbis"', 'video/ogg; codecs="dirac"', 'video/ogg; codecs="theora, speex"'], + '3gpp': ['video/3gpp; codecs="mp4v.20.8, samr"'], + 'webm': ['video/webm; codecs="vp8, vorbis"'], + 'mkv': ['video/x-matroska; codecs="theora, vorbis"'], + 'm3u8': ['application/x-mpegurl'] +}; +MIMETYPES['ogv'] = MIMETYPES['ogg']; +MIMETYPES['3gp'] = MIMETYPES['3gpp']; + +var AUDIO_MIMETYPES = { + 'wav': ['audio/wav'], + 'mp3': ['audio/mp3', 'audio/mpeg;codecs="mp3"'], + 'aac': ['audio/mp4;codecs="mp4a.40.5"'], + 'oga': ['audio/ogg'] +}; + +var KNOWN_AUDIO_MIMETYPES = (0, _keys2.default)(AUDIO_MIMETYPES).reduce(function (acc, k) { + return [].concat((0, _toConsumableArray3.default)(acc), (0, _toConsumableArray3.default)(AUDIO_MIMETYPES[k])); +}, []); + +var UNKNOWN_ERROR = { code: 'unknown', message: 'unknown' + + // TODO: rename this Playback to HTML5Playback (breaking change, only after 0.3.0) +}; +var HTML5Video = function (_Playback) { + (0, _inherits3.default)(HTML5Video, _Playback); + (0, _createClass3.default)(HTML5Video, [{ + key: 'name', + get: function get() { + return 'html5_video'; + } + }, { + key: 'tagName', + get: function get() { + return this.isAudioOnly ? 'audio' : 'video'; + } + }, { + key: 'isAudioOnly', + get: function get() { + var resourceUrl = this.options.src; + var mimeTypes = HTML5Video._mimeTypesForUrl(resourceUrl, AUDIO_MIMETYPES, this.options.mimeType); + return this.options.playback && this.options.playback.audioOnly || this.options.audioOnly || KNOWN_AUDIO_MIMETYPES.indexOf(mimeTypes[0]) >= 0; + } + }, { + key: 'attributes', + get: function get() { + return { + 'data-html5-video': '' + }; + } + }, { + key: 'events', + get: function get() { + return { + 'canplay': '_onCanPlay', + 'canplaythrough': '_handleBufferingEvents', + 'durationchange': '_onDurationChange', + 'ended': '_onEnded', + 'error': '_onError', + 'loadeddata': '_onLoadedData', + 'loadedmetadata': '_onLoadedMetadata', + 'pause': '_onPause', + 'playing': '_onPlaying', + 'progress': '_onProgress', + 'seeking': '_onSeeking', + 'seeked': '_onSeeked', + 'stalled': '_handleBufferingEvents', + 'timeupdate': '_onTimeUpdate', + 'waiting': '_onWaiting' + }; + } + + /** + * Determine if the playback has ended. + * @property ended + * @type Boolean + */ + + }, { + key: 'ended', + get: function get() { + return this.el.ended; + } + + /** + * Determine if the playback is having to buffer in order for + * playback to be smooth. + * This is related to the PLAYBACK_BUFFERING and PLAYBACK_BUFFERFULL events + * @property buffering + * @type Boolean + */ + + }, { + key: 'buffering', + get: function get() { + return this._isBuffering; + } + }]); + + function HTML5Video() { + (0, _classCallCheck3.default)(this, HTML5Video); + + for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) { + args[_key] = arguments[_key]; + } + + var _this = (0, _possibleConstructorReturn3.default)(this, _Playback.call.apply(_Playback, [this].concat(args))); + + _this._destroyed = false; + _this._loadStarted = false; + _this._isBuffering = false; + _this._playheadMoving = false; + _this._playheadMovingTimer = null; + _this._stopped = false; + _this._ccTrackId = -1; + _this._setupSrc(_this.options.src); + // backwards compatibility (TODO: remove on 0.3.0) + _this.options.playback || (_this.options.playback = _this.options || {}); + _this.options.playback.disableContextMenu = _this.options.playback.disableContextMenu || _this.options.disableVideoTagContextMenu; + + var playbackConfig = _this.options.playback; + var preload = playbackConfig.preload || (_browser2.default.isSafari ? 'auto' : _this.options.preload); + + var posterUrl = void 0; // FIXME: poster plugin should always convert poster to object with expected properties ? + if (_this.options.poster) { + if (typeof _this.options.poster === 'string') posterUrl = _this.options.poster;else if (typeof _this.options.poster.url === 'string') posterUrl = _this.options.poster.url; + } + + _clapprZepto2.default.extend(_this.el, { + muted: _this.options.mute, + defaultMuted: _this.options.mute, + loop: _this.options.loop, + poster: posterUrl, + preload: preload || 'metadata', + controls: (playbackConfig.controls || _this.options.useVideoTagDefaultControls) && 'controls', + crossOrigin: playbackConfig.crossOrigin, + 'x-webkit-playsinline': playbackConfig.playInline + }); + + playbackConfig.playInline && _this.$el.attr({ playsinline: 'playsinline' }); + playbackConfig.crossOrigin && _this.$el.attr({ crossorigin: playbackConfig.crossOrigin }); + + // TODO should settings be private? + _this.settings = { default: ['seekbar'] }; + _this.settings.left = ['playpause', 'position', 'duration']; + _this.settings.right = ['fullscreen', 'volume', 'hd-indicator']; + + playbackConfig.externalTracks && _this._setupExternalTracks(playbackConfig.externalTracks); + + _this.options.autoPlay && _this.attemptAutoPlay(); + return _this; + } + + // See Playback.attemptAutoPlay() + + + HTML5Video.prototype.attemptAutoPlay = function attemptAutoPlay() { + var _this2 = this; + + this.canAutoPlay(function (result, error) { + error && _log2.default.warn(_this2.name, 'autoplay error.', { result: result, error: error }); + + // https://github.com/clappr/clappr/issues/1076 + result && process.nextTick(function () { + return !_this2._destroyed && _this2.play(); + }); + }); + }; + + // See Playback.canAutoPlay() + + + HTML5Video.prototype.canAutoPlay = function canAutoPlay(cb) { + if (this.options.disableCanAutoPlay) cb(true, null); + + var opts = { + timeout: this.options.autoPlayTimeout || 500, + inline: this.options.playback.playInline || false, + muted: this.options.mute || false // Known issue: mediacontrols may asynchronously mute video + + + // Use current video element if recycling feature enabled with mobile devices + };if (_browser2.default.isMobile && _utils.DomRecycler.options.recycleVideo) opts.element = this.el; + + // Desktop browser autoplay policy may require user action + // Mobile browser autoplay require user consent and video recycling feature enabled + // It may returns a false positive with source-less player consent + (0, _utils.canAutoPlayMedia)(cb, opts); + }; + + HTML5Video.prototype._setupExternalTracks = function _setupExternalTracks(tracks) { + this._externalTracks = tracks.map(function (track) { + return { + kind: track.kind || 'subtitles', // Default is 'subtitles' + label: track.label, + lang: track.lang, + src: track.src + }; + }); + }; + + /** + * Sets the source url on the
    - {content1 &&
    + {content1 &&
    {content1}
    } - {content2 &&
    + {content2 &&
    {content2}
    } - {content3 &&
    + {content3 &&
    {content3}
    }
    diff --git a/public/react/src/modules/page/MainContentContainer.js b/public/react/src/modules/page/MainContentContainer.js index 829b84b16..0211b3801 100644 --- a/public/react/src/modules/page/MainContentContainer.js +++ b/public/react/src/modules/page/MainContentContainer.js @@ -368,17 +368,20 @@ class MainContentContainer extends Component { } componentDidMount() { - - - window.$(window.documents).bind("submitChoose",function(){ - - alert("hello world!"); - - }); - - - + // if (this.binded == true) { + // return; + // } else { + // this.binded = true + // window.$(window).unload( ()=>{ + // alert(111) + // var fileUpdatePromise = this.doFileUpdateRequest(true) + // }); + // } + } + componentWillUnmount() { + // window.$(window).off( "unload" ) } + doFileUpdateRequestOnCodeMirrorBlur = () => { var fileUpdatePromise = this.doFileUpdateRequest(true) From a3b6d5aa368931b34d684c44e43cc61143e91252 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 09:39:17 +0800 Subject: [PATCH 080/221] modify user project package apig --- app/views/users/project_packages/index.json.jbuilder | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/users/project_packages/index.json.jbuilder b/app/views/users/project_packages/index.json.jbuilder index a2574d558..ad56be7d2 100644 --- a/app/views/users/project_packages/index.json.jbuilder +++ b/app/views/users/project_packages/index.json.jbuilder @@ -16,5 +16,11 @@ json.project_packages do json.deadline_at package.display_deadline_at json.published_at package.display_published_at + + json.operation do + can_manage = current_user&.id == observed_user.id || current_user&.admin_or_business? + json.can_edit can_manage && package.editable? + json.can_delete can_manage && package.deletable? + end end end \ No newline at end of file From f9cb02bf96b621a64c081115213c91637a500019 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 09:41:24 +0800 Subject: [PATCH 081/221] comment --- public/react/src/common/components/media/Clappr.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/public/react/src/common/components/media/Clappr.js b/public/react/src/common/components/media/Clappr.js index c420bebc0..2c4d89e92 100644 --- a/public/react/src/common/components/media/Clappr.js +++ b/public/react/src/common/components/media/Clappr.js @@ -16,15 +16,12 @@ class Clappr extends Component{ } componentDidMount() { - - + return; const source = this.props.source || "http://your.video/here.mp4" const { id, type } = this.props const _id = `#_player${id}` - - return; if (!window['Clappr'] && window['ClapprLoading'] == true) { setTimeout(() => { this.componentDidMount() @@ -91,6 +88,7 @@ class Clappr extends Component{ const _id = `_player${id}` return( + {/* https://github.com/CookPete/react-player/issues/686 */} {/*
    12?"cdefault ":"cdefault "}> -
    +
      { diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js index df376e4e5..6078f7d6d 100644 --- a/public/react/src/modules/user/usersInfo/Infos.js +++ b/public/react/src/modules/user/usersInfo/Infos.js @@ -384,11 +384,11 @@ class Infos extends Component{ to={`/users/${username}/projects`}>项目 - {/*
    • */} - {/* this.setState({moduleName: 'package'})}*/} - {/*to={`/users/${username}/package`}>众包*/} - {/*
      • */} +
    • + this.setState({moduleName: 'package'})} + to={`/users/${username}/package`}>众包 +
      • {/*{ data && data.identity!="学生" &&
    • 题库
      • }*/} @@ -404,11 +404,11 @@ class Infos extends Component{ {/* 众包 */} {/* http://localhost:3007/courses/1309/homework/9300/setting */} - {/* ()*/} - {/*}*/} - {/*>*/} + () + } + > {/* 课堂 */} {/* http://localhost:3007/courses/1309/homework/9300/setting */} diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index bef2bf366..7c243faef 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -4,7 +4,8 @@ import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {Tooltip,Menu,Pagination,Spin} from 'antd'; import axios from 'axios'; import {getImageUrl} from 'educoder'; -import NoneData from '../../courses/coursesPublic/NoneData' +import Modals from '../../modals/Modals'; +import NoneData from '../../courses/coursesPublic/NoneData'; import "./usersInfo.css" import moment from 'moment'; let categorylist=[ @@ -113,6 +114,37 @@ class InfosPackage extends Component{ } } + + delectprojectModal=(id)=>{ + this.setState({ + Modalstype: true, + Modalstopval: '是否确认删除?', + ModalSave: () => this.delectproject(id), + ModalCancel: this.cancelProject + }) + } + + cancelProject=()=>{ + this.setState({ + Modalstype: false, + }) + } + + delectproject=(id)=>{ + + let {cate,status}=this.state; + let url=`/project_packages/${id}.json` + + axios.delete(url).then((response) => { + if (response.data.status == 0) { + this.getCourses(cate,status,1); + } + }) + .catch(function (error) { + console.log(error); + }); + + } render(){ let{ category, @@ -127,6 +159,13 @@ class InfosPackage extends Component{ // console.log(data) return(
      + {/*提示*/} +
    • this.changeCategory()}>全部
      • @@ -160,21 +199,27 @@ class InfosPackage extends Component{ {/*type: "bidden"*/} - {data===undefined?:data.project_packages.length===0?:data.project_packages.map((item,key)=>{ return(
      -
      +
      +
      图片
      +
      +
      + {item.bidden_status==="pending"?竞标中:""} + {item.bidden_status==="bidding_won"?已中标:""} + {item.bidden_status==="bidding_lost"?未中标:""}
      +
      {item.min_price===null?"":￥{item.min_price}} @@ -205,6 +250,28 @@ class InfosPackage extends Component{
      + + {category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===true? + :"":""} + + {category=="manage"?item.operation.can_edit===true? +
      + + + +
      :"":""} + +
      )})} diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 3485f6d16..25cfd6e21 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/public/react/src/modules/user/usersInfo/usersInfo.css @@ -94,4 +94,29 @@ .mtf15{ margin-top:-15px; +} + +.project-package-item.with-operator .item-operator { + width: 0; + transition: width .2s; + -moz-transition: width .2s; /* Firefox 4 */ + -webkit-transition: width .2s; /* Safari 和 Chrome */ + -o-transition: width .2s; /* Opera */ +} +.project-package-item.with-operator:hover .item-operator { + margin: -20px -20px -20px 20px; + padding: 20px 0; + width: 100px; + display: flex; + justify-content: space-around; + flex-direction: column; + align-items: center; + background: #f0f0f0; +} +.project-package-item.with-operator .item-operator a { + display: none; +} +.project-package-item.with-operator:hover .item-operator a { + display: block; + font-size: 20px; } \ No newline at end of file From 9fb497e22425f59d14812346d9e8450d88d5a6a2 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 11:04:40 +0800 Subject: [PATCH 090/221] fix --- app/decorators/tiding_decorator.rb | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index c9ad806ee..677812217 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -2,6 +2,9 @@ module TidingDecorator def content method_name = "#{container_type.underscore}_content" respond_to?(method_name) ? send(method_name) : '' + rescue => ex + Util.logger_error(ex) + '' end def how_long_time @@ -261,16 +264,16 @@ module TidingDecorator def journal_content case tiding_type when 'Mentioned' then - I18n.t(locale_format(tiding_type)) % message_content_helper(container.notes) + I18n.t(locale_format(tiding_type)) % message_content_helper(container&.notes) when 'Comment' then - I18n.t(locale_format(tiding_type, container.parent.present?)) % message_content_helper(container.notes) + I18n.t(locale_format(tiding_type, container.parent.present?)) % message_content_helper(container&.notes) else - I18n.t(locale_format) % container.issue.subject + I18n.t(locale_format) % container&.issue&.subject end end def issue_content - I18n.t(locale_format) % container.subject + I18n.t(locale_format) % container&.subject end def pull_request_content @@ -291,15 +294,15 @@ module TidingDecorator end def poll_content - I18n.t(locale_format(parent_container_type)) % container.polls_name + I18n.t(locale_format(parent_container_type)) % container&.polls_name end def exercise_content - I18n.t(locale_format(parent_container_type)) % container.exercise_name + I18n.t(locale_format(parent_container_type)) % container&.exercise_name end def student_graduation_topic_content - I18n.t(locale_format) % container.graduation_topic.try(:name) + I18n.t(locale_format) % container&.graduation_topic.try(:name) end def deal_student_topic_select_content @@ -307,27 +310,27 @@ module TidingDecorator end def graduation_task_content - I18n.t(locale_format(parent_container_type)) % container.name + I18n.t(locale_format(parent_container_type)) % container&.name end def graduation_work_content - I18n.t(locale_format(extra.nil?)) % container.graduation_task.try(:name) + I18n.t(locale_format(extra.nil?)) % container&.graduation_task.try(:name) end def graduation_work_score_content - I18n.t(locale_format) % container.graduation_work.graduation_task.try(:name) + I18n.t(locale_format) % container&.graduation_work&.graduation_task.try(:name) end def homework_common_content - I18n.t(locale_format(parent_container_type), name: container.name, reason: extra) + I18n.t(locale_format(parent_container_type), name: container&.name, reason: extra) end def student_work_content - I18n.t(locale_format(extra.nil?)) % container.homework_common.try(:name) + I18n.t(locale_format(extra.nil?)) % container&.homework_common.try(:name) end def student_works_score_content - I18n.t(locale_format(extra)) % container.student_work.homework_common.try(:name) + I18n.t(locale_format(extra)) % container&.student_work&.homework_common.try(:name) end def challenge_work_score_content From 8db1823226e64cc1ba9c83ff64c07bbfcebd8c5c Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 11:07:48 +0800 Subject: [PATCH 091/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 8 ++------ dump.rdb | Bin 551 -> 668 bytes 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 0475eb0da..9d7beb6c1 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -3,7 +3,7 @@ class MemosController < ApplicationController before_action :set_memo, only: [:show, :edit, :update, :destroy, :sticky_or_cancel, :hidden, :more_reply] before_action :validate_memo_params, only: [:create, :update] before_action :owner_or_admin, only: [:edit, :update, :destroy] - before_action :is_admin, only: [:sticky_or_cancel, :hidden] + before_action :require_business, only: [:sticky_or_cancel, :hidden] include ApplicationHelper # GET /memos @@ -132,7 +132,7 @@ class MemosController < ApplicationController def hidden tip_exception("不能对主贴进行隐藏操作") if @memo.parent_id.nil? begin - @memo.update_attributes!(hidden: !@memo.hidden) + @memo.update_attributes!(hidden: @memo.hidden == 0 ? 1 : 0) normal_status("更新成功") rescue Exception => e tip_exception("更新失败，原因：#{e}") @@ -182,10 +182,6 @@ class MemosController < ApplicationController tip_exception(403, "无权限操作") unless @memo.author == current_user || current_user.admin? || current_user.business? end - def is_admin - tip_exception(403, "无权限操作") unless current_user.admin? || current_user.business? - end - # Never trust parameters from the scary internet, only allow the white list through. def memo_params params.require(:memo).permit(:subject, :content, :forum_id) diff --git a/dump.rdb b/dump.rdb index a799840b19b627ba79861403e776c55d27442bac..4687968bdc78f7e61538606ad77386166339f236 100644 GIT binary patch delta 421 zcmWmAO=}ZD7y#hiP11&>B7*c}$#%hm9~0+uXC^1pDyX0!3Oz|WGy86vrb%=^T574b z;7Ko*UOd=yz4;f4SAT)GvR(!63a$A3gy*FGx$zNSIry^t;!m^8Awgppe>=5@{aa+| z^1b$KyY6|-!1KbO)Bn30xlNPjQ7`JdVz>p5rnc96T0#l^#Jrq4JYKsF$}+5z7=d66 zaibMd%%q6A)at~tnx<)dbi=3Jdh{5^)9`tNam}LJs}GyIQ8q1$;biUf&ZU9b800%+ zJKY?NU}sevz4sU1zH7W*N6Sy5yNk69iY$CnE3y*8-}}GjQ)vw6I$?rX!%_*_GEPnS z;hM|96p#!|5%q|Oxg>%x+2t(8l!Oy+Vz$m&ou;N5tG)AczxwL86Ba9#!~$VVBL8ZN zQ)IZ@7RbiV38e{_ST2UueShXzX*a+X;fhBp2i7dkpob!ByBL1bZYk)3BHWHUB6IAk_8Eif=KGc7b` zFlH@bG&eOZVm4!AH8?pj12i`}P9i`d19D|_av*;LbaHiNAn;)A z7c?QZee%e3X^vN9SB{g@}Rpw8d??$RI>m8 From 1897c7d7c169d89964b60d03849ad90739ca18e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 11:08:00 +0800 Subject: [PATCH 092/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/Leftdialogue.js | 2 +- public/react/src/modules/message/js/MessagChat.js | 2 +- public/react/src/modules/message/js/MessagSub.js | 2 +- public/react/src/modules/message/js/MessagePrivate.js | 2 +- public/react/src/modules/message/js/Messagerouting.js | 2 +- public/react/src/modules/message/js/Rightdialogue.js | 2 +- .../modules/message/messagemodal/WriteaprivateletterModal.js | 4 ++-- public/react/src/modules/user/usersInfo/InfosPackage.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index 2e586aa40..aa7b0782b 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -46,7 +46,7 @@ class Leftdialogue extends Component{ { this.props.objeysl&&this.props.objeysl.sender.image_url ? 头像:"" + src={getImageUrl("images/" + this.props.objeysl.sender.image_url)} />:"" }
      diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 377f3cd3a..e7c6dc147 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -639,7 +639,7 @@ class MessagChat extends Component{ return(
      this.Clickedontheuser(item.target)}>
      - +

      diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 88e339b20..091d3ee06 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -121,7 +121,7 @@ class MessagSub extends Component{ return(

      - this.myCome(item)} src={getImageUrl("/images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/> + this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>

      this.myCome(item)}>{item.trigger_user.name} diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index fa5531c80..4e2197d3b 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -135,7 +135,7 @@ class MessagePrivate extends Component{

      this.smyJump(3,item.target.id)}> this.myCome(item)}> - this.myCome(item)} src={getImageUrl("/images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/> + this.myCome(item)} src={getImageUrl("images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/>

      diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 2c649c23c..2e75fe624 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -160,7 +160,7 @@ class Messagerouting extends Component{ { this.props.current_user!== undefined? - + :"" } diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index d177e7c4f..c33b9d7cf 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -46,7 +46,7 @@ class Rightdialogue extends Component{ this.myCome(this.props.objeysl.sender)}> {this.props.objeysl&&this.props.objeysl.sender.image_url ? 头像:"" + src={getImageUrl("images/" + this.props.objeysl.sender.image_url)}/>:"" }

      diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index a89614745..dfa27ba9a 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -283,7 +283,7 @@ class WriteaprivateletterModal extends Component { onFocus={this.myonFocus} onChange={this.setdatafunsval} suffix={ - this.search_message_person()}/> + this.search_message_person()}/> } />
      @@ -296,7 +296,7 @@ class WriteaprivateletterModal extends Component { users.map((item,key)=>{ return(

      this.Getuserinformation(item)}> - 1?1558048024 {item.name}

      diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 7c243faef..272c827f4 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -264,7 +264,7 @@ class InfosPackage extends Component{
      :"":""} - {category=="manage"?item.operation.can_edit===true? + {category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===false?
      From af6bcfdf2b3ef15f671542351c8a88ace789ffa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 12:48:49 +0800 Subject: [PATCH 093/221] b --- public/react/src/modules/courses/Resource/index.js | 2 +- .../react/src/modules/courses/graduation/tasks/index.js | 2 +- .../react/src/modules/courses/graduation/topics/index.js | 6 +++--- .../src/modules/courses/shixunHomework/shixunHomework.js | 2 +- public/react/src/modules/message/js/Leftdialogue.js | 6 ++++-- public/react/src/modules/message/js/MessagChat.js | 9 ++++++--- public/react/src/modules/message/js/Rightdialogue.js | 6 ++++-- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index f83b525ee..d93c30d75 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -950,7 +950,7 @@ class Fileslists extends Component{
      diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index 08639b521..80dceb562 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -767,7 +767,7 @@ class GraduationTasks extends Component{
      diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js index 84b500716..6587ed0c6 100644 --- a/public/react/src/modules/courses/graduation/topics/index.js +++ b/public/react/src/modules/courses/graduation/topics/index.js @@ -28,7 +28,7 @@ class Boards extends Component{ checkAllValue: false, checkBoxValues: [], data:[], - topicList: [], + topicList: undefined, course_public:1, page:1, totalCount:undefined, @@ -412,7 +412,7 @@ onBoardsNew=()=>{ } onPressEnter={this.onPressEnter} searchPlaceholder={"请输入名称进行搜索"} - showSearchInput={topicList.length >= pageSize} + showSearchInput={topicList&&topicList.length >= pageSize} > { @@ -475,7 +475,7 @@ onBoardsNew=()=>{ >
      - ):() + ):(topicList && topicList.length===0?:
      ) } { diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 61133acd2..48c988114 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -1205,7 +1205,7 @@ class ShixunHomework extends Component{
      diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index aa7b0782b..5523ec615 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl,markdownToHTML} from 'educoder'; +import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -51,7 +51,9 @@ class Leftdialogue extends Component{
      -
      + + +
      diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index e7c6dc147..315da2166 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -575,12 +575,12 @@ class MessagChat extends Component{ } { parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? - this.DELETEsetreplyfun(user_id,id)}> + this.DELETEsetreplyfun(user_id,id)}> {/*自己的*/} - :this.DELETEsetreplyfun(user_id,id)}> + :this.DELETEsetreplyfun(user_id,id)}> {/*他人的*/} @@ -650,7 +650,10 @@ class MessagChat extends Component{ {moment(item.send_time).fromNow()}

      -

      + + +

      +

      diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index c33b9d7cf..d53a8a435 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl,markdownToHTML} from 'educoder'; +import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -51,7 +51,9 @@ class Rightdialogue extends Component{
      -
      + + +
      this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除 From fe96a49cde60ef4edb9639fedb855666aa0df6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 13:02:23 +0800 Subject: [PATCH 094/221] b --- public/react/src/modules/message/js/Leftdialogue.js | 4 ++-- public/react/src/modules/message/js/MessagChat.js | 4 ++-- public/react/src/modules/message/js/Rightdialogue.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index 5523ec615..b16746c70 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -51,9 +51,9 @@ class Leftdialogue extends Component{
      - + -
      +
      diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 315da2166..612a87f2b 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -575,12 +575,12 @@ class MessagChat extends Component{ } { parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? - this.DELETEsetreplyfun(user_id,id)}> + this.DELETEsetreplyfun(user_id,id)}> {/*自己的*/} - :this.DELETEsetreplyfun(user_id,id)}> + :this.DELETEsetreplyfun(user_id,id)}> {/*他人的*/} diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index d53a8a435..04c5f966d 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -51,9 +51,9 @@ class Rightdialogue extends Component{
      - + -
      +
      this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除 From 90e19611d26727bf93a6e45e44b9c96532f323a0 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 2 Aug 2019 13:40:34 +0800 Subject: [PATCH 095/221] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index fca143623..913013442 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -406,9 +406,10 @@ class ShixunsController < ApplicationController end end @shixun.update_attributes(shixun_params) + logger.info("##########shixun_info_params: #{shixun_info_params}") + logger.info("##########params[:shixun_info][:evaluate_script]: #{params[:shixun_info][:evaluate_script]}") @shixun.shixun_info.update_attributes(shixun_info_params) @shixun.shixun_schools.delete_all - logger.info("##########scope_partment:###{params[:scope_partment]}") # scope_partment: 高校的名称 if params[:scope_partment].present? arr = [] From 79608b15ec2cb4a0b582416c7cfc858df0a5037a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 13:42:39 +0800 Subject: [PATCH 096/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 2 +- public/stylesheets/educoder/edu-all.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 9f129eabc..1c19799b8 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -577,7 +577,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;} .recently_name{float: left;line-height: 48px;display: block} .recently_item:hover{background-color: #F9F9F9;} /*私信对话框*/ -.private-list{min-height: 660px;max-height: 810px;overflow-y: auto} +.private-list{min-height: 660px;max-height: 810px;overflow-y: auto;overflow-x: hidden;} .private-list .private-part{padding-left:20px;cursor: pointer} .private-part:hover{background-color: #F5F5F5;} .private-part.active{background-color: #F5F5F5;} diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index fa879a9e5..29d389202 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -580,7 +580,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;} .recently_name{float: left;line-height: 48px;display: block} .recently_item:hover{background-color: #F9F9F9;} /*私信对话框*/ -.private-list{min-height: 660px;max-height: 810px;overflow-y: auto} +.private-list{min-height: 660px;max-height: 810px;overflow-y: auto;overflow-x: hidden;} .private-list .private-part{padding-left:20px;cursor: pointer} .private-part:hover{background-color: #F5F5F5;} .private-part.active{background-color: #F5F5F5;} From ae69c3918729dc766dfdec5adacca088a1883319 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 13:50:20 +0800 Subject: [PATCH 097/221] fix library praise thread --- app/views/libraries/show.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/libraries/show.json.jbuilder b/app/views/libraries/show.json.jbuilder index a5181b548..fd20d7bf2 100644 --- a/app/views/libraries/show.json.jbuilder +++ b/app/views/libraries/show.json.jbuilder @@ -38,7 +38,7 @@ json.operation do json.can_deletable manageable json.can_editable manageable - json.user_praised PraiseTread.exists?(user_id: current_user&.id) + json.user_praised library.praise_treads.exists?(user_id: current_user&.id) else json.can_deletable false json.can_editable false From fef63f7786a4a81ead58ea8d1c06c8d838769e8f Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 14:15:02 +0800 Subject: [PATCH 098/221] =?UTF-8?q?=E5=85=B3=E6=B3=A8=20=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/forums/ForumsIndex.css | 3 + public/react/src/modules/forums/MemoDetail.js | 23 ++++++-- public/react/src/modules/forums/PostItem.js | 4 +- .../src/modules/forums/RecommendShixun.js | 4 +- .../react/src/modules/forums/UserSection.js | 55 ++++++++++++++----- .../src/modules/forums/shixun/MemoShixun.css | 2 +- .../src/modules/forums/shixun/MemoShixun.js | 2 +- .../modules/forums/shixun/ShiXunPostItem.js | 2 +- 8 files changed, 68 insertions(+), 27 deletions(-) diff --git a/public/react/src/modules/forums/ForumsIndex.css b/public/react/src/modules/forums/ForumsIndex.css index c4af188eb..22925f882 100644 --- a/public/react/src/modules/forums/ForumsIndex.css +++ b/public/react/src/modules/forums/ForumsIndex.css @@ -5,6 +5,9 @@ .discuss-tab { height: 90px; } + .discuss-tab ._forum_tab a.navItem { + line-height: 2; + } .discuss-tab ._forum_tab a.navItem:hover { color: #4CACFF !important; border-bottom: none !important; diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js index 15e412981..0b53d9507 100644 --- a/public/react/src/modules/forums/MemoDetail.js +++ b/public/react/src/modules/forums/MemoDetail.js @@ -444,7 +444,7 @@ class MemoDetail extends Component { showSnackbar(response.data.message) return; } - if (response.data.status === 1) { + if (response.data.status === 0) { if (!childCommentId) { comment.hidden = !comment.hidden; @@ -677,7 +677,13 @@ class MemoDetail extends Component { memo.isDetailPage = true; // TODO 图片上传地址 return ( -
      {/* fl with100 */} +
      {/* fl with100 */} + + {memo.reward} } { _current_user && (_current_user.admin === true || _current_user.user_id === author_info.user_id) && -
      +
        { _current_user.admin === true && @@ -713,13 +719,20 @@ class MemoDetail extends Component {
      } + || _current_user.user_id === author_info.user_id) ? '': 'no_mr'} `} to="/forums" + style={{ marginRight: '10px'}} + > 返回
      {moment(memo.time).fromNow()} 发布 -
      +
      + { _current_user.admin && diff --git a/public/react/src/modules/forums/PostItem.js b/public/react/src/modules/forums/PostItem.js index a56badb80..02d9fa273 100644 --- a/public/react/src/modules/forums/PostItem.js +++ b/public/react/src/modules/forums/PostItem.js @@ -29,7 +29,7 @@ class PostItem extends Component { 用户头像
      -

      +

      {/* target="_blank" */} @@ -55,7 +55,7 @@ class PostItem extends Component { {/*C++*/} -

      +

      {/* data-tip-down="回复数" {memo.replies_count} {memo.praise_count}*/} {memo.replies_count ? diff --git a/public/react/src/modules/forums/RecommendShixun.js b/public/react/src/modules/forums/RecommendShixun.js index 9ebaf3cae..aa9dec952 100644 --- a/public/react/src/modules/forums/RecommendShixun.js +++ b/public/react/src/modules/forums/RecommendShixun.js @@ -33,7 +33,7 @@ class RecommendShixun extends Component {

      + className="color-grey-6 task-hide mb10 recomment-name" style={{maxWidth:'147px'}}> {_shixun.name}

      {_shixun.myshixuns_count} 人学习

      @@ -50,7 +50,7 @@ class RecommendShixun extends Component { // 参考 TPMShixunDiscuss.js 推荐实训， 页面路径：http://localhost:3007/shixuns/uznmbg54/shixun_discuss return (
      -

      推荐实训

      +

      推荐实训

      {this.showRecommandShixun()}
      diff --git a/public/react/src/modules/forums/UserSection.js b/public/react/src/modules/forums/UserSection.js index 4e8bdb45c..8376a2369 100644 --- a/public/react/src/modules/forums/UserSection.js +++ b/public/react/src/modules/forums/UserSection.js @@ -21,21 +21,46 @@ class UserSection extends Component { const { author_info } = this.props /*http://localhost:3000/api/v1/users/155/watch?object_id=156&object_type=user*/ - const focusUrl = `/api/v1/users/${author_info.user_id}/${this.props.author_info.watched ? 'unwatch' : 'watch'}?object_id=${author_info.user_id}&object_type=user` - - axios.get(focusUrl,{ - }) - .then((response) => { - const status = response.data.status; - console.log(status); - if(status == 1){ - const new_author_info = Object.assign({}, this.props.author_info) - new_author_info.watched = !new_author_info.watched - this.props.initForumState({author_info: new_author_info}) - } - }).catch((error) => { - console.log(error) - }) + // const focusUrl = `/api/v1/users/${author_info.user_id}/${this.props.author_info.watched ? 'unwatch' : 'watch'}?object_id=${author_info.user_id}&object_type=user` + + // axios.get(focusUrl,{ + // }) + // .then((response) => { + // const status = response.data.status; + // console.log(status); + // if(status == 1){ + // const new_author_info = Object.assign({}, this.props.author_info) + // new_author_info.watched = !new_author_info.watched + // this.props.initForumState({author_info: new_author_info}) + // } + // }).catch((error) => { + // console.log(error) + // }) + + let url=`/users/${author_info.user_id}/watch.json`; + // 取消关注 + if(author_info.watched){ + axios.delete(url).then((result)=>{ + if(result){ + const new_author_info = Object.assign({}, this.props.author_info) + new_author_info.watched = !new_author_info.watched + this.props.initForumState({author_info: new_author_info}) + } + }).catch((error)=>{ + console.log(error) + }) + }else{ + // 关注 + axios.post(url).then((result)=>{ + if(result){ + const new_author_info = Object.assign({}, this.props.author_info) + new_author_info.watched = !new_author_info.watched + this.props.initForumState({author_info: new_author_info}) + } + }).catch((error)=>{ + console.log(error); + }) + } } diff --git a/public/react/src/modules/forums/shixun/MemoShixun.css b/public/react/src/modules/forums/shixun/MemoShixun.css index c76000ccf..c1421e02f 100644 --- a/public/react/src/modules/forums/shixun/MemoShixun.css +++ b/public/react/src/modules/forums/shixun/MemoShixun.css @@ -11,7 +11,7 @@ height:48px; width: 48px; float: left; - margin-top: 7px; + margin-top: 4px; } .shixunReply{ max-width: 604px; diff --git a/public/react/src/modules/forums/shixun/MemoShixun.js b/public/react/src/modules/forums/shixun/MemoShixun.js index f82ed2e34..664b844ac 100644 --- a/public/react/src/modules/forums/shixun/MemoShixun.js +++ b/public/react/src/modules/forums/shixun/MemoShixun.js @@ -83,7 +83,7 @@ class MemoShixun extends Component { } const stringifid = queryString.stringify(paramsObject); - const url = `/discusses.json?${stringifid}` // /${challenge.identifier}/star + const url = `/discusses/forum_discusses.json?${stringifid}` // /${challenge.identifier}/star // 获取memo list this.setState({ diff --git a/public/react/src/modules/forums/shixun/ShiXunPostItem.js b/public/react/src/modules/forums/shixun/ShiXunPostItem.js index 1f8c0d379..961e16ff1 100644 --- a/public/react/src/modules/forums/shixun/ShiXunPostItem.js +++ b/public/react/src/modules/forums/shixun/ShiXunPostItem.js @@ -39,7 +39,7 @@ class ShiXunPostItem extends Component width="48px" height="48px" className="radius"/>
      -
      +

      {memo.subject}

      From 024c24665b8fdc66b4c7eb32fc06305f05cc8238 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 2 Aug 2019 14:22:06 +0800 Subject: [PATCH 099/221] =?UTF-8?q?mp3=E3=80=81mp4=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/picture_display.json.jbuilder | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder index 2bc88fdf4..34a22ef12 100644 --- a/app/views/games/picture_display.json.jbuilder +++ b/app/views/games/picture_display.json.jbuilder @@ -25,25 +25,30 @@ elsif @type == "txt" elsif @type =="qrcode" json.qrcode_str @qrcode_str elsif @type == "mp3" || @type == "mp4" + # if @type == "mp4" + # json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] + # json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] + # json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] + # else + # json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] + # json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + # json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + # end + json.orignal_file do + json.array! @orignal_picture do |file| + json.file_url attachment_show_users_path(:file_name => file, :path => @original_path) + end + end + json.user_file do + json.array! @user_picture do |file| + json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) + end + end if @type == "mp4" - json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}] - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] else - json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}] - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] end - # json.orignal_file do - # json.array! @orignal_picture do |file| - # json.file_url attachment_show_users_path(:file_name => file, :path => @original_path) - # end - # end - # json.user_file do - # json.array! @user_picture do |file| - # json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) - # end - # end # json.answer_file do # json.array! @answer_picture do |file| # json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path) From f20341088b447b7aedf4cfad31d8a802d67b58ca Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 2 Aug 2019 14:28:09 +0800 Subject: [PATCH 100/221] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/games/picture_display.json.jbuilder | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder index 34a22ef12..838cfeda0 100644 --- a/app/views/games/picture_display.json.jbuilder +++ b/app/views/games/picture_display.json.jbuilder @@ -39,19 +39,19 @@ elsif @type == "mp3" || @type == "mp4" json.file_url attachment_show_users_path(:file_name => file, :path => @original_path) end end - json.user_file do - json.array! @user_picture do |file| - json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) - end - end + # json.user_file do + # json.array! @user_picture do |file| + # json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) + # end + # end if @type == "mp4" - json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] else - json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + end + json.answer_file do + json.array! @answer_picture do |file| + json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path) + end end - # json.answer_file do - # json.array! @answer_picture do |file| - # json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path) - # end - # end end \ No newline at end of file From b3c91e54db06015842aa0403be0fabe342338619 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 14:30:30 +0800 Subject: [PATCH 101/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dump.rdb | Bin 668 -> 764 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index 4687968bdc78f7e61538606ad77386166339f236..63b8abb0ac1774c1ce21048cfe8c89e5356d4737 100644 GIT binary patch delta 347 zcmWN^JugF17y#gVdRwhZ2U8=_v~CQD!}+}ToNkve*hIu6oO{k&A=-+5EC{h$(8R>x z7ud{L{0*s&egV?(Y|nk>H*-zKZ=aX9zjK`yI9!MN+l#x2=Sg$5P%eykUOw%4zURe1 zCxJaQtyWMCV%y&D!df#aR;%kB=s@hu(apo&G>sT_ARVR}3>H8fHY_sOS?;VgiO-ns z&7iyU-LInMN=rkuOt>~8)WiUlM7YY;q&)`H2Df9{L6yo-L{u^^7KG$VMU{rvFx`)_ za#o8_oehVm|Ab1Q5>B)WF-Xp_Fj`^7O${?!OSGGsMXc6;MMbDZ#t6}SN8_b_0gX}~ zEeIYGM*nwF_BGQaKq!^!jiu%m2P^)_MkhG{+pcVRbO7nRpg;s;3K*Hr=M+nnkdbgp UpMz|==TanhaJqCkF}3;l2M<1EBme*a delta 237 zcmVMLtXj^b#rB8Ep26O!oXsYK`by2L<|OVRLgLIwC=1bZK^FN^fF1I#G3Hb!9tQooAB|0v-lpGXps?W|JrZmQ8@{ z7G^hLVKg*3WHU7}Vqr68H)T0uGc+<`Ad4Jha%Ew3Wn^DrbRs%2H8wOiF*PwWH!d_Y zHZU?VAZ`F|VRqmO9|$=zIWRbV{{8`zYXT}S;za=lQ*~l$Wn*+8R{$~MWdas7F=a3` nGBP-2GB9B Date: Fri, 2 Aug 2019 14:36:37 +0800 Subject: [PATCH 102/221] require login for project package show api --- app/controllers/project_packages_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/project_packages_controller.rb b/app/controllers/project_packages_controller.rb index de896c920..3cc7e79cb 100644 --- a/app/controllers/project_packages_controller.rb +++ b/app/controllers/project_packages_controller.rb @@ -1,7 +1,7 @@ class ProjectPackagesController < ApplicationController include PaginateHelper - before_action :require_login, :check_auth, only: %i[create update destroy] + before_action :require_login, :check_auth, only: %i[show create update destroy] helper_method :current_package, :package_manageable? From a99771f90d8d9a7b4018de144ad002504855b6d1 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 14:41:26 +0800 Subject: [PATCH 103/221] =?UTF-8?q?=E5=8E=9F=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/common/components/media/Clappr.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/react/src/common/components/media/Clappr.js b/public/react/src/common/components/media/Clappr.js index 2c4d89e92..312ea9007 100644 --- a/public/react/src/common/components/media/Clappr.js +++ b/public/react/src/common/components/media/Clappr.js @@ -90,12 +90,19 @@ class Clappr extends Component{ {/* https://github.com/CookPete/react-player/issues/686 */} + {/*
      */} + + {/* 原生 */} + {/* { type == 'mp3' ? + : } */}       ) } From e277b9db33f8af6fdc41f4b0c8767fb54974d583 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 14:44:03 +0800 Subject: [PATCH 104/221] require login for tiding list api --- app/controllers/tidings_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/tidings_controller.rb b/app/controllers/tidings_controller.rb index 795010b3f..9324b2755 100644 --- a/app/controllers/tidings_controller.rb +++ b/app/controllers/tidings_controller.rb @@ -1,6 +1,7 @@ class TidingsController < ApplicationController include PaginateHelper + before_action :require_login after_action :update_onclick_time!, only: [:index] def index From 16388a95305cb4642993ebcc5e3462c59bfca5a2 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 14:57:45 +0800 Subject: [PATCH 105/221] modify tiding list api --- app/views/tidings/_tiding.json.jbuilder | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/tidings/_tiding.json.jbuilder b/app/views/tidings/_tiding.json.jbuilder index cdaa48299..4a392edfd 100644 --- a/app/views/tidings/_tiding.json.jbuilder +++ b/app/views/tidings/_tiding.json.jbuilder @@ -1,4 +1,5 @@ -json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type, :parent_container_id, :parent_container_type +json.extract! tiding, :id, :status, :viewed, :user_id, :tiding_type, :container_id, :container_type, + :parent_container_id, :parent_container_type, :belong_container_id, :belong_container_type json.content tiding.content json.identifier tiding.identifier From ea9f8adb1bfcd82a6e015c7fbb894de592e3074d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:16:34 +0800 Subject: [PATCH 106/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndexNEITaskDetails.js | 32 +++++++++++-------- public/react/src/modules/tpm/TPMBanner.js | 11 +++++-- .../modules/tpm/TPMsettings/TPMsettings.js | 16 ++++++++-- public/stylesheets/educoder/edu-all.css | 4 +-- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 13bec2dd9..2eee9d882 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -55,9 +55,11 @@ class PackageIndexNEITaskDetails extends Component { getdatas=()=>{ let url =`/project_packages/${this.props.match.params.id}.json`; axios.get(url).then((response) => { - this.setState({ - data:response.data - }) + if(response.data.status!=401&&response.data.status!=403&&response.data.status!=408&&response.data.status!=409)[ + this.setState({ + data:response.data + }) + ] }).catch((error) => { console.log(error); @@ -236,8 +238,12 @@ class PackageIndexNEITaskDetails extends Component { render() { let {overtype,data}=this.state; - // console.log(data&&data.creator.login) - console.log(data) + // console.log(data&&data.creator.id) + let datalogin=data&&data.creator.id; + let userlogin=this.props.current_user&&this.props.current_user.user_id; + + console.log(datalogin===userlogin) + // console.log(this.props.current_user&&this.props.current_user.user_id) return ( data===undefined?"":
      @@ -258,11 +264,9 @@ class PackageIndexNEITaskDetails extends Component { {data&&data.title} - 返回 + 返回
      - -

      - +

      @@ -289,12 +293,12 @@ class PackageIndexNEITaskDetails extends Component { {data&&data.creator.name}
      - {data&&data.creator.login===this.props.current_user&&this.props.current_user.login?"":
      - {overtype===false? 头像联系TA: - 头像 头像联系TA: + 头像联系TA}
      }
      @@ -304,7 +308,7 @@ class PackageIndexNEITaskDetails extends Component {
      -
      +
      :""}

      {item.name}

      - {this.props.current_user&&this.props.current_user.login!=item.login? + {this.props.current_user&&this.props.current_user.login!=item.login? 头像联系TA :""}
      diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 33dc7fc5b..6e73b754a 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -692,7 +692,7 @@ class TPMBanner extends Component {
      { - startbtn === false ? + startbtn === false && shixunsDetails.shixun_status != -1 ? 发送至 @@ -913,7 +913,12 @@ class TPMBanner extends Component { 已关闭 } - {this.props.identity < 8?
      已删除 + } + + + {this.props.identity < 8&&shixunsDetails.shixun_status != -1 ?
      { + + if(this.state.status===-1){ + this.props.showSnackbar("该实训已被删除，保存失败！"); + return + } + let { name, choice_main_type, choice_small_type, choice_standard_scripts, scope_partment, choice_standard_scriptssum, evaluate_script, webssh, use_scope, trainee, can_copy, task_pass, test_set_permission, hide_code, code_hidden, forbid_copy, vnc,multi_webssh, @@ -739,13 +745,15 @@ export default class TPMsettings extends Component { return v1 }); - let operateauthority=this.props.identity<5&&this.state.status==0||this.props.identity===1&&this.state.status==2||this.props.identity===1&&this.state.status==1; + // let operateauthority= + // this.props.identity===1?true:this.props.identity<5&&this.state.status==0?true:false; + // this.props.identity<5&&this.state.status==0||this.props.identity===1&&this.state.status==2||this.props.identity===1&&this.state.status==1; const description_editormd = this.description_editormd.getValue(); let evaluate_script_editormd; - if(operateauthority===true){ + if(this.state.status==0||this.state.status==1||this.state.status==2&&this.props.identity===1){ // evaluate_script_editormd = this.evaluate_script_editormd.getValue(); evaluate_script_editormd = shixunmemoMDvalue }else{ @@ -753,6 +761,7 @@ export default class TPMsettings extends Component { } + if (name === "") { this.setState({ shixunnametype: true @@ -826,6 +835,7 @@ export default class TPMsettings extends Component { if(newmulti_webssh===null){ newmulti_webssh=false } + //exec_time: exec_time, let Url = `/shixuns/` + id + `.json`; let data = { @@ -1625,8 +1635,8 @@ export default class TPMsettings extends Component { options={ { selectOnLineNumbers: true }} - onChange={operateauthority===true?this.getshixunmemoMDvalue:""} + // onChange={this.getshixunmemoMDvalue} />
      diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index ef9f74870..1889df4a5 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3122,7 +3122,7 @@ a.singlepublishtwo{ height: 40px; } .project-package-item .item-head-title { - max-width: 700px; + max-width: 650px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -3213,7 +3213,7 @@ a.singlepublishtwo{ font-size: 20px; } .project-package-item.with-operator:hover .item-head-title { - max-width: 600px; + max-width: 650px; } .list-count { From 18f9a5d215916389884cd59c885ae27829e07c57 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 15:18:37 +0800 Subject: [PATCH 107/221] modify tiding content --- config/locales/tidings/zh-CN.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml index 07e3c2f6d..21d2d0879 100644 --- a/config/locales/tidings/zh-CN.yml +++ b/config/locales/tidings/zh-CN.yml @@ -6,9 +6,9 @@ "2_end": "申请职业认证：%s %s" System: "1_1_end": "你提交的实名认证申请，审核已通过" - "1_2_end": "你提交的实名认证申请，审核未通过    原因：%{reason}" + "1_2_end": "你提交的实名认证申请，审核未通过
      原因：%{reason}" "2_1_end": "你提交的职业认证申请，审核已通过" - "2_2_end": "你提交的职业认证申请，审核未通过    原因：%{reason}" + "2_2_end": "你提交的职业认证申请，审核未通过
      原因：%{reason}" CancelUserAuthentication_end: "取消了你的实名认证：%s %s" CancelUserProCertification_end: "取消了你的实名认证：%s %s" JoinCourse: @@ -28,31 +28,31 @@ Apply_end: "申请添加二级单位：%s（%s）" System: "1_end": "你提交的添加二级单位申请：%s（%s），审核已通过" - "2_false_end": "你提交的添加二级单位申请：%s（%s），审核未通过    原因：%{reason}" + "2_false_end": "你提交的添加二级单位申请：%s（%s），审核未通过
      原因：%{reason}" "2_true_end": "你提交的添加二级单位申请：%s（%s），审核未通过" "3_end": "你提交的添加二级单位申请：%s（%s），已被更改为%{reason}" ApplyAddSchools: Apply_end: "申请添加单位：%s" System: "1_end": "你提交的添加单位申请：%{name}，审核已通过" - "2_reason_end": "你提交的添加单位申请：%{name}，审核未通过    原因：%{reason}" + "2_reason_end": "你提交的添加单位申请：%{name}，审核未通过
      原因：%{reason}" "2_no_reason_end": "你提交的添加单位申请：%{name}，审核未通过" "3_end": "你提交的添加单位申请：%{name}，已被更改为：%{reason}" ApplyAction: ApplyShixun: System: "1_end": "你提交的实训发布申请：%{name}，审核已通过" - "2_end": "你提交的实训发布申请：%{name}，审核未通过    原因：%{reason}" + "2_end": "你提交的实训发布申请：%{name}，审核未通过
      原因：%{reason}" Apply_end: "申请发布实训：%{name}" ApplySubject: System: "1_end": "你提交的实训课程发布申请：%{name}，审核已通过" - "2_end": "你提交的实训课程发布申请：%{name}，审核未通过    原因：%{reason}" + "2_end": "你提交的实训课程发布申请：%{name}，审核未通过
      原因：%{reason}" Apply_end: "申请发布实训课程：%{name}" TrialAuthorization: System: "1_end": "你提交的试用授权申请，审核已通过" - "2_end": "你提交的试用授权申请，审核未通过    原因：%{reason}" + "2_end": "你提交的试用授权申请，审核未通过
      原因：%{reason}" Apply_end: "提交了试用授权申请" Course_end: "成功创建了课堂：%s" Shixun_end: "成功创建了实训：%s" @@ -174,7 +174,7 @@ GraduationWorkScore_end: "评阅了你的作品：%s" HomeworkCommon: AnonymousComment_end: "开启了作业匿评：%{name}" - AnonymousCommentFail_end: "开启作业匿评失败：%{name}，
      原因：%{reason}" + AnonymousCommentFail_end: "开启作业匿评失败：%{name}
      原因：%{reason}" AnonymousAppeal_end: "开启了匿评申诉：%{name}" HomeworkPublish_end: "发布了作业：%{name}" NearlyEnd_end: "作业的提交截止时间快到啦：%{name}" @@ -203,12 +203,12 @@ Apply_end: "申请发布教学案例：%s" System: 1_end: "你提交的发布教学案例申请：%s，审核已通过" - 2_end: "你提交的发布教学案例申请：%s，审核未通过，原因：%{reason}" + 2_end: "你提交的发布教学案例申请：%s，审核未通过
      原因：%{reason}" ProjectPackage: Apply_end: "申请发布众包需求：%s" System: 1_end: "你提交的众包需求申请：%s，审核已通过" - 2_end: "你提交的众包需求申请：%s，审核未通过，原因：%{reason}" + 2_end: "你提交的众包需求申请：%s，审核未通过
      原因：%{reason}" Created_end: "你创建了众包需求：%s" Destroyed_end: "你删除了众包需求：%s" Bidding_end: "应征了你发布的众包任务：%s" From e523282877aa004a9a46ecd216ca6595e4b4df6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:38:43 +0800 Subject: [PATCH 108/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 20 ++++++------ public/react/src/modules/login/LoginDialog.js | 32 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 97cfa8eeb..d97c7a223 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -20,16 +20,16 @@ function locationurl(list){ // TODO 开发期多个身份切换 let debugType ="" -if (isDev) { - const _search = window.location.search; - let parsed = {}; - if (_search) { - parsed = queryString.parse(_search); - } - debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : - window.location.search.indexOf('debug=s') != -1 ? 'student' : - window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -} +// if (isDev) { +// const _search = window.location.search; +// let parsed = {}; +// if (_search) { +// parsed = queryString.parse(_search); +// } +// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : +// window.location.search.indexOf('debug=s') != -1 ? 'student' : +// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +// } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 58cd9b7fb..3bc77c52e 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -398,23 +398,23 @@ class LoginDialog extends Component { }); } handleDialogClose = () => { - // if(this.props.match===undefined){ - // window.location.href="/"; - // }else if(this.props.match.path==="/"){ - // this.setState({ - // isRender: false - // }) - // }else{ - // window.location.href="/"; - // } - this.setState({ - isRender: false - }) - try { - this.props.Modifyloginvalue(); - }catch (e) { - + + if(this.props.match===undefined){ + window.location.href="/"; + }else{ + this.setState({ + isRender: false + }) + this.props.Modifyloginvalue(); } + // this.setState({ + // isRender: false + // }) + // try { + // this.props.Modifyloginvalue(); + // }catch (e) { + // + // } } loginEDU=()=>{ From ab8cd784f6dc91d470f2c648cd2a7d36e850efdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:39:09 +0800 Subject: [PATCH 109/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/AppConfig.js | 20 +++++++++---------- public/react/src/modules/login/LoginDialog.js | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index d97c7a223..97cfa8eeb 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -20,16 +20,16 @@ function locationurl(list){ // TODO 开发期多个身份切换 let debugType ="" -// if (isDev) { -// const _search = window.location.search; -// let parsed = {}; -// if (_search) { -// parsed = queryString.parse(_search); -// } -// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : -// window.location.search.indexOf('debug=s') != -1 ? 'student' : -// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -// } +if (isDev) { + const _search = window.location.search; + let parsed = {}; + if (_search) { + parsed = queryString.parse(_search); + } + debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : + window.location.search.indexOf('debug=s') != -1 ? 'student' : + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +} window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 3bc77c52e..f4f8a3f1c 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -398,7 +398,7 @@ class LoginDialog extends Component { }); } handleDialogClose = () => { - + if(this.props.match===undefined){ window.location.href="/"; }else{ From 5333e28f0030c9d34158ed1c6ac99bedef8270cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:56:30 +0800 Subject: [PATCH 110/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndex/PackageConcent.js | 15 +++++++++++++-- .../PackageIndexNEITaskDetails.js | 2 +- .../projectPackages/ProjectPackageIndex.js | 3 ++- .../modules/projectPackages/packageconcnet.css | 4 ++-- .../src/modules/user/usersInfo/InfosPackage.js | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index ea9de38fe..1950d7ed8 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -185,6 +185,17 @@ class PackageConcent extends Component { }) } + onChangePagelist=(pageNum)=> { + + this.setState({ + page: pageNum + }) + let {category, keyword, sort_by, sort_direction} = this.state; + this.setdatas(category, keyword, sort_by, sort_direction, pageNum) + + } + + render() { let {data,page,category,sort_by,sort_direction,project_packages, isRender,AccountProfiletype @@ -286,7 +297,7 @@ class PackageConcent extends Component {
      - this.onReleaseRequirements("/crowdsourcing/"+item.id)} title={item.title} >{item.title} @@ -346,7 +357,7 @@ class PackageConcent extends Component {
      :""}
      - +
      diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 2eee9d882..2ad696538 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -311,7 +311,7 @@ class PackageIndexNEITaskDetails extends Component {
      - {data&&data.title} diff --git a/public/react/src/modules/projectPackages/ProjectPackageIndex.js b/public/react/src/modules/projectPackages/ProjectPackageIndex.js index 097e012e0..29d4efa17 100644 --- a/public/react/src/modules/projectPackages/ProjectPackageIndex.js +++ b/public/react/src/modules/projectPackages/ProjectPackageIndex.js @@ -36,7 +36,8 @@ class ProjectPackageIndex extends Component { } render() { - +console.log(this.props) + console.log(this.state) return (
      diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 2fc8a8ebb..f7ee4cc06 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -31,8 +31,8 @@ color:#8F8F8F !important; } -.maxwidth700{ - max-width: 700px; +.maxwidth670{ + max-width: 670px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 272c827f4..6bd11a926 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -138,6 +138,7 @@ class InfosPackage extends Component{ axios.delete(url).then((response) => { if (response.data.status == 0) { this.getCourses(cate,status,1); + this.cancelProject; } }) .catch(function (error) { From 15f28ffa9d71c6458267f70f9b5bedb3cd946114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:58:49 +0800 Subject: [PATCH 111/221] b --- public/react/src/modules/user/usersInfo/InfosPackage.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 6bd11a926..36175295b 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -138,13 +138,12 @@ class InfosPackage extends Component{ axios.delete(url).then((response) => { if (response.data.status == 0) { this.getCourses(cate,status,1); - this.cancelProject; } }) .catch(function (error) { console.log(error); }); - + this.cancelProject; } render(){ let{ From ece14919f78d1934ac16f4144d804c463db8b769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 16:05:46 +0800 Subject: [PATCH 112/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/projectPackages/PackageIndex/PackageConcent.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index 1950d7ed8..ba8655d9b 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -18,7 +18,7 @@ let categorylist=[ {name:"云计算和大数据",value:"cloud_compute_and_big_data"}, {name:"人工智能",value:"ai"}, {name:"运维与测试",value:"devops_and_test"}, - {name:"其他",value:"other"}, + {name:"其它",value:"other"}, ] // function setcategorylist(val){ @@ -30,7 +30,6 @@ function setcategorylist(val){ } } ) - return vals } From 7a1d8064caa7ca79d95b27cd37eca92911922684 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 16:06:25 +0800 Subject: [PATCH 113/221] resize --- public/react/public/js/js_min_all.js | 2 ++ .../react/src/modules/page/main/ActionView.js | 20 +++++++++++++++++-- .../src/modules/page/tpiPageForMobile.css | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/public/react/public/js/js_min_all.js b/public/react/public/js/js_min_all.js index dfead438a..63c1207af 100755 --- a/public/react/public/js/js_min_all.js +++ b/public/react/public/js/js_min_all.js @@ -209,6 +209,7 @@ $(function(){ // window resize $(window).on('resize', function() { + window._tpiWidthResize && window._tpiWidthResize() $('#games_repository_contents .CodeMirror.cm-s-railscasts').css("height", $("#games_repository_contents").height() - repositoryTabHeight); }) @@ -1221,6 +1222,7 @@ $(function(){ // 这里重新加一次事件监听，不在原有事件的基 ); doc.live("mousemove", function(e) { if (dragging === true && lab == dragDom) { + window._tpiWidthResize && window._tpiWidthResize() // React 组件中需要resize，搜索该引用可以找到初始化的位置 window._currentChildcommentMDEditor && window._currentChildcommentMDEditor.resize() } diff --git a/public/react/src/modules/page/main/ActionView.js b/public/react/src/modules/page/main/ActionView.js index d8638efb8..1e587bfbe 100644 --- a/public/react/src/modules/page/main/ActionView.js +++ b/public/react/src/modules/page/main/ActionView.js @@ -51,6 +51,13 @@ class ActionView extends Component { componentDidMount() { // request + window._tpiWidthResize = () => { + if (window.$('#actionView').width() < 580) { + window.$('.time_limit').hide() + } else { + window.$('.time_limit').show() + } + } } showWebDisplay(challenge) { @@ -59,10 +66,17 @@ class ActionView extends Component { /*耗时：0 天 3 小时 11 分钟 57 秒 */ render() { const { onRunCodeTest, onShowPrevStage, onShowNextStage, gameBuilding - , game, classes, st, shixun, record, challenge } = this.props; + , game, classes, st, shixun, record, challenge, time_limit } = this.props; return (
      + + {!!time_limit && + {`本关最大执行时间：${time_limit}秒`}} {!gameBuilding && record ? { record } 秒 @@ -73,7 +87,9 @@ class ActionView extends Component { {/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/} diff --git a/public/react/src/modules/page/tpiPageForMobile.css b/public/react/src/modules/page/tpiPageForMobile.css index 3f1c9364d..c30f40636 100644 --- a/public/react/src/modules/page/tpiPageForMobile.css +++ b/public/react/src/modules/page/tpiPageForMobile.css @@ -14,7 +14,7 @@ min-width: 280px; } - #time-consuming span{ + #time-consuming .time_limit { display: none; } .actionViewfirstButton { From 16109dbe9fb3d958aba3c94b27936d02f5f433b0 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 16:13:35 +0800 Subject: [PATCH 114/221] modify tiding list apu --- app/views/tidings/_tiding.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/tidings/_tiding.json.jbuilder b/app/views/tidings/_tiding.json.jbuilder index 4a392edfd..c00670433 100644 --- a/app/views/tidings/_tiding.json.jbuilder +++ b/app/views/tidings/_tiding.json.jbuilder @@ -4,6 +4,7 @@ json.content tiding.content json.identifier tiding.identifier json.auth_type tiding.container_type == 'ApplyUserAuthentication' ? tiding.container.auth_type : nil +json.homework_type tiding.container_type == 'HomeworkCommon' ? tiding.container.homework_type : nil json.time tiding.how_long_time json.new_tiding tiding.unread?(@onclick_time) From 531cdbf4ab22d87d69532de311ecb7c37dbb5635 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 16:19:16 +0800 Subject: [PATCH 115/221] visibility --- public/react/src/modules/page/main/ActionView.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/page/main/ActionView.js b/public/react/src/modules/page/main/ActionView.js index 1e587bfbe..0a1faa7ea 100644 --- a/public/react/src/modules/page/main/ActionView.js +++ b/public/react/src/modules/page/main/ActionView.js @@ -87,8 +87,9 @@ class ActionView extends Component { {/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/} From 983246dd8360d630dfb94558274f17efa9c8253b Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 16:43:33 +0800 Subject: [PATCH 116/221] none data --- public/react/src/modules/courses/boards/index.js | 2 +- public/react/src/modules/courses/members/studentsList.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js index 94c8c4c00..db3232b23 100644 --- a/public/react/src/modules/courses/boards/index.js +++ b/public/react/src/modules/courses/boards/index.js @@ -440,7 +440,7 @@ class Boards extends Component{
      { - ( !messages || messages.length == 0 ) && + ( !this.state.isSpin && (!messages || messages.length == 0) ) && } {/* { haveMore &&

      diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index d7c4cb85b..c3dc2c6ab 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -677,9 +677,9 @@ class studentsList extends Component{

      - + {!this.state.isSpin &&
      -       +       }
      From 9f039a49aa9b113e9e090bda5d874f02f2951a65 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 16:45:17 +0800 Subject: [PATCH 117/221] add delete course tiding --- app/controllers/courses_controller.rb | 2 ++ app/decorators/tiding_decorator.rb | 6 +++++- config/locales/tidings/zh-CN.yml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index abc3e4856..9f62a03bb 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -234,6 +234,8 @@ class CoursesController < ApplicationController def destroy if @course.is_delete == 0 @course.delete! + Tiding.create!(user_id: @course.tea_id, trigger_user_id: 1, container_id: @course.id, + container_type: 'Course', tiding_type: 'Delete', extra: @course.name) normal_status(0, "成功") else normal_status(-1, "课堂已删除，无需重复操作") diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index 677812217..c7d914089 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -126,7 +126,11 @@ module TidingDecorator end def course_content - I18n.t(locale_format) % container.name + if tiding_type == 'Delete' + I18n.t(locale_format(tiding_type)) % extra + else + I18n.t(locale_format) % container.name + end end def shixun_content diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml index 21d2d0879..e00407b28 100644 --- a/config/locales/tidings/zh-CN.yml +++ b/config/locales/tidings/zh-CN.yml @@ -55,6 +55,8 @@ "2_end": "你提交的试用授权申请，审核未通过
      原因：%{reason}" Apply_end: "提交了试用授权申请" Course_end: "成功创建了课堂：%s" + Course: + Delete_end: "你删除了课堂：%s" Shixun_end: "成功创建了实训：%s" Subject_end: "成功创建了实训课程：%s" ArchiveCourse_end: "你的课堂已经归档：%s" From b5e9c29b772c41ea8686349205d746ee939fddc6 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 16:47:25 +0800 Subject: [PATCH 118/221] modify user update account api check --- app/forms/users/update_account_form.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/forms/users/update_account_form.rb b/app/forms/users/update_account_form.rb index d82459fcf..16c3c8013 100644 --- a/app/forms/users/update_account_form.rb +++ b/app/forms/users/update_account_form.rb @@ -5,8 +5,8 @@ class Users::UpdateAccountForm attr_accessor :nickname, :name, :show_realname, :gender, :location, :location_city, :identity, :student_id, :technical_title, :school_id, :department_id - validates :nickname, presence: true - validates :name, presence: true + validates :nickname, presence: true, length: { maximum: 20 } + validates :name, presence: true, length: { maximum: 10 } validates :gender, presence: true, numericality: { only_integer: true }, inclusion: { in: [0, 1] } validates :location, presence: true validates :location_city, presence: true From 9dd1999feecaa3c22ce45746bd46ec0c5d2e9a14 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 16:48:59 +0800 Subject: [PATCH 119/221] watch={false} --- public/react/src/modules/courses/boards/BoardsNew.js | 2 +- public/react/src/modules/courses/busyWork/NewWork.js | 4 ++-- public/react/src/modules/courses/exercise/new/JudgeEditor.js | 2 +- public/react/src/modules/courses/exercise/new/MainEditor.js | 4 ++-- .../react/src/modules/courses/exercise/new/NullChildEditor.js | 2 +- public/react/src/modules/courses/exercise/new/NullEditor.js | 2 +- public/react/src/modules/courses/exercise/new/ShixunEditor.js | 2 +- public/react/src/modules/courses/exercise/new/SingleEditor.js | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index 7c48d372b..56dddff7c 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -416,7 +416,7 @@ class BoardsNew extends Component{ max: 10000, message: '最大限制为10000个字符', }], })( - )} diff --git a/public/react/src/modules/courses/busyWork/NewWork.js b/public/react/src/modules/courses/busyWork/NewWork.js index 164b3f61e..410d12a3f 100644 --- a/public/react/src/modules/courses/busyWork/NewWork.js +++ b/public/react/src/modules/courses/busyWork/NewWork.js @@ -446,7 +446,7 @@ class NewWork extends Component{ }], })( + className="courseMessageMD" initValue={this.state.description}> )} } @@ -508,7 +508,7 @@ class NewWork extends Component{ required: false }], })( - )} diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js index 586d77ed0..50224e125 100644 --- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js +++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js @@ -187,7 +187,7 @@ class SingleEditor extends Component{ （客观题，由系统自动评分，请设置标准答案）

      - this.setState({ question_title: val})} ref="titleEditor" > diff --git a/public/react/src/modules/courses/exercise/new/MainEditor.js b/public/react/src/modules/courses/exercise/new/MainEditor.js index e9dd3b105..9a3eda659 100644 --- a/public/react/src/modules/courses/exercise/new/MainEditor.js +++ b/public/react/src/modules/courses/exercise/new/MainEditor.js @@ -152,14 +152,14 @@ class MainEditor extends Component{ （主观题，未作答的情况下自动评为零分）

      - this.setState({ question_title: val})} noStorage={true} ref="titleEditor" >
      参考答案
      - this.setState({ standard_answers: [val]})} noStorage={true} > diff --git a/public/react/src/modules/courses/exercise/new/NullChildEditor.js b/public/react/src/modules/courses/exercise/new/NullChildEditor.js index 9e50e2ad3..5146f05ec 100644 --- a/public/react/src/modules/courses/exercise/new/NullChildEditor.js +++ b/public/react/src/modules/courses/exercise/new/NullChildEditor.js @@ -57,7 +57,7 @@ class NullChildEditor extends Component{ className={'nullChildEditor'} placeholder={`请输入参考答案${itemIndex == 0 ?'':'(可选)'}`} toMDMode={toMDMode} noStorage={true} - mdID={`answer_${index}${itemIndex}`} height={155} watch={false} + mdID={`answer_${index}${itemIndex}`} height={155} initValue={item} onChange={(val) => onAnswerChange(index, itemIndex, val)} >
      diff --git a/public/react/src/modules/courses/exercise/new/NullEditor.js b/public/react/src/modules/courses/exercise/new/NullEditor.js index 299daf904..8cfb21a5f 100644 --- a/public/react/src/modules/courses/exercise/new/NullEditor.js +++ b/public/react/src/modules/courses/exercise/new/NullEditor.js @@ -297,7 +297,7 @@ class NullEditor extends Component{ （客观题，由系统自动评分，允许手动调分，请设置标准答案 ；支持最多5个空，每空得分按照本题的总分平均计算）

      - this.setState({ question_title: val})} onPlaceholderChange={this.onPlaceholderChange} showNullButton={exerciseIsPublish ? false : true} ref="titleEditor" diff --git a/public/react/src/modules/courses/exercise/new/ShixunEditor.js b/public/react/src/modules/courses/exercise/new/ShixunEditor.js index 29ba724af..543e840bc 100644 --- a/public/react/src/modules/courses/exercise/new/ShixunEditor.js +++ b/public/react/src/modules/courses/exercise/new/ShixunEditor.js @@ -250,7 +250,7 @@ class ShixunEditor extends Component{ style={{ marginBottom: '10px'}} > {/*
      {shixun_name}
      */} - this.setState({ question_title: val})} noStorage={true} > diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js index 8e68a593c..f339e5680 100644 --- a/public/react/src/modules/courses/exercise/new/SingleEditor.js +++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js @@ -242,7 +242,7 @@ class SingleEditor extends Component{ （客观题，由系统自动评分，请设置标准答案）

      - this.setState({ question_title: val})} ref="titleEditor" @@ -265,7 +265,7 @@ class SingleEditor extends Component{ this.onOptionContentChange(value, index)} initValue={item} > From cf7c93d141aac09ee608f5d07122581014ceb5aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 17:07:22 +0800 Subject: [PATCH 120/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/message/js/MessagChat.js | 1 + .../react/src/modules/message/js/MessagSub.js | 378 +++++++++++++++++- .../src/modules/message/js/MessagePrivate.js | 35 ++ .../src/modules/message/js/Messagerouting.js | 40 +- 4 files changed, 439 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 377f3cd3a..e7d1dd082 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -48,6 +48,7 @@ class MessagChat extends Component{ // console.log(this.props); // console.log(this.props.match.params.userid); this.scrollToBottom(); + this.props.triggerRef(this) } componentDidUpdate() { diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 88e339b20..0a0dec81e 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -30,6 +30,7 @@ class MessagSub extends Component{ }catch (e) { } + this.props.triggerRef(this) } //塞选页数 @@ -70,6 +71,36 @@ class MessagSub extends Component{ isSpin:false, }) }) + }; + getdatas=()=>{ + this.setState({ + isSpin:true, + }) + let{typeysl,page,limit}=this.state; + let url = `/users/tidings.json`; + axios.get((url),{params:{ + type:typeysl, + page:page, + per_page:limit, + }}).then((result) => { + if (result) { + // if (result.data.status === 0) { + + this.setState({ + page: page, + count: result.data.count, + typeysl: typeysl, + isSpin: false, + data: result.data.tidings === null ? undefined : result.data.tidings === undefined ? undefined : result.data.tidings === [] ? undefined : result.data.tidings === "[]" ? undefined : result.data.tidings.length === 0 ? undefined : result.data.tidings, + }) + // } + } + }).catch((error) => { + console.log(error); + this.setState({ + isSpin:false, + }) + }) } componentWillUnmount(){ @@ -78,6 +109,339 @@ class MessagSub extends Component{ return; } } + + gettourl=(item)=>{ + switch (item.container_type) { + case "ApplyUserAuthentication" : + if(item.tiding_type==="Apply"){ + if(item.auth_type===1){ + //系统管理页面 + return window.location.href="/managements/identity_authentication"; + } + if(item.auth_type===2){ + //系统管理页面 + return window.location.href="/managements/professional_authentication"; + } + } + if(item.tiding_type ==="System"){ + // 账号管理页-认证信息 + return window.location.href="/account/certification"; + } + case "CancelUserAuthentication" : + // 账号管理页-认证信息 + return window.location.href="/account/certification"; + case "CancelUserProCertification" : + // 账号管理页-认证信息 + return window.location.href="/account/certification"; + case "ApplyAddDepartment" : + if(item.tiding_type==="Apply"){ + //部门审批 + return window.location.href="/managements/depart"; + } + if(item.tiding_type==="System"){ + // 账号管理页/account/profile + return window.location.href="/account/profile"; + } + case "ApplyAddSchools" : + if(item.tiding_type==="Apply"){ + // 单位审批 + return window.location.href=" /managements/unit"; + } + if(item.tiding_type==="System"){ + // 账号管理页 + return window.location.href="/account/profile"; + } + case "ApplyAction" : + switch (item.parent_container_type) { + case "ApplyShixun" : + if(item.tiding_type==="Apply"){ + return window.location.href="/managements/shixun_authorization"; + } + if(item.tiding_type==="System"){ + // 实训详情页 :identifier = identifier + return window.location.href=`/shixuns/${item.identifier}/challenges`; + } + case "ApplySubject" : + if(item.tiding_type==="Apply"){ + // 实训课程发布 + return window.location.href="/managements/subject_authorization"; + } + if(item.tiding_type==="System"){ + // 实践课程详情页 :identifier = identifier + + return window.location.href=`/paths/${item.identifier}`; + } + case "TrialAuthorization" : + if(item.tiding_type==="Apply"){ + // 试用授权页面 + return window.location.href="/managements/trial_authorization"; + } + if(item.tiding_type==="System"){ + // 账号管理页 + return window.location.href="/account/profile"; + } + } + case 'JoinCourse' : + // 课堂详情页 :id = + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case 'StudentJoinCourse': + // 课堂详情页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case 'DealCourse': + // 课堂详情页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case 'TeacherJoinCourse': + // 课堂详情页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case 'Course' : + // 课堂详情页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case 'ArchiveCourse' : + // 课堂详情页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case "Shixun" : + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + case "Subject" : + // 实践课程详情页 :id = container_id + return window.location.href=`/paths/${item.identifier}`; + case "JournalsForMessage" : + switch (item.parent_container_type) { + case "Principal" : + // 反馈页 :id = parent_container_id + // 不用跳了 + return ''; + case "HomeworkCommon" : + //学生作业页 homework = parent_container_id + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + return ''; + case "GraduationTopic" : + // 毕业目标页 parent_container_id + return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + case "StudentWorksScore" : + //学生作业页 + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + } + case "Memo" : + // 交流问答页 :id = parent_container_id + return window.location.href="/forums/categories/all?order=newest"; + case "Watcher" : + // 用户个人中心页 :id = item.trigger_user.login + return window.location.href=`/users/${item.trigger_user.login}/courses`; + case "PraiseTread" : + // 这块太复杂 不好处理 + return ''; + case "Grade" : + //个人中心页 :id = item.trigger_user.login + return window.location.href=`/users/${item.trigger_user.login}/courses`; + case "JoinProject" : + //项目详情-申请加入项目审核页 :id = container_id + return window.location.href=`/projects/${item.container_id}`; + case 'ReporterJoinProject': + //项目详情页 :id = container_id + return window.location.href=`/projects/${item.container_id}`; + case 'DealProject': + //项目详情页 :id = container_id + return window.location.href=`/projects/${item.container_id}`; + case 'ManagerJoinProject': + //项目详情页 :id = container_id + return window.location.href=`/projects/${item.container_id}`; + case "Poll": + switch (item.parent_container_type) { + case "CommitPoll" : + // 课堂id belong_container_id + //课堂-学生已提交问卷列表 :id = container_id + return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + default : + // 课堂-问卷列表 :id = container_id + return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + } + case "Exercise" : + switch (item.parent_container_type) { + case "CommitExercise": + // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id + return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + case "ExerciseScore": + // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id + return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + default : + // 课堂-试卷列表详情 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/exercises/${item.container_id}`; + } + case 'StudentGraduationTopic' : + //课堂-毕业选题详情 :id = parent_container_id + return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + case 'DealStudentTopicSelect' : + //课堂-毕业选题详情 :id = parent_container_id + return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + case 'GraduationTask' : + //课堂-毕业任务页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + case "GraduationWork" : + //课堂-毕业xx页 :id = container_id + return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + case "GraduationWorkScore" : + // 课堂-毕业xx页 :id = parent_container_id + return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`; + case "HomeworkCommon" : + switch (item.parent_container_type) { + case "AnonymousCommentFail" : + // 课堂-作业列表 homework = container_id + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + case "HomeworkPublish" : + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + case "AnonymousAppeal" : + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + default : + // 课堂-作业列表 homework = container_id + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + } + case "StudentWork" : + //课堂-作业 :id = container_id + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + case "StudentWorksScore" : + //课堂-作业 :id = parent_container_id + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + case "StudentWorksScoresAppeal" : + if(item.homework_type===1){ + //普通作业 + return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===3){ + //分组作业 + return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + } + if(item.homework_type===4){ + //实训作业 + return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + } + case "ChallengeWorkScore" : + return ''; + case "SendMessage" : + // /managements/mirror_repository + return window.location.href=`/managements/mirror_repository`; + case "Journal" : + //项目Issue页 :id = parent_container_id + return window.location.href=`/projects/${item.parent_container_id}/issues?remote=true`; + case "Issue" : + //项目Issue页 :id = container_id + return window.location.href=`/projects/${item.container_id}/issues?remote=true`; + case "PullRequest" : + // 项目pull request页 :id = parent_container_id + return window.location.href=`/projects/${item.parent_container_id}/pull_requests`; + case "Department" : + //账号管理页 + return window.location.href=`/account/profile`; + case "Library" : + if (item.tiding_type === 'Apply') { + // /managements/library_applies + return window.location.href=`/managements/library_applies`; + } + if(item.tiding_type === 'System'){ + //教学案例详情 :id = container_id + return window.location.href=`/moop_cases/${item.container_id}`; + } + case "ProjectPackage" : + if (item.tiding_type === 'Apply') { + ///managements/project_package_applies + return window.location.href=`/managements/project_package_applies`; + } + if(item.tiding_type === 'System'){ + //众包详情 :id = container_id + return window.location.href=`/crowdsourcing/${item.container_id}`; + } + default : + return window.location.href="/"; + } + + } render() { let{page,limit,typeysl,count,isSpin,data}=this.state; // console.log("6868686868"); @@ -117,10 +481,9 @@ class MessagSub extends Component{

      暂无数据哦~

      :data.map((item,key)=>{ - console.log(data) return(
      -
      +
      this.gettourl(item)}> this.myCome(item)} src={getImageUrl("/images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>

      @@ -136,12 +499,15 @@ class MessagSub extends Component{ ):""}

      -

      + +

      diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index fa5531c80..0d2889cef 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -31,6 +31,7 @@ class MessagePrivate extends Component{ }catch (e) { } + this.props.triggerRef(this) // console.log("MessagePrivate"); // console.log(this.props); // console.log(this.props.match.params.userid); @@ -80,6 +81,40 @@ class MessagePrivate extends Component{ }) }) }; + getdatas2=()=>{ + this.setState({ + isSpin:true, + }); + let{limit,page}=this.state; + let url = `/users/${this.props.match&&this.props.match.params.userid}/private_messages.json`; + // let url = `/users/71519/private_messages.json`; + axios.get((url),{params:{ + page:page, + per_page:limit, + }}).then((result) => { + if (result) { + // console.log(types); + // console.log(result); + + // console.log("调用了消失的方法"); + // console.log("5454545454"); + // if (result.data.status === 0) { + + this.setState({ + page: page, + count: result.data.count, + isSpin: false, + data: result.data.private_messages === null ? undefined : result.data.private_messages === undefined ? undefined : result.data.private_messages === [] ? undefined : result.data.private_messages === "[]" ? undefined : result.data.private_messages.length === 0 ? undefined : result.data.private_messages, + }) + // } + } + }).catch((error) => { + console.log(error); + this.setState({ + isSpin:false, + }) + }) + }; paginationonChanges=(pageNumber)=>{ this.setState({ diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 2c649c23c..651253ae3 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -45,6 +45,9 @@ class Messagerouting extends Component{ // console.log(courstype); + } + getdatas2=()=>{ + } componentDidUpdate(prevProps) { // console.log("11111111111"); @@ -74,17 +77,21 @@ class Messagerouting extends Component{ }) }; - SwitchonClick=(value)=>{ + SwitchonClick=(value,child)=>{ this.setState({ routing:value, }); this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); if(value===1){ this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); + this.homeworkendss1(child); } if(value===2){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`);; + this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); + this.homeworkendss2(child); } + + }; @@ -145,6 +152,21 @@ class Messagerouting extends Component{ routing:3, }); } + }; + bindRef = ref => { this.child = ref }; + homeworkendss1(child){ + // console.log(child); + // // console.log(this.refs.childModel); + // console.log(child); + child.getdatas(); + // + } + homeworkendss2(child){ + // console.log(child); + // // console.log(this.refs.childModel); + // console.log(child); + child.getdatas2(); + // } render() { let{routing,unread_message_count,unread_tiding_count} =this.state; @@ -171,12 +193,12 @@ class Messagerouting extends Component{ {/*路由跳转*/}
      @@ -197,19 +219,19 @@ class Messagerouting extends Component{ {/*/!*消息自路由*! name 是 /message/info/:userid/*/} (this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}>) + (props) => (this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } > {/*/!*私信*! name 是letter/*/} (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}> ) + (props) => (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}> ) } > {/*/!*私信聊天页面*! letters/*/} (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}>) + (props) => (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } > From aa48c32dc42404d23a3239a753b5e3684204b010 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 17:09:34 +0800 Subject: [PATCH 121/221] ... --- .../react/src/modules/user/account/AccountCertification.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/user/account/AccountCertification.js b/public/react/src/modules/user/account/AccountCertification.js index 15a78b564..e1bdc1372 100644 --- a/public/react/src/modules/user/account/AccountCertification.js +++ b/public/react/src/modules/user/account/AccountCertification.js @@ -83,7 +83,7 @@ class AccountCertification extends Component {
      实名认证
      -
      有些课程需要实名认证才能加入哟，还能获得500金币的奖励~
      +
      实名认证可以增强你在平台的江湖地位，还可以获得500金币的奖励~
      { basicInfo && basicInfo.authentication =="uncertified" ? @@ -96,7 +96,10 @@ class AccountCertification extends Component {
      职业认证
      -
      教师认证完毕之后，可创建课堂、发布实训、免金币查看所有实训答案..
      + + {basicInfo && (basicInfo.identity == "teacher" + ?
      教师通过认证，可以克隆实训、免金币查看实训答案和隐藏测试集...
      + :
      通过认证，可以获得500金币的奖励~
      )}
      { basicInfo && basicInfo.professional_certification =="uncertified" ? From 57dc6723f1cb834e972501c7aded0d531fb2e0d6 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 17:10:13 +0800 Subject: [PATCH 122/221] fix --- app/models/course_message.rb | 2 +- config/locales/tidings/zh-CN.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/course_message.rb b/app/models/course_message.rb index acb45d5f4..77c86e3e5 100644 --- a/app/models/course_message.rb +++ b/app/models/course_message.rb @@ -28,7 +28,7 @@ class CourseMessage < ApplicationRecord def send_deal_tiding # 发送申请处理结果消息 Tiding.create!( - user_id: user_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse', + user_id: course_message_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse', belong_container: course, extra: content.to_i == 2 ? '7' : '9', tiding_type: 'System', status: status == :PASSED ? 1 : 2 ) # 将申请消息置为已处理 diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml index e00407b28..456f15887 100644 --- a/config/locales/tidings/zh-CN.yml +++ b/config/locales/tidings/zh-CN.yml @@ -21,6 +21,9 @@ "7_2_end": "你提交的加入课堂申请：%s（助教）, 审核未通过" StudentJoinCourse_end: "加入了课堂：%s（学生）" TeacherJoinCourse: + "2_end": "%s将你加入课堂：%s（教师）" + "3_end": "%s将你加入课堂：%s（助教）" + "4_end": "%s将你加入课堂：%s（学生）" "9_end": "%s将你加入课堂：%s（教师）" "7_end": "%s将你加入课堂：%s（助教）" "10_end": "%s将你加入课堂：%s（学生）" From cf76f3db60cf96e578dd9aa904de5a4a95bc8fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 17:11:09 +0800 Subject: [PATCH 123/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/TPMIndex.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css index 2f6eccfd6..5c2580093 100644 --- a/public/react/src/modules/tpm/TPMIndex.css +++ b/public/react/src/modules/tpm/TPMIndex.css @@ -200,6 +200,10 @@ body>.-task-title { .HeaderSearch{ width: 325px; + /*right: 20px;*/ +} +.HeaderSearch .ant-input-search{ + right: 20px; } .mainheighs{ height: 100%; From 11f20d7fd00cdbdc1a8bf5785f5cf6cdd3d99681 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 17:12:32 +0800 Subject: [PATCH 124/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/graduation_topics/_graduation_comments.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/graduation_topics/_graduation_comments.json.jbuilder b/app/views/graduation_topics/_graduation_comments.json.jbuilder index ee9ed7529..51551d95d 100644 --- a/app/views/graduation_topics/_graduation_comments.json.jbuilder +++ b/app/views/graduation_topics/_graduation_comments.json.jbuilder @@ -11,6 +11,6 @@ if message.m_parent_id json.can_delete message.can_delete(identity) else json.praise_count message.praise_treads.select{|pt| pt.praise_or_tread == 1}.count - json.user_praise message.praise_treads.select{|pt| pt.praise_or_tread == 1 && user_id == current_user.id}.count + json.user_praise message.praise_treads.select{|pt| pt.praise_or_tread == 1 && pt.user_id == current_user.id}.count json.child_message_count message.m_reply_count end From a0f073438824294d0b92046baf7275bbe2eee92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 17:17:27 +0800 Subject: [PATCH 125/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/message/js/MessagChat.js | 3 +++ public/react/src/modules/message/js/MessagSub.js | 16 ++++++++++------ .../src/modules/message/js/Messagerouting.js | 2 -- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index e7d1dd082..b731ace23 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -110,6 +110,7 @@ class MessagChat extends Component{ // } }; + shuaxingetChatList=(page,listl,target_ids,bool)=>{ this.setState({ isSpin:true, @@ -385,7 +386,9 @@ class MessagChat extends Component{ // console.log(i); this.props.Modifyur(i); }; + getdatas2=()=>{ + } // 点击了用户 Clickedontheuser=(user)=>{ // debugger diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 0a0dec81e..cf8c77fc3 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -428,14 +428,18 @@ class MessagSub extends Component{ //教学案例详情 :id = container_id return window.location.href=`/moop_cases/${item.container_id}`; } - case "ProjectPackage" : - if (item.tiding_type === 'Apply') { - ///managements/project_package_applies - return window.location.href=`/managements/project_package_applies`; - } - if(item.tiding_type === 'System'){ + case "ProjectPackage" : + if(item.tiding_type==="Destroyed_end"){ + return ; + }else { + // if (item.tiding_type === 'Apply') { + // ///managements/project_package_applies + // return window.location.href=`/managements/project_package_applies`; + // } + // if(item.tiding_type === 'System'){ //众包详情 :id = container_id return window.location.href=`/crowdsourcing/${item.container_id}`; + // } } default : return window.location.href="/"; diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 651253ae3..430bf7836 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -46,9 +46,7 @@ class Messagerouting extends Component{ } - getdatas2=()=>{ - } componentDidUpdate(prevProps) { // console.log("11111111111"); // console.log(prevProps); From d3c082a0e89d4082f80ed1234a66c6e0a35eb59c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 17:25:41 +0800 Subject: [PATCH 126/221] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagSub.js --- public/react/src/modules/message/js/Messagerouting.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 5d3076268..c9806445c 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -156,14 +156,14 @@ class Messagerouting extends Component{ // console.log(child); // // console.log(this.refs.childModel); // console.log(child); - child.getdatas(); + // child.getdatas(); // } homeworkendss2(child){ // console.log(child); // // console.log(this.refs.childModel); // console.log(child); - child.getdatas2(); + // child.getdatas2(); // } render() { From 2eb8948aa6cbc310a69d8a4dc185339dd5c6968e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 17:27:00 +0800 Subject: [PATCH 127/221] b --- public/react/src/search/SearchPage.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js index ccdb9e12a..68efca036 100644 --- a/public/react/src/search/SearchPage.js +++ b/public/react/src/search/SearchPage.js @@ -150,9 +150,9 @@ class SearchPage extends Component{
      - 开发社区 - 实践课程 - 翻转课堂 + 实践课程 + 翻转课堂 + 开发社区 交流问答
      From 7d34d8ea3cb8083ab315f28b828e597d82ec1d5b Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 17:35:25 +0800 Subject: [PATCH 128/221] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 8 +++++--- app/models/user.rb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 9f62a03bb..6c2eb5299 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -928,12 +928,14 @@ class CoursesController < ApplicationController course_message.save! - role = course_message.content == 2 ? '7' : '9' # 7:助教 9:教师 + role = course_message.content == 2 ? '9' : '7' # 7:助教 9:教师 ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role) - message = "#{course_message.content == 2 ? '助教' : '教师'}申请已提交，请等待审核" + message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核" else - message = "#{existing_course_message.content == 2 ? '助教' : '教师'}申请已提交，请等待审核" + message = "#{existing_course_message.content == 2 ? '教师' : '助教'}申请已提交，请等待审核" end + else + message = "您已是课堂成员" end teacher_role = 1 end diff --git a/app/models/user.rb b/app/models/user.rb index b453f9998..e9d6ce54b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -234,7 +234,7 @@ class User < ApplicationRecord # 课堂的老师(创建者、老师、助教)，不用考虑当前身份 def teacher_of_course_non_active?(course) - course.course_members.exists?(user_id: id, role: [1,2,3]) || admin? || business? + course.course_members.exists?(user_id: id, role: [1,2,3]) end # 是否是教师，课堂管理员或者超级管理员 From 9a9e547fad4cc5ee333bcc29edb6b72326e3041f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 17:36:17 +0800 Subject: [PATCH 129/221] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagSub.js --- .../react/src/modules/message/js/Messagerouting.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index c9806445c..a4d7fd6f9 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -156,14 +156,24 @@ class Messagerouting extends Component{ // console.log(child); // // console.log(this.refs.childModel); // console.log(child); - // child.getdatas(); + try { + child.getdatas(); + }catch (e) { + + } + // } homeworkendss2(child){ // console.log(child); // // console.log(this.refs.childModel); // console.log(child); - // child.getdatas2(); + try { + child.getdatas2(); + }catch (e) { + + } + // } render() { From 7f591bd4b261fbc2f919160e062b33f6603ff456 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 17:44:53 +0800 Subject: [PATCH 130/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 6c2eb5299..d49e28d80 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -911,6 +911,7 @@ class CoursesController < ApplicationController CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id]) StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id) end + student_role = 1 end # 创建教师身份 @@ -940,9 +941,9 @@ class CoursesController < ApplicationController teacher_role = 1 end - if teacher_role && current_user.student_of_course?(course) + if teacher_role && student_role render json: { status: 0, message: message, course_id: course.id} - elsif current_user.student_of_course?(course) + elsif student_role render json: { status: 0, message: "加入成功", course_id: course.id} else normal_status(message) From 8b94dc48a160381aeddad78ac096781150dfe359 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 17:47:08 +0800 Subject: [PATCH 131/221] send tiding when create shixun --- app/models/shixun.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 82f689e3f..392807479 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -62,6 +62,8 @@ class Shixun < ApplicationRecord scope :field_for_recommend, lambda{ select([:id, :name, :identifier, :myshixuns_count]) } scope :find_by_ids,lambda{|k| where(id:k)} + after_create :send_tiding + # REDO:  def propaedeutics shixun_info.try(:propaedeutics) @@ -242,4 +244,11 @@ class Shixun < ApplicationRecord def finished_challenges_count(user) Game.joins(:myshixun).where(user_id: user.id, status: 2, myshixuns: { shixun_id: id }).count end + + private + + def send_tiding + self.tidings << Tiding.new(:user_id => self.user_id, :trigger_user_id => self.user_id, :belong_container_id => self.id, :belong_container_type =>'Shixun', :tiding_type => "System", :viewed => 0) + end + end From 1f3ca2c64eceee65acc396746c42490c7511132f Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 17:55:20 +0800 Subject: [PATCH 132/221] fix --- app/models/shixun.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/shixun.rb b/app/models/shixun.rb index 392807479..61d15de55 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -38,6 +38,7 @@ class Shixun < ApplicationRecord belongs_to :user # 实训服务配置 has_many :shixun_service_configs, :dependent => :destroy + has_many :tidings, as: :container, dependent: :destroy scope :search_by_name, ->(keyword) { where("name like ? or description like ? ", "%#{keyword}%", "%#{keyword}%") } @@ -248,7 +249,7 @@ class Shixun < ApplicationRecord private def send_tiding - self.tidings << Tiding.new(:user_id => self.user_id, :trigger_user_id => self.user_id, :belong_container_id => self.id, :belong_container_type =>'Shixun', :tiding_type => "System", :viewed => 0) + self.tidings << Tiding.new(:user_id => user_id, :trigger_user_id => 1, :belong_container_id => id, :belong_container_type =>'Shixun', :tiding_type => "System", :viewed => 0) end end From 292a78243599260b55835fbfd429a25f9c334636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 17:57:18 +0800 Subject: [PATCH 133/221] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagSub.js --- .../src/modules/message/js/Messagerouting.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index a4d7fd6f9..fa0c607d4 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -43,7 +43,8 @@ class Messagerouting extends Component{ // // courstype=courstype[3]; // // console.log("45"); // console.log(courstype); - + // console.log("Messagerouting46"); + // console.log(this.props.current_user); } @@ -54,7 +55,9 @@ class Messagerouting extends Component{ // console.log(this.props); // console.log("33333333333"); if(prevProps.current_user !== this.props.current_user){ - this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); + this.Messageprivatemessageunreadmessage(this.props.current_user.login); + // console.log("Messagerouting59"); + // console.log(this.props.current_user); } } //消息未读 @@ -79,13 +82,13 @@ class Messagerouting extends Component{ this.setState({ routing:value, }); - this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); + this.Messageprivatemessageunreadmessage(this.props.current_user.login); if(value===1){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); + this.props.history.replace(`/message/${this.props.current_user.login}/user_tidings`); this.homeworkendss1(child); } if(value===2){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); + this.props.history.replace(`/message/${this.props.current_user.login}/private_messages`); this.homeworkendss2(child); } @@ -114,10 +117,10 @@ class Messagerouting extends Component{ routing:i, }); if(i===1){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); + this.props.history.replace(`/message/${this.props.current_user.login}/user_tidings`); } if(i===2){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); + this.props.history.replace(`/message/${this.props.current_user.login}/private_messages`); } }else { @@ -125,7 +128,7 @@ class Messagerouting extends Component{ routing:i, }); console.log("22222222222"); - this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${id}`); + this.props.history.replace(`/message/${this.props.current_user.login}/message_detail?target_ids=${id}`); } }; From 69e90953899712cda441e7cfa5d2fb4a912654d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 17:59:26 +0800 Subject: [PATCH 134/221] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagSub.js --- public/react/src/modules/message/js/MessagChat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index cf09ecc5d..ae7944b2d 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -402,7 +402,7 @@ class MessagChat extends Component{ myuserl:user, }) - this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${user.id}`); + this.props.history.replace(`/message/${this.props.current_user.login}/message_detail?target_ids=${user.id}`); // this.getdatatwo(this.state.page); this.getChatListtwo(1,this.state.mypagey,user.id); From 23a5835ba915f333b4aa4cddc168d3d24914ed10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 18:04:23 +0800 Subject: [PATCH 135/221] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagSub.js --- public/react/src/modules/message/js/MessagSub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 8b9b31da5..c44685361 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -200,7 +200,7 @@ class MessagSub extends Component{ // 课堂详情页 :id = container_id return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; case "Shixun" : - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.location.href=`/shixuns/${item.identifier}/challenges`; case "Subject" : // 实践课程详情页 :id = container_id return window.location.href=`/paths/${item.identifier}`; From 64e232a5afc6946f1ee416070682f7172e1b802a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 18:06:03 +0800 Subject: [PATCH 136/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 2 +- public/react/src/modules/forums/UserSection.js | 2 +- .../react/src/modules/message/js/MessagChat.js | 2 +- .../src/modules/message/js/Messagerouting.js | 16 ++++++++-------- .../react/src/modules/modals/DownloadMessage.js | 2 +- .../src/modules/modals/DownloadMessageysl.js | 2 +- .../PackageIndexNEITaskDetails.js | 6 +++--- public/react/src/modules/tpm/NewHeader.js | 2 +- public/react/src/modules/user/usersInfo/Infos.js | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 0612fdfca..dc5d1f4a8 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -360,7 +360,7 @@ class App extends Component { - () } diff --git a/public/react/src/modules/forums/UserSection.js b/public/react/src/modules/forums/UserSection.js index 4610c2441..13cda2e03 100644 --- a/public/react/src/modules/forums/UserSection.js +++ b/public/react/src/modules/forums/UserSection.js @@ -52,7 +52,7 @@ class UserSection extends Component { { author_info.user_id !== current_user.user_id &&

      {this.AboutFocus()}}>{ author_info.watched == true ? "取消关注" : "关注" } - 私信 + 私信

      }
      ); diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index cf09ecc5d..cd46aca5a 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -402,7 +402,7 @@ class MessagChat extends Component{ myuserl:user, }) - this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${user.id}`); + this.props.history.replace(`/messages/${this.props.current_user.user_id}/message_detail?target_ids=${user.id}`); // this.getdatatwo(this.state.page); this.getChatListtwo(1,this.state.mypagey,user.id); diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 5d3076268..a902c1266 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -81,11 +81,11 @@ class Messagerouting extends Component{ }); this.Messageprivatemessageunreadmessage(this.props.current_user.user_id); if(value===1){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); + this.props.history.replace(`/messages/${this.props.current_user.user_id}/user_tidings`); this.homeworkendss1(child); } if(value===2){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); + this.props.history.replace(`/messages/${this.props.current_user.user_id}/private_messages`); this.homeworkendss2(child); } @@ -114,10 +114,10 @@ class Messagerouting extends Component{ routing:i, }); if(i===1){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/user_tidings`); + this.props.history.replace(`/messages/${this.props.current_user.user_id}/user_tidings`); } if(i===2){ - this.props.history.replace(`/message/${this.props.current_user.user_id}/private_messages`); + this.props.history.replace(`/messages/${this.props.current_user.user_id}/private_messages`); } }else { @@ -125,7 +125,7 @@ class Messagerouting extends Component{ routing:i, }); console.log("22222222222"); - this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail?target_ids=${id}`); + this.props.history.replace(`/messages/${this.props.current_user.user_id}/message_detail?target_ids=${id}`); } }; @@ -215,19 +215,19 @@ class Messagerouting extends Component{ {/*/!*消息自路由*! name 是 /message/info/:userid/*/} - (this.Message2()} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } > {/*/!*私信*! name 是letter/*/} - (this.Message2()} Modifyur={(i,item)=>this.Modifyur(i,item)} Mtab={(i)=>this.myxiaoxisixintab(i)}> ) } > {/*/!*私信聊天页面*! letters/*/} - (this.Message2()} Modifyur={(i)=>this.Modifyur(i)} Mtab={(i)=>this.myxiaoxisixintab(i)}>) } diff --git a/public/react/src/modules/modals/DownloadMessage.js b/public/react/src/modules/modals/DownloadMessage.js index 0e975be09..4655d7478 100644 --- a/public/react/src/modules/modals/DownloadMessage.js +++ b/public/react/src/modules/modals/DownloadMessage.js @@ -18,7 +18,7 @@ class DownloadMessage extends Component { setDownload=()=>{ this.modalCancel(); - window.open(`/message/${this.props.user.login}/message_detail?target_ids=1`) + window.open(`/messages/${this.props.user.login}/message_detail?target_ids=1`) } modalCancel = () => { this.setState({ diff --git a/public/react/src/modules/modals/DownloadMessageysl.js b/public/react/src/modules/modals/DownloadMessageysl.js index db715297f..549a1478a 100644 --- a/public/react/src/modules/modals/DownloadMessageysl.js +++ b/public/react/src/modules/modals/DownloadMessageysl.js @@ -11,7 +11,7 @@ class DownloadMessageysl extends Component { setDownload=()=>{ this.props.modalCancel(); - window.open(`/message/${this.props.user.login}/message_detail?target_ids=1`) + window.open(`/messages/${this.props.user.login}/message_detail?target_ids=1`) } render() { diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 2ad696538..954bffcb7 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -297,8 +297,8 @@ class PackageIndexNEITaskDetails extends Component { onMouseOver={this.setover} onMouseOut={this.setout} > - {overtype===false? 头像联系TA: - 头像 头像联系TA: + 头像联系TA}
      }
      @@ -411,7 +411,7 @@ class PackageIndexNEITaskDetails extends Component { {item.status==="bidding_won"?:""}

      {item.name}

      - {this.props.current_user&&this.props.current_user.login!=item.login? + {this.props.current_user&&this.props.current_user.login!=item.login? 头像联系TA :""}
      diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 910799be9..d725201ff 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -934,7 +934,7 @@ submittojoinclass=(value)=>{ From 882b4d38a889779ff3ce61bd990a50670cb71319 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 18:23:17 +0800 Subject: [PATCH 137/221] fix tiding --- app/models/tiding.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/app/models/tiding.rb b/app/models/tiding.rb index 90abdf809..d885f93fd 100644 --- a/app/models/tiding.rb +++ b/app/models/tiding.rb @@ -9,16 +9,15 @@ class Tiding < ApplicationRecord def identifier value = nil - if Object.const_defined?(container_type) - value = container.try(:identifier) - end - if value.blank? && parent_container_type && Object.const_defined?(parent_container_type) - value = parent_container_type.try(:identifier) + value = container.try(:identifier) rescue nil + + if value.blank? && parent_container_type + value = parent_container_type.try(:identifier) rescue nil end - if value.blank? && belong_container_type && Object.const_defined?(belong_container_type) - value = belong_container.try(:identifier) + if value.blank? && belong_container_type + value = belong_container.try(:identifier) rescue nil end value From 8d57899cbb1a4277397d3eea8c9dbe79be571c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 18:43:21 +0800 Subject: [PATCH 138/221] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index d725201ff..212b17036 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -934,7 +934,7 @@ submittojoinclass=(value)=>{
      { user===undefined?"":user.login===""?"": From eb5b1aa6f906ec3685f1ff87d0b8d2eb358eddc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 19:00:52 +0800 Subject: [PATCH 139/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/usersInfo/InfosPackage.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 36175295b..0355e2d76 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -132,18 +132,19 @@ class InfosPackage extends Component{ delectproject=(id)=>{ - let {cate,status}=this.state; + let {category,status}=this.state; + debugger let url=`/project_packages/${id}.json` axios.delete(url).then((response) => { if (response.data.status == 0) { - this.getCourses(cate,status,1); + this.getCourses(category,status,1); } }) .catch(function (error) { console.log(error); }); - this.cancelProject; + this.cancelProject(); } render(){ let{ From f9fa3ebcc22b5351b81f07303eb30badf1f9763a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 19:01:02 +0800 Subject: [PATCH 140/221] Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagChat.js # public/react/src/modules/message/js/Messagerouting.js --- .../react/src/modules/message/js/MessagSub.js | 156 +++++++++--------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index c44685361..cb2d18105 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -116,94 +116,94 @@ class MessagSub extends Component{ if(item.tiding_type==="Apply"){ if(item.auth_type===1){ //系统管理页面 - return window.location.href="/managements/identity_authentication"; + return window.open("/managements/identity_authentication"); } if(item.auth_type===2){ //系统管理页面 - return window.location.href="/managements/professional_authentication"; + return window.open("/managements/professional_authentication") } } if(item.tiding_type ==="System"){ // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") } case "CancelUserAuthentication" : // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") case "CancelUserProCertification" : // 账号管理页-认证信息 - return window.location.href="/account/certification"; + return window.open("/account/certification") case "ApplyAddDepartment" : if(item.tiding_type==="Apply"){ //部门审批 - return window.location.href="/managements/depart"; + return window.open("/managements/depart") } if(item.tiding_type==="System"){ // 账号管理页/account/profile - return window.location.href="/account/profile"; + return window.open("/account/profile") } case "ApplyAddSchools" : if(item.tiding_type==="Apply"){ // 单位审批 - return window.location.href=" /managements/unit"; + return window.open(" /managements/unit") } if(item.tiding_type==="System"){ // 账号管理页 - return window.location.href="/account/profile"; + return window.open("/account/profile") } case "ApplyAction" : switch (item.parent_container_type) { case "ApplyShixun" : if(item.tiding_type==="Apply"){ - return window.location.href="/managements/shixun_authorization"; + return window.open("/managements/shixun_authorization") } if(item.tiding_type==="System"){ // 实训详情页 :identifier = identifier - return window.location.href=`/shixuns/${item.identifier}/challenges`; + return window.open(`/shixuns/${item.identifier}/challenges`) } case "ApplySubject" : if(item.tiding_type==="Apply"){ // 实训课程发布 - return window.location.href="/managements/subject_authorization"; + return window.open("/managements/subject_authorization") } if(item.tiding_type==="System"){ // 实践课程详情页 :identifier = identifier - return window.location.href=`/paths/${item.identifier}`; + return window.open(`/paths/${item.identifier}`) } case "TrialAuthorization" : if(item.tiding_type==="Apply"){ // 试用授权页面 - return window.location.href="/managements/trial_authorization"; + return window.open("/managements/trial_authorization") } if(item.tiding_type==="System"){ // 账号管理页 - return window.location.href="/account/profile"; + return window.open("/account/profile") } } case 'JoinCourse' : // 课堂详情页 :id = - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'StudentJoinCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'DealCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'TeacherJoinCourse': // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'Course' : // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case 'ArchiveCourse' : // 课堂详情页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}`) case "Shixun" : - return window.location.href=`/shixuns/${item.identifier}/challenges`; + return window.open(`/shixuns/${item.identifier}/challenges`) case "Subject" : // 实践课程详情页 :id = container_id - return window.location.href=`/paths/${item.identifier}`; + return window.open(`/paths/${item.identifier}`) case "JournalsForMessage" : switch (item.parent_container_type) { case "Principal" : @@ -214,219 +214,219 @@ class MessagSub extends Component{ //学生作业页 homework = parent_container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } return ''; case "GraduationTopic" : // 毕业目标页 parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case "StudentWorksScore" : //学生作业页 if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "Memo" : // 交流问答页 :id = parent_container_id - return window.location.href="/forums/categories/all?order=newest"; + return window.open("/forums/categories/all?order=newest") case "Watcher" : // 用户个人中心页 :id = item.trigger_user.login - return window.location.href=`/users/${item.trigger_user.login}/courses`; + return window.open(`/users/${item.trigger_user.login}/courses`) case "PraiseTread" : // 这块太复杂 不好处理 return ''; case "Grade" : //个人中心页 :id = item.trigger_user.login - return window.location.href=`/users/${item.trigger_user.login}/courses`; + // return window.open(`/users/${item.trigger_user.login}/courses`; case "JoinProject" : //项目详情-申请加入项目审核页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'ReporterJoinProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'DealProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case 'ManagerJoinProject': //项目详情页 :id = container_id - return window.location.href=`/projects/${item.container_id}`; + return window.open(`/projects/${item.container_id}`) case "Poll": switch (item.parent_container_type) { case "CommitPoll" : // 课堂id belong_container_id //课堂-学生已提交问卷列表 :id = container_id - return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + return window.open(` /courses/${item.belong_container_id}/polls/${item.container_id}`) default : // 课堂-问卷列表 :id = container_id - return window.location.href=` /courses/${item.belong_container_id}/polls/${item.container_id}`; + return window.open(` /courses/${item.belong_container_id}/polls/${item.container_id}`) } case "Exercise" : switch (item.parent_container_type) { case "CommitExercise": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) case "ExerciseScore": // 课堂-学生试卷详情 :id = container_id :user_id = trigger_user.id - return window.location.href=` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`; + return window.open(` /courses/${item.belong_container_id}/exercises/${item.container_id}/student_exercise_list?tab=0`) default : // 课堂-试卷列表详情 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/exercises/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/exercises/${item.container_id}`) } case 'StudentGraduationTopic' : //课堂-毕业选题详情 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case 'DealStudentTopicSelect' : //课堂-毕业选题详情 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`; + return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case 'GraduationTask' : //课堂-毕业任务页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`) case "GraduationWork" : //课堂-毕业xx页 :id = container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.container_id}`) case "GraduationWorkScore" : // 课堂-毕业xx页 :id = parent_container_id - return window.location.href=`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`; + return window.open(`/courses/${item.belong_container_id}/graduation_tasks/${item.parent_container_id}`) case "HomeworkCommon" : switch (item.parent_container_type) { case "AnonymousCommentFail" : // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "HomeworkPublish" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "AnonymousAppeal" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } default : // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "StudentWork" : //课堂-作业 :id = container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScoresAppeal" : if(item.homework_type===1){ //普通作业 - return window.location.href=`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`; + return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.location.href=`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`; + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.location.href=`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`; + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "ChallengeWorkScore" : return ''; case "SendMessage" : // /managements/mirror_repository - return window.location.href=`/managements/mirror_repository`; + return window.open(`/managements/mirror_repository`) case "Journal" : //项目Issue页 :id = parent_container_id - return window.location.href=`/projects/${item.parent_container_id}/issues?remote=true`; + return window.open(`/projects/${item.parent_container_id}/issues?remote=true`) case "Issue" : //项目Issue页 :id = container_id - return window.location.href=`/projects/${item.container_id}/issues?remote=true`; + return window.open(`/projects/${item.container_id}/issues?remote=true`) case "PullRequest" : // 项目pull request页 :id = parent_container_id - return window.location.href=`/projects/${item.parent_container_id}/pull_requests`; + return window.open(`/projects/${item.parent_container_id}/pull_requests`) case "Department" : //账号管理页 - return window.location.href=`/account/profile`; + return window.open(`/account/profile`) case "Library" : if (item.tiding_type === 'Apply') { // /managements/library_applies - return window.location.href=`/managements/library_applies`; + return window.open(`/managements/library_applies`) } if(item.tiding_type === 'System'){ //教学案例详情 :id = container_id - return window.location.href=`/moop_cases/${item.container_id}`; + return window.open(`/moop_cases/${item.container_id}`) } case "ProjectPackage" : if(item.tiding_type==="Destroyed_end"){ @@ -434,15 +434,15 @@ class MessagSub extends Component{ }else { // if (item.tiding_type === 'Apply') { // ///managements/project_package_applies - // return window.location.href=`/managements/project_package_applies`; + // return window.open(`/managements/project_package_applies`; // } // if(item.tiding_type === 'System'){ //众包详情 :id = container_id - return window.location.href=`/crowdsourcing/${item.container_id}`; + return window.open(`/crowdsourcing/${item.container_id}`) // } } default : - return window.location.href="/"; + return window.open("/") } } From 1fa5ba918a62494e3fc2d8c0508d211ce31e1757 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 19:03:59 +0800 Subject: [PATCH 141/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7e9fd652b..ee0abd903 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -129,16 +129,15 @@ module ApplicationHelper if File.exist?(disk_filename(source.class, source.id)) if source.class.to_s == 'User' File.join(relative_path, ["#{source.class}", "#{source.id}"]) - else - File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + elseavatars", ["#{source.class}", "#{source.id}"]) end elsif source.class.to_s == 'User' str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g" File.join(relative_path, "#{source.class}", str) elsif source.class.to_s == 'Subject' - File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg") + File.join("educoder", "index", "subject", "subject#{rand(17)}.jpg") elsif source.class.to_s == 'Shixun' - File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg") + File.join("educoder","index", "shixun", "shixun#{rand(23)}.jpg") end end From 20e3985a23951af0984abfb37d53c5803cf5ab4c Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 19:05:15 +0800 Subject: [PATCH 142/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ee0abd903..5040acec0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -129,7 +129,8 @@ module ApplicationHelper if File.exist?(disk_filename(source.class, source.id)) if source.class.to_s == 'User' File.join(relative_path, ["#{source.class}", "#{source.id}"]) - elseavatars", ["#{source.class}", "#{source.id}"]) + else + File.join("avatars", ["#{source.class}", "#{source.id}"]) end elsif source.class.to_s == 'User' str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g" From 9b6836fc70534a46ea6eabdbe516b4cad8f21f05 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 19:08:30 +0800 Subject: [PATCH 143/221] delete --- public/react/src/modules/forums/PostPaginationHOC.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/forums/PostPaginationHOC.js b/public/react/src/modules/forums/PostPaginationHOC.js index 3922eae41..1f67c8d7d 100644 --- a/public/react/src/modules/forums/PostPaginationHOC.js +++ b/public/react/src/modules/forums/PostPaginationHOC.js @@ -267,7 +267,7 @@ return function wrap(WrappedComponent) { this.setTop(memo); } onMemoDelete(memo) { - const deleteUrl = `/api/v1/memos/${memo.id}`; + const deleteUrl = `/memos/${memo.id}.json`; // 获取memo list axios.delete(deleteUrl, { // withCredentials: true, From 981be28c668e626aa051729431d1ac328c9b5f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 19:11:31 +0800 Subject: [PATCH 144/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/coursesPublic/Addcourses.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js index 8225907b8..a9d30f2b6 100644 --- a/public/react/src/modules/courses/coursesPublic/Addcourses.js +++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js @@ -75,6 +75,7 @@ class Addcourses extends Component{ if(e.target.checked===true){ this.setState({ assistant_professor:1, + professor:null, Checkboxteachingchecked:e.target.checked, Checkboxteachertype:true }) @@ -95,6 +96,7 @@ class Addcourses extends Component{ if(e.target.checked===true){ this.setState({ professor:1, + assistant_professor:null, Checkboxteacherchecked:e.target.checked, Checkboxteachingtype:true }) From d484af9a0d7dfa838404d34f8e74efcb6a7dd466 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 19:15:28 +0800 Subject: [PATCH 145/221] fix --- app/decorators/tiding_decorator.rb | 1 + app/models/apply_add_school.rb | 3 ++- db/migrate/20190802105008_tranfer_tiding_data.rb | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20190802105008_tranfer_tiding_data.rb diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index c7d914089..30a325cd3 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -30,6 +30,7 @@ module TidingDecorator end def strip_html(text, len = 0, suffix = "...") + text = text.to_s str = "" if !text.nil? && text.length > 0 str = text.gsub(/<\/?.*?>/, '').strip diff --git a/app/models/apply_add_school.rb b/app/models/apply_add_school.rb index bae65d24f..c303283ca 100644 --- a/app/models/apply_add_school.rb +++ b/app/models/apply_add_school.rb @@ -9,6 +9,7 @@ class ApplyAddSchool < ApplicationRecord private def send_notify - tidings.create!(user_id: 1, status: 0, trigger_user_id: user_id, belong_container: school, tiding_type: 'Apply') + Tiding.create!(user_id: 1, status: 0, container_id: id, container_type: 'ApplyAddSchools', + trigger_user_id: user_id, belong_container: school, tiding_type: 'Apply') end end \ No newline at end of file diff --git a/db/migrate/20190802105008_tranfer_tiding_data.rb b/db/migrate/20190802105008_tranfer_tiding_data.rb new file mode 100644 index 000000000..ef7682530 --- /dev/null +++ b/db/migrate/20190802105008_tranfer_tiding_data.rb @@ -0,0 +1,5 @@ +class TranferTidingData < ActiveRecord::Migration[5.2] + def change + Tiding.where(container_type: 'ApplyAddSchool').update_all(container_type: 'ApplyAddSchools') + end +end From db61139032f5c0e2dcd0619517276c3e92d9613d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 19:18:36 +0800 Subject: [PATCH 146/221] page --- public/react/src/modules/forums/PostPaginationHOC.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/forums/PostPaginationHOC.js b/public/react/src/modules/forums/PostPaginationHOC.js index 1f67c8d7d..cdba0a35a 100644 --- a/public/react/src/modules/forums/PostPaginationHOC.js +++ b/public/react/src/modules/forums/PostPaginationHOC.js @@ -136,7 +136,7 @@ return function wrap(WrappedComponent) { const params = { // replies_count最热 created_at 最新 // s_order: 'replies_count', - page: currentPage - 1, + page: currentPage, // forum: // forum_id // user_id From d54e4c58ebeca3a8d4647788b3f29e09244f2e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 19:34:56 +0800 Subject: [PATCH 147/221] Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagChat.js # public/react/src/modules/message/js/Messagerouting.js --- .../src/modules/message/css/messagemy.css | 4 ++ .../react/src/modules/message/js/MessagSub.js | 48 +++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/message/css/messagemy.css b/public/react/src/modules/message/css/messagemy.css index 9f6736ec3..05d6c3511 100644 --- a/public/react/src/modules/message/css/messagemy.css +++ b/public/react/src/modules/message/css/messagemy.css @@ -20,6 +20,10 @@ .ant-modal-header{ border-radius: 0px !important; } +.ridinglist-subs{ + border-bottom: 1px solid #F5F5F5; + padding: 25px 0px; +} .search-new{ width: 100% !important; margin-bottom: 0px !important; diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index cb2d18105..de23f4764 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -167,9 +167,9 @@ class MessagSub extends Component{ return window.open("/managements/subject_authorization") } if(item.tiding_type==="System"){ - // 实践课程详情页 :identifier = identifier + // 实践课程详情页 :parent_container_id = parent_container_id - return window.open(`/paths/${item.identifier}`) + return window.open(`/paths/${item.parent_container_id}`) } case "TrialAuthorization" : if(item.tiding_type==="Apply"){ @@ -203,7 +203,7 @@ class MessagSub extends Component{ return window.open(`/shixuns/${item.identifier}/challenges`) case "Subject" : // 实践课程详情页 :id = container_id - return window.open(`/paths/${item.identifier}`) + return window.open(`/paths/${item.container_id}`) case "JournalsForMessage" : switch (item.parent_container_type) { case "Principal" : @@ -224,7 +224,6 @@ class MessagSub extends Component{ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } - return ''; case "GraduationTopic" : // 毕业目标页 parent_container_id return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) @@ -245,7 +244,7 @@ class MessagSub extends Component{ } case "Memo" : // 交流问答页 :id = parent_container_id - return window.open("/forums/categories/all?order=newest") + return window.open(`/forums/${item.parent_container_id}`) case "Watcher" : // 用户个人中心页 :id = item.trigger_user.login return window.open(`/users/${item.trigger_user.login}/courses`) @@ -255,6 +254,7 @@ class MessagSub extends Component{ case "Grade" : //个人中心页 :id = item.trigger_user.login // return window.open(`/users/${item.trigger_user.login}/courses`; + return ""; case "JoinProject" : //项目详情-申请加入项目审核页 :id = container_id return window.open(`/projects/${item.container_id}`) @@ -365,15 +365,15 @@ class MessagSub extends Component{ //课堂-作业 :id = container_id if(item.homework_type===1){ //普通作业 - return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.container_id}/list`) } if(item.homework_type===3){ //分组作业 - return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.container_id}/list`) } if(item.homework_type===4){ //实训作业 - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) + return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}/list?tab=0`) } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id @@ -432,10 +432,10 @@ class MessagSub extends Component{ if(item.tiding_type==="Destroyed_end"){ return ; }else { - // if (item.tiding_type === 'Apply') { - // ///managements/project_package_applies - // return window.open(`/managements/project_package_applies`; - // } + if (item.tiding_type === 'Apply') { + ///managements/project_package_applies + return window.open(`/managements/project_package_applies`) + } // if(item.tiding_type === 'System'){ //众包详情 :id = container_id return window.open(`/crowdsourcing/${item.container_id}`) @@ -485,10 +485,30 @@ class MessagSub extends Component{

      暂无数据哦~

      :data.map((item,key)=>{ - console.log(data) + // console.log(data) + // ridinglist-subs + var boolps=true; + if(item.container_type==="PraiseTread"||item.container_type==="Grade"||item.container_type==="ChallengeWorkScore"){ + boolps=false; + } + if(item.container_type==="JournalsForMessage"){ + if(item.parent_container_type==="Principal"){ + boolps=false; + } + } + // if(item.container_type==="HomeworkCommon"){ + // if(item.parent_container_type==="AnonymousAppeal"){ + // boolps=false; + // } + // } + if(item.container_type==="ProjectPackage"){ + if(item.tiding_type==="Destroyed_end"){ + boolps=false; + } + } return(
      -
      this.gettourl(item)}> +
      this.gettourl(item)}> this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>

      From 84cbf79f395239f876256695fad3b50225bf3275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 19:36:34 +0800 Subject: [PATCH 148/221] Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagChat.js # public/react/src/modules/message/js/Messagerouting.js --- public/react/src/modules/message/js/MessagSub.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index de23f4764..469d94914 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -214,7 +214,7 @@ class MessagSub extends Component{ //学生作业页 homework = parent_container_id if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -231,7 +231,7 @@ class MessagSub extends Component{ //学生作业页 if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -310,7 +310,7 @@ class MessagSub extends Component{ // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -323,7 +323,7 @@ class MessagSub extends Component{ case "HomeworkPublish" : if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -336,7 +336,7 @@ class MessagSub extends Component{ case "AnonymousAppeal" : if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -350,7 +350,7 @@ class MessagSub extends Component{ // 课堂-作业列表 homework = container_id if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -379,7 +379,7 @@ class MessagSub extends Component{ //课堂-作业 :id = parent_container_id if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 @@ -392,7 +392,7 @@ class MessagSub extends Component{ case "StudentWorksScoresAppeal" : if(item.homework_type===1){ //普通作业 - return window.open(`t/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + return window.open(`courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } if(item.homework_type===3){ //分组作业 From d842784e29a34d032ed1b16f7623c7e669300adf Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 19:37:38 +0800 Subject: [PATCH 149/221] fix --- app/models/journals_for_message.rb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 1da26fd22..d5697d87f 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -25,6 +25,8 @@ class JournalsForMessage < ApplicationRecord # "is_comprehensive_evaluation", # 1 教师评论、2 匿评、3 留言 # "hidden", 隐藏 + after_create :send_tiding + # course_identity 课堂用户身份 def contents_show course_identity @@ -47,4 +49,29 @@ class JournalsForMessage < ApplicationRecord JournalsForMessage.includes(:user).where(m_parent_id: self.id).page(page).per(limit).reorder("created_on asc") end + + def send_tiding + # 回复和@同一个人时：只发@的消息（因@的消息先创建） + case self.jour_type + # 用户留言当做私信处理 不发消息 + when "Principal" +=begin + user_id = self.m_parent_id.present? ? JournalsForMessage.find(self.m_parent_id).user_id : self.jour_id + if user_id != self.user_id && !self.tidings.where(:user_id => user_id, :trigger_user_id => self.user_id, :tiding_type => "Mentioned").first.present? + self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => user_id, :parent_container_id => self.jour_id, :parent_container_type => self.jour_type, :belong_container_id => self.jour_id, :belong_container_type => "User", :viewed => 0, :tiding_type => self.m_parent_id.present? ? "Comment" : "Journal") + end +=end + when "HomeworkCommon", "GraduationTopic" + user_id = self.m_parent_id.present? ? JournalsForMessage.find(self.m_parent_id).user_id : (self.jour_type == "HomeworkCommon" ? self.jour.user_id : self.jour.tea_id) + if user_id != self.user_id && !self.tidings.where(:user_id => user_id, :trigger_user_id => self.user_id, :tiding_type => "Mentioned").first.present? + self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => user_id, :parent_container_id => self.jour_id, :parent_container_type => self.jour_type, :belong_container_id => self.jour.course_id, :belong_container_type => "Course", :viewed => 0, :tiding_type => "Comment") + end + when "StudentWorksScore" + course_id = self.jour.try(:student_work).try(:homework_common).try(:course_id) + user_id = self.m_parent_id.present? ? JournalsForMessage.find(self.m_parent_id).user_id : self.jour.user_id + if user_id != self.user_id && !self.tidings.where(:user_id => user_id, :trigger_user_id => self.user_id, :tiding_type => "Mentioned").first.present? + self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => user_id, :parent_container_id => self.jour_id, :parent_container_type => self.jour_type, :belong_container_id => course_id, :belong_container_type => "Course", :viewed => 0, :tiding_type => "Comment") + end + end + end end From a5e0a0cfffa38d330f7e410fd1195e1bbe4e3d69 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 19:39:25 +0800 Subject: [PATCH 150/221] =?UTF-8?q?=E7=82=B9=E8=B5=9E=E8=B7=B3404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/discusses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb index 6a270f619..4af27b919 100644 --- a/app/controllers/discusses_controller.rb +++ b/app/controllers/discusses_controller.rb @@ -1,7 +1,7 @@ class DiscussesController < ApplicationController LIMIT = 10 before_action :find_container, only: [:index, :hidden] - before_action :find_discuss, except: [:create, :index, :new_message, :reward_code, :forum_discusses] + before_action :find_discuss, except: [:create, :index, :new_message, :reward_code, :forum_discusses, :plus] def index page = params[:page].to_i From 81bd737bc7fd96056678f1d498ebc36660e1ab1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 19:41:37 +0800 Subject: [PATCH 151/221] b --- .../PackageIndexNEITaskDetails.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 1f7851303..ac498b4ee 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -297,8 +297,8 @@ class PackageIndexNEITaskDetails extends Component { onMouseOver={this.setover} onMouseOut={this.setout} > - {overtype===false? 头像联系TA: - 头像 头像联系TA: + 头像联系TA}

      }
      @@ -411,7 +411,7 @@ class PackageIndexNEITaskDetails extends Component { {item.status==="bidding_won"?:""}

      {item.name}

      - {this.props.current_user&&this.props.current_user.login!=item.login? + {this.props.current_user&&this.props.current_user.login!=item.login? 头像联系TA :""}
      From a0902f907993b0a11afe9d1d0b78d921c81e6395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 19:44:26 +0800 Subject: [PATCH 152/221] Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl # Conflicts: # public/react/src/modules/message/js/MessagChat.js # public/react/src/modules/message/js/Messagerouting.js --- public/react/src/modules/message/js/MessagChat.js | 2 +- public/react/src/modules/message/js/MessagSub.js | 2 +- public/react/src/modules/message/js/MessagePrivate.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index ad966f7c9..76057f38a 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -656,7 +656,7 @@ class MessagChat extends Component{

      -

      +

      diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 469d94914..bbbb7caa3 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -532,7 +532,7 @@ class MessagSub extends Component{ ` } -

      +

      diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index 4ff3a73cc..b41ba41a5 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -179,7 +179,7 @@ class MessagePrivate extends Component{ [{item.message_count}{"条"}] {moment(item.send_time).fromNow()}

      - +
      {item.unread === true ?:""} From 9de5f06a56bea273088840dac22bb70a558e1e8a Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 19:44:28 +0800 Subject: [PATCH 153/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_memo.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/memos/_memo.json.jbuilder b/app/views/memos/_memo.json.jbuilder index a33de2492..f0ac5cd3d 100644 --- a/app/views/memos/_memo.json.jbuilder +++ b/app/views/memos/_memo.json.jbuilder @@ -9,6 +9,6 @@ json.memo do json.tag memo.tag_repertoires.map(&:name) json.time memo.created_at json.replies_count memo.all_replies_count - json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 1 ? true : false + json.user_praise memo.praise_treads.user_liker(@user.try(:id)).count > 0 ? true : false json.memo_praise_count memo.praise_treads.liker.count end From ae2c877639bee865f45dea3e9424fdd276a7b52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 19:46:35 +0800 Subject: [PATCH 154/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/new/CoursesNew.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index f37f1a1db..fc4719013 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -203,7 +203,7 @@ class CoursesNew extends Component { // debugger if (response.data.status === 0) { // this.goback() - this.props.history.push(first_category_url); + window.location.href=first_category_url; } }).catch((error) => { console.log(error) @@ -247,7 +247,7 @@ class CoursesNew extends Component { ).then((response) => { if (response.status === 200) { // this.goback - this.props.history.push(response.data.first_category_url); + window.location.href=response.data.first_category_url; } }).catch((error) => { console.log(error) From ace93f1b948792234c24f5622442b16ec069ad2f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 2 Aug 2019 19:49:54 +0800 Subject: [PATCH 155/221] =?UTF-8?q?Mp3mp4=E7=B1=BB=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E5=BC=80=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- app/views/games/picture_display.json.jbuilder | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 913013442..a0377e4e4 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -164,7 +164,7 @@ class ShixunsController < ApplicationController @new_shixun = Shixun.new @new_shixun.attributes = @shixun.attributes.dup.except("id","user_id","visits","gpid","status", "identifier", "averge_star", "homepage_show","repo_name", "myshixuns_count", "challenges_count", - "can_copy") + "can_copy", "created_at", "updated_at") @new_shixun.user_id = User.current.id @new_shixun.averge_star = 5 @new_shixun.identifier = generate_identifier Shixun, 8 diff --git a/app/views/games/picture_display.json.jbuilder b/app/views/games/picture_display.json.jbuilder index 838cfeda0..770f0d71b 100644 --- a/app/views/games/picture_display.json.jbuilder +++ b/app/views/games/picture_display.json.jbuilder @@ -39,15 +39,10 @@ elsif @type == "mp3" || @type == "mp4" json.file_url attachment_show_users_path(:file_name => file, :path => @original_path) end end - # json.user_file do - # json.array! @user_picture do |file| - # json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) - # end - # end - if @type == "mp4" - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}] - else - json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}] + json.user_file do + json.array! @user_picture do |file| + json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i) + end end json.answer_file do json.array! @answer_picture do |file| From 6958276a63d1f441025d78c9f70cb6a82a7a955d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 19:51:25 +0800 Subject: [PATCH 156/221] images --- public/react/src/modules/forums/RecommendShixun.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/forums/RecommendShixun.js b/public/react/src/modules/forums/RecommendShixun.js index aa9dec952..af0ca0007 100644 --- a/public/react/src/modules/forums/RecommendShixun.js +++ b/public/react/src/modules/forums/RecommendShixun.js @@ -28,7 +28,7 @@ class RecommendShixun extends Component {
      - {`${_shixun.id}`} + {`${_shixun.id}`}
      From 6836318b209fdba4a67885a3de93fbd53a16ad9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 19:58:19 +0800 Subject: [PATCH 157/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/message/js/MessagSub.js | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index bbbb7caa3..07ab9e890 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -212,15 +212,15 @@ class MessagSub extends Component{ return ''; case "HomeworkCommon" : //学生作业页 homework = parent_container_id - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } @@ -229,15 +229,15 @@ class MessagSub extends Component{ return window.open(`/courses/${item.belong_container_id}/graduation_topics/${item.parent_container_id}/detail`) case "StudentWorksScore" : //学生作业页 - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } @@ -308,97 +308,97 @@ class MessagSub extends Component{ switch (item.parent_container_type) { case "AnonymousCommentFail" : // 课堂-作业列表 homework = container_id - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "HomeworkPublish" : - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "AnonymousAppeal" : - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } default : // 课堂-作业列表 homework = container_id - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } } case "StudentWork" : //课堂-作业 :id = container_id - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.container_id}/list?tab=0`) } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } case "StudentWorksScoresAppeal" : - if(item.homework_type===1){ + if(item.homework_type==="normal"){ //普通作业 return window.open(`courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===3){ + if(item.homework_type==="group"){ //分组作业 return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) } - if(item.homework_type===4){ + if(item.homework_type==="practice"){ //实训作业 return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) } From 925582c1f42cbb01ab7a14bb9f14093a907a657e Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 2 Aug 2019 20:02:30 +0800 Subject: [PATCH 158/221] evaluation_end --- public/react/src/modules/courses/busyWork/CommonWorkSetting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js index 17a944d41..8baee4b45 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkSetting.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkSetting.js @@ -722,7 +722,7 @@ class CommonWorkSetting extends Component{ late_time: late_time ? new Date(late_time) : late_time, // 补交截止时间 anonymous_comment: anonymous_comment, // true: 启用匿评 false:未启用匿评 evaluation_start: evaluation_start ? new Date(evaluation_start) : evaluation_start, //匿评开始时间 - evaluation_end: evaluation_end, + evaluation_end: evaluation_end ? new Date(evaluation_end) : evaluation_end, evaluation_num: evaluation_num, // 匿评数 absence_penalty: absence_penalty, // 匿评扣分 anonymous_appeal: anonymous_appeal, // true: 启用匿评申诉, false:未启用 From aeaf0a322fdb9e10a7c1649a08ba38650cae3c0b Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 20:06:09 +0800 Subject: [PATCH 159/221] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5040acec0..7e9fd652b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -130,15 +130,15 @@ module ApplicationHelper if source.class.to_s == 'User' File.join(relative_path, ["#{source.class}", "#{source.id}"]) else - File.join("avatars", ["#{source.class}", "#{source.id}"]) + File.join("images/avatars", ["#{source.class}", "#{source.id}"]) end elsif source.class.to_s == 'User' str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g" File.join(relative_path, "#{source.class}", str) elsif source.class.to_s == 'Subject' - File.join("educoder", "index", "subject", "subject#{rand(17)}.jpg") + File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg") elsif source.class.to_s == 'Shixun' - File.join("educoder","index", "shixun", "shixun#{rand(23)}.jpg") + File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg") end end From 558135dc1fa7004104227307e35b02de8f6e13a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 20:06:20 +0800 Subject: [PATCH 160/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagSub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 07ab9e890..c072902e0 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -412,7 +412,7 @@ class MessagSub extends Component{ return window.open(`/projects/${item.parent_container_id}/issues?remote=true`) case "Issue" : //项目Issue页 :id = container_id - return window.open(`/projects/${item.container_id}/issues?remote=true`) + return window.open(`/issues/${item.container_id}`) case "PullRequest" : // 项目pull request页 :id = parent_container_id return window.open(`/projects/${item.parent_container_id}/pull_requests`) From 11d2976b2be32c54120002c26ebdbf72ecc071f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 20:15:02 +0800 Subject: [PATCH 161/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagSub.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index c072902e0..55b0754d6 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -441,6 +441,8 @@ class MessagSub extends Component{ return window.open(`/crowdsourcing/${item.container_id}`) // } } + case "Discuss": + return window.open(`/shixuns/${item.identifier}/shixun_discuss`); default : return window.open("/") } From 93ea9a2ad8705381112322032e4d696045f04155 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 20:38:38 +0800 Subject: [PATCH 162/221] fix tiding --- app/decorators/tiding_decorator.rb | 4 ++-- config/locales/tidings/zh-CN.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index 30a325cd3..2e800c4b4 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -106,9 +106,9 @@ module TidingDecorator if tiding_type == 'Apply' I18n.t(locale_format(tiding_type)) % name elsif status == 2 - I18n.t(locale_format(tiding_type, "#{status}_#{extra.nil?}"), reason: extra) % name + I18n.t(locale_format(tiding_type, "#{status}_#{extra.nil?}"), name: name, reason: extra) else - I18n.t(locale_format(tiding_type, status)) % name + I18n.t(locale_format(tiding_type, status), name: name, reason: extra) end end diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml index 456f15887..8d7d1950f 100644 --- a/config/locales/tidings/zh-CN.yml +++ b/config/locales/tidings/zh-CN.yml @@ -38,8 +38,8 @@ Apply_end: "申请添加单位：%s" System: "1_end": "你提交的添加单位申请：%{name}，审核已通过" - "2_reason_end": "你提交的添加单位申请：%{name}，审核未通过
      原因：%{reason}" - "2_no_reason_end": "你提交的添加单位申请：%{name}，审核未通过" + "2_false_end": "你提交的添加单位申请：%{name}，审核未通过
      原因：%{reason}" + "2_true_end": "你提交的添加单位申请：%{name}，审核未通过" "3_end": "你提交的添加单位申请：%{name}，已被更改为：%{reason}" ApplyAction: ApplyShixun: From 6b02e495a8ce15c44905858b9b5b01b5c8319ba3 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 20:41:16 +0800 Subject: [PATCH 163/221] fix --- app/decorators/tiding_decorator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index 2e800c4b4..77bbcf9e3 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -97,7 +97,7 @@ module TidingDecorator elsif status == 2 I18n.t(locale_format(tiding_type, "#{status}_#{extra.nil?}"), reason: extra) % [name, second_name] else - I18n.t(locale_format(tiding_type, status)) % [name, second_name] + I18n.t(locale_format(tiding_type, status), reason: extra) % [name, second_name] end end From e459f48ac9802af92795beba934f2b03aa2703c6 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 20:45:01 +0800 Subject: [PATCH 164/221] fix --- app/models/apply_user_authentication.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/models/apply_user_authentication.rb b/app/models/apply_user_authentication.rb index c7fb5019e..d467eb850 100644 --- a/app/models/apply_user_authentication.rb +++ b/app/models/apply_user_authentication.rb @@ -3,8 +3,18 @@ class ApplyUserAuthentication < ApplicationRecord belongs_to :user + has_many :tidings, :as => :container, :dependent => :destroy + scope :real_name_auth, -> { where(auth_type: 1) } scope :professional_auth, -> { where(auth_type: 2) } scope :processing, -> { where(status: 0) } scope :passed, -> { where(status: 1) } + + after_create :send_tiding + + private + + def send_tiding + self.tidings << Tiding.new(:user_id => '1', :status=> 0, :trigger_user_id => user_id, :belong_container_id => 1, :belong_container_type =>'User', :tiding_type => "Apply") + end end From aec6029a00152dbc14c40534b1163f5756ba7b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 21:03:07 +0800 Subject: [PATCH 165/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/message/js/MessagSub.js | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 55b0754d6..69dcf0b36 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -377,31 +377,34 @@ class MessagSub extends Component{ } case "StudentWorksScore" : //课堂-作业 :id = parent_container_id - if(item.homework_type==="normal"){ - //普通作业 - return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) - } - if(item.homework_type==="group"){ - //分组作业 - return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) - } - if(item.homework_type==="practice"){ - //实训作业 - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) - } + // if(item.homework_type==="normal"){ + // //普通作业 + // return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + // } + // if(item.homework_type==="group"){ + // //分组作业 + // return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) + // } + // if(item.homework_type==="practice"){ + // //实训作业 + // return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) + // } + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.trigger_user.id}/appraise`); + case "StudentWorksScoresAppeal" : - if(item.homework_type==="normal"){ - //普通作业 - return window.open(`courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) - } - if(item.homework_type==="group"){ - //分组作业 - return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) - } - if(item.homework_type==="practice"){ - //实训作业 - return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) - } + // if(item.homework_type==="normal"){ + // //普通作业 + // return window.open(`courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/list`) + // } + // if(item.homework_type==="group"){ + // //分组作业 + // return window.open(`/courses/${item.belong_container_id}/group_homeworks/${item.parent_container_id}/list`) + // } + // if(item.homework_type==="practice"){ + // //实训作业 + // return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) + // } + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.trigger_user.id}/appraise`); case "ChallengeWorkScore" : return ''; case "SendMessage" : From 1304c93f15b5e01e94581d89b73116675b4cbadc Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 2 Aug 2019 21:05:23 +0800 Subject: [PATCH 166/221] fix --- app/decorators/tiding_decorator.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb index 77bbcf9e3..d1f6f08e6 100644 --- a/app/decorators/tiding_decorator.rb +++ b/app/decorators/tiding_decorator.rb @@ -47,13 +47,13 @@ module TidingDecorator # ================ 各种类消息内容方法 ================ def apply_user_authentication_content - return if trigger_user_id.zero? + t_user = trigger_user || User.find(1) if tiding_type == 'Apply' str1, str2 = if container.auth_type == 1 - [trigger_user.show_real_name, trigger_user.ID_number] + [t_user.show_real_name, t_user.ID_number] elsif container.auth_type == 2 - ue = trigger_user.user_extension + ue = t_user.user_extension [[ue.school&.name, ue.department&.name].join('_'), ue.identity_text] end I18n.t(locale_format(tiding_type, container.auth_type)) % [str1, str2] From 77f9ec58da1a88a89f2bd08f58765ef2cc27e186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 21:08:28 +0800 Subject: [PATCH 167/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagSub.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 69dcf0b36..e8b3b4d7e 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -389,7 +389,7 @@ class MessagSub extends Component{ // //实训作业 // return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) // } - return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.trigger_user.id}/appraise`); + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`); case "StudentWorksScoresAppeal" : // if(item.homework_type==="normal"){ @@ -404,7 +404,7 @@ class MessagSub extends Component{ // //实训作业 // return window.open(`/courses/${item.belong_container_id}/shixun_homeworks/${item.parent_container_id}/list?tab=0`) // } - return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.parent_container_id}/${item.trigger_user.id}/appraise`); + return window.open(`/courses/${item.belong_container_id}/common_homeworks/${item.trigger_user.id}/${item.parent_container_id}/appraise`); case "ChallengeWorkScore" : return ''; case "SendMessage" : From c263a62514c1b0d34a27a1c2a044c98f7c89ca3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 21:17:09 +0800 Subject: [PATCH 168/221] b --- .../src/modules/courses/busyWork/common/WorkDetailPageHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js index eef99bfcd..56460a44a 100644 --- a/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js +++ b/public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js @@ -90,7 +90,7 @@ class WorkDetailPageHeader extends Component{ } `} Date: Fri, 2 Aug 2019 21:19:40 +0800 Subject: [PATCH 169/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagSub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index e8b3b4d7e..28eb3fb2d 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -467,7 +467,7 @@ class MessagSub extends Component{
    • this.getdata("project_package",1)}>众包提醒
      • -
    • this.getdata("interactive",1)}>互动提醒
      • +
    • this.getdata("interaction",1)}>互动提醒
    • this.getdata("apply",1)}>审核
      • From e7d3a06259e916eb6469fb2341b82915009e4c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 21:20:06 +0800 Subject: [PATCH 170/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/MessagSub.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 28eb3fb2d..ea280af75 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -467,7 +467,7 @@ class MessagSub extends Component{
    • this.getdata("project_package",1)}>众包提醒
      • -
    • this.getdata("interaction",1)}>互动提醒
      • +
    • this.getdata("interaction",1)}>互动提醒
    • this.getdata("apply",1)}>审核
      • From c7036f25525a0fd8e16ee139157a34c3ffa3c1e1 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 21:26:49 +0800 Subject: [PATCH 171/221] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercises_controller.rb | 5 +++- app/controllers/polls_controller.rb | 1 + app/jobs/commit_exercsie_notify_job_job.rb | 26 +++++++++++++++++++ app/jobs/commit_poll_notify_job_job.rb | 26 +++++++++++++++++++ app/models/student_graduation_topic.rb | 5 ++++ config/locales/tidings/zh-CN.yml | 10 +++---- .../commit_exercsie_notify_job_job_spec.rb | 5 ++++ spec/jobs/commit_poll_notify_job_job_spec.rb | 5 ++++ 8 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 app/jobs/commit_exercsie_notify_job_job.rb create mode 100644 app/jobs/commit_poll_notify_job_job.rb create mode 100644 spec/jobs/commit_exercsie_notify_job_job_spec.rb create mode 100644 spec/jobs/commit_poll_notify_job_job_spec.rb diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index 6f121db5f..e92c3b266 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -703,12 +703,14 @@ class ExercisesController < ApplicationController end if ex_status == 1 #如果试卷存在已发布的，或者是已截止的，那么则直接跳过 g_course = params[:group_ids] #表示是否传入分班参数,如果传入分班的参数，那么试卷的统一设置需修改 + tiding_group_ids = g_course if g_course user_course_groups = @course.charge_group_ids(current_user) if g_course.map(&:to_i).sort == user_course_groups.sort # 如果是设置为全部班级，则试卷不用分组，且试卷设定为统一设置,否则则分组设置 exercise.exercise_group_settings.destroy_all ex_unified = true e_time = ex_end_time + tiding_group_ids = [] else ex_unified = false g_course.each do |i| @@ -748,7 +750,7 @@ class ExercisesController < ApplicationController if exercise.course_acts.size == 0 exercise.course_acts << CourseActivity.new(:user_id => exercise.user_id,:course_id => exercise.course_id) end - ExercisePublishNotifyJob.perform_later(exercise.id, g_course) + ExercisePublishNotifyJob.perform_later(exercise.id, tiding_group_ids) end end end @@ -1084,6 +1086,7 @@ class ExercisesController < ApplicationController :subjective_score => subjective_score } @answer_committed_user.update_attributes(commit_option) + CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id) normal_status(0,"试卷提交成功！") end rescue Exception => e diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 7d978d722..ba3030424 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -919,6 +919,7 @@ class PollsController < ApplicationController :end_at => Time.now } poll_user_current.update_attributes(poll_user_params) + CommitPollNotifyJobJob.perform_later(@poll.id, current_user.id) normal_status(0, "问卷提交成功！") end ## 需添加发送消息的接口，稍后添加 diff --git a/app/jobs/commit_exercsie_notify_job_job.rb b/app/jobs/commit_exercsie_notify_job_job.rb new file mode 100644 index 000000000..1be0bb2bc --- /dev/null +++ b/app/jobs/commit_exercsie_notify_job_job.rb @@ -0,0 +1,26 @@ +class CommitExercsieNotifyJobJob < ApplicationJob + queue_as :notify + + def perform(exercise_id, user_id) + exercise = Exercise.find_by(id: exercise_id) + user = User.find_by(id: user_id) + return if [exercise, user].any?(&:blank?) + course = exercise.course + + attrs = %i[user_id trigger_user_id container_id container_type parent_container_id parent_container_type + belong_container_id belong_container_type tiding_type viewed status created_at updated_at] + + same_attrs = { + trigger_user_id: user.id, + container_id: exercise.id, container_type: 'Exercise', + parent_container_id: exercise.id, parent_container_type: 'CommitExercise', + belong_container_id: course.id, belong_container_type: 'Course', + tiding_type: 'Exercise', viewed: 0, status: 0 + } + Tiding.bulk_insert(*attrs) do |worker| + course.course_member(user).member_teachers.each do |teacher| + worker.add same_attrs.merge(user_id: teacher.user_id) + end + end + end +end diff --git a/app/jobs/commit_poll_notify_job_job.rb b/app/jobs/commit_poll_notify_job_job.rb new file mode 100644 index 000000000..6953fa9e9 --- /dev/null +++ b/app/jobs/commit_poll_notify_job_job.rb @@ -0,0 +1,26 @@ +class CommitPollNotifyJobJob < ApplicationJob + queue_as :notify + + def perform(poll_id, user_id) + poll = Poll.find_by(id: poll_id) + user = User.find_by(id: user_id) + return if [poll, user].any?(&:blank?) + course = poll.course + + attrs = %i[user_id trigger_user_id container_id container_type parent_container_id parent_container_type + belong_container_id belong_container_type tiding_type viewed status created_at updated_at] + + same_attrs = { + trigger_user_id: user.id, + container_id: poll.id, container_type: 'Poll', + parent_container_id: poll.id, parent_container_type: 'CommitPoll', + belong_container_id: course.id, belong_container_type: 'Course', + tiding_type: 'Poll', viewed: 0, status: 0 + } + Tiding.bulk_insert(*attrs) do |worker| + course.course_member(user).member_teachers.each do |teacher| + worker.add same_attrs.merge(user_id: teacher.user_id) + end + end + end +end diff --git a/app/models/student_graduation_topic.rb b/app/models/student_graduation_topic.rb index ea1774695..50f150f92 100644 --- a/app/models/student_graduation_topic.rb +++ b/app/models/student_graduation_topic.rb @@ -17,7 +17,12 @@ class StudentGraduationTopic < ApplicationRecord scope :is_refused, -> {where(status: 2)} scope :is_accepted, -> {where(status: 1)} scope :is_accepting, -> {where(status: 0)} + after_create :send_tiding + def send_tiding + self.tidings << Tiding.new(:user_id => self.graduation_topic.tea_id, :trigger_user_id => self.user_id, :parent_container_id => self.graduation_topic_id, :parent_container_type => "GraduationTopic", + :belong_container_id => self.graduation_topic.course_id, :belong_container_type => "Course", :viewed => 0, :status => 0, :tiding_type => "GraduationTopic") + end # 学生名称 def name diff --git a/config/locales/tidings/zh-CN.yml b/config/locales/tidings/zh-CN.yml index 456f15887..d6b44b26c 100644 --- a/config/locales/tidings/zh-CN.yml +++ b/config/locales/tidings/zh-CN.yml @@ -164,7 +164,7 @@ NearlyEnd_end: "试卷的截止时间快到啦：%s" CommitExercise_end: "提交了试卷答题：%s" ExerciseScore_end: "评阅了你的试卷：%s" - StudentGraduationTopic_end: "选择了毕设选题：%s" + StudentGraduationTopic_end: "申请选择毕设选题：%s" DealStudentTopicSelect: 1_end: "你提交的选题申请：%s，审核已通过" 2_end: "你提交的选题申请：%s，审核未通过" @@ -195,11 +195,11 @@ ChallengeWorkScore_end: "调整了你的作品分数：%s" StudentWorksScoresAppeal: UserAppealResult: - 1_end: "同意了你提交的匿评申诉申请：%s" - 2_end: "拒绝了你提交的匿评申诉：%s" + 1_end: "你提交的匿评申诉申请：%s，审核已通过" + 2_end: "你提交的匿评申诉：%s，审核未通过" AppealResult: - 1_end: "同意了他人对你的匿评申诉申请：%s" - 2_end: "拒绝了他人对你的匿评申诉：%s" + 1_end: "别人对你的匿评发起的申诉申请：%s，审核已通过" + 2_end: "别人对你的匿评发起的申诉申请：%s，审核未通过" StudentWork: Apply_end: "发起了匿评申诉申请：%s" HomeworkCommon_end: "有人对你的匿评发起了申诉：%s" diff --git a/spec/jobs/commit_exercsie_notify_job_job_spec.rb b/spec/jobs/commit_exercsie_notify_job_job_spec.rb new file mode 100644 index 000000000..17894c9ad --- /dev/null +++ b/spec/jobs/commit_exercsie_notify_job_job_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CommitExercsieNotifyJobJob, type: :job do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/jobs/commit_poll_notify_job_job_spec.rb b/spec/jobs/commit_poll_notify_job_job_spec.rb new file mode 100644 index 000000000..da292f7fb --- /dev/null +++ b/spec/jobs/commit_poll_notify_job_job_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe CommitPollNotifyJobJob, type: :job do + pending "add some examples to (or delete) #{__FILE__}" +end From de9a841c6fd5162c8c66ef6da8e5c5081e420fbf Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 2 Aug 2019 21:31:07 +0800 Subject: [PATCH 172/221] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index d5697d87f..4300ae9cc 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -11,6 +11,7 @@ class JournalsForMessage < ApplicationRecord scope :parent_comment, -> { where(m_parent_id: nil)} scope :search_by_jour_type, lambda{|type,ids| where(jour_type:type,jour_id: ids)} + has_many :tidings, as: :container, dependent: :destroy # "jour_type", # 留言所属类型 # "jour_id", # 留言所属类型的id From 8e20a561c30b8ce471f612aaadca58f6882606ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 2 Aug 2019 21:44:02 +0800 Subject: [PATCH 173/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/message/js/Leftdialogue.js | 2 +- public/react/src/modules/message/js/MessagChat.js | 4 ++-- public/react/src/modules/message/js/MessagSub.js | 6 +++--- public/react/src/modules/message/js/MessagePrivate.js | 4 ++-- public/react/src/modules/message/js/Rightdialogue.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index b16746c70..c809bc9c9 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -53,7 +53,7 @@ class Leftdialogue extends Component{ -
      +
      diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 76057f38a..52c8d9870 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import "../css/messagemy.css" -import {getImageUrl} from 'educoder'; +import {getImageUrl,markdownToHTML} from 'educoder'; import { Modal,Input,Icon,Tooltip,Spin} from 'antd'; import axios from 'axios'; import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; @@ -656,7 +656,7 @@ class MessagChat extends Component{

      -

      +

      diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index ea280af75..72a7e373e 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -4,7 +4,7 @@ import { Pagination, } from "antd"; import axios from 'axios'; -import {getImageUrl} from 'educoder'; +import {getImageUrl,markdownToHTML} from 'educoder'; import "../css/messagemy.css" //消息页面 class MessagSub extends Component{ @@ -471,7 +471,7 @@ class MessagSub extends Component{
    • this.getdata("apply",1)}>审核
      • -
    • this.getdata("system",1)}>通知
      • +
    • this.getdata("notice",1)}>通知
      • @@ -537,7 +537,7 @@ class MessagSub extends Component{ ` } -

      +

      diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index b41ba41a5..036ae99aa 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl} from 'educoder'; +import {getImageUrl,markdownToHTML} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -179,7 +179,7 @@ class MessagePrivate extends Component{ [{item.message_count}{"条"}] {moment(item.send_time).fromNow()}

      - +
      {item.unread === true ?:""} diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index 04c5f966d..a414f5d52 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -53,7 +53,7 @@ class Rightdialogue extends Component{ -
      +
      this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除 From 55b6c641593b02dd701f698416bcbe772377e75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 21:46:17 +0800 Subject: [PATCH 174/221] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/boards/BoardsNew.js | 896 +++++----- .../src/modules/courses/boards/TopicDetail.js | 1452 ++++++++--------- .../courses/busyWork/CommonWorkDetailIndex.js | 2 +- .../modules/courses/exercise/ExerciseNew.js | 1140 ++++++------- .../graduation/topics/GraduateTopicDetail.js | 2 +- .../graduation/topics/GraduateTopicNew.js | 2 +- 6 files changed, 1747 insertions(+), 1747 deletions(-) diff --git a/public/react/src/modules/courses/boards/BoardsNew.js b/public/react/src/modules/courses/boards/BoardsNew.js index 56dddff7c..cea4f47aa 100644 --- a/public/react/src/modules/courses/boards/BoardsNew.js +++ b/public/react/src/modules/courses/boards/BoardsNew.js @@ -1,449 +1,449 @@ -import React,{ Component } from "react"; - -import { - Form, Input, InputNumber, Switch, Radio, - Slider, Button, Upload, Icon, Rate, Checkbox, message, - Row, Col, Select, Modal, Divider -} from 'antd'; -import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; -import axios from 'axios' -import './board.css' -import "../common/formCommon.css" -import AddDirModal from './AddDirModal' -import { RouteHOC } from './common.js' -import CBreadcrumb from '../common/CBreadcrumb' -import {getUploadActionUrl, bytesToSize, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll} from 'educoder'; - -const confirm = Modal.confirm; -const $ = window.$ -const { Option } = Select; -// https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=71072679-b925-4824-aceb-4649535e3652 -class BoardsNew extends Component{ - constructor(props){ - super(props); - - this.mdRef = React.createRef(); - - this.state = { - fileList: [], - boards: [], - title_num: 60 - } - } - addSuccess = () => { - this.fetchBoards() - } - fetchBoards = () => { - const isEdit = this.isEdit - const boardId = this.props.match.params.boardId - - const boardsUrl = `/courses/board_list.json?board_id=${boardId}` - axios.get(boardsUrl, { }) - .then((response) => { - if (response.data.status == 0) { - this.setState({ - boards: response.data.data.boards || [], - course_id: response.data.data.course_id - }) - if (!isEdit) { - response.data.data.boards.forEach( board => { - if (board.id == boardId) { - this.setState({ board_name: board.name }) - } - }) - // board_name - } - } - }) - .catch(function (error) { - console.log(error); - }); - } - componentDidMount = () => { - - const topicId = this.props.match.params.topicId - const isEdit = !!topicId - this.isEdit = isEdit - - const boardId = this.props.match.params.boardId - - this.fetchBoards() - - if (isEdit) { - const url = `/messages/${topicId}.json` - axios.get(url, { - }) - .then((response) => { - if (response.data.status == 0) { - const { id, data } = response.data; - if (data) { - this.editTopic = data; - this.props.form.setFieldsValue({ - sticky: !!data.sticky, - content: data.content, - subject: data.subject, - select_board_id: data.board_id // TODO 没返回给前端 - }); - this.mdRef.current.setValue(data.content) - const _fileList = data.attachments.map(item => { - return { - id: item.id, - uid: item.id, - name: appendFileSizeToUploadFile(item), - url: item.url, - status: 'done' - } - }) - - this.setState({ fileList: _fileList, board_name: data.board_name, title_num: 60 - parseInt(data.subject.length) }) - } - } - }) - .catch(function (error) { - console.log(error); - }); - } else { - const boardId = this.props.match.params.boardId - - this.props.form.setFieldsValue({ - select_board_id: parseInt(boardId) - }); - } - } - handleSubmit = (e) => { - e.preventDefault(); - const cid = this.state.course_id - const boardId = this.props.match.params.boardId - - this.props.form.validateFieldsAndScroll((err, values) => { - if (!err) { - console.log('Received values of form: ', values); - if (this.isEdit == true) { - const editTopic = this.editTopic - const editUrl = `/messages/${editTopic.id}.json` - - let attachment_ids = undefined - if (this.state.fileList) { - attachment_ids = this.state.fileList.map(item => { - return item.response ? item.response.id : item.id - }) - } - axios.put(editUrl, { - subject: values.subject, - select_board_id: values.select_board_id, - content: values.content, - sticky: values.sticky, - attachment_ids, - }) - .then((response) => { - if (response.data.status == 0) { - const { id } = response.data; - console.log('--- success') - - this.props.toDetailPage(cid, values.select_board_id, editTopic.id) - } - }) - .catch(function (error) { - console.log(error); - }); - } else { - const url = `/boards/${boardId}/messages.json` - let attachment_ids = undefined - if (this.state.fileList) { - attachment_ids = this.state.fileList.map(item => { - return item.response.id - }) - } - - axios.post(url, { - ...values, - course_id: cid, - attachment_ids, - }) - .then((response) => { - if (response.data.data && response.data.status == 0) { - const { id } = response.data.data; - if (id) { - console.log('--- success') - this.props.toDetailPage(cid, values.select_board_id, id) - } - } - }) - .catch(function (error) { - console.log(error); - }); - } - } else { - $("html").animate({ scrollTop: $('html').scrollTop() - 100 }) - } - }); - } - // 附件相关 START - handleChange = (info) => { - let fileList = info.fileList; - this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) - }); - } - onAttachmentRemove = (file) => { - confirm({ - // title: '确定要删除这个附件吗?', - title: '是否确认删除?', - - okText: '确定', - cancelText: '取消', - // content: 'Some descriptions', - onOk: () => { - this.deleteAttachment(file) - }, - onCancel() { - console.log('Cancel'); - }, - }); - - - return false; - } - deleteAttachment = (file) => { - // 初次上传不能直接取uid - const url = `/attachments/${file.response ? file.response.id : file.uid}.json` - axios.delete(url, { - }) - .then((response) => { - if (response.data) { - const { status } = response.data; - if (status == 0) { - console.log('--- success') - - this.setState((state) => { - const index = state.fileList.indexOf(file); - const newFileList = state.fileList.slice(); - newFileList.splice(index, 1); - return { - fileList: newFileList, - }; - }); - } - } - }) - .catch(function (error) { - console.log(error); - }); - } - // 附件相关 ------------ END - changeTitle=(e)=>{ - console.log(e.target.value.length); - this.setState({ - title_num: 60 - parseInt(e.target.value.length) - }) - } - render() { - let { addGroup, fileList, course_id, title_num } = this.state; - const { getFieldDecorator } = this.props.form; - const { current_user } = this.props - - const formItemLayout = { - labelCol: { - xs: { span: 24 }, - // sm: { span: 8 }, - sm: { span: 24 }, - }, - wrapperCol: { - xs: { span: 24 }, - // sm: { span: 16 }, - sm: { span: 24 }, - }, - }; - - const uploadProps = { - width: 600, - fileList, - multiple: true, - // https://github.com/ant-design/ant-design/issues/15505 - // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。 - // showUploadList: false, - action: `${getUploadActionUrl()}`, - onChange: this.handleChange, - onRemove: this.onAttachmentRemove, - beforeUpload: (file) => { - console.log('beforeUpload', file.name); - const isLt150M = file.size / 1024 / 1024 < 150; - if (!isLt150M) { - message.error('文件大小必须小于150MB!'); - } - return isLt150M; - }, - }; - const isAdmin = this.props.isAdmin() - const courseId=this.props.match.params.coursesId; - const boardId = this.props.match.params.boardId - - return( -
      - - -
      - - -

      - {this.isEdit ? "编辑" : "新建"}帖子 - this.props.history.goBack()}> - 返回 - -

      - {/* notRequired */} -
      -
      - { isAdmin && - - {getFieldDecorator('sticky', { - valuePropName: 'checked', - })( - isAdmin && 置顶 - )} - {/* checkbox 有个边距样式 .ant-checkbox-wrapper + span, */} - - - } - - - {getFieldDecorator('subject', { - rules: [{ - required: true, message: '请输入标题', - }, { - max: 60, message: '最大限制为60个字符', - }], - })( - - )} - - - - {getFieldDecorator('select_board_id', { - // initialValue: '3779', - })( - - )} - - - {/* { isAdmin && - {getFieldDecorator('sticky', { - })( - 置顶 - )} - } */} -
      - - - -
      - - - {getFieldDecorator('content', { - rules: [{ - required: true, message: '请输入帖子内容', - }, { - max: 10000, message: '最大限制为10000个字符', - }], - })( - - )} - - - - - (单个文件150M以内) - -
      - - - - - -
      -
      - ) - } -} - -const WrappedBoardsNew = Form.create({ name: 'boardsNew' })(BoardsNew); +import React,{ Component } from "react"; + +import { + Form, Input, InputNumber, Switch, Radio, + Slider, Button, Upload, Icon, Rate, Checkbox, message, + Row, Col, Select, Modal, Divider +} from 'antd'; +import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor'; +import axios from 'axios' +import './board.css' +import "../common/formCommon.css" +import AddDirModal from './AddDirModal' +import { RouteHOC } from './common.js' +import CBreadcrumb from '../common/CBreadcrumb' +import {getUploadActionUrl, bytesToSize, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll} from 'educoder'; + +const confirm = Modal.confirm; +const $ = window.$ +const { Option } = Select; +// https://lanhuapp.com/web/#/item/project/board/detail?pid=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&project_id=a3bcd4b1-99ce-4e43-8ead-5b8b0a410807&image_id=71072679-b925-4824-aceb-4649535e3652 +class BoardsNew extends Component{ + constructor(props){ + super(props); + + this.mdRef = React.createRef(); + + this.state = { + fileList: [], + boards: [], + title_num: 60 + } + } + addSuccess = () => { + this.fetchBoards() + } + fetchBoards = () => { + const isEdit = this.isEdit + const boardId = this.props.match.params.boardId + + const boardsUrl = `/courses/board_list.json?board_id=${boardId}` + axios.get(boardsUrl, { }) + .then((response) => { + if (response.data.status == 0) { + this.setState({ + boards: response.data.data.boards || [], + course_id: response.data.data.course_id + }) + if (!isEdit) { + response.data.data.boards.forEach( board => { + if (board.id == boardId) { + this.setState({ board_name: board.name }) + } + }) + // board_name + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + componentDidMount = () => { + + const topicId = this.props.match.params.topicId + const isEdit = !!topicId + this.isEdit = isEdit + + const boardId = this.props.match.params.boardId + + this.fetchBoards() + + if (isEdit) { + const url = `/messages/${topicId}.json` + axios.get(url, { + }) + .then((response) => { + if (response.data.status == 0) { + const { id, data } = response.data; + if (data) { + this.editTopic = data; + this.props.form.setFieldsValue({ + sticky: !!data.sticky, + content: data.content, + subject: data.subject, + select_board_id: data.board_id // TODO 没返回给前端 + }); + this.mdRef.current.setValue(data.content) + const _fileList = data.attachments.map(item => { + return { + id: item.id, + uid: item.id, + name: appendFileSizeToUploadFile(item), + url: item.url, + status: 'done' + } + }) + + this.setState({ fileList: _fileList, board_name: data.board_name, title_num: 60 - parseInt(data.subject.length) }) + } + } + }) + .catch(function (error) { + console.log(error); + }); + } else { + const boardId = this.props.match.params.boardId + + this.props.form.setFieldsValue({ + select_board_id: parseInt(boardId) + }); + } + } + handleSubmit = (e) => { + e.preventDefault(); + const cid = this.state.course_id + const boardId = this.props.match.params.boardId + + this.props.form.validateFieldsAndScroll((err, values) => { + if (!err) { + console.log('Received values of form: ', values); + if (this.isEdit == true) { + const editTopic = this.editTopic + const editUrl = `/messages/${editTopic.id}.json` + + let attachment_ids = undefined + if (this.state.fileList) { + attachment_ids = this.state.fileList.map(item => { + return item.response ? item.response.id : item.id + }) + } + axios.put(editUrl, { + subject: values.subject, + select_board_id: values.select_board_id, + content: values.content, + sticky: values.sticky, + attachment_ids, + }) + .then((response) => { + if (response.data.status == 0) { + const { id } = response.data; + console.log('--- success') + + this.props.toDetailPage(cid, values.select_board_id, editTopic.id) + } + }) + .catch(function (error) { + console.log(error); + }); + } else { + const url = `/boards/${boardId}/messages.json` + let attachment_ids = undefined + if (this.state.fileList) { + attachment_ids = this.state.fileList.map(item => { + return item.response.id + }) + } + + axios.post(url, { + ...values, + course_id: cid, + attachment_ids, + }) + .then((response) => { + if (response.data.data && response.data.status == 0) { + const { id } = response.data.data; + if (id) { + console.log('--- success') + this.props.toDetailPage(cid, values.select_board_id, id) + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + } else { + $("html").animate({ scrollTop: $('html').scrollTop() - 100 }) + } + }); + } + // 附件相关 START + handleChange = (info) => { + let fileList = info.fileList; + this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) + }); + } + onAttachmentRemove = (file) => { + confirm({ + // title: '确定要删除这个附件吗?', + title: '是否确认删除?', + + okText: '确定', + cancelText: '取消', + // content: 'Some descriptions', + onOk: () => { + this.deleteAttachment(file) + }, + onCancel() { + console.log('Cancel'); + }, + }); + + + return false; + } + deleteAttachment = (file) => { + // 初次上传不能直接取uid + const url = `/attachments/${file.response ? file.response.id : file.uid}.json` + axios.delete(url, { + }) + .then((response) => { + if (response.data) { + const { status } = response.data; + if (status == 0) { + console.log('--- success') + + this.setState((state) => { + const index = state.fileList.indexOf(file); + const newFileList = state.fileList.slice(); + newFileList.splice(index, 1); + return { + fileList: newFileList, + }; + }); + } + } + }) + .catch(function (error) { + console.log(error); + }); + } + // 附件相关 ------------ END + changeTitle=(e)=>{ + console.log(e.target.value.length); + this.setState({ + title_num: 60 - parseInt(e.target.value.length) + }) + } + render() { + let { addGroup, fileList, course_id, title_num } = this.state; + const { getFieldDecorator } = this.props.form; + const { current_user } = this.props + + const formItemLayout = { + labelCol: { + xs: { span: 24 }, + // sm: { span: 8 }, + sm: { span: 24 }, + }, + wrapperCol: { + xs: { span: 24 }, + // sm: { span: 16 }, + sm: { span: 24 }, + }, + }; + + const uploadProps = { + width: 600, + fileList, + multiple: true, + // https://github.com/ant-design/ant-design/issues/15505 + // showUploadList={false}，然后外部拿到 fileList 数组自行渲染列表。 + // showUploadList: false, + action: `${getUploadActionUrl()}`, + onChange: this.handleChange, + onRemove: this.onAttachmentRemove, + beforeUpload: (file) => { + console.log('beforeUpload', file.name); + const isLt150M = file.size / 1024 / 1024 < 150; + if (!isLt150M) { + message.error('文件大小必须小于150MB!'); + } + return isLt150M; + }, + }; + const isAdmin = this.props.isAdmin() + const courseId=this.props.match.params.coursesId; + const boardId = this.props.match.params.boardId + + return( +
      + + +
      + + +

      + {this.isEdit ? "编辑" : "新建"}帖子 + this.props.history.goBack()}> + 返回 + +

      + {/* notRequired */} +
      +
      + { isAdmin && + + {getFieldDecorator('sticky', { + valuePropName: 'checked', + })( + isAdmin && 置顶 + )} + {/* checkbox 有个边距样式 .ant-checkbox-wrapper + span, */} + + + } + + + {getFieldDecorator('subject', { + rules: [{ + required: true, message: '请输入标题', + }, { + max: 60, message: '最大限制为60个字符', + }], + })( + + )} + + + + {getFieldDecorator('select_board_id', { + // initialValue: '3779', + })( + + )} + + + {/* { isAdmin && + {getFieldDecorator('sticky', { + })( + 置顶 + )} + } */} +
      + + + +
      + + + {getFieldDecorator('content', { + rules: [{ + required: true, message: '请输入帖子内容', + }, { + max: 10000, message: '最大限制为10000个字符', + }], + })( + + )} + + + + + (单个文件150M以内) + +
      + + + + + +
      +
      + ) + } +} + +const WrappedBoardsNew = Form.create({ name: 'boardsNew' })(BoardsNew); export default RouteHOC()(WrappedBoardsNew); \ No newline at end of file diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js index 7aaecdd16..970cf798a 100644 --- a/public/react/src/modules/courses/boards/TopicDetail.js +++ b/public/react/src/modules/courses/boards/TopicDetail.js @@ -1,726 +1,726 @@ -import React, { Component } from 'react'; -import { Redirect } from 'react-router'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import PropTypes from 'prop-types'; - -import classNames from 'classnames' - -import axios from 'axios' - -import moment from 'moment' - -import Comments from '../../comment/Comments' - -import update from 'immutability-helper' -import RewardDialog from '../../common/RewardDialog'; -import {ImageLayerOfCommentHOC} from '../../page/layers/ImageLayerOfCommentHOC' - -import MemoDetailMDEditor from '../../forums/MemoDetailMDEditor' -import { RouteHOC } from './common.js' -import '../../forums/Post.css' -import '../../forums/RightSection.css' -import './TopicDetail.css' -import '../common/courseMessage.css' -import { Pagination, Tooltip } from 'antd' -import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml } from 'educoder' -import SendToCourseModal from '../coursesPublic/modal/SendToCourseModal' -import CBreadcrumb from '../common/CBreadcrumb' -import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment - , addSecondLevelComment, NEED_TO_WRITE_CONTENT, handleContentBeforeCreateSecondLevelComment - , handleDeleteComment, handleCommentPraise, handleHiddenComment } from '../common/CommentsHelper' - -const $ = window.$ -const REPLY_PAGE_COUNT = 10 -function urlStringify(params) { - let noParams = true; - let paramsUrl = ''; - for (let key in params) { - noParams = false; - paramsUrl += `${key}=${params[key]}&` - } - if (noParams) { - return ''; - } - paramsUrl = paramsUrl.substring(0, paramsUrl.length - 1); - return paramsUrl; -} -class TopicDetail extends Component { - constructor(props) { - super(props) - - this.state = { - memo: {}, - memoLoading: true, - hasMoreComments: false, - pageCount: 1, - comments: [], - goldRewardDialogOpen: false, - } - } - componentDidMount() { - window.$("html,body").animate({"scrollTop":0}) - - const topicId = this.props.match.params.topicId - const bid = this.props.match.params.boardId - - const memoUrl = `/messages/${topicId}.json`; - this.setState({ - memoLoading: true - }) - axios.get(memoUrl,{ - }) - .then((response) => { - - if (response.data.status === -1) { - setTimeout(() => { - this.props.showNotification('帖子不存在！') - }, 300) - // this.props.toListPage(response.data.data.course_id, bid) - return; - } else { - - this.setState({ - memo: Object.assign({}, { - ...response.data.data, - replies_count: response.data.data.total_replies_count - }, {...this.state.memo}) - }, () => { - }) - - // const { memo_replies, memo } = response.data; - // let hasMoreComments = false; - // if (memo_replies && memo_replies.length === 10 && memo.total_replies_count > 10) { - // // 遍历一遍，计算下是否还有评论未加载 - // let totalCount = 10; - // memo_replies.forEach(item=>{ - // totalCount += item.children.length - // }) - // if (totalCount < memo.total_replies_count) { - // hasMoreComments = true; - // } - // } - // this.setState({ - // hasMoreComments, - // pageCount: 1, - // comments: memo_replies - // }) - // delete response.data.memo_replies; - // this.setState(response.data) - // const user = response.data.current_user; - // user.tidding_count = response.data.tidding_count; - // this.props.initCommonState(user) - } - this.setState({ - memoLoading: false - }) - - }).catch((error) => { - console.log(error) - }) - - this.fetchReplies() - - $('body>#root').on('onMemoDelete', (event) => { - // const val = $('body>#root').data('onMemoDelete') - const val = window.onMemoDelete ; - this.onMemoDelete( JSON.parse(decodeURIComponent(val)) ) - }) - - - } - - onPaginationChange = (pageCount) => { - this.setState({ pageCount }, () => { - this.fetchReplies() - }) - } - - componentWillUnmount() { - $('body>#root').off('onMemoDelete') - } - onMemoDelete(memo) { - const deleteUrl = `/commons/delete.json`; - // 获取memo list - axios.delete(deleteUrl, { data: { - object_id: memo.id, - object_type: 'message' - } - }) - .then((response) => { - const status = response.data.status - if (status === 0) { - - this.props.showNotification('删除成功'); - const props = Object.assign({}, this.props, {}) - this.props.toListPage( Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id} ) ) - - } else if (status === -1) { - this.props.showNotification('帖子已被删除'); - this.props.history.push(`/forums`) - } - }).catch((error) => { - console.log(error) - }) - } - - componentDidUpdate(prevProps, prevState, snapshot) { - // if (this.state.memo && this.state.memo.content - // && (!prevProps.memo || prevProps.memo.content != this.state.memo.content) ) { - if (this.state.memo && this.state.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) { - // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md - - setTimeout(()=>{ - // var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", { - // htmlDecode: "style,script,iframe", // you can filter tags decode - // taskList: true, - // tex: true, // 默认不解析 - // flowChart: true, // 默认不解析 - // sequenceDiagram: true // 默认不解析 - // }); - }, 200) - } - - } - - clickPraise(){ - const { memo } = this.state; - // const url = `/api/v1/discusses/${memo.id}/plus`; - const url = memo.user_praise ? '/praise_tread/unlike.json' : `/praise_tread/like.json`; - const _method = memo.user_praise ? axios.delete : axios.post - let _data = { - object_id: memo.id, - object_type: 'message', //Discuss - } - if (memo.user_praise) { - _data = { - data: _data - } - } - _method(url, { - ..._data - }, - { - - } - ).then((response) => { - - const newMemo = Object.assign({}, this.state.memo) - newMemo.praises_count = newMemo.user_praise ? newMemo.praises_count - 1 : newMemo.praises_count + 1 - newMemo.total_praises_count = newMemo.user_praise ? newMemo.total_praises_count - 1 : newMemo.total_praises_count + 1 - newMemo.user_praise = !newMemo.user_praise - this.setState({memo : newMemo }) - }).catch((error) => { - console.log(error) - }) - } - renderAttachment() { - const { memo } = this.state; - const attachments = [] - memo.attachments.forEach((item, index) => { - const ar = item.url.split('/') - const fileName = item.title || ar[ar.length - 1] - let filesize = 0 - if (item.filesize) { - filesize = item.filesize - // filesize = bytesToSize(item.filesize) - } - attachments.push( - //

      - // - // - // {fileName && 30 }> - // {fileName} - // } - // {filesize? ` ${filesize.replace(' ', '')}` : ''} - // - //

      - - - ) - }) - return attachments; - } - // ------------------------------------------------------------------------------------------- comments START - // ------------------------------------------------------------------------------------------- comments START - transformReply = (reply, children = []) => { - const isAdmin = this.props.isAdmin() - const isSuperAdmin = this.props.isSuperAdmin() - return { - isSuperAdmin: isSuperAdmin, - admin: isAdmin, // - permission: true, // - children: children, - child_message_count: reply.total_count, - hidden: reply.is_hidden, - id: reply.id, - image_url: reply.author.image_url, - reward: null, // - time: moment(reply.created_on).fromNow(), - user_id: reply.author.id, - user_login: reply.author.login, - user_praise: reply.liked, - username: reply.author.name, - content: reply.content, - praise_count: reply.praises_count - } - } - - fetchReplies = () => { - const topicId = this.props.match.params.topicId - const url = `/messages/${topicId}/reply_list.json?page=${this.state.pageCount}&page_size=${REPLY_PAGE_COUNT}` - axios.get(url,{ - }) - .then((response) => { - const { replies, liked, total_replies_count, total_count } = response.data.data - - const memo = Object.assign({}, this.state.memo) - memo.user_praise = liked - memo.total_replies_count = total_replies_count; - this.setState({ - memo, - comments: generateComments(replies, this.transformReply, 'replies'), - // : this.state.comments.concat(comments), - total_count: total_count - }) - }).catch((error) => { - console.log(error) - }) - } - - _getUser() { - const { current_user } = this.props; - current_user.user_url = `/users/${current_user.login}`; - return current_user; - } - _findById = _findById - replyComment = (commentContent, id, editor) => { - const { showNotification } = this.props; - // if (!commentContent || commentContent.length === 0) { - // showNotification(NEED_TO_WRITE_CONTENT) - // return; - // } - - if (this.state.memo.id === id ) { // 回复帖子 - this.createNewComment(commentContent, id, editor); - return; - } - const url = `/messages/${id}/reply.json`; - - const { comments } = this.state; - const user = this._getUser(); - /* - 移除末尾的空行 - .replace(/(\n

      \n\t
      \n<\/p>)*$/g,''); - - */ - - commentContent = handleContentBeforeCreateSecondLevelComment(commentContent) - if (!commentContent) { - this.props.showNotification('不能为空') - return; - } - axios.post(url, { - content: commentContent - }, - { - } - ).then((response) => { - if (response.data.data.id) { - let newId = response.data.data.id; - const commentIndex = this._findById(id, comments); - const parentComment = comments[commentIndex] - - this.setState({ - // runTesting: false, - comments: addSecondLevelComment(comments, parentComment, commentIndex, newId, commentContent, user, editor) - }, ()=>{ - // keditor代码美化 - editor.html && window.prettyPrint() - }) - - const newMemo2 = Object.assign({}, this.state.memo); - newMemo2.total_replies_count = newMemo2.total_replies_count + 1; - this.setState({ - memo: newMemo2 - }) - } - - }).catch((error) => { - console.log(error) - }) - } - // 公共接口 --- 删除回复 - deleteComment = (parrentComment, childCommentId) => { - handleDeleteComment(this, parrentComment, childCommentId, 'message') - - } - // 公共接口 --- 回复点赞 - commentPraise = (discussId) => { - handleCommentPraise(this, discussId, 'message', (old_user_praise) => { - const newMemo2 = Object.assign({}, this.state.memo); - - newMemo2.total_praises_count = old_user_praise - ? newMemo2.total_praises_count - 1 : newMemo2.total_praises_count + 1; - this.setState({ - memo: newMemo2 - }) - }) - } - // 公共接口 --- 隐藏回复 - hiddenComment = (item, childCommentId) => { - handleHiddenComment(this, item, childCommentId, 'message') - } - createNewComment = (commentContent, id, editor) => { - let content = handleContentBeforeCreateNew(commentContent); - const { memo } = this.props; - - const url = `/messages/${id}/reply.json`; - - // const url = `/api/v1/memos/${memo.id}/reply`; - let { comments } = this.state; - axios.post(url, { - content: content - }, - { - } - ).then((response) => { - if (response.data.status === -1) { - console.error('服务端异常') - return; - } - // this.props.showNotification('帖子发表成功') - - if (response.data) { - const _id = response.data.data.id; - // ke - editor.html && editor.html(''); - editor.afterBlur && editor.afterBlur() - // md - editor.setValue && editor.setValue('') - - - const user = this._getUser(); - this.setState({ - comments: addNewComment(comments, _id, content, user, this.props.isSuperAdmin(), this) - }) - const newMemo2 = Object.assign({}, this.state.memo); - newMemo2.total_replies_count = newMemo2.total_replies_count + 1; - this.setState({ - memo: newMemo2 - }) - this.refs.editor.showEditor(); - this.refs.editor.close(); - - - } - }).catch((error) => { - console.log(error) - }) - } - - /** - * parent.isAllChildrenLoaded 为 true的时候，表示已经没有更多子回复了 - */ - loadMoreChildComments = (parent) => { - const url = `/messages/${parent.id}/reply_list.json?page=1&page_size=500` - axios.get(url,{ - }) - .then((response) => { - const { replies, liked, total_replies_count } = response.data.data - - // const memo = Object.assign({}, this.state.memo) - // memo.total_replies_count = total_replies_count; - this.setState({ - // memo, - comments: generateChildComments(replies, this.state.comments, parent, this.transformReply) - }) - }).catch((error) => { - console.log(error) - }) - } - // ------------------------------------------------------------------------------------------- comments END - // ------------------------------------------------------------------------------------------- comments END - // 置顶 - setTop(memo) { - // const params = { - // sticky: memo.sticky ? 0 : 1, - // } - // if (this.state.p_s_order) { - // params.order = this.state.p_s_order; - // } - // if (this.state.p_forum_id) { - // params.forum_id = this.state.p_forum_id; - // } - // let paramsUrl = urlStringify(params) - const set_top_or_down_Url = `/messages/${memo.id}/sticky_top.json`; - // 获取memo list - axios.put(set_top_or_down_Url, { - - }) - .then((response) => { - const status = response.data.status - if (status === 0) { - this.props.showNotification( memo.sticky ? '取消置顶成功' : '置顶成功'); - memo.sticky = memo.sticky ? false : true - this.setState({ - memo: Object.assign({}, memo) - }) - } - }).catch((error) => { - console.log(error) - }) - } - - setRewardDialogVisible = (visible) => { - this.setState({ - goldRewardDialogOpen: visible - }) - } - showRewardDialog = () => { - this.setState({ - goldRewardDialogOpen: true - }) - } - // --------------------------------------------------------------------------------------------帖子獎勵 END - showCommentInput = () => { - if (window.__useKindEditor === true) { - this.refs.editor.showEditor(); - } else { - this.refs.editor.showEditor(); - } - } - initReply = (parent) => { - if (!parent.isAllChildrenLoaded) { - this.loadMoreChildComments(parent) - } - } - - - render() { - const { match, history } = this.props - const { recommend_shixun, current_user,author_info } = this.props; - const { memo, comments, hasMoreComments, goldRewardDialogOpen, pageCount, total_count } = this.state; - const messageId = match.params.topicId - if (this.state.memoLoading || !current_user) { - return

      - } - current_user.user_url = `/users/${current_user.login}`; - const isCurrentUserTheAuthor = current_user.login == memo.author.login - const isAdmin = this.props.isAdmin() - // TODO 图片上传地址 - const courseId=this.props.match.params.coursesId; - const boardId = this.props.match.params.boardId - return ( -
      {/* fl with100 */} - - - - -
      -
      -
      -
      - {memo.subject} - { !!memo.sticky && 置顶} - { !!memo.reward && - {memo.reward} - } - {/* || current_user.user_id === author_info.user_id */} - { current_user && (isAdmin || isCurrentUserTheAuthor) && - - } - -
      -
      - {moment(memo.created_on).fromNow()} 发布 -
      - -
      -
      - -
      - - {/* { current_user.admin && - - - - } */} - - - - {memo.visits || '1'} - - - { !!memo.total_replies_count && - - - - { memo.total_replies_count } - - - } - {!!memo.total_praises_count && - - - - { memo.total_praises_count } - - - } - - -
      -
      - - -
      - {memo.is_md == true ? : -
      - } -
      -
      -
      - {/* ${memo.user_praise ? '' : ''} */} - -

      {this.clickPraise()}} > -
      - {memo.praises_count} -

      -       -
      - - { memo.attachments && !!memo.attachments.length && -
      - {this.renderAttachment()} -
      - } -
      - - - - {/* onClick={ this.createNewComment } - enableReplyTo={true} - */} -
      -
      - 全部回复 - ({memo.total_replies_count}) -
      - - - - - {/* { true ? : -
      -
      写评论
      -
      } */} -
      - - -
      - { total_count > REPLY_PAGE_COUNT && - - } -
      写评论
      -
      - -
      -
      -
      - - ); - } -} - -export default ImageLayerOfCommentHOC() ( RouteHOC()(TopicDetail) ); +import React, { Component } from 'react'; +import { Redirect } from 'react-router'; + +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; + +import PropTypes from 'prop-types'; + +import classNames from 'classnames' + +import axios from 'axios' + +import moment from 'moment' + +import Comments from '../../comment/Comments' + +import update from 'immutability-helper' +import RewardDialog from '../../common/RewardDialog'; +import {ImageLayerOfCommentHOC} from '../../page/layers/ImageLayerOfCommentHOC' + +import MemoDetailMDEditor from '../../forums/MemoDetailMDEditor' +import { RouteHOC } from './common.js' +import '../../forums/Post.css' +import '../../forums/RightSection.css' +import './TopicDetail.css' +import '../common/courseMessage.css' +import { Pagination, Tooltip } from 'antd' +import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml } from 'educoder' +import SendToCourseModal from '../coursesPublic/modal/SendToCourseModal' +import CBreadcrumb from '../common/CBreadcrumb' +import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment + , addSecondLevelComment, NEED_TO_WRITE_CONTENT, handleContentBeforeCreateSecondLevelComment + , handleDeleteComment, handleCommentPraise, handleHiddenComment } from '../common/CommentsHelper' + +const $ = window.$ +const REPLY_PAGE_COUNT = 10 +function urlStringify(params) { + let noParams = true; + let paramsUrl = ''; + for (let key in params) { + noParams = false; + paramsUrl += `${key}=${params[key]}&` + } + if (noParams) { + return ''; + } + paramsUrl = paramsUrl.substring(0, paramsUrl.length - 1); + return paramsUrl; +} +class TopicDetail extends Component { + constructor(props) { + super(props) + + this.state = { + memo: {}, + memoLoading: true, + hasMoreComments: false, + pageCount: 1, + comments: [], + goldRewardDialogOpen: false, + } + } + componentDidMount() { + window.$("html,body").animate({"scrollTop":0}) + + const topicId = this.props.match.params.topicId + const bid = this.props.match.params.boardId + + const memoUrl = `/messages/${topicId}.json`; + this.setState({ + memoLoading: true + }) + axios.get(memoUrl,{ + }) + .then((response) => { + + if (response.data.status === -1) { + setTimeout(() => { + this.props.showNotification('帖子不存在！') + }, 300) + // this.props.toListPage(response.data.data.course_id, bid) + return; + } else { + + this.setState({ + memo: Object.assign({}, { + ...response.data.data, + replies_count: response.data.data.total_replies_count + }, {...this.state.memo}) + }, () => { + }) + + // const { memo_replies, memo } = response.data; + // let hasMoreComments = false; + // if (memo_replies && memo_replies.length === 10 && memo.total_replies_count > 10) { + // // 遍历一遍，计算下是否还有评论未加载 + // let totalCount = 10; + // memo_replies.forEach(item=>{ + // totalCount += item.children.length + // }) + // if (totalCount < memo.total_replies_count) { + // hasMoreComments = true; + // } + // } + // this.setState({ + // hasMoreComments, + // pageCount: 1, + // comments: memo_replies + // }) + // delete response.data.memo_replies; + // this.setState(response.data) + // const user = response.data.current_user; + // user.tidding_count = response.data.tidding_count; + // this.props.initCommonState(user) + } + this.setState({ + memoLoading: false + }) + + }).catch((error) => { + console.log(error) + }) + + this.fetchReplies() + + $('body>#root').on('onMemoDelete', (event) => { + // const val = $('body>#root').data('onMemoDelete') + const val = window.onMemoDelete ; + this.onMemoDelete( JSON.parse(decodeURIComponent(val)) ) + }) + + + } + + onPaginationChange = (pageCount) => { + this.setState({ pageCount }, () => { + this.fetchReplies() + }) + } + + componentWillUnmount() { + $('body>#root').off('onMemoDelete') + } + onMemoDelete(memo) { + const deleteUrl = `/commons/delete.json`; + // 获取memo list + axios.delete(deleteUrl, { data: { + object_id: memo.id, + object_type: 'message' + } + }) + .then((response) => { + const status = response.data.status + if (status === 0) { + + this.props.showNotification('删除成功'); + const props = Object.assign({}, this.props, {}) + this.props.toListPage( Object.assign({}, this.props.match.params, {'coursesId': this.state.memo.course_id} ) ) + + } else if (status === -1) { + this.props.showNotification('帖子已被删除'); + this.props.history.push(`/forums`) + } + }).catch((error) => { + console.log(error) + }) + } + + componentDidUpdate(prevProps, prevState, snapshot) { + // if (this.state.memo && this.state.memo.content + // && (!prevProps.memo || prevProps.memo.content != this.state.memo.content) ) { + if (this.state.memo && this.state.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) { + // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md + + setTimeout(()=>{ + // var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", { + // htmlDecode: "style,script,iframe", // you can filter tags decode + // taskList: true, + // tex: true, // 默认不解析 + // flowChart: true, // 默认不解析 + // sequenceDiagram: true // 默认不解析 + // }); + }, 200) + } + + } + + clickPraise(){ + const { memo } = this.state; + // const url = `/api/v1/discusses/${memo.id}/plus`; + const url = memo.user_praise ? '/praise_tread/unlike.json' : `/praise_tread/like.json`; + const _method = memo.user_praise ? axios.delete : axios.post + let _data = { + object_id: memo.id, + object_type: 'message', //Discuss + } + if (memo.user_praise) { + _data = { + data: _data + } + } + _method(url, { + ..._data + }, + { + + } + ).then((response) => { + + const newMemo = Object.assign({}, this.state.memo) + newMemo.praises_count = newMemo.user_praise ? newMemo.praises_count - 1 : newMemo.praises_count + 1 + newMemo.total_praises_count = newMemo.user_praise ? newMemo.total_praises_count - 1 : newMemo.total_praises_count + 1 + newMemo.user_praise = !newMemo.user_praise + this.setState({memo : newMemo }) + }).catch((error) => { + console.log(error) + }) + } + renderAttachment() { + const { memo } = this.state; + const attachments = [] + memo.attachments.forEach((item, index) => { + const ar = item.url.split('/') + const fileName = item.title || ar[ar.length - 1] + let filesize = 0 + if (item.filesize) { + filesize = item.filesize + // filesize = bytesToSize(item.filesize) + } + attachments.push( + //

      + // + // + // {fileName && 30 }> + // {fileName} + // } + // {filesize? ` ${filesize.replace(' ', '')}` : ''} + // + //

      + + + ) + }) + return attachments; + } + // ------------------------------------------------------------------------------------------- comments START + // ------------------------------------------------------------------------------------------- comments START + transformReply = (reply, children = []) => { + const isAdmin = this.props.isAdmin() + const isSuperAdmin = this.props.isSuperAdmin() + return { + isSuperAdmin: isSuperAdmin, + admin: isAdmin, // + permission: true, // + children: children, + child_message_count: reply.total_count, + hidden: reply.is_hidden, + id: reply.id, + image_url: reply.author.image_url, + reward: null, // + time: moment(reply.created_on).fromNow(), + user_id: reply.author.id, + user_login: reply.author.login, + user_praise: reply.liked, + username: reply.author.name, + content: reply.content, + praise_count: reply.praises_count + } + } + + fetchReplies = () => { + const topicId = this.props.match.params.topicId + const url = `/messages/${topicId}/reply_list.json?page=${this.state.pageCount}&page_size=${REPLY_PAGE_COUNT}` + axios.get(url,{ + }) + .then((response) => { + const { replies, liked, total_replies_count, total_count } = response.data.data + + const memo = Object.assign({}, this.state.memo) + memo.user_praise = liked + memo.total_replies_count = total_replies_count; + this.setState({ + memo, + comments: generateComments(replies, this.transformReply, 'replies'), + // : this.state.comments.concat(comments), + total_count: total_count + }) + }).catch((error) => { + console.log(error) + }) + } + + _getUser() { + const { current_user } = this.props; + current_user.user_url = `/users/${current_user.login}`; + return current_user; + } + _findById = _findById + replyComment = (commentContent, id, editor) => { + const { showNotification } = this.props; + // if (!commentContent || commentContent.length === 0) { + // showNotification(NEED_TO_WRITE_CONTENT) + // return; + // } + + if (this.state.memo.id === id ) { // 回复帖子 + this.createNewComment(commentContent, id, editor); + return; + } + const url = `/messages/${id}/reply.json`; + + const { comments } = this.state; + const user = this._getUser(); + /* + 移除末尾的空行 + .replace(/(\n

      \n\t
      \n<\/p>)*$/g,''); + + */ + + commentContent = handleContentBeforeCreateSecondLevelComment(commentContent) + if (!commentContent) { + this.props.showNotification('不能为空') + return; + } + axios.post(url, { + content: commentContent + }, + { + } + ).then((response) => { + if (response.data.data.id) { + let newId = response.data.data.id; + const commentIndex = this._findById(id, comments); + const parentComment = comments[commentIndex] + + this.setState({ + // runTesting: false, + comments: addSecondLevelComment(comments, parentComment, commentIndex, newId, commentContent, user, editor) + }, ()=>{ + // keditor代码美化 + editor.html && window.prettyPrint() + }) + + const newMemo2 = Object.assign({}, this.state.memo); + newMemo2.total_replies_count = newMemo2.total_replies_count + 1; + this.setState({ + memo: newMemo2 + }) + } + + }).catch((error) => { + console.log(error) + }) + } + // 公共接口 --- 删除回复 + deleteComment = (parrentComment, childCommentId) => { + handleDeleteComment(this, parrentComment, childCommentId, 'message') + + } + // 公共接口 --- 回复点赞 + commentPraise = (discussId) => { + handleCommentPraise(this, discussId, 'message', (old_user_praise) => { + const newMemo2 = Object.assign({}, this.state.memo); + + newMemo2.total_praises_count = old_user_praise + ? newMemo2.total_praises_count - 1 : newMemo2.total_praises_count + 1; + this.setState({ + memo: newMemo2 + }) + }) + } + // 公共接口 --- 隐藏回复 + hiddenComment = (item, childCommentId) => { + handleHiddenComment(this, item, childCommentId, 'message') + } + createNewComment = (commentContent, id, editor) => { + let content = handleContentBeforeCreateNew(commentContent); + const { memo } = this.props; + + const url = `/messages/${id}/reply.json`; + + // const url = `/api/v1/memos/${memo.id}/reply`; + let { comments } = this.state; + axios.post(url, { + content: content + }, + { + } + ).then((response) => { + if (response.data.status === -1) { + console.error('服务端异常') + return; + } + // this.props.showNotification('帖子发表成功') + + if (response.data) { + const _id = response.data.data.id; + // ke + editor.html && editor.html(''); + editor.afterBlur && editor.afterBlur() + // md + editor.setValue && editor.setValue('') + + + const user = this._getUser(); + this.setState({ + comments: addNewComment(comments, _id, content, user, this.props.isSuperAdmin(), this) + }) + const newMemo2 = Object.assign({}, this.state.memo); + newMemo2.total_replies_count = newMemo2.total_replies_count + 1; + this.setState({ + memo: newMemo2 + }) + this.refs.editor.showEditor(); + this.refs.editor.close(); + + + } + }).catch((error) => { + console.log(error) + }) + } + + /** + * parent.isAllChildrenLoaded 为 true的时候，表示已经没有更多子回复了 + */ + loadMoreChildComments = (parent) => { + const url = `/messages/${parent.id}/reply_list.json?page=1&page_size=500` + axios.get(url,{ + }) + .then((response) => { + const { replies, liked, total_replies_count } = response.data.data + + // const memo = Object.assign({}, this.state.memo) + // memo.total_replies_count = total_replies_count; + this.setState({ + // memo, + comments: generateChildComments(replies, this.state.comments, parent, this.transformReply) + }) + }).catch((error) => { + console.log(error) + }) + } + // ------------------------------------------------------------------------------------------- comments END + // ------------------------------------------------------------------------------------------- comments END + // 置顶 + setTop(memo) { + // const params = { + // sticky: memo.sticky ? 0 : 1, + // } + // if (this.state.p_s_order) { + // params.order = this.state.p_s_order; + // } + // if (this.state.p_forum_id) { + // params.forum_id = this.state.p_forum_id; + // } + // let paramsUrl = urlStringify(params) + const set_top_or_down_Url = `/messages/${memo.id}/sticky_top.json`; + // 获取memo list + axios.put(set_top_or_down_Url, { + + }) + .then((response) => { + const status = response.data.status + if (status === 0) { + this.props.showNotification( memo.sticky ? '取消置顶成功' : '置顶成功'); + memo.sticky = memo.sticky ? false : true + this.setState({ + memo: Object.assign({}, memo) + }) + } + }).catch((error) => { + console.log(error) + }) + } + + setRewardDialogVisible = (visible) => { + this.setState({ + goldRewardDialogOpen: visible + }) + } + showRewardDialog = () => { + this.setState({ + goldRewardDialogOpen: true + }) + } + // --------------------------------------------------------------------------------------------帖子獎勵 END + showCommentInput = () => { + if (window.__useKindEditor === true) { + this.refs.editor.showEditor(); + } else { + this.refs.editor.showEditor(); + } + } + initReply = (parent) => { + if (!parent.isAllChildrenLoaded) { + this.loadMoreChildComments(parent) + } + } + + + render() { + const { match, history } = this.props + const { recommend_shixun, current_user,author_info } = this.props; + const { memo, comments, hasMoreComments, goldRewardDialogOpen, pageCount, total_count } = this.state; + const messageId = match.params.topicId + if (this.state.memoLoading || !current_user) { + return

      + } + current_user.user_url = `/users/${current_user.login}`; + const isCurrentUserTheAuthor = current_user.login == memo.author.login + const isAdmin = this.props.isAdmin() + // TODO 图片上传地址 + const courseId=this.props.match.params.coursesId; + const boardId = this.props.match.params.boardId + return ( +
      {/* fl with100 */} + + + + +
      +
      +
      +
      + {memo.subject} + { !!memo.sticky && 置顶} + { !!memo.reward && + {memo.reward} + } + {/* || current_user.user_id === author_info.user_id */} + { current_user && (isAdmin || isCurrentUserTheAuthor) && + + } + +
      +
      + {moment(memo.created_on).fromNow()} 发布 +
      + +
      +
      + +
      + + {/* { current_user.admin && + + + + } */} + + + + {memo.visits || '1'} + + + { !!memo.total_replies_count && + + + + { memo.total_replies_count } + + + } + {!!memo.total_praises_count && + + + + { memo.total_praises_count } + + + } + + +
      +
      + + +
      + {memo.is_md == true ? : +
      + } +
      +
      +
      + {/* ${memo.user_praise ? '' : ''} */} + +

      {this.clickPraise()}} > +
      + {memo.praises_count} +

      +       +
      + + { memo.attachments && !!memo.attachments.length && +
      + {this.renderAttachment()} +
      + } +
      + + + + {/* onClick={ this.createNewComment } + enableReplyTo={true} + */} +
      +
      + 全部回复 + ({memo.total_replies_count}) +
      + + + + + {/* { true ? : +
      +
      写评论
      +
      } */} +
      + + +
      + { total_count > REPLY_PAGE_COUNT && + + } +
      写评论
      +
      + +
      +
      +
      + + ); + } +} + +export default ImageLayerOfCommentHOC() ( RouteHOC()(TopicDetail) ); diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js index eb53fa373..4d82f4182 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js @@ -223,7 +223,7 @@ class CommonWorkDetailIndex extends Component{ } `} {current_user && { - const Id = this.props.match.params.Id - this.isEdit = !!Id - if (Id) { - const url = `/exercises/${Id}/edit.json` - axios.get(url) - .then((response) => { - if (response.data.status == 0) { - const { exercise, ...others } = response.data - this.setState({ - ...exercise, - ...others, - editMode: false - }) - } - }) - .catch(function (error) { - console.log(error); - }); - } else { - const courseId=this.props.match.params.coursesId; - - const newUrl = `/courses/${courseId}/exercises/new.json` - axios.get(newUrl) - .then((response) => { - if (response.data.status == 0) { - this.setState({ - ...response.data - }) - } - }) - .catch(function (error) { - console.log(error); - }); - } - } - componentDidMount = () => { - this.fetchExercise() - } - handleSubmit = (e) => { - - } - onSaveExercise = () => { - const { exercise_name, exercise_description } = this.state; - const exercise_id = this.props.match.params.Id - const courseId = this.props.match.params.coursesId - if (this.isEdit) { - const editUrl = `/exercises/${exercise_id}.json` - axios.put(editUrl, { - exercise_name, - exercise_description - }) - .then((response) => { - if (response.data.status == 0) { - this.setState({editMode: false}) - this.props.showNotification('试卷编辑成功') - } - }) - .catch(function (error) { - console.log(error); - }); - } else { - const url = `/courses/${courseId}/exercises.json` - axios.post(url, { - exercise_name, - exercise_description - }) - .then((response) => { - if (response.data.status == 0) { - this.setState({editMode: false}) - - this.props.showNotification('试卷新建成功') - const exercise_id = response.data.data.exercise_id; - this.isEdit = true; - - this.props.history.replace(`/courses/${courseId}/exercises/${exercise_id}/edit`); - - } - }) - .catch(function (error) { - console.log(error); - }); - } - } - exercise_name_change = (e) => { - this.setState({exercise_name: e.target.value}) - } - exercise_description_change = (e) => { - this.setState({exercise_description: e.target.value}) - } - // #问题的类型，0为单选题，1为多选题，2为判断题，3为填空题，4为主观题，5为实训题 - _checkIsEditing = () => { - if (this.editingId && $(this.editingId).length ) { - this.props.showNotification('请先保存或取消当前正在编辑的问题。') - $("html").animate({ scrollTop: $(this.editingId).offset().top - 100}) - return true - } - return false - } - onEditorCancel = () => { - this.editingId = null; - // 找到编辑或新建的item，新建就删掉item，编辑就isNew改为false - const { exercise_questions } = this.state - let index = -1; - for(let i = 0; i < exercise_questions.length; i++) { - if (exercise_questions[i].isNew == true) { - index = i; - break; - } - } - if (exercise_questions[index].question_id) { // 编辑 - this.setState( - (prevState) => ({ - exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: false}}}) - // update(prevState.exercise_questions, {$splice: [[index, 1]]}) - }) - ) - } else { // 新建 - this.setState( - (prevState) => ({ - exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) - }) - ) - } - } - addQuestion = (question_id_to_insert_after, type) => { - if (!this.isEdit) { - this.props.showNotification('请先输入试卷标题，并保存试卷') - return; - } - if (this._checkIsEditing()) { - return; - } - if (type == Q_TYPE_SHIXUN) { - this.addShixun(question_id_to_insert_after) - } else { - this.addEditingQuestion(type, question_id_to_insert_after) - } - } - chooseShixun = (array) => { - this.addEditingQuestion(Q_TYPE_SHIXUN, this.question_id_to_insert_after, { - shixun_id: array[0] - }) - } - chooseShixunSuccess = () => { - this.refs.shixunChooseModal.setVisible(false) - } - addShixun = (question_id_to_insert_after) => { - if (!this.isEdit) { - this.props.showNotification('请先输入试卷标题，并保存试卷') - return; - } - // TODO 弹框选择实训 - if (this._checkIsEditing()) { - return; - } - this.refs.shixunChooseModal.setVisible(true) - this.question_id_to_insert_after = question_id_to_insert_after; - return; - // 拉取实训items - this.addEditingQuestion(Q_TYPE_SHIXUN, question_id_to_insert_after, { - shixun_id: 50 - }) - } - editQestion = (index) => { - if (this._checkIsEditing()) { - return; - } - this.editingId = `#question_${index}` - - this.setState( - (prevState) => ({ - exercise_questions : update(prevState.exercise_questions, {[index]: { isNew: {$set: true}}}) - }) - ) - } - onSort = (index, question_id, isUp) => { - if (this._checkIsEditing()) { - return; - } - const url = `/exercise_questions/${question_id}/up_down.json` - axios.post(url, { opr: isUp ? 'up' : 'down'}) - .then((response) => { - if (response.data.status == 0) { - // this.props.showNotification('移动成功') - this.fetchExercise() - } - }) - .catch(function (error) { - console.log(error); - }); - } - onSortDown = (index, question_id) => { - this.onSort(index, question_id, false) - } - onSortUp = (index, question_id) => { - this.onSort(index, question_id, true) - } - getInitScore = (question_type, question_id_to_insert_after) => { - /** - 1.每个题型的首个题目默认值规则如下： - 选择题：5分 01 - 判断题：2分 2 - 填空题：2分 3 - 简答题：10分 4 - 实训题：每个关卡5分 5 - */ - let init_question_score = 0; - if (question_type == 0 || question_type == 1) { - init_question_score = 5 - } else if (question_type == 2) { - init_question_score = 2 - } else if (question_type == 3) { - init_question_score = 2 - } else if (question_type == 4) { - init_question_score = 10 - } else if (question_type == 5) { - init_question_score = 5 - } - const _indexBefore = question_id_to_insert_after ? this.findIndexById(question_id_to_insert_after) : this.state.exercise_questions.length - 1 - for (let i = _indexBefore; i >= 0; i--) { - if(this.state.exercise_questions[i].question_type == question_type) { - init_question_score = this.state.exercise_questions[i].question_score - break; - } - } - return init_question_score; - } - addEditingQuestion = (question_type, question_id_to_insert_after, otherAttributes) => { - - let init_question_score = this.getInitScore(question_type, question_id_to_insert_after) - - let questionObj = { - question_type: question_type, // 需要这个通过类型判断 - init_question_score: init_question_score, - isNew: true, // 新建或编辑，用是否有id区分是新建还是编辑 - question_id_to_insert_after, - ...otherAttributes - } - const { exercise_questions } = this.state; - let new_exercise_questions = exercise_questions.slice(0) - let newIndex = new_exercise_questions.length; - - if (question_id_to_insert_after) { - const _indexBefore = this.findIndexById(question_id_to_insert_after) - new_exercise_questions.splice(_indexBefore + 1, 0, questionObj) - newIndex = _indexBefore + 1 - } else { - new_exercise_questions.push(questionObj) - } - this.editingId = `#question_${newIndex}` - this.setState({ exercise_questions: new_exercise_questions }, () => { - setTimeout(() => { - $(this.editingId).length && $("html").animate({ scrollTop: $(this.editingId).offset().top - 100}) - }, 500) - }) - } - findIndexById = (id) => { - const { exercise_questions } = this.state - for(let i = 0; i < exercise_questions.length; i++) { - if (exercise_questions[i].question_id == id) { - return i; - } - } - } - onQestionDelete = (question_id) => { - this.props.confirm({ - content: `确认要删除这个问题吗？`, - onOk: () => { - const url = `/exercise_questions/${question_id}.json` - axios.delete(url) - .then((response) => { - if (response.data.status == 0) { - this.props.showNotification('删除成功') - const { exercise_questions } = this.state - const index = this.findIndexById(question_id) - - this.setState( - (prevState) => ({ - exercise_questions : update(prevState.exercise_questions, {$splice: [[index, 1]]}) - }) - ) - } - }) - .catch(function (error) { - console.log(error); - }); - } - }) - } - addSuccess = () => { - this.editingId = null; - this.fetchExercise() - } - goToPreview = () => { - const exercise_id = this.props.match.params.Id - const courseId = this.props.match.params.coursesId - this.props.history.push(`/courses/${courseId}/exercises/${exercise_id}/student_exercise_list?tab=2`) - } - render() { - let { exercise_name, exercise_description, course_id, exercise_types, - exercise_questions, left_banner_id } = this.state; - // if (this.isEdit && !exercise_types) { - // return '' - // } - // const { getFieldDecorator } = this.props.form; - const { q_counts, q_scores, q_doubles, q_doubles_scores, q_judges, q_judges_scores, - q_mains, q_mains_scores, q_nulls, q_nulls_scores, q_shixuns, q_shixuns_scores, q_singles, q_singles_scores} = exercise_types; - const formItemLayout = { - labelCol: { - xs: { span: 24 }, - // sm: { span: 8 }, - sm: { span: 24 }, - }, - wrapperCol: { - xs: { span: 24 }, - // sm: { span: 16 }, - sm: { span: 24 }, - }, - }; - - const { current_user } = this.props - const isAdmin = this.props.isAdmin() - const courseId=this.props.match.params.coursesId; - const exercise_id = this.props.match.params.Id - - const isEdit = this.isEdit - const commonHandler = { - onQestionDelete: this.onQestionDelete, - addSuccess: this.addSuccess, - addQuestion: this.addQuestion, - onEditorCancel: this.onEditorCancel, - editQestion: this.editQestion, - onSortDown: this.onSortDown, - onSortUp: this.onSortUp, - displayCount: exercise_questions.length, - exercise_status: this.state.exercise_status, - exerciseIsPublish: this.state.exercise_status >= 2 - } - return( -
      - - -
      - { current_user && } - -

      - {this.isEdit ? "编辑" : "新建"}试卷 - this.props.history.length == 1 ? this.props.history.push(`/courses/${courseId}/exercises/${left_banner_id}`): this.props.history.goBack()}> - 返回 - -

      - - {!this.state.editMode && } - {this.state.editMode &&
      -
      - - {/* {getFieldDecorator('subject', { - rules: [{ - required: true, message: '请输入标题', - }, { - max: 20, message: '最大限制为20个字符', - }], - })( */} - - {/* )} */} - - - - {/* {getFieldDecorator('select_board_id', { - // initialValue: '3779', - })( */} -