Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

adding 1.7.2

  • Loading branch information...
commit a1411b54e457fda6e83e8b93fe9b4d102f0d9b9f 1 parent 47b4237
Jon Alter authored
View
3  .gitignore
@@ -0,0 +1,3 @@
+*.pyc
+tmp
+.DS_Store
View
49 Resources/3298.js
@@ -0,0 +1,49 @@
+var Test3298 = {};
+
+
+Test3298.masterView = Ti.UI.createWindow({backgroundColor:'white'});
+
+Test3298.table = Ti.UI.createTableView({
+ data: [{
+ title: 'close'
+ }]
+});
+
+Test3298.masterView.add(Test3298.table);
+
+Test3298.detailView = Ti.UI.createWindow({
+ title: 'test',
+ backgroundColor:'black'
+});
+
+Test3298.nav = Ti.UI.iPhone.createNavigationGroup({
+ window: Test3298.detailView
+});
+
+Test3298.container = Ti.UI.createWindow();
+Test3298.container.add(Test3298.nav);
+
+Test3298.splitWindow = Titanium.UI.iPad.createSplitWindow({
+ masterView: Test3298.masterView,
+ detailView: Test3298.container
+});
+
+Test3298.masterView.addEventListener('click', function () {
+ Test3298.splitWindow.close();
+});
+
+Test3298.splitWindow.addEventListener('visible', function(e) {
+
+ if (e.view == 'detail') {
+ e.button.title = 'Menu';
+ Test3298.detailView.leftNavButton = e.button;
+ }
+ else if (e.view == 'master') {
+ Test3298.detailView.leftNavButton = null;
+ }
+
+});
+
+Test3298.open = function() {
+ Test3298.splitWindow.open();
+}
View
29 Resources/app.js
@@ -1,4 +1,4 @@
-Ti.include( 'split_view_nav.js','split_view_plain.js', 'nav_controller.js','main_tests.js' );
+Ti.include( 'split_view_nav.js','split_view_plain.js', 'nav_controller.js','main_tests.js','3298.js','split_view_features.js');
var win = Ti.UI.createWindow();
@@ -66,7 +66,7 @@ var b5= Ti.UI.createButton({
title:'Fixed Orientation',
width:300,
height:50,
- top:310
+ top:380
});
b5.addEventListener('click', function()
{
@@ -80,4 +80,29 @@ b5.addEventListener('click', function()
w.open();
});
win.add(b5);
+
+var b6 = Ti.UI.createButton({
+ title:'Bug 3298',
+ width:300,
+ height:50,
+ top:450
+});
+b6.addEventListener('click', function()
+{
+ Test3298.open();
+});
+win.add(b6);
+
+var b7 = Ti.UI.createButton({
+ title: 'Split view features',
+ width:300,
+ height:50,
+ top:520
+});
+b7.addEventListener('click', function()
+{
+ SplitFeatures.open();
+});
+win.add(b7);
+
win.open();
View
2  Resources/popover.js
@@ -94,6 +94,8 @@ Popover.init = function()
picker.selectionIndicator = true;
popover.add(picker)
+ // TEST: #1282
+ picker.setSelectedRow(0,1,true);
popover.show({
view:b2,
animated:true,
View
33 Resources/split_view_features.js
@@ -0,0 +1,33 @@
+SplitFeatures = {};
+
+// WINDOWS
+SplitFeatures.masterWindow = Ti.UI.createWindow({backgroundColor:'#ffffff'});
+SplitFeatures.detailWindow = Ti.UI.createWindow({backgroundColor:'#336699'});
+
+SplitFeatures.masterDisplayButton = Ti.UI.createButton({
+ title:'Display master (portrait)',
+ width:300,
+ height:40
+});
+SplitFeatures.detailWindow.add(SplitFeatures.masterDisplayButton);
+SplitFeatures.masterDisplayButton.addEventListener('click', function() {
+ if (!SplitFeatures.splitView.showMasterInPortrait) {
+ SplitFeatures.masterDisplayButton.title = "Don't display master (portrait)";
+ SplitFeatures.splitView.showMasterInPortrait = true;
+ }
+ else {
+ SplitFeatures.masterDisplayButton.title = 'Display master (portrait)';
+ SplitFeatures.splitView.showMasterInPortrait = false;
+ }
+});
+
+// SPLIT VIEW
+SplitFeatures.splitView = Titanium.UI.iPad.createSplitWindow({
+ masterView:SplitFeatures.masterWindow,
+ detailView:SplitFeatures.detailWindow,
+});
+
+SplitFeatures.open = function()
+{
+ SplitFeatures.splitView.open();
+};
View
11 Resources/split_view_nav.js
@@ -94,16 +94,17 @@ SplitViewNav.detailButton.addEventListener('click', function()
SplitViewNav.detailWindow.add(SplitViewNav.detailButton);
var done = Titanium.UI.createButton({
- systemButton:Titanium.UI.iPhone.SystemButton.DONE
+ title:'Flash Popover'
});
SplitViewNav.detailWindow.setRightNavButton(done);
done.addEventListener('click',function()
{
- Titanium.UI.createAlertDialog({
- title:'Clicked!',
- message:'You clicked the right nav button!'
- }).show();
+ SplitViewNav.splitView.setMasterPopupVisible(true);
+ setTimeout(function()
+ {
+ SplitViewNav.splitView.setMasterPopupVisible(false);
+ },3000);
});
View
7 Resources/split_view_plain.js
@@ -28,6 +28,13 @@ SplitViewPlain.modalButton.addEventListener('click', function() {
modal:true
});
+ modal.orientationModes = [
+ Titanium.UI.PORTRAIT,
+ Titanium.UI.UPSIDE_PORTRAIT,
+ Titanium.UI.LANDSCAPE_LEFT,
+ Titanium.UI.LANDSCAPE_RIGHT
+ ];
+
var flexSpace = Titanium.UI.createButton({
systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE
});
View
BIN  build/.DS_Store
Binary file not shown
View
BIN  build/android/.DS_Store
Binary file not shown
View
BIN  build/iphone/.DS_Store
Binary file not shown
View
8 manifest
@@ -1,8 +1,8 @@
#appname: KitchenSink-iPad
-#publisher: kevin
-#url: http://www.appcelerator.com
+#publisher: nwright
+#url: appcelerator.com
#image: appicon.png
-#appid: com.appcelerator.kitchensink.ipad
+#appid: com.nolanwright.kitchensinkipad
#desc: undefined
#type: ipad
-#guid: 63cc828c-d5c2-4c9b-9acb-ec390a370627
+#guid: 1000da51-9909-4a9e-a82f-52de59746d37
View
33 tiapp.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ti:app xmlns:ti="http://ti.appcelerator.org">
- <id>com.appcelerator.kitchensink.ipad</id>
- <name>KitchenSink-iPad</name>
- <version>1.0</version>
- <publisher>not specified</publisher>
- <url>not specified</url>
- <description>not specified</description>
- <copyright>not specified</copyright>
- <icon>appicon.png</icon>
+<id>com.nolanwright.kitchensinkipad</id>
+<name>KitchenSink-iPad</name>
+<version>1.0</version>
+<publisher>nwright</publisher>
+<url>http://www.appcelerator.com</url>
+<description>No description provided</description>
+<copyright>2010 by nwright</copyright>
+<icon>default_app_logo.png</icon>
<persistent-wifi>false</persistent-wifi>
<prerendered-icon>false</prerendered-icon>
<statusbar-style>default</statusbar-style>
@@ -15,20 +15,5 @@
<fullscreen>false</fullscreen>
<navbar-hidden>false</navbar-hidden>
<analytics>true</analytics>
-<guid>63cc828c-d5c2-4c9b-9acb-ec390a370627</guid>
- <iphone>
- <orientations device="iphone">
- <orientation>Ti.UI.PORTRAIT</orientation>
- </orientations>
- <orientations device="ipad">
- <orientation>Ti.UI.PORTRAIT</orientation>
- <orientation>Ti.UI.UPSIDE_PORTRAIT</orientation>
- <orientation>Ti.UI.LANDSCAPE_LEFT</orientation>
- <orientation>Ti.UI.LANDSCAPE_RIGHT</orientation>
- </orientations>
- </iphone>
- <android xmlns:android="http://schemas.android.com/apk/res/android">
- </android>
- <modules>
- </modules>
+<guid>1000da51-9909-4a9e-a82f-52de59746d37</guid>
</ti:app>
Please sign in to comment.
Something went wrong with that request. Please try again.