Merge pull request #124 from jpl-mac/timob-9665

TIMOB-9665 Blackberry: fix property enumeration on JS object created by ...
Macadamian · Aug 7, 2012 · 26a7ec8 · 26a7ec8
2 parents 74ef36a + 247837a
commit 26a7ec8
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 24 deletions.
diff --git a/blackberry/tibb/TiObject.cpp b/blackberry/tibb/TiObject.cpp
@@ -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())

diff --git a/blackberry/tibb/TiUIActivityIndicator.cpp b/blackberry/tibb/TiUIActivityIndicator.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUIBase.cpp b/blackberry/tibb/TiUIBase.cpp
@@ -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[] =
 {
@@ -220,9 +221,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;
 }
 
@@ -231,9 +233,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();
+        }
     }
 }
 

diff --git a/blackberry/tibb/TiUIButton.cpp b/blackberry/tibb/TiUIButton.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUIImageView.cpp b/blackberry/tibb/TiUIImageView.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUILabel.cpp b/blackberry/tibb/TiUILabel.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUIOptionDialog.cpp b/blackberry/tibb/TiUIOptionDialog.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUIPicker.cpp b/blackberry/tibb/TiUIPicker.cpp
@@ -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);

diff --git a/blackberry/tibb/TiUIProgressBar.cpp b/blackberry/tibb/TiUIProgressBar.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUISlider.cpp b/blackberry/tibb/TiUISlider.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUISwitch.cpp b/blackberry/tibb/TiUISwitch.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUITab.cpp b/blackberry/tibb/TiUITab.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUITabGroup.cpp b/blackberry/tibb/TiUITabGroup.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUITableView.cpp b/blackberry/tibb/TiUITableView.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUITextField.cpp b/blackberry/tibb/TiUITextField.cpp
@@ -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();

diff --git a/blackberry/tibb/TiUIWindow.cpp b/blackberry/tibb/TiUIWindow.cpp
@@ -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();