You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/05/05 18:09:49 UTC
[49/49] git commit: Merge branch 'master' into cdvtest
Merge branch 'master' into cdvtest
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/commit/1954d48b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/tree/1954d48b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/diff/1954d48b
Branch: refs/heads/cdvtest
Commit: 1954d48b4802c39258506576c06e2f4f11787607
Parents: 25de119 3fd4807
Author: Michal Mocny <mm...@gmail.com>
Authored: Mon May 5 12:08:45 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Mon May 5 12:08:45 2014 -0400
----------------------------------------------------------------------
CONTRIBUTING.md | 16 +++
NOTICE | 5 +
README.md | 25 +++-
RELEASENOTES.md | 33 +++++
doc/index.md | 157 ++++++++++++++++++++++
docs/acceleration/acceleration.md | 109 ---------------
docs/accelerometer.clearWatch.md | 114 ----------------
docs/accelerometer.getCurrentAcceleration.md | 110 ---------------
docs/accelerometer.md | 90 -------------
docs/accelerometer.watchAcceleration.md | 138 -------------------
docs/parameters/accelerometerError.md | 27 ----
docs/parameters/accelerometerOptions.md | 28 ----
docs/parameters/accelerometerSuccess.md | 42 ------
plugin.xml | 63 ++++++++-
src/firefoxos/accelerometer.js | 41 ++++++
src/ios/CDVAccelerometer.h | 2 +-
src/ios/CDVAccelerometer.m | 66 +++++----
src/tizen/AccelerometerProxy.js | 51 +++++++
src/ubuntu/accelerometer.cpp | 58 ++++++++
src/ubuntu/accelerometer.h | 55 ++++++++
src/windows8/AccelerometerProxy.js | 2 +-
21 files changed, 537 insertions(+), 695 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-device-motion/blob/1954d48b/plugin.xml
----------------------------------------------------------------------
diff --cc plugin.xml
index 0c96b4d,36032b1..c32a175
--- a/plugin.xml
+++ b/plugin.xml
@@@ -16,10 -36,20 +36,23 @@@
<js-module src="www/accelerometer.js" name="accelerometer">
<clobbers target="navigator.accelerometer" />
</js-module>
+
+ <js-module src="test/tests.js" name="tests">
+ </js-module>
+ <!-- firefoxos -->
+ <platform name="firefoxos">
+ <config-file target="config.xml" parent="/*">
+ <feature name="Accelerometer">
+ <param name="firefoxos-package" value="Accelerometer" />
+ </feature>
+ </config-file>
+
+ <js-module src="src/firefoxos/accelerometer.js" name="accelerometer-impl">
+ <runs />
+ </js-module>
+ </platform>
+
<!-- android -->
<platform name="android">