bugfix
This commit is contained in:
parent
da3a8f7ed5
commit
359f177de6
@ -74,7 +74,8 @@ bricks.Cols = class extends bricks.VBox {
|
|||||||
if (!data){
|
if (!data){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (! this.loader.is_max_page(page)){
|
var rev = ! this.loader.is_max_page(page);
|
||||||
|
if (rev){
|
||||||
data.reverse();
|
data.reverse();
|
||||||
}
|
}
|
||||||
for (var i=0;i<data.length;i++){
|
for (var i=0;i<data.length;i++){
|
||||||
@ -83,17 +84,14 @@ bricks.Cols = class extends bricks.VBox {
|
|||||||
w.user_data = r;
|
w.user_data = r;
|
||||||
w.bind('click', this.handle_click.bind(this, w));
|
w.bind('click', this.handle_click.bind(this, w));
|
||||||
w.set_attribute('data-page', page);
|
w.set_attribute('data-page', page);
|
||||||
if (this.loader.is_max_page(page)){
|
if (rev){
|
||||||
this.main.add_widget(w);
|
|
||||||
} else {
|
|
||||||
this.main.add_widget(w, 0);
|
this.main.add_widget(w, 0);
|
||||||
|
} else {
|
||||||
|
this.main.add_widget(w);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (d.delete_page){
|
if (d.delete_page){
|
||||||
this.delete_page(d.delete_page);
|
this.delete_page(d.delete_page);
|
||||||
console.log('No.', page, 'added', 'No.', d.delete_page, 'deleted', this.loader.pages , this.loader.cache_pages);
|
|
||||||
} else {
|
|
||||||
console.log('No.', page, 'added', this.loader.pages , this.loader.cache_pages);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
delete_page(page){
|
delete_page(page){
|
||||||
|
@ -325,8 +325,8 @@ bricks.DataViewer = class extends bricks.VBox {
|
|||||||
var d = await this.loader.loadNextPage();
|
var d = await this.loader.loadNextPage();
|
||||||
if (d){
|
if (d){
|
||||||
this.dataHandle(d);
|
this.dataHandle(d);
|
||||||
var total = this.scrollpanel.dom_element.scrollHeight - this.scrollpanel.dom_element.clientHeight;
|
// var total = this.scrollpanel.dom_element.scrollHeight - this.scrollpanel.dom_element.clientHeight;
|
||||||
this.scrollpanel.dom_element.scrollTop = d.pos_rate * total;
|
// this.scrollpanel.dom_element.scrollTop = d.pos_rate * total;
|
||||||
} else {
|
} else {
|
||||||
bricks.debug(this.loader, 'load next page error');
|
bricks.debug(this.loader, 'load next page error');
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,9 @@ bricks.key_selectable_stack = [];
|
|||||||
|
|
||||||
bricks.Layout = class extends bricks.JsWidget {
|
bricks.Layout = class extends bricks.JsWidget {
|
||||||
constructor(options){
|
constructor(options){
|
||||||
|
if (! options){
|
||||||
|
options = {};
|
||||||
|
}
|
||||||
super(options);
|
super(options);
|
||||||
this._container = true;
|
this._container = true;
|
||||||
this.keyselectable = options.keyselectable || false;
|
this.keyselectable = options.keyselectable || false;
|
||||||
|
@ -91,6 +91,20 @@ bricks.Video = class extends bricks.Layout {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
dispatch_mute(){
|
||||||
|
var e = this.video_body.dom_element;
|
||||||
|
var mute_btn = e.querySelector(".vjs-mute-control");
|
||||||
|
if (!mute_btn){
|
||||||
|
console.log('there is not mute button found')
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var clickevent = new MouseEvent('click', {
|
||||||
|
'bubbles': true, // 事件是否冒泡
|
||||||
|
'cancelable': true // 事件是否可取消
|
||||||
|
});
|
||||||
|
mute_btn.dispatchEvent(clickEvent);
|
||||||
|
}
|
||||||
|
|
||||||
create_player(){
|
create_player(){
|
||||||
if(this.url){
|
if(this.url){
|
||||||
this.player = videojs(this.video_body.dom_element, {
|
this.player = videojs(this.video_body.dom_element, {
|
||||||
@ -150,6 +164,8 @@ bricks.Video = class extends bricks.Layout {
|
|||||||
vtype = 'application/x-mpegURL';
|
vtype = 'application/x-mpegURL';
|
||||||
} else if (t.endsWith('.mp4')){
|
} else if (t.endsWith('.mp4')){
|
||||||
vtype = 'video/mp4';
|
vtype = 'video/mp4';
|
||||||
|
} else if (t.endsWith('.avi')){
|
||||||
|
vtype = 'video/avi';
|
||||||
} else if (t.endsWith('.webm')){
|
} else if (t.endsWith('.webm')){
|
||||||
vtype = 'video/webm';
|
vtype = 'video/webm';
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user