You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2012/09/18 04:12:09 UTC
[15/25] android commit: Spelling (en-us): behavior [slightly more
instances of this spelling than the British]
Spelling (en-us): behavior [slightly more instances of this spelling than the British]
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/5a94b38e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5a94b38e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5a94b38e
Branch: refs/heads/master
Commit: 5a94b38e2fc25894265d239cbe6b0b2b5e8085d3
Parents: 1bc55f5
Author: Josh Soref <js...@rim.com>
Authored: Mon Sep 10 14:59:10 2012 -0400
Committer: Simon MacDonald <si...@gmail.com>
Committed: Mon Sep 17 22:09:51 2012 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/AudioPlayer.java | 2 +-
.../src/org/apache/cordova/CordovaWebView.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5a94b38e/framework/src/org/apache/cordova/AudioPlayer.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/AudioPlayer.java b/framework/src/org/apache/cordova/AudioPlayer.java
index e8ea1d3..c0d6b93 100644
--- a/framework/src/org/apache/cordova/AudioPlayer.java
+++ b/framework/src/org/apache/cordova/AudioPlayer.java
@@ -410,7 +410,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
*/
private void setMode(MODE mode) {
if (this.mode != mode) {
- //mode is not part of the expected behaviour, so no notification
+ //mode is not part of the expected behavior, so no notification
//this.handler.sendJavascript("cordova.require('cordova/plugin/Media').onStatus('" + this.id + "', " + MEDIA_STATE + ", " + mode + ");");
}
this.mode = mode;
http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5a94b38e/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 66ffd4b..d6a75b4 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -731,7 +731,7 @@ public class CordovaWebView extends WebView {
if(keyDownCodes.contains(keyCode))
{
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
- // only override default behaviour is event bound
+ // only override default behavior is event bound
LOG.d(TAG, "Down Key Hit");
this.loadUrl("javascript:cordova.fireDocumentEvent('volumedownbutton');");
return true;
@@ -766,7 +766,7 @@ public class CordovaWebView extends WebView {
if (this.backHistory()) {
return true;
}
- // If not, then invoke default behaviour
+ // If not, then invoke default behavior
else {
//this.activityState = ACTIVITY_EXITING;
return false;
@@ -789,7 +789,7 @@ public class CordovaWebView extends WebView {
return super.onKeyUp(keyCode, event);
}
- //Does webkit change this behaviour?
+ //Does webkit change this behavior?
return super.onKeyUp(keyCode, event);
}