You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/06/22 03:00:33 UTC
[1/2] git commit: updated plugin.xml
Updated Branches:
refs/heads/master 1d1bbf772 -> 877fd9517
updated plugin.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/commit/a3aebdd5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/tree/a3aebdd5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/diff/a3aebdd5
Branch: refs/heads/master
Commit: a3aebdd5a2e43dbb8f91acea950e79061824fa66
Parents: d5ca2f0
Author: Steven Gill <st...@gmail.com>
Authored: Fri Jun 21 17:59:09 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Jun 21 17:59:09 2013 -0700
----------------------------------------------------------------------
plugin.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/blob/a3aebdd5/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 9fec03c..16e83e7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -2,10 +2,9 @@
<plugin xmlns="http://cordova.apache.org/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
-id="org.apache.cordova.core.Notification"
- version="0.1.0">
+id="org.apache.cordova.core.Notification" version="0.1.0">
- <name>Vibration</name>
+ <name>vibration</name>
<js-module src="www/notification.js" name="notification">
<clobbers target="navigator.notification" />
@@ -24,7 +23,7 @@ id="org.apache.cordova.core.Notification"
<source-file src="src/android/Notification.java" target-dir="src/org/apache/cordova/core" />
<!-- android specific notification apis -->
- <js-module src="www/android/notification.js" name="notification">
+ <js-module src="www/android/notification.js" name="notification2">
<merges target="navigator.notification" />
</js-module>
@@ -39,7 +38,7 @@ id="org.apache.cordova.core.Notification"
<source-file src="src/ios/CDVNotification.m" />
<!-- ios specific notification apis -->
- <js-module src="www/ios/notification.js" name="notification">
+ <js-module src="www/ios/notification.js" name="notification1">
<merges target="navigator.notification" />
</js-module>
[2/2] git commit: fixed merge issue with plugin.xml
Posted by st...@apache.org.
fixed merge issue with plugin.xml
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/commit/877fd951
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/tree/877fd951
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/diff/877fd951
Branch: refs/heads/master
Commit: 877fd9517ad5560654927830a6c26218f511b713
Parents: a3aebdd 1d1bbf7
Author: Steven Gill <st...@gmail.com>
Authored: Fri Jun 21 18:00:24 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Fri Jun 21 18:00:24 2013 -0700
----------------------------------------------------------------------
plugin.xml | 18 ++++++++---
src/wp7/NotificationBox.xaml | 62 ++++++++++++++++++++++++++++++++++++
src/wp7/NotificationBox.xaml.cs | 41 ++++++++++++++++++++++++
3 files changed, 117 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-vibration/blob/877fd951/plugin.xml
----------------------------------------------------------------------