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.

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

TIMOB-9369: BlackBerry: merge BB fork with appcelerator branch #80

Merged
merged 2,141 commits into from Jun 19, 2012

Conversation

dlifshitz-maca
Copy link

Reviewers: Alex, JP

Conflicts:
apidoc/Titanium/UI/Label.yml
apidoc/Titanium/UI/OptionDialog.yml
apidoc/Titanium/UI/Switch.yml
apidoc/Titanium/UI/TableView.yml
apidoc/Titanium/UI/TextField.yml
apidoc/Titanium/UI/UI.yml
support/project.py

Tests:

  1. Created, built, run project using command line
  2. Created, built, run project using Titanium Studio Beta (with hardcoded IP)

vishalduggal and others added 30 commits May 30, 2012 13:23
[TIMOB-9016]Clearing text on tableview searchbar causing rendering issues.
[MOD-747][MOD-749][MOD-750] Android push notification's badge, sound, vi...
[MOD-752] Fix for data parameters not being URI encoded properly in some...
[TIMOB-7773]iOS: Back/close animation broken when a NavigationGroup is in a TabGroup
TIDOC-353 APIDOC UI.Clipboard rewrite
vishalduggal and others added 19 commits June 11, 2012 10:57
TIDOC-623 TIDOC-622 APIDOC: Ti.UI.TableViewSection issues
[TIMOB-8955] Set gradient page context as execution context only if available.
timob-9427: implementation of removePerson() + removing support for contacts API 4
TIMOB-9336 Android: If java location for Windows is determined by builder.py, go ...
[TIMOB-3215]Make the topmost Parent ScrollView handle the keyboardevents
TIMOB 8091 Android: fix "repeat" animation property
[TIMOB-8471]iOS: VideoPlayer doesnot play with local file on iOS5 and above.
[TIDOC-663][TIMOB-9438][TIMOB-9439] Make the zoom properties play nice with each other
TIMOB-8561 Add Geo permissions when Map.createView is seen, so that user...
Conflicts:
	apidoc/Titanium/UI/Label.yml
	apidoc/Titanium/UI/OptionDialog.yml
	apidoc/Titanium/UI/Switch.yml
	apidoc/Titanium/UI/TableView.yml
	apidoc/Titanium/UI/TextField.yml
	apidoc/Titanium/UI/UI.yml
	support/project.py
@jpl-mac
Copy link

jpl-mac commented Jun 14, 2012

caught running validate.py in apidoc

Titanium/UI/ActivityIndicator.yml:
    x Titanium.UI.ActivityIndicator
        x "extends" type "Titanium.Proxy On Blackberry the activity indicator has three fixed graphics sizes. The activity indicator will choose the largest of its three graphics sizes that fits inside the avaliable space." could not be found

@jpl-mac
Copy link

jpl-mac commented Jun 14, 2012

It would be worthwhile to add platforms line to all new entries in the apidoc, as it is not going to have been implemented for BB. This only affects the components that are already partly implemented on BB

@jpl-mac
Copy link

jpl-mac commented Jun 14, 2012

-       if blackberry:
+       blackberry_resources = os.path.join(resources_dir, 'blackberry')
+       if blackberry and (not update_platforms or not os.path.exists(blackberry_resources)):
+               if not os.path.exists(blackberry_resources):
+                       os.makedirs(blackberry_resources)
                blackberry_gen = os.path.join(template_dir,'blackberry','blackberry.py')
-               run([sys.executable, blackberry_gen, '--name', name, '--id', appid, '--dir', directory, '--ndk', blac
-

we didn't create the resources folder before, i see no reason why we should now. Actually from what i remember (unless it's been changed since), that dir would get deleted in the blackberry.py script before being copied from somewhere else. So creating it here was useless and still is.

@jpl-mac
Copy link

jpl-mac commented Jun 14, 2012

Reviewed

[Changes]
ActivityIndicator.yml
- fixed BlackBerry spelling
- fixed placement of extends

TableView.yml
- fixed BlackBerry spelling
- event swipe
  - put platforms back

TextField.yml
- property enableReturnKey
  - added platforms

UI.yml
- properties INPUT_BORDERSTYLE_BEZEL, INPUT_BORDERSTYLE_LINE, INPUT_BORDERSTYLE_NONE, INPUT_BORDERSTYLE_ROUNDED
  - added platforms

project.py
- reverted extra resource folder creation

[Tests]
Test 1: validate apidoc
1) Run validate.py
2) Verify there are no errors
@dlifshitz-maca
Copy link
Author

I've addressed all comments and updated the patch

@jpl-mac
Copy link

jpl-mac commented Jun 18, 2012

Looks good to me, Approved

@alexandergalstyan
Copy link

Need merge. Approved

Conflicts:
	apidoc/Titanium/UI/ActivityIndicator.yml
dlifshitz-maca added a commit that referenced this pull request Jun 19, 2012
TIMOB-9369: BlackBerry: merge BB fork with appcelerator branch
@dlifshitz-maca dlifshitz-maca merged commit 14d20c9 into Macadamian:blackberry Jun 19, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet