public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Tagging 2.1.0

Browse Source
This commit is contained in:
Simon MacDonald 2012-09-12 11:44:53 -04:00
parent a42f095cef
commit 59a3cf93e6
5 changed files with 71 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
2.1.0rc2 2.1.0

2
bin/templates/project/assets/www/index.html
View File

@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p> <p class="event received">Device is Ready</p>
</div> </div>
</div> </div>
<script type="text/javascript" src="cordova-2.1.0rc2.js"></script> <script type="text/javascript" src="cordova-2.1.0.js"></script>
<script type="text/javascript" src="js/index.js"></script> <script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript"> <script type="text/javascript">
app.initialize(); app.initialize();

95
framework/assets/js/cordova.android.js
View File

@ -1,6 +1,6 @@
// commit 2aa46aa0eef2ba641cf91793735152d7fb5b6998 // commit dc26996057d667e1a8ac6d524918cce0e7078e21
// File generated at :: Fri Aug 31 2012 16:26:04 GMT-0400 (EDT) // File generated at :: Wed Sep 12 2012 10:09:05 GMT-0400 (EDT)
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
@ -186,13 +186,19 @@ var cordova = {
}, },
/** /**
* Method to fire event from native code * Method to fire event from native code
* bNoDetach is required for events which cause an exception which needs to be caught in native code
*/ */
fireDocumentEvent: function(type, data) { fireDocumentEvent: function(type, data, bNoDetach) {
var evt = createEvent(type, data); var evt = createEvent(type, data);
if (typeof documentEventHandlers[type] != 'undefined') { if (typeof documentEventHandlers[type] != 'undefined') {
if( bNoDetach ) {
documentEventHandlers[type].fire(evt);
}
else {
setTimeout(function() { setTimeout(function() {
documentEventHandlers[type].fire(evt); documentEventHandlers[type].fire(evt);
}, 0); }, 0);
}
} else { } else {
document.dispatchEvent(evt); document.dispatchEvent(evt);
} }
@ -3224,34 +3230,39 @@ Media.prototype.setVolume = function(volume) {
* PRIVATE * PRIVATE
* *
* @param id The media object id (string) * @param id The media object id (string)
* @param status The status code (int) * @param msgType The 'type' of update this is
* @param msg The status message (string) * @param value Use of value is determined by the msgType
*/ */
Media.onStatus = function(id, msg, value) { Media.onStatus = function(id, msgType, value) {
var media = mediaObjects[id]; var media = mediaObjects[id];
// If state update
if (msg === Media.MEDIA_STATE) { if(media) {
if (media.statusCallback) { switch(msgType) {
media.statusCallback(value); case Media.MEDIA_STATE :
media.statusCallback && media.statusCallback(value);
if(value == Media.MEDIA_STOPPED) {
media.successCallback && media.successCallback();
} }
if (value === Media.MEDIA_STOPPED) { break;
if (media.successCallback) { case Media.MEDIA_DURATION :
media.successCallback();
}
}
}
else if (msg === Media.MEDIA_DURATION) {
media._duration = value; media._duration = value;
} break;
else if (msg === Media.MEDIA_ERROR) { case Media.MEDIA_ERROR :
if (media.errorCallback) { media.errorCallback && media.errorCallback(value);
// value should be a MediaError object when msg == MEDIA_ERROR break;
media.errorCallback(value); case Media.MEDIA_POSITION :
media._position = Number(value);
break;
default :
console && console.error && console.error("Unhandled Media.onStatus :: " + msgType);
break;
} }
} }
else if (msg === Media.MEDIA_POSITION) { else {
media._position = value; console && console.error && console.error("Received Media.onStatus callback for unknown media :: " + id);
} }
}; };
module.exports = Media; module.exports = Media;
@ -3261,20 +3272,36 @@ module.exports = Media;
define("cordova/plugin/MediaError", function(require, exports, module) { define("cordova/plugin/MediaError", function(require, exports, module) {
/** /**
* This class contains information about any Media errors. * This class contains information about any Media errors.
* @constructor
*/ */
var MediaError = function(code, msg) { /*
this.code = (code !== undefined ? code : null); According to :: http://dev.w3.org/html5/spec-author-view/video.html#mediaerror
this.message = msg || ""; We should never be creating these objects, we should just implement the interface
}; which has 1 property for an instance, 'code'
MediaError.MEDIA_ERR_NONE_ACTIVE = 0; instead of doing :
MediaError.MEDIA_ERR_ABORTED = 1; errorCallbackFunction( new MediaError(3,'msg') );
MediaError.MEDIA_ERR_NETWORK = 2; we should simply use a literal :
MediaError.MEDIA_ERR_DECODE = 3; errorCallbackFunction( {'code':3} );
MediaError.MEDIA_ERR_NONE_SUPPORTED = 4; */
if(!MediaError) {
var MediaError = function(code, msg) {
this.code = (typeof code != 'undefined') ? code : null;
this.message = msg || ""; // message is NON-standard! do not use!
};
}
MediaError.MEDIA_ERR_NONE_ACTIVE = MediaError.MEDIA_ERR_NONE_ACTIVE || 0;
MediaError.MEDIA_ERR_ABORTED = MediaError.MEDIA_ERR_ABORTED || 1;
MediaError.MEDIA_ERR_NETWORK = MediaError.MEDIA_ERR_NETWORK || 2;
MediaError.MEDIA_ERR_DECODE = MediaError.MEDIA_ERR_DECODE || 3;
MediaError.MEDIA_ERR_NONE_SUPPORTED = MediaError.MEDIA_ERR_NONE_SUPPORTED || 4;
// TODO: MediaError.MEDIA_ERR_NONE_SUPPORTED is legacy, the W3 spec now defines it as below.
// as defined by http://dev.w3.org/html5/spec-author-view/video.html#error-codes
MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED = MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED || 4;
module.exports = MediaError; module.exports = MediaError;
}); });
// file: lib/common/plugin/MediaFile.js // file: lib/common/plugin/MediaFile.js

2
framework/assets/www/index.html
View File

@ -19,7 +19,7 @@
<html> <html>
<head> <head>
<title></title> <title></title>
<script src="cordova-2.1.0rc2.js"></script> <script src="cordova-2.1.0.js"></script>
</head> </head>
<body> <body>

2
framework/src/org/apache/cordova/Device.java
View File

@ -38,7 +38,7 @@ import android.telephony.TelephonyManager;
public class Device extends Plugin { public class Device extends Plugin {
public static final String TAG = "Device"; public static final String TAG = "Device";
public static String cordovaVersion = "2.1.0rc2"; // Cordova version public static String cordovaVersion = "2.1.0"; // Cordova version
public static String platform = "Android"; // Device OS public static String platform = "Android"; // Device OS
public static String uuid; // Device UUID public static String uuid; // Device UUID