Skip to content

Commit 74ed559

Browse files
olecomolecom
committed
[build] by supro/_ExtJS4_tools.sh
after: olecom/supro@f3dcad7 suprojs/supro@f3dcad7
1 parent 16fe8da commit 74ed559

File tree

5 files changed

+83
-26
lines changed

5 files changed

+83
-26
lines changed

‎ext-all-nw.js

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (c) 2011-2013 Sencha Inc
44
GNU General Public License Usage
55
If you are unsure which license is appropriate for your use, please contact the sales department
66
at http://www.sencha.com/contact.
7-
Source: ext-all-debug.js (a6956528f9e51de3e1a3924e99f2b370f3c7cbb2)
7+
Source: ext-all-debug.js (16fe8da2b314463258625ddd6c77379040d34b45)
88
*/
99
var Ext = Ext || {};
1010
Ext._startTime = new Date().getTime();
@@ -26780,11 +26780,11 @@ len = tempHidden ? tempHidden.length : 0,
2678026780
comp;
2678126781
for (; i < len; i++) {
2678226782
comp = tempHidden[i];
26783-
comp.el.show();
26783+
comp.el && comp.el.show();
2678426784
comp.hidden = false;
2678526785
comp.setPosition(comp.x, comp.y);
2678626786
}
26787-
delete this.tempHidden;
26787+
this.tempHidden = void 0;
2678826788
},
2678926789
getActive : function() {
2679026790
return this.front;
@@ -33433,7 +33433,7 @@ group = component.toggleGroup;
3343333433
Ext.copyTo(config, component, [
3343433434
'iconCls', 'icon', 'itemId', 'disabled', 'handler', 'scope', 'menu', 'tabIndex'
3343533435
]);
33436-
Ext.apply(config, {
33436+
Ext.applyIf(config, {
3343733437
text : component.overflowText || component.text,
3343833438
hideOnClick: hideOnClick,
3343933439
destroyMenu: false,
@@ -33444,6 +33444,8 @@ config.value = component.getValue();
3344433444
config.listeners.change = function(c, newVal, oldVal) {
3344533445
component.setValue(newVal);
3344633446
}
33447+
} else if (component.text){
33448+
config.text = component.text
3344733449
}
3344833450
else if (group || component.enableToggle) {
3344933451
Ext.apply(config, {
@@ -33455,12 +33457,18 @@ component.onClick(e);
3345533457
}
3345633458
});
3345733459
}
33458-
if (component.isButton && !component.changeListenersAdded) {
33460+
if (!component.changeListenersAdded) {
33461+
if (component.isButton){
3345933462
component.on({
3346033463
textchange: me.onButtonAttrChange,
3346133464
iconchange: me.onButtonAttrChange,
3346233465
toggle: me.onButtonToggle
3346333466
});
33467+
} else if ('text' in component) {
33468+
component.on({
33469+
textchange: me.onTextChange
33470+
});
33471+
}
3346433472
component.changeListenersAdded = true;
3346533473
}
3346633474
delete config.margin;
@@ -33470,6 +33478,9 @@ delete config.id;
3347033478
delete config.itemId;
3347133479
return config;
3347233480
},
33481+
onTextChange: function(cmp, newText) {
33482+
cmp.overflowClone.setText(newText);
33483+
},
3347333484
onButtonAttrChange: function(btn) {
3347433485
var clone = btn.overflowClone;
3347533486
clone.suspendLayouts();
@@ -33524,6 +33535,7 @@ if (trigger && !this.layout.owner.items.contains(trigger)) {
3352433535
delete trigger.ownerCt;
3352533536
}
3352633537
Ext.destroy(this.menu, trigger);
33538+
this.callParent();
3352733539
}
3352833540
});
3352933541
Ext.define('Ext.layout.container.boxOverflow.Scroller', {
@@ -66399,15 +66411,21 @@ return Ext.apply(me.callParent(), {
6639966411
htmlFor: me.forId || ''
6640066412
});
6640166413
},
66414+
initComponent: function() {
66415+
this.addEvents(
66416+
'textchange'
66417+
);
66418+
},
6640266419
setText : function(text, encode){
6640366420
var me = this;
66421+
me.fireEvent('textchange', this, text, me.text);
6640466422
encode = encode !== false;
6640566423
if(encode) {
6640666424
me.text = text;
66407-
delete me.html;
66425+
me.html = void 0;
6640866426
} else {
6640966427
me.html = text;
66410-
delete me.text;
66428+
me.text = void 0;
6641166429
}
6641266430
if(me.rendered){
6641366431
me.el.dom.innerHTML = encode !== false ? Ext.util.Format.htmlEncode(text) : text;

‎ext-lite-debug.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34865,11 +34865,11 @@ Ext.define('Ext.ZIndexManager', {
3486534865

3486634866
for (; i < len; i++) {
3486734867
comp = tempHidden[i];
34868-
comp.el.show();
34868+
comp.el && comp.el.show();
3486934869
comp.hidden = false;
3487034870
comp.setPosition(comp.x, comp.y);
3487134871
}
34872-
delete this.tempHidden;
34872+
this.tempHidden = void 0;
3487334873
},
3487434874

3487534875

‎ext-lite-nw.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (c) 2011-2013 Sencha Inc
44
GNU General Public License Usage
55
If you are unsure which license is appropriate for your use, please contact the sales department
66
at http://www.sencha.com/contact.
7-
Source: ext-all-debug.js (a6956528f9e51de3e1a3924e99f2b370f3c7cbb2)
7+
Source: ext-all-debug.js (16fe8da2b314463258625ddd6c77379040d34b45)
88
*/
99
var Ext = Ext || {};
1010
Ext._startTime = new Date().getTime();
@@ -24404,11 +24404,11 @@ len = tempHidden ? tempHidden.length : 0,
2440424404
comp;
2440524405
for (; i < len; i++) {
2440624406
comp = tempHidden[i];
24407-
comp.el.show();
24407+
comp.el && comp.el.show();
2440824408
comp.hidden = false;
2440924409
comp.setPosition(comp.x, comp.y);
2441024410
}
24411-
delete this.tempHidden;
24411+
this.tempHidden = void 0;
2441224412
},
2441324413
getActive : function() {
2441424414
return this.front;
@@ -44352,6 +44352,7 @@ callbackAuth
4435244352
)
4435344353
}
4435444354
function callbackAuth(err, json, res){
44355+
if(!view) return
4435544356
if(!err){
4435644357
return view.fadeOut(finishAuth)
4435744358
} else {

‎ext-rest-debug.js

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5553,7 +5553,7 @@ Ext.define('Ext.layout.container.boxOverflow.Menu', {
55535553
'iconCls', 'icon', 'itemId', 'disabled', 'handler', 'scope', 'menu', 'tabIndex'
55545554
]);
55555555

5556-
Ext.apply(config, {
5556+
Ext.applyIf(config, {
55575557
text : component.overflowText || component.text,
55585558
hideOnClick: hideOnClick,
55595559
destroyMenu: false,
@@ -5572,6 +5572,8 @@ Ext.define('Ext.layout.container.boxOverflow.Menu', {
55725572
config.listeners.change = function(c, newVal, oldVal) {
55735573
component.setValue(newVal);
55745574
}
5575+
} else if (component.text){
5576+
config.text = component.text
55755577
}
55765578

55775579

@@ -5587,12 +5589,18 @@ Ext.define('Ext.layout.container.boxOverflow.Menu', {
55875589
}
55885590

55895591

5590-
if (component.isButton && !component.changeListenersAdded) {
5591-
component.on({
5592-
textchange: me.onButtonAttrChange,
5593-
iconchange: me.onButtonAttrChange,
5594-
toggle: me.onButtonToggle
5595-
});
5592+
if (!component.changeListenersAdded) {
5593+
if (component.isButton){
5594+
component.on({
5595+
textchange: me.onButtonAttrChange,
5596+
iconchange: me.onButtonAttrChange,
5597+
toggle: me.onButtonToggle
5598+
});
5599+
} else if ('text' in component) {
5600+
component.on({
5601+
textchange: me.onTextChange
5602+
});
5603+
}
55965604
component.changeListenersAdded = true;
55975605
}
55985606

@@ -5607,6 +5615,10 @@ Ext.define('Ext.layout.container.boxOverflow.Menu', {
56075615
return config;
56085616
},
56095617

5618+
onTextChange: function(cmp, newText) {
5619+
cmp.overflowClone.setText(newText);
5620+
},
5621+
56105622
onButtonAttrChange: function(btn) {
56115623
var clone = btn.overflowClone;
56125624
clone.suspendLayouts();
@@ -5678,6 +5690,8 @@ Ext.define('Ext.layout.container.boxOverflow.Menu', {
56785690
delete trigger.ownerCt;
56795691
}
56805692
Ext.destroy(this.menu, trigger);
5693+
5694+
this.callParent();
56815695
}
56825696
});
56835697
Ext.define('Ext.layout.container.boxOverflow.Scroller', {
@@ -36756,17 +36770,23 @@ Ext.define('Ext.form.Label', {
3675636770
});
3675736771
},
3675836772

36773+
initComponent: function() {
36774+
this.addEvents(
36775+
'textchange'
36776+
);
36777+
},
3675936778

3676036779
setText : function(text, encode){
3676136780
var me = this;
3676236781

36782+
me.fireEvent('textchange', this, text, me.text);
3676336783
encode = encode !== false;
3676436784
if(encode) {
3676536785
me.text = text;
36766-
delete me.html;
36786+
me.html = void 0;
3676736787
} else {
3676836788
me.html = text;
36769-
delete me.text;
36789+
me.text = void 0;
3677036790
}
3677136791

3677236792
if(me.rendered){

‎ext-rest-nw.js

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (c) 2011-2013 Sencha Inc
44
GNU General Public License Usage
55
If you are unsure which license is appropriate for your use, please contact the sales department
66
at http://www.sencha.com/contact.
7-
Source: ext-all-debug.js (a6956528f9e51de3e1a3924e99f2b370f3c7cbb2)
7+
Source: ext-all-debug.js (16fe8da2b314463258625ddd6c77379040d34b45)
88
*/
99
Ext.define('Ext.perf.Accumulator', (function () {
1010
var currentFrame = null,
@@ -4186,7 +4186,7 @@ group = component.toggleGroup;
41864186
Ext.copyTo(config, component, [
41874187
'iconCls', 'icon', 'itemId', 'disabled', 'handler', 'scope', 'menu', 'tabIndex'
41884188
]);
4189-
Ext.apply(config, {
4189+
Ext.applyIf(config, {
41904190
text : component.overflowText || component.text,
41914191
hideOnClick: hideOnClick,
41924192
destroyMenu: false,
@@ -4197,6 +4197,8 @@ config.value = component.getValue();
41974197
config.listeners.change = function(c, newVal, oldVal) {
41984198
component.setValue(newVal);
41994199
}
4200+
} else if (component.text){
4201+
config.text = component.text
42004202
}
42014203
else if (group || component.enableToggle) {
42024204
Ext.apply(config, {
@@ -4208,12 +4210,18 @@ component.onClick(e);
42084210
}
42094211
});
42104212
}
4211-
if (component.isButton && !component.changeListenersAdded) {
4213+
if (!component.changeListenersAdded) {
4214+
if (component.isButton){
42124215
component.on({
42134216
textchange: me.onButtonAttrChange,
42144217
iconchange: me.onButtonAttrChange,
42154218
toggle: me.onButtonToggle
42164219
});
4220+
} else if ('text' in component) {
4221+
component.on({
4222+
textchange: me.onTextChange
4223+
});
4224+
}
42174225
component.changeListenersAdded = true;
42184226
}
42194227
delete config.margin;
@@ -4223,6 +4231,9 @@ delete config.id;
42234231
delete config.itemId;
42244232
return config;
42254233
},
4234+
onTextChange: function(cmp, newText) {
4235+
cmp.overflowClone.setText(newText);
4236+
},
42264237
onButtonAttrChange: function(btn) {
42274238
var clone = btn.overflowClone;
42284239
clone.suspendLayouts();
@@ -4277,6 +4288,7 @@ if (trigger && !this.layout.owner.items.contains(trigger)) {
42774288
delete trigger.ownerCt;
42784289
}
42794290
Ext.destroy(this.menu, trigger);
4291+
this.callParent();
42804292
}
42814293
});
42824294
Ext.define('Ext.layout.container.boxOverflow.Scroller', {
@@ -27591,15 +27603,21 @@ return Ext.apply(me.callParent(), {
2759127603
htmlFor: me.forId || ''
2759227604
});
2759327605
},
27606+
initComponent: function() {
27607+
this.addEvents(
27608+
'textchange'
27609+
);
27610+
},
2759427611
setText : function(text, encode){
2759527612
var me = this;
27613+
me.fireEvent('textchange', this, text, me.text);
2759627614
encode = encode !== false;
2759727615
if(encode) {
2759827616
me.text = text;
27599-
delete me.html;
27617+
me.html = void 0;
2760027618
} else {
2760127619
me.html = text;
27602-
delete me.text;
27620+
me.text = void 0;
2760327621
}
2760427622
if(me.rendered){
2760527623
me.el.dom.innerHTML = encode !== false ? Ext.util.Format.htmlEncode(text) : text;

0 commit comments

Comments
 (0)