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

Renamed some JS timer methods, removed junk from OOJSGlobal.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1174 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2007-09-15 14:28:45 +00:00
parent 0da77044e5
commit 75259572d1
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,6 @@ enum
// Property IDs // Property IDs
kGlobal_galaxyNumber, // galaxy number, integer, read-only kGlobal_galaxyNumber, // galaxy number, integer, read-only
kGlobal_planetNumber, // planet number, integer, read-only kGlobal_planetNumber, // planet number, integer, read-only
kGlobal_missionVariables, // mission variables, custom object, read-only
kGlobal_guiScreen, // current GUI screen, string, read-only kGlobal_guiScreen, // current GUI screen, string, read-only
}; };
@ -83,7 +82,6 @@ static JSPropertySpec sGlobalProperties[] =
// JS name ID flags // JS name ID flags
{ "galaxyNumber", kGlobal_galaxyNumber, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY }, { "galaxyNumber", kGlobal_galaxyNumber, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ "planetNumber", kGlobal_planetNumber, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY }, { "planetNumber", kGlobal_planetNumber, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
// { "missionVariables", kGlobal_missionVariables, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ "guiScreen", kGlobal_guiScreen, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY }, { "guiScreen", kGlobal_guiScreen, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ 0 } { 0 }
}; };

16
src/Core/Scripting/OOJSTimer.m
View File

@ -202,8 +202,8 @@ static JSClass sTimerClass =
enum enum
{ {
// Property IDs // Property IDs
kTimer_nextFireTime, // next fire time, double, read/write kTimer_nextTime, // next fire time, double, read/write
kTimer_fireInterval, // next fire time, double, read/write kTimer_interval, // interval, double, read/write
kTimer_isPersistent, // is persistent, boolean, read/write kTimer_isPersistent, // is persistent, boolean, read/write
kTimer_isRunning // is scheduled, boolean, read-only kTimer_isRunning // is scheduled, boolean, read-only
}; };
@ -212,8 +212,8 @@ enum
static JSPropertySpec sTimerProperties[] = static JSPropertySpec sTimerProperties[] =
{ {
// JS name ID flags // JS name ID flags
{ "nextFireTime", kTimer_nextFireTime, JSPROP_PERMANENT | JSPROP_ENUMERATE }, { "nextTime", kTimer_nextTime, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "fireInterval", kTimer_fireInterval, JSPROP_PERMANENT | JSPROP_ENUMERATE }, { "interval", kTimer_interval, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "isPersistent", kTimer_isPersistent, JSPROP_PERMANENT | JSPROP_ENUMERATE }, { "isPersistent", kTimer_isPersistent, JSPROP_PERMANENT | JSPROP_ENUMERATE },
{ "isRunning", kTimer_isRunning, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY }, { "isRunning", kTimer_isRunning, JSPROP_PERMANENT | JSPROP_ENUMERATE | JSPROP_READONLY },
{ 0 } { 0 }
@ -260,11 +260,11 @@ static JSBool TimerGetProperty(JSContext *context, JSObject *this, jsval name, j
switch (JSVAL_TO_INT(name)) switch (JSVAL_TO_INT(name))
{ {
case kTimer_nextFireTime: case kTimer_nextTime:
JS_NewDoubleValue(context, [timer nextTime], outValue); JS_NewDoubleValue(context, [timer nextTime], outValue);
break; break;
case kTimer_fireInterval: case kTimer_interval:
JS_NewDoubleValue(context, [timer interval], outValue); JS_NewDoubleValue(context, [timer interval], outValue);
break; break;
@ -296,7 +296,7 @@ static JSBool TimerSetProperty(JSContext *context, JSObject *this, jsval name, j
switch (JSVAL_TO_INT(name)) switch (JSVAL_TO_INT(name))
{ {
case kTimer_nextFireTime: case kTimer_nextTime:
if (JS_ValueToNumber(context, *value, &fValue)) if (JS_ValueToNumber(context, *value, &fValue))
{ {
if (![timer setNextTime:fValue]) if (![timer setNextTime:fValue])
@ -306,7 +306,7 @@ static JSBool TimerSetProperty(JSContext *context, JSObject *this, jsval name, j
} }
break; break;
case kTimer_fireInterval: case kTimer_interval:
if (JS_ValueToNumber(context, *value, &fValue)) if (JS_ValueToNumber(context, *value, &fValue))
{ {
[timer setInterval:fValue]; [timer setInterval:fValue];