Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed stringification of null and undefined log message classes in JS logging.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4788 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2012-02-21 20:43:57 +00:00
parent 1c1769ba72
commit 95b6e5f175
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oolite.xcodeproj/project.pbxproj
View File

@ -4046,7 +4046,6 @@
COPY_PHASE_STRIP = NO;
HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)";
HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\"";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-DLOADSAVEGUI";
};
name = Debug;
@ -4057,7 +4056,6 @@
buildSettings = {
HEADER_SEARCH_PATHS = "$(HEADER_SEARCH_PATHS_QUOTED_1)";
HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Cocoa-deps/Ogg Vorbis\"";
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "-DLOADSAVEGUI";
};
name = Deployment;

2
src/Core/Scripting/OOJSGlobal.m
View File

@ -239,7 +239,7 @@ static JSBool GlobalLog(JSContext *context, uintN argc, jsval *vp)
}
else
{
messageClass = OOStringFromJSValue(context, OOJS_ARGV[0]);
messageClass = OOStringFromJSValueEvenIfNull(context, OOJS_ARGV[0]);
message = [NSString concatenationOfStringsFromJavaScriptValues:OOJS_ARGV + 1 count:argc - 1 separator:@", " inContext:context];
}