antville/antville
antville/antville
1
1
Fork 0
Code Issues 48 Pull requests 9 Projects Releases 9 Wiki Activity Actions

* Added check if remove() method exists in a prototype's constructor

Browse source 
* Fixed bug that caused exception when calling Layout.reset() due to undefined main skin of a third-party prototype (e.g. Feed)
This commit is contained in:
Tobi Schäfer 2008-04-27 10:54:07 +00:00
parent 271e48eaa9
commit dff39778a6
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/HopObject/HopObject.js
View file

@ -115,8 +115,10 @@ HopObject.remove = function(collection) {
var item; var item;
while (collection.size() > 0) { while (collection.size() > 0) {
item = collection.get(0); item = collection.get(0);
if (item.constructor.remove) {
item.constructor.remove.call(item, item); item.constructor.remove.call(item, item);
} }
}
return; return;
} }

10
code/Skin/Skin.js
View file

@ -229,6 +229,9 @@ Skin.prototype.setSource = function(source) {
res.writeln(source.trim()); res.writeln(source.trim());
} }
var skin = this.getMainSkin(); var skin = this.getMainSkin();
if (!skin) {
return;
}
var subskins = skin.getSubskinNames(); var subskins = skin.getSubskinNames();
for (var i in subskins) { for (var i in subskins) {
if (subskins[i] !== this.name) { if (subskins[i] !== this.name) {
@ -262,8 +265,11 @@ Skin.prototype.getStaticFile = function(fpath, skin) {
} }
Skin.prototype.getMainSkin = function() { Skin.prototype.getMainSkin = function() {
var source = app.getSkinfilesInPath(res.skinpath)[this.prototype][this.prototype]; var skinSet = app.getSkinfilesInPath(res.skinpath)[this.prototype];
return createSkin(source); if (skinSet && skinSet[this.prototype]) {
return createSkin(skinSet[this.prototype]);
}
return null;
} }
Skin.prototype.custom_macro = function() { Skin.prototype.custom_macro = function() {