Skip to content

Fix a crash on android and a little bug #13

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.

Sign up for GitHub

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

Open
wachri wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix a crash on android and a little bug #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b10aa02
Fix crash on Android when no selectedIndex was found
May 12, 2015
fd5014d
Fix wrong selectedIndex when key === 0
May 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions controllers/widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ else {
* Generate and populate the optionsDialog.
*/
function populateOptionsDialog() {
var selectedIndex = undefined;
var selectedIndex;
var options;

// Convert the object into array pairs.
pickerValueArray = _.pairs(args.pickerValues[0]);
Expand All @@ -87,12 +88,18 @@ function populateOptionsDialog() {
selectedIndex = getKeyIndexFromPairs(pickerValueArray, args.selectedValues[0]);
}

// Create an options dialog.
optionsDialog = Ti.UI.createOptionDialog({
options = {
options: pickerData,
buttonNames: ['Cancel'],
selectedIndex: selectedIndex
});
buttonNames: ['Cancel']
};


if(selectedIndex !== null) {
options.selectedIndex = selectedIndex;
}

// Create an options dialog.
optionsDialog = Ti.UI.createOptionDialog(options);
optionsDialog.show();
optionsDialog.addEventListener('click', done);
}
Expand Down Expand Up @@ -200,7 +207,11 @@ function getSelectedRowTitle(index) {
*/
function getKeyIndexFromPairs(pairs, key) {
pairs = pairs || [];
key = key || null;

if(typeof key === 'undefined') {
key = null;
}

var rowIndex = null;

// Determine index.
Expand Down