You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2016/04/07 09:24:19 UTC
[4/5] git commit: [flex-utilities] [refs/heads/develop] - Fix license
text and colors
Fix license text and colors
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d50c6402
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d50c6402
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d50c6402
Branch: refs/heads/develop
Commit: d50c6402ba2283f8a956c085053e9895beeaeacc
Parents: 59fbf7a
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Wed Apr 6 17:54:47 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Thu Apr 7 00:21:06 2016 -0700
----------------------------------------------------------------------
npm-flexjs/dependencies/AdobeAIR.js | 8 ++++---
npm-flexjs/dependencies/FlashPlayerGlobal.js | 29 ++++++++++++-----------
2 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d50c6402/npm-flexjs/dependencies/AdobeAIR.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/AdobeAIR.js b/npm-flexjs/dependencies/AdobeAIR.js
index d037a48..d9afb92 100644
--- a/npm-flexjs/dependencies/AdobeAIR.js
+++ b/npm-flexjs/dependencies/AdobeAIR.js
@@ -38,15 +38,16 @@ Apache FlexJS SDK uses the Adobe AIR SDK to build Adobe AIR applications.\n\
The Adobe AIR SDK is subject to and governed by the\n\
Adobe AIR SDK License Agreement specified here:\n\
http://www.adobe.com/products/air/sdk-eula.html.\n\
- This license is not compatible with the Apache v2 license.\n\
-Do you want to download and install the Adobe AIR SDK? (y/n)";
+This license is not compatible with the Apache v2 license.\n\
+Do you want to download and install the Adobe AIR SDK?\
+This is a required component (y/n)";
function promptForAdobeAIR()
{
var schema = {
properties: {
accept: {
- description: adobeAirPromptText.magenta,
+ description: adobeAirPromptText.grey,
pattern: /^[YNyn\s]{1}$/,
message: 'Please respond with either y or n'.red,
required: true
@@ -62,6 +63,7 @@ function promptForAdobeAIR()
else
{
console.log('Aborting installation');
+ AdobeAIR.emit('abort');
}
});
}
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d50c6402/npm-flexjs/dependencies/FlashPlayerGlobal.js
----------------------------------------------------------------------
diff --git a/npm-flexjs/dependencies/FlashPlayerGlobal.js b/npm-flexjs/dependencies/FlashPlayerGlobal.js
index 2e5e32b..a8197bc 100644
--- a/npm-flexjs/dependencies/FlashPlayerGlobal.js
+++ b/npm-flexjs/dependencies/FlashPlayerGlobal.js
@@ -32,20 +32,20 @@ var FlashPlayerGlobal = module.exports = Object.create(events.EventEmitter.proto
var flashPlayerGlobalURL = pjson.org_apache_flex.flash_player_global_url;
var fileNameFlashPlayerGlobal = pjson.org_apache_flex.flash_player_global_file_name;
var flashPlayerGlobalPromptText = "\
- Apache FlexJS SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
- \n\
- The playerglobal.swc file is subject to and governed by the\n\
- Adobe Flex SDK License Agreement specified here:\n\
- http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
- By downloading, modifying, distributing, using and/or accessing the playerglobal.swc file\n\
- you agree to the terms and conditions of the applicable end user license agreement.\n\
- \n\
- In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here:\n\
- http://www.adobe.com/products/eula/third_party/.\n\
- Adobe recommends that you review these third-party terms.\n\
- \n\
- This license is not compatible with the Apache v2 license.\n\
- Do you want to download and install the playerglobal.swc? (y/n)";
+Apache FlexJS SDK uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
+The playerglobal.swc file is subject to and governed by the\n\
+Adobe Flex SDK License Agreement specified here:\n\
+http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf,\n\
+By downloading, modifying, distributing, using and/or accessing the playerglobal.swc file\n\
+you agree to the terms and conditions of the applicable end user license agreement.\n\
+\n\
+In addition to the Adobe license terms, you also agree to be bound by the third-party terms specified here:\n\
+http://www.adobe.com/products/eula/third_party/.\n\
+Adobe recommends that you review these third-party terms.\n\
+\n\
+This license is not compatible with the Apache v2 license.\n\
+Do you want to download and install the playerglobal.swc?\n\
+This is a required component (y/n)";
FlashPlayerGlobal.promptForFlashPlayerGlobal = function()
{
@@ -68,6 +68,7 @@ FlashPlayerGlobal.promptForFlashPlayerGlobal = function()
else
{
console.log('Aborting installation');
+ FlashPlayerGlobal.emit('abort');
}
});
};