Skip to content
Browse files

Merge branch 'master' of github.com:appcelerator/titanium_mobile

  • Loading branch information...
2 parents ede03f3 + fd6f276 commit c932a6523a3e133c61eb1766936afe78cda9a0cb @jhaynie jhaynie committed
View
2 demos/KitchenSink/Resources/contacts.html
@@ -177,7 +177,7 @@
cancel:function()
{
},
- details:['firstName','lastName','phone','email', 'organization']
+ details:['firstName','lastName','phone','email', 'organization', 'birthday']
});
break;
}
View
2 demos/KitchenSink/Resources/geo.html
@@ -152,7 +152,6 @@
{
document.getElementById("compass").innerHTML = "No compass reading available";
document.getElementById("magneticfield").innerHTML = "No compass reading available";
-
document.getElementById("callcount3").innerHTML = "Call count: Not available";
document.getElementById("timestamp3").innerHTML = "Timestamp: Not available";
document.getElementById("accuracy3").innerHTML = "Accuracy: Not available";
@@ -161,7 +160,6 @@
document.getElementById("x").innerHTML ="x: Not available";
document.getElementById("y").innerHTML = "y: Not available";
document.getElementById("z").innerHTML = "z: Not available";
-
document.getElementById("callcount4").innerHTML = "Call count: Not available";
document.getElementById("timestamp4").innerHTML = "Timestamp: Not available";
document.getElementById("accuracy4").innerHTML = "Accuracy: Not available";
View
1 demos/KitchenSink/Resources/js_events2.html
@@ -8,6 +8,7 @@
var move = 1;
document.body.ontouchstart = function(e)
{
+ e.preventDefault()
document.getElementById('start').innerHTML = start;
start++;
};
View
2 demos/KitchenSink/Resources/maps.html
@@ -7,7 +7,7 @@
var mapview = Titanium.Map.createView({
mapType: Titanium.Map.HYBRID_TYPE,
- region: {latitude:37.33168900, longitude:-122.03073100, latitudeDelta:0.04, longitudeDelta:0.04},
+ region: {latitude:37.33168900, longitude:-122.03073100, latitudeDelta:0.01, longitudeDelta:0.01},
animate:true,
regionFit:true,
userLocation:true,
View
25 demos/KitchenSink/Resources/mashups.html
@@ -5,10 +5,17 @@
<script>
// data for tableview
+ // var data = [
+ // {title:'Yahoo YQL',image:'KS_share_Yahoo.png'},
+ // {title:'Facebook Connect',image:'KS_share_FB.png'},
+ // {title:'Facebook Video',image:'KS_share_FB.png'},
+ // {title:'Twitter',image:'KS_share_TW.png'},
+ // {title:'SOAP Web Services',image:'KS_share_soap2.png'}
+ // ];
+
var data = [
{title:'Yahoo YQL',image:'KS_share_Yahoo.png'},
{title:'Facebook Connect',image:'KS_share_FB.png'},
- {title:'Facebook Video',image:'KS_share_FB.png'},
{title:'Twitter',image:'KS_share_TW.png'},
{title:'SOAP Web Services',image:'KS_share_soap2.png'}
];
@@ -37,22 +44,22 @@
w.open({animated:true});
break;
}
+ // case 2:
+ // {
+ // Titanium.Analytics.featureEvent('mashups.facebook.video');
+ // var w = Titanium.UI.createWindow({url:'facebook_video.html',barColor:'#3b5998',titleImage:'images/facebook_logo.png',orientation:'either'});
+ // w.open({animated:true});
+ // break;
+ // }
case 2:
{
- Titanium.Analytics.featureEvent('mashups.facebook.video');
- var w = Titanium.UI.createWindow({url:'facebook_video.html',barColor:'#3b5998',titleImage:'images/facebook_logo.png',orientation:'either'});
- w.open({animated:true});
- break;
- }
- case 3:
- {
Titanium.Analytics.featureEvent('mashups.twitter');
var w = Titanium.UI.createWindow({url:'twitter.html',barColor:'#33ccff',titleImage:'images/twitter_logo.png'});
w.open({animated:true});
break;
break;
}
- case 4:
+ case 3:
{
Titanium.Analytics.featureEvent('mashups.soap');
var w = Titanium.UI.createWindow({url:'soap.html',barColor:'#990000'});
View
2 demos/KitchenSink/Resources/phone.html
@@ -575,7 +575,7 @@
// show alert
a.show();
},
- allowImageEditing:true
+ allowImageEditing:false
});
};
View
1 demos/KitchenSink/Resources/textfields.html
@@ -182,7 +182,6 @@
value:'I am a textarea',
height:200,
width:300,
- borderStyle:Titanium.UI.INPUT_BORDERSTYLE_BEZEL
});
ta1.addEventListener('return',function(e)
View
4 demos/KitchenSink/tiapp.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?><ti:app xmlns:ti="http://ti.appcelerator.org">
<id>com.nolanwright.kitchensink</id>
<name>KitchenSink</name>
-<version>1.1</version>
+<version>1.0</version>
<publisher>nwright</publisher>
<url>appcelerator.com</url>
<copyright>2009 by nwright</copyright>
-<description>Mobile Unit Test App</description>
+<description>demo app for mobile</description>
<icon>default_app_logo.png</icon>
<analytics>true</analytics>
<windows>

0 comments on commit c932a65

Please sign in to comment.
Something went wrong with that request. Please try again.