Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nwright committed Nov 27, 2009
1 parent f7c3b62 commit ce763da
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions demos/KitchenSink/Resources/ui.html
Expand Up @@ -5,10 +5,9 @@
<script>

// test preload feature
var worked = true;
window.onload = function()
{
Titanium.UI.createAlertDialog({title:'Preload',message:'this is a preload test').show();
Titanium.UI.createAlertDialog({title:'Preload',message:'this is a preload test'}).show();
};

Titanium.UI.addEventListener('tabchange',function(e)
Expand Down
1 change: 0 additions & 1 deletion demos/KitchenSink/Resources/window_unfocus.html
Expand Up @@ -21,7 +21,6 @@
document.getElementById('focused').innerHTML = Titanium.App.Properties.getString('focused');

});

Titanium.UI.currentView.addEventListener('load',function()
{
Titanium.UI.createAlertDialog({title:'Load event called'}).show();
Expand Down
Binary file modified demos/KitchenSink/build/iphone/Resources/Default.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ce763da

Please sign in to comment.