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/12/15 14:33:26 UTC
[37/37] cordova-ubuntu git commit: Merge branch 'master' of
https://github.com/Zaspire/cordova-ubuntu
Merge branch 'master' of https://github.com/Zaspire/cordova-ubuntu
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/4150c7fc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/4150c7fc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/4150c7fc
Branch: refs/heads/master
Commit: 4150c7fc530aa0df324aaca90dc8435e895ca577
Parents: 77dc7c0 937e133
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Mon Dec 15 16:28:53 2014 +0300
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Mon Dec 15 16:28:53 2014 +0300
----------------------------------------------------------------------
.gitignore | 1 +
CMakeLists.txt | 35 +-
CordovaUbuntu/CordovaViewInternal.qml | 185 +++++++
CordovaUbuntu/cordova_wrapper.js | 51 ++
CordovaUbuntu/escape.js | 1 +
CordovaUbuntu/qmldir | 5 +
Cordovaqt/CordovaViewInternal.qml | 169 ------
Cordovaqt/cordova_wrapper.js | 51 --
Cordovaqt/qmldir | 5 -
bin/build/build | 32 --
bin/build/clean | 28 -
bin/build/lib/msg.js | 25 -
bin/build/lib/ubuntu.js | 522 -------------------
bin/build/run | 32 --
bin/build/version | 25 -
bin/check_reqs | 14 +-
bin/create | 76 +--
bin/lib/check_reqs.js | 92 ++++
bin/lib/create.js | 63 +++
bin/lib/update.js | 68 +++
bin/package.json | 37 --
bin/templates/project/cordova/build | 39 ++
bin/templates/project/cordova/clean | 27 +
bin/templates/project/cordova/defaults.xml | 33 ++
bin/templates/project/cordova/lib/build.js | 349 +++++++++++++
bin/templates/project/cordova/lib/config.js | 44 ++
.../project/cordova/lib/config_parser.js | 65 +++
bin/templates/project/cordova/lib/constants.js | 33 ++
bin/templates/project/cordova/lib/device.js | 77 +++
bin/templates/project/cordova/lib/logger.js | 57 ++
bin/templates/project/cordova/lib/manifest.js | 74 +++
bin/templates/project/cordova/lib/run.js | 147 ++++++
bin/templates/project/cordova/lib/utils.js | 90 ++++
bin/templates/project/cordova/run | 36 ++
bin/templates/project/cordova/version | 25 +
bin/templates/project/misc/changelog | 7 +
bin/templates/project/misc/compat | 1 +
bin/templates/project/misc/control | 17 +
bin/templates/project/misc/cordova.desktop | 7 +
bin/templates/project/misc/install | 3 +
bin/templates/project/misc/rules | 27 +
bin/update | 34 ++
main.cpp | 56 +-
package.json | 32 +-
qml/CordovaView.qml.in | 12 +-
qml/main.qml.in | 21 +-
src/cordova.cpp | 18 +-
src/cordova.h | 7 +-
src/cordova_config.cpp | 91 ++++
src/cordova_config.hpp | 47 ++
src/cordova_whitelist.cpp | 116 +++++
src/cordova_whitelist.hpp | 49 ++
src/qmlplugin.cpp | 4 +-
src/qmlplugin.h | 44 +-
tests/CMakeLists.txt | 46 ++
tests/data/config.xml | 45 ++
tests/data/www/index.html | 7 +
tests/main.cpp | 90 ++++
www/cordova.js | 14 +-
59 files changed, 2287 insertions(+), 1121 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/4150c7fc/www/cordova.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org