From 7e7272236b900c9a7af33b870feb7446d3d5a853 Mon Sep 17 00:00:00 2001 From: Stephen Tramer Date: Fri, 21 Jan 2011 14:30:55 -0800 Subject: [PATCH] Check for Titanium SDK version before allowing creation/edit of universal iOS project. --- Resources/modules/project_edit/js/project_edit.js | 12 ++++++++++++ Resources/perspectives/projects/js/projects.js | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/Resources/modules/project_edit/js/project_edit.js b/Resources/modules/project_edit/js/project_edit.js index cc9c0db..ccdf6a8 100755 --- a/Resources/modules/project_edit/js/project_edit.js +++ b/Resources/modules/project_edit/js/project_edit.js @@ -318,6 +318,18 @@ EditProject.setupView = function() var version = EditProject.currentProject.version = $('#edit_project_version').val(); var copyright = EditProject.currentProject.copyright = $('#edit_project_copyright').val(); + if (EditProject.currentProject.type=='universal') + { + // Perform a Titanium SDK check - we require at minimum 1.6.0 + var versions = EditProject.currentProject.runtime.split('.'); + if (parseInt(versions[0]) < 1 || + (parseInt(versions[0]) == 1 && parseInt(versions[1]) < 6)) + { + alert('iOS universal development is only supported in Titanium SDK 1.6.0 and later'); + return; + } + } + var rubyOn = ($('#language_ruby_checked').css('display') != 'none')?'on':''; var pythonOn = ($('#language_python_checked').css('display') != 'none')?'on':''; var phpOn = ($('#language_php_checked').css('display') != 'none')?'on':''; diff --git a/Resources/perspectives/projects/js/projects.js b/Resources/perspectives/projects/js/projects.js index 0f91054..884d689 100644 --- a/Resources/perspectives/projects/js/projects.js +++ b/Resources/perspectives/projects/js/projects.js @@ -1322,6 +1322,18 @@ Projects.handleNewProjectClick = function() options.python = ($('#language_python_checked').css('display') != 'none')?'on':''; options.php = ($('#language_php_checked').css('display') != 'none')?'on':''; + if (options.type=='universal') + { + // Perform a Titanium SDK check - we require at minimum 1.6.0 + var versions = options.runtime.split('.'); + if (parseInt(versions[0]) < 1 || + (parseInt(versions[0]) == 1 && parseInt(versions[1]) < 6)) + { + alert('iOS universal development is only supported in Titanium SDK 1.6.0 and later'); + return; + } + } + Projects.createProject(options,true); });