Skip to content

Commit

Permalink
Update KS code to 3.0.2 version
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Stepanov committed Feb 19, 2013
1 parent b1b7245 commit b6f3750
Show file tree
Hide file tree
Showing 18 changed files with 54 additions and 22 deletions.
4 changes: 3 additions & 1 deletion Resources/ui/common/baseui/window_properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@ function win_props() {
top:110
});
var full=true;
var oldColor = null;
buttonWidthHeight.addEventListener('click', function()
{
Ti.API.info('in width height');
if (full)
{
oldColor = win.backgroundColor;
win.height = 300;
win.width = 300;
win.backgroundColor = 'black';
Expand All @@ -58,7 +60,7 @@ function win_props() {
// unset them to go back to previous layout
win.height = null;
win.width = null;
win.backgroundColor = null;
win.backgroundColor = oldColor;
full=true;
}
});
Expand Down
4 changes: 4 additions & 0 deletions Resources/ui/common/controls/button_state.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ function button_states() {
enabled:true,
focusable:true,
title:'B1',
backgroundColor: 'white',
backgroundImage:'/images/slightlylargerimage.png'
});

Expand All @@ -20,6 +21,7 @@ function button_states() {
focusable:true,
enabled:true,
title:'B2',
backgroundColor: 'white',
backgroundDisabledImage:'/images/slightlylargerimage.png'
});

Expand All @@ -31,6 +33,7 @@ function button_states() {
enabled:true,
focusable:true,
title:'B3',
backgroundColor: 'white',
backgroundFocusedImage:'/images/slightlylargerimage.png'
});

Expand All @@ -42,6 +45,7 @@ function button_states() {
focusable:true,
enabled:true,
title:'B4',
backgroundColor: 'white',
backgroundSelectedImage:'/images/slightlylargerimage.png'
});

Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/controls/label.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function label(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/controls/picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function picker(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/controls/slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ function slider(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/controls/textarea.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ function textarea(_args) {
data.push({title:'Auto Link', hasChild:true, test:'ui/handheld/ios/controls/textarea_autodetect'});
}
// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/controls/textfield.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function textfield_list(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/mashups/facebook.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function facebook(_args) {
];

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
1 change: 1 addition & 0 deletions Resources/ui/common/mashups/yql.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ function yql(_args) {
];

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
6 changes: 5 additions & 1 deletion Resources/ui/common/phone/camera.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function camera(_args) {
var self = Ti.UI.createWindow();
var self = Ti.UI.createWindow({
title:_args.title,
backgroundColor:'#fff'
});
// create table view data object
var data = [
{title:'Camera Basic', hasChild:true, test:'ui/common/phone/camera_basic'}
Expand Down Expand Up @@ -27,6 +30,7 @@ function camera(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
6 changes: 5 additions & 1 deletion Resources/ui/common/phone/contacts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function contacts(_args) {
var self = Ti.UI.createWindow();
var self = Ti.UI.createWindow({
title:_args.title,
backgroundColor:'#fff'
});
// create table view data object
Ti.include("/etc/version.js");

Expand Down Expand Up @@ -85,6 +88,7 @@ function contacts(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
6 changes: 5 additions & 1 deletion Resources/ui/common/phone/movie.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function movie(_args) {
var self = Ti.UI.createWindow();
var self = Ti.UI.createWindow({
title:_args.title,
backgroundColor:'#fff'
});
// create table view data object
var data = [
{title:'Local', hasChild:true, test:'ui/common/phone/movie_local'}
Expand All @@ -23,6 +26,7 @@ function movie(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
10 changes: 3 additions & 7 deletions Resources/ui/common/phone/photo_gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,9 @@ function photo_gallery() {
popoverView = imageView;
}

if (Ti.Platform.osname === 'android') {
win.addEventListener('open', function(e) {
openGallery();
});
} else {
openGallery();
}
win.addEventListener('open', function(e) {
openGallery();
});

return win;
};
Expand Down
6 changes: 5 additions & 1 deletion Resources/ui/common/phone/sound.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function sound(_args) {
var self = Ti.UI.createWindow();
var self = Ti.UI.createWindow({
title:_args.title,
backgroundColor:'#fff'
});
// create table view data object
var data = [
{title:'Local', hasChild:true, test:'ui/common/phone/sound_local'},
Expand All @@ -24,6 +27,7 @@ function sound(_args) {
}

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
6 changes: 5 additions & 1 deletion Resources/ui/common/platform/xhr.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function xhr(_args) {
var self = Ti.UI.createWindow(),
var self = Ti.UI.createWindow({
title:_args.title,
backgroundColor:'#fff'
}),

// if we're mobile web, don't make the rows touch enabled
isMobileWeb = Ti.Platform.osname == "mobileweb";
Expand All @@ -22,6 +25,7 @@ function xhr(_args) {
data.push({title:'File Upload', hasChild:true, test:'ui/handheld/ios/platform/xhr_fileupload'});
}
// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
7 changes: 3 additions & 4 deletions Resources/ui/handheld/android/baseui/android_menu_3.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
function android_menu3() {
//var activity = Ti.Android.currentActivity;
var win = Ti.UI.currentWindow;

win.backgroundColor = 'white';
var win = Ti.UI.createWindow({
backgroundColor: 'white'
});

var b1 = Ti.UI.createButton({
title : 'Open Window',
Expand Down
6 changes: 5 additions & 1 deletion Resources/ui/handheld/android/baseui/android_menus.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
function android_menus(_args) {
var win = Ti.UI.createWindow();
var win = Ti.UI.createWindow({
title:_args.title,
backgroundColor:'#fff'
});
//create table view data object
var data = [];

Expand All @@ -8,6 +11,7 @@ function android_menus(_args) {
data.push({title:'Menu Handlers (Activity Property)', hasChild:true, test:'ui/handheld/android/baseui/android_menu_3'});

// create table view
for (var i = 0; i < data.length; i++ ) { data[i].color = '#000'; data[i].font = {fontWeight:'bold'} };
var tableview = Titanium.UI.createTableView({
data:data
});
Expand Down
8 changes: 4 additions & 4 deletions tiapp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<target device="android">true</target>
<target device="blackberry">false</target>
</deployment-targets>
<sdk-version>3.0.0.GA</sdk-version>
<sdk-version>3.0.2.GA</sdk-version>
<id>com.appcelerator.kitchensink</id>
<name>KitchenSink</name>
<version>3.0.0.GA</version>
<publisher>adecena</publisher>
<version>3.0.2.GA</version>
<publisher>appcelerator</publisher>
<url>http://appcelerator.com</url>
<description>not specified</description>
<copyright>2012 by adecena</copyright>
<copyright>2012 by appcelerator</copyright>
<icon>appicon.png</icon>
<persistent-wifi>false</persistent-wifi>
<prerendered-icon>false</prerendered-icon>
Expand Down

0 comments on commit b6f3750

Please sign in to comment.