You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by na...@apache.org on 2014/06/12 00:08:11 UTC
[1/2] git commit: JS confirm dnd alert dialog in Cordova consumes all
key events
Repository: cordova-amazon-fireos
Updated Branches:
refs/heads/master 59dc5fbc9 -> 11ba0a443
JS confirm dnd alert dialog in Cordova consumes all key events
Removed the code which was listening to key events and was only handling the backbutton.
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/11ba0a44
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/11ba0a44
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/11ba0a44
Branch: refs/heads/master
Commit: 11ba0a443c3c0ced232d850999347a64c6be2b14
Parents: f24c338
Author: Archana Naik <na...@lab126.com>
Authored: Thu May 22 15:34:16 2014 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Tue Jun 3 16:46:06 2014 -0700
----------------------------------------------------------------------
.../org/apache/cordova/CordovaChromeClient.java | 24 --------------------
1 file changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/11ba0a44/framework/src/org/apache/cordova/CordovaChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java
index 6de43b6..6dfbcb8 100755
--- a/framework/src/org/apache/cordova/CordovaChromeClient.java
+++ b/framework/src/org/apache/cordova/CordovaChromeClient.java
@@ -138,18 +138,6 @@ public class CordovaChromeClient extends AmazonWebChromeClient {
result.cancel();
}
});
- dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
- //DO NOTHING
- public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK)
- {
- result.confirm();
- return false;
- }
- else
- return true;
- }
- });
dlg.show();
return true;
}
@@ -190,18 +178,6 @@ public class CordovaChromeClient extends AmazonWebChromeClient {
result.cancel();
}
});
- dlg.setOnKeyListener(new DialogInterface.OnKeyListener() {
- //DO NOTHING
- public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_BACK)
- {
- result.cancel();
- return false;
- }
- else
- return true;
- }
- });
dlg.show();
return true;
}
[2/2] git commit: Fixes 2 issues while adding amazon-fireos platform
after fresh cordova install. 1. create.js updated to create "libs" folder
before copying it to the project's platform folder. 2. check_reqs.js updated
to report error and abort if awv_i
Posted by na...@apache.org.
Fixes 2 issues while adding amazon-fireos platform after fresh cordova install.
1. create.js updated to create "libs" folder before copying it to the project's platform folder.
2. check_reqs.js updated to report error and abort if awv_interface.jar is missing from libs folder.
Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/f24c3380
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/f24c3380
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/f24c3380
Branch: refs/heads/master
Commit: f24c338015bf7ae21d56aaa4cfcc7664614c7f7c
Parents: 59dc5fb
Author: Archana Naik <na...@lab126.com>
Authored: Wed Apr 2 13:06:51 2014 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Tue Jun 3 16:46:06 2014 -0700
----------------------------------------------------------------------
bin/lib/check_reqs.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/f24c3380/bin/lib/check_reqs.js
----------------------------------------------------------------------
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index b15a9b6..3525aa8 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -79,7 +79,12 @@ module.exports.check_android = function() {
return d.promise.then(function(output) {
if (!output.match(valid_target)) {
return Q.reject(new Error('Please install Android target ' + valid_target.split('-')[1] + ' (the Android newest SDK). Make sure you have the latest Android tools installed as well. Run \"android\" from your command-line to install/update any missing SDKs or tools.'));
- }
+ } else {
+ var awv_interface_expected_path=path.join(ROOT, 'framework','libs');
+ if (!fs.existsSync(path.join(awv_interface_expected_path,awv_interface))) {
+ return Q.reject(new Error('awv_interface.jar not found in ' + awv_interface_expected_path +' folder. \nPlease download the AmazonWebView SDK from http://developer.amazon.com/sdk/fire/IntegratingAWV.html#installawv and copy the awv_interface.jar file to this folder:' + awv_interface_expected_path + ' and re-run cordova platform add amazon-fireos command.'));
+ }
+ }
return Q();
}, function(stderr) {
if (stderr.match(/command\snot\sfound/)) {