You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2014/06/10 12:01:04 UTC
[12/12] spec commit: Merge branch 'ffos_privileged_compatible'
Merge branch 'ffos_privileged_compatible'
Conflicts:
battery/index.html
Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/4322b9c7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/4322b9c7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/4322b9c7
Branch: refs/heads/master
Commit: 4322b9c7f7b7b4672104a847bfc2a9ee99e2971a
Parents: 9a8914f 46c0918
Author: Piotr Zalewa <pi...@zalewa.info>
Authored: Tue Jun 10 12:00:22 2014 +0200
Committer: Piotr Zalewa <pi...@zalewa.info>
Committed: Tue Jun 10 12:00:22 2014 +0200
----------------------------------------------------------------------
accelerometer/index.html | 120 +-------
accelerometer/index.js | 111 ++++++++
audio/index.html | 370 +------------------------
audio/index.js | 356 ++++++++++++++++++++++++
autotest/index.html | 3 +-
autotest/index.js | 4 +
autotest/pages/accelerometer.html | 20 +-
autotest/pages/all.html | 47 +---
autotest/pages/all.js | 46 +++
autotest/pages/battery.html | 19 +-
autotest/pages/bridge.html | 20 +-
autotest/pages/camera.html | 20 +-
autotest/pages/capture.html | 20 +-
autotest/pages/compass.html | 20 +-
autotest/pages/contacts.html | 19 +-
autotest/pages/datauri.html | 18 +-
autotest/pages/device.html | 20 +-
autotest/pages/file.html | 41 +--
autotest/pages/file.js | 39 +++
autotest/pages/filetransfer.html | 41 +--
autotest/pages/geolocation.html | 20 +-
autotest/pages/globalization.html | 20 +-
autotest/pages/localXHR.html | 20 +-
autotest/pages/media.html | 20 +-
autotest/pages/network.html | 20 +-
autotest/pages/notification.html | 20 +-
autotest/pages/platform.html | 20 +-
autotest/pages/run-tests.js | 18 ++
autotest/pages/splashscreen.html | 20 +-
autotest/pages/storage.html | 20 +-
autotest/pages/vibration.html | 20 +-
autotest/pages/whitelist.html | 20 +-
battery/index.html | 83 +-----
battery/index.js | 72 +++++
camera/index.html | 361 +-----------------------
camera/index.js | 344 +++++++++++++++++++++++
capture/index.html | 147 +---------
capture/index.js | 137 +++++++++
compass/index.html | 114 +-------
compass/index.js | 104 +++++++
contacts/index.html | 99 +------
contacts/index.js | 90 ++++++
cordova-incl.js | 22 ++
events/index.html | 86 ++----
events/index.js | 94 +++++++
file/index.html | 158 +----------
file/index.js | 153 ++++++++++
inappbrowser/index.html | 266 ++++--------------
inappbrowser/index.js | 242 ++++++++++++++++
index.html | 2 +-
keyboard/index.html | 68 +----
keyboard/index.js | 69 +++++
keyboard/window-onerror.js | 1 +
lazyloadjs/do-not-write-cordova-script.js | 1 +
lazyloadjs/index.html | 20 +-
lazyloadjs/index.js | 16 ++
location/index.html | 143 +---------
location/index.js | 128 +++++++++
main.js | 2 +
misc/index.html | 35 +--
misc/index.js | 30 ++
misc/page2.html | 14 +-
misc/page2.js | 12 +
misc/page3.html | 30 +-
misc/page3A.js | 27 ++
network/index.html | 45 +--
network/index.js | 38 +++
notification/index.html | 110 +-------
notification/index.js | 100 +++++++
sql/index.html | 137 +--------
sql/index.js | 125 +++++++++
storage/index.html | 37 +--
storage/index.js | 27 ++
vibration/index.html | 39 +--
vibration/index.js | 31 +++
75 files changed, 2687 insertions(+), 2764 deletions(-)
----------------------------------------------------------------------