Commit 9ea403d4 authored by Steven Gill's avatar Steven Gill
Browse files

Merge branch 'dev'

parents 6de7e53f e04381e1

RELEASENOTES.md

+4 −0
Changes for RELEASENOTES.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -35,3 +35,7 @@ 
* Rename plugin id from AudioHandler -> media

* [CB-4763] Remove reference to cordova-android's FileHelper.

* [CB-4752] Incremented plugin version on dev branch.



### 0.2.4 (Oct 9, 2013)

* [CB-4928] plugin-media doesn't load on windows8

* [CB-4915] Incremented plugin version on dev branch.
 
 No newline at end of file

plugin.xml

+1 −1
Changes for plugin.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"

xmlns:android="http://schemas.android.com/apk/res/android"

id="org.apache.cordova.media"

    version="0.2.3">

    version="0.2.4">

    <name>Media</name>

    <description>Cordova Media Plugin</description>

    <license>Apache 2.0</license>

src/windows8/MediaProxy.js

+2 −2
Changes for src/windows8/MediaProxy.js: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
/*global Windows:true */



var cordova = require('cordova'),

    Media = require('org.apache.cordova.AudioHandler.Media');

    Media = require('org.apache.cordova.media.Media');



var MediaError = require('org.apache.cordova.AudioHandler.MediaError');

var MediaError = require('org.apache.cordova.media.MediaError');



module.exports = {

    mediaCaptureMrg:null,