Skip to content

Commit 92faa7f

Browse files
committed
Minor changes
1 parent a002dbe commit 92faa7f

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

xui/js/UI.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1580,10 +1580,6 @@ xui.Class("xui.UI", "xui.absObj", {
15801580
}
15811581
ns[i]=n.get(0);
15821582

1583-
//for functions like: UI refresh itself
1584-
if(fun)
1585-
fun.call(fun.target,n.get(0));
1586-
15871583
//add to parent, and trigger RenderTrigger
15881584
if(b)
15891585
p.append(n,paras);
@@ -1606,6 +1602,10 @@ xui.Class("xui.UI", "xui.absObj", {
16061602
if(uiv)
16071603
n.setUIValue(uiv,true,null,'refresh');
16081604

1605+
//for functions like: UI refresh itself
1606+
if(fun)
1607+
fun.call(fun.target,n.get(0));
1608+
16091609
if(ar){
16101610
n.get(0).$afterRefresh=ar;
16111611
ar(n.get(0));
@@ -5159,13 +5159,13 @@ xui.Class("xui.UI", "xui.absObj", {
51595159
rowtotal += rw;
51605160
isFirstCol = false;
51615161
if(rowtotal > pw){
5162+
isFirstRow = false;
5163+
isFirstCol = true;
51625164
// new row
51635165
css['margin-left'] = (isFirstCol ? pad.left : spc.width)+'px';
51645166
css['margin-top'] = (isFirstRow ? pad.top : spc.height)+'px';
51655167
// redo last row
51665168
handleLastRow(pw + (cols-oneRow.length)*spc.width, oneRow, cols, allCtrls);
5167-
isFirstRow = false;
5168-
isFirstCol = true;
51695169
oneRow=[];
51705170
rowtotal=rw;
51715171
}

xui/js/UI/Block.js

+1
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ xui.Class("xui.UI.Block", "xui.UI.Widget",{
119119
//delete those properties
120120
disabled:null,
121121
tips:null,
122+
disableTips:null,
122123
rotate:null,
123124
iframeAutoLoad:{
124125
ini:"",

xui/js/UI/Resizer.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ xui.Class("xui.UI.Resizer","xui.UI",{
158158
}
159159
b._resizer(v,arg);
160160
if(this.$inDesign){
161-
this.$resizer.get(0).$inDesign=1;
161+
t=this.$resizer.get(0);
162+
t && (t.$inDesign=1);
162163
}
163164
}else
164165
b._unResizer();

xui/js/xui.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -5557,7 +5557,7 @@ xui.Class('xui.absObj',"xui.absBox",{
55575557
oldAlias=prf.alias;
55585558

55595559
if(ref && oldRef && oldRef!==ref){
5560-
throw new Error("Can not set the refrence again");
5560+
throw new Error("Can not set the reference again");
55615561
}
55625562
if((!host && !alias)||(oldHost===host && oldAlias===alias && oldRef===ref)){
55635563
return self;
@@ -5612,6 +5612,9 @@ xui.Class('xui.absObj',"xui.absBox",{
56125612
}else{
56135613
alias=prf.alias;
56145614
}
5615+
if(ref && oldRef!==ref){
5616+
prf.ref=ref;
5617+
}
56155618

56165619
if(host!==prf){
56175620
if(oldHost==host){

0 commit comments

Comments
 (0)