Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TIMOB-9665 Blackberry: fix property enumeration on JS object created by ... #124

Merged
merged 1 commit into from
Aug 7, 2012
Merged

TIMOB-9665 Blackberry: fix property enumeration on JS object created by ... #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion blackberry/tibb/TiObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ Handle<Value> TiObject::propGetter_(Local<String> prop, const AccessorInfo& info
return result;
}
*/
return Undefined();
return Handle<Value>();
}
Handle<Value> ret = propObject->getValue();
if (!ret.IsEmpty())
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIActivityIndicator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void TiUIActivityIndicator::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_ACTIVITYINDICATOR);
setNativeObject(obj);
obj->release();
Expand Down
24 changes: 15 additions & 9 deletions blackberry/tibb/TiUIBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@
*/

#include "TiUIBase.h"
#include "TiLogger.h"

#include "TiGenericFunctionObject.h"
#include "TiPropertySetFunctionObject.h"
#include "TiLogger.h"
#include "TiMessageStrings.h"
#include "TiPropertyGetFunctionObject.h"
#include "TiPropertyMapObject.h"
#include "TiPropertyGetObject.h"
#include "TiPropertyMapObject.h"
#include "TiPropertySetFunctionObject.h"
#include "TiV8Event.h"
#include "TiMessageStrings.h"
#include <string>
#include <ctype.h>
#include <string>

const static TiProperty g_tiProperties[] =
{
Expand Down Expand Up @@ -210,9 +211,10 @@ TiUIBase::TiUIBase(const char* name)

TiUIBase* TiUIBase::createView(NativeObjectFactory* nativeObjectFactory)
{
TiUIBase* obj = new TiUIBase;
TiUIBase* obj = new TiUIBase("TiUIBase");
obj->setNativeObjectFactory(nativeObjectFactory);
obj->initializeTiObject(NULL);

return obj;
}

Expand All @@ -221,9 +223,13 @@ void TiUIBase::initializeTiObject(TiObject* parentContext)
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_VIEW);
setNativeObject(obj);
obj->release();
/* Don't create a native view object for derived classes */
if (string("TiUIBase") == getName())
{
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_VIEW);
setNativeObject(obj);
obj->release();
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void TiUIButton::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_BUTTON);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIImageView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void TiUIImageView::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_IMAGEVIEW);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUILabel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void TiUILabel::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_LABEL);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIOptionDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ void TiUIOptionDialog::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_DROPDOWN);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIPicker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void TiUIPicker::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
//currently cascades only supports date/time picker that is why we should create native DateTimePicker object here
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_DATE_TIME_PICKER);
setNativeObject(obj);
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIProgressBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ void TiUIProgressBar::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_PROGRESSBAR);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUISlider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void TiUISlider::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_SLIDER);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUISwitch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void TiUISwitch::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_TOGGLEBUTTON);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUITab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void TiUITab::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_TAB);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUITabGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void TiUITabGroup::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_TABGROUP);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUITableView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void TiUITableView::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_LIST_VIEW);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUITextField.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void TiUITextField::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_TEXT_FIELD);
setNativeObject(obj);
obj->release();
Expand Down
2 changes: 1 addition & 1 deletion blackberry/tibb/TiUIWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void TiUIWindow::initializeTiObject(TiObject* parentContext)
{
if (!isInitialized())
{
TiProxy::initializeTiObject(parentContext);
TiUIBase::initializeTiObject(parentContext);
NativeObject* obj = getNativeObjectFactory()->createNativeObject(N_TYPE_WINDOW);
setNativeObject(obj);
obj->release();
Expand Down