merge conflight
diff --git a/CHANGELOG.md b/RELEASENOTES.md
similarity index 68%
rename from CHANGELOG.md
rename to RELEASENOTES.md
index a5248b4..86942eb 100644
--- a/CHANGELOG.md
+++ b/RELEASENOTES.md
@@ -23,3 +23,13 @@
### 0.3.0 (Sept 5, 2013)
* Initial FirefoxOS support
* [CB-4661] VIBRATE permission for Android
+
+### 0.3.2 (Sept 25, 2013)
+* CB-4889 bumping&resetting version
+* CB-4889 renaming org.apache.cordova.core.vibration to org.apache.cordova.vibration
+* Rename CHANGELOG.md -> RELEASENOTES.md
+* updated to work with ffos commandProxy
+* fixed plugin.xml for vibration
+* [CB-4593] [Blackberry10] Added vibration support for bb10
+* updated plugin to work with ffos
+* [CB-4752] Incremented plugin version on dev branch.
diff --git a/plugin.xml b/plugin.xml
index 37e0b3a..7b03fc7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
- id="org.apache.cordova.core.vibration"
- version="0.3.0">
+ id="org.apache.cordova.vibration"
+ version="0.3.2">
<name>Vibration</name>
<description>Cordova Vibration Plugin</description>
@@ -20,7 +20,9 @@
<param name="firefoxos-package" value="Vibration" />
</feature>
</config-file>
- <source-file src="src/firefoxos/vibration.js" target-dir="Vibration" />
+ <js-module src="src/firefoxos/VibrationProxy.js" name="VibrationProxy">
+ <runs />
+ </js-module>
</platform>
<!-- wp7 -->
diff --git a/src/firefoxos/vibration.js b/src/firefoxos/VibrationProxy.js
similarity index 82%
rename from src/firefoxos/vibration.js
rename to src/firefoxos/VibrationProxy.js
index 7299848..2084de7 100644
--- a/src/firefoxos/vibration.js
+++ b/src/firefoxos/VibrationProxy.js
@@ -19,16 +19,17 @@
*
*/
+var cordova = require('cordova');
+
module.exports = {
- vibrate: function(milliseconds) {
- console.log ("milliseconds" , milliseconds);
-
- if (navigator.vibrate) {
+ vibrate: function(success, fail, milliseconds) {
+ if (navigator.notification.vibrate) {
navigator.vibrate(milliseconds);
} else {
console.log ("cordova/plugin/firefoxos/vibration, vibrate API does not exist");
}
}
+};
-};
\ No newline at end of file
+require("cordova/firefoxos/commandProxy").add("Vibration", module.exports);
\ No newline at end of file
