colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-17 16:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:280north/cappuccino

Browse Source
This commit is contained in:
Francisco Ryan Tolmasky I
2008-10-22 18:16:24 -07:00
parent 2e9e38ebaf f34265a864
commit 98e5c0ed3e
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/Cib/_CPCibCustomView.j
+3 -1
View File
@@ -73,7 +73,9 @@ var _CPCibCustomViewClassNameKey = @"_CPCibCustomViewClassNameKey";
[view setBounds:[self bounds]];
// Since the object replacement logic hasn't had a chance to kick in yet, we need to do it manually:
var subviews = [self subviews],
// we need to copy subviews since each time we add a subview to a different view its removed from the original subviews array
var subviews = [[self subviews] copy],
index = 0,
count = subviews.length;
Objective-J/plist.js
+4
View File
@@ -241,6 +241,7 @@ var XML_XML = "xml",
PLIST_BOOLEAN_FALSE = "false",
PLIST_NUMBER_REAL = "real",
PLIST_NUMBER_INTEGER = "integer";
PLIST_DATA = "data";
#if RHINO
@@ -409,6 +410,9 @@ function CPPropertyListCreateFromXMLData(XMLNodeOrData)
case PLIST_BOOLEAN_FALSE: object = false;
break;
case PLIST_DATA: object = FIRST_CHILD(XMLNode) ? CHILD_VALUE(XMLNode) : ""; // FIXME: temporary fix for NIBs with <data> tags
break;
default: objj_exception_throw(new objj_exception(OBJJPlistParseException, "*** " + NODE_NAME(XMLNode) + " tag not recognized in Plist."));
}