bugfix
This commit is contained in:
parent
691648791b
commit
06b230fb95
@ -63,6 +63,10 @@ bricks.Accordion = class extends bricks.VBox {
|
|||||||
}
|
}
|
||||||
var c = objget(this.subcontents,name);
|
var c = objget(this.subcontents,name);
|
||||||
if (refresh || ! c ){
|
if (refresh || ! c ){
|
||||||
|
if (!this.opts.items[pos].content){
|
||||||
|
console.log('***', pos, 'item dont has content');
|
||||||
|
return;
|
||||||
|
}
|
||||||
c = await bricks.widgetBuild(this.opts.items[pos].content);
|
c = await bricks.widgetBuild(this.opts.items[pos].content);
|
||||||
this.subcontents[name] = c;
|
this.subcontents[name] = c;
|
||||||
}
|
}
|
||||||
|
@ -232,7 +232,7 @@ bricks.AudioRecorder = class extends bricks.HBox {
|
|||||||
downA.href=this.recordData.url;
|
downA.href=this.recordData.url;
|
||||||
downA.download=fileName;
|
downA.download=fileName;
|
||||||
// document.querySelector("."+cls).appendChild(downA);
|
// document.querySelector("."+cls).appendChild(downA);
|
||||||
if(/mobile/i.test(navigator.userAgent)){
|
if(bricks.is_mobile()){
|
||||||
bricks.debug('mobile device');
|
bricks.debug('mobile device');
|
||||||
}
|
}
|
||||||
downA.click();
|
downA.click();
|
||||||
|
@ -460,7 +460,7 @@ bricks.App = class extends bricks.Layout {
|
|||||||
*/
|
*/
|
||||||
super(opts);
|
super(opts);
|
||||||
bricks.app = this;
|
bricks.app = this;
|
||||||
bricks.bug = opts.debug or false;
|
bricks.bug = opts.debug || false;
|
||||||
bricks.Body = this;
|
bricks.Body = this;
|
||||||
this.deviceid = bricks.deviceid(opts.appname || 'appname');
|
this.deviceid = bricks.deviceid(opts.appname || 'appname');
|
||||||
this.login_url = opts.login_url;
|
this.login_url = opts.login_url;
|
||||||
@ -483,6 +483,12 @@ bricks.App = class extends bricks.Layout {
|
|||||||
this._Height = this.dom_element.offsetHeight;
|
this._Height = this.dom_element.offsetHeight;
|
||||||
document.addEventListener('keydown', this.key_down_action.bind(this));
|
document.addEventListener('keydown', this.key_down_action.bind(this));
|
||||||
}
|
}
|
||||||
|
screenHeight(){
|
||||||
|
return this.dom_element.clientHeight;
|
||||||
|
}
|
||||||
|
screenWidth(){
|
||||||
|
return this.dom_element.clientWidth;
|
||||||
|
}
|
||||||
create(){
|
create(){
|
||||||
this.dom_element = document.getElementsByTagName('body')[0];
|
this.dom_element = document.getElementsByTagName('body')[0];
|
||||||
this.set_baseURI(this.dom_element.baseURI);
|
this.set_baseURI(this.dom_element.baseURI);
|
||||||
|
@ -43,8 +43,16 @@ bricks.HttpText = class {
|
|||||||
"Accept":"text/html",
|
"Accept":"text/html",
|
||||||
};
|
};
|
||||||
bricks.extend(this.headers, headers);
|
bricks.extend(this.headers, headers);
|
||||||
|
var width=0, height=0;
|
||||||
|
if (bricks.app) {
|
||||||
|
width = bricks.app.screenWidth();
|
||||||
|
height = bricks.app.screenHeight();
|
||||||
|
}
|
||||||
this.params = {
|
this.params = {
|
||||||
"_webbricks_":1
|
"_webbricks_":1,
|
||||||
|
"width":width,
|
||||||
|
"height":height,
|
||||||
|
"_is_mobile":bricks.is_mobile()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
url_parse(url){
|
url_parse(url){
|
||||||
|
@ -139,6 +139,9 @@ bricks.Layout = class extends bricks.JsWidget {
|
|||||||
} else {
|
} else {
|
||||||
// append child at end
|
// append child at end
|
||||||
w.parent = this;
|
w.parent = this;
|
||||||
|
if (this.baseURI && !w.baseURI){
|
||||||
|
w.set_baseURI(this.baseURI);
|
||||||
|
}
|
||||||
this.children.push(w);
|
this.children.push(w);
|
||||||
this.dom_element.appendChild(w.dom_element);
|
this.dom_element.appendChild(w.dom_element);
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,11 @@ bricks.debug = function(...args){
|
|||||||
try {
|
try {
|
||||||
throw new Error();
|
throw new Error();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
callInfo = e.stack.split('\n')[2].trim();
|
try {
|
||||||
|
callInfo = e.stack.split('\n')[2].trim();
|
||||||
|
} catch (e1) {
|
||||||
|
callInfo = e.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
console.log(callInfo, ...args);
|
console.log(callInfo, ...args);
|
||||||
}
|
}
|
||||||
@ -259,6 +263,9 @@ bricks.absurl = function(url, widget){
|
|||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
var base_uri = widget.baseURI;
|
var base_uri = widget.baseURI;
|
||||||
|
if (!base_uri){
|
||||||
|
base_uri = bricks.Body.baseURI;
|
||||||
|
}
|
||||||
if (url.startsWith('/')){
|
if (url.startsWith('/')){
|
||||||
base_uri = bricks.Body.baseURI;
|
base_uri = bricks.Body.baseURI;
|
||||||
url = url.substring(1);
|
url = url.substring(1);
|
||||||
|
@ -211,8 +211,16 @@ bricks.JsWidget = class {
|
|||||||
this.id = id;
|
this.id = id;
|
||||||
this.dom_element.id = id;
|
this.dom_element.id = id;
|
||||||
}
|
}
|
||||||
set_baseURI(url){
|
set_baseURI(uri){
|
||||||
this.baseURI = url;
|
this.baseURI = uri;
|
||||||
|
if (!this._container){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.children.forEach(c =>{
|
||||||
|
if (!c.baseURI){
|
||||||
|
c.set_baseURI(uri);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
show(){
|
show(){
|
||||||
this.dom_element.style.display = '';
|
this.dom_element.style.display = '';
|
||||||
|
Loading…
Reference in New Issue
Block a user