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 2015/12/05 02:27:01 UTC
[7/8] cordova-lib git commit: sync with upstream
sync with upstream
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e32ca648
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e32ca648
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e32ca648
Branch: refs/heads/master
Commit: e32ca648a894ea781f9acb226629ed8756069146
Parents: aebd307 7af5c53
Author: David Barth <da...@canonical.com>
Authored: Thu Dec 3 14:53:43 2015 +0100
Committer: David Barth <da...@canonical.com>
Committed: Thu Dec 3 14:53:43 2015 +0100
----------------------------------------------------------------------
.travis.yml | 11 +-
CONTRIBUTING.md | 2 +-
README.md | 5 +-
appveyor.yml | 13 +-
cordova-common/.jscs.json | 24 +
cordova-common/.jshintignore | 1 +
cordova-common/.npmignore | 2 +
cordova-common/.ratignore | 2 +
cordova-common/README.md | 149 +
cordova-common/RELEASENOTES.md | 34 +
cordova-common/cordova-common.js | 42 +
cordova-common/package.json | 45 +
cordova-common/spec/.jshintrc | 11 +
cordova-common/spec/ActionStack.spec.js | 77 +
.../spec/ConfigChanges/ConfigChanges.spec.js | 412 +
.../spec/ConfigParser/ConfigParser.spec.js | 232 +
.../spec/PluginInfo/PluginInfo.spec.js | 50 +
.../spec/PluginInfo/PluginInfoProvider.spec.js | 33 +
.../fixtures/plugins/ChildBrowser/plugin.xml | 126 +
.../ChildBrowser/src/android/ChildBrowser.java | 19 +
.../plugins/ChildBrowser/www/childbrowser.js | 19 +
.../ChildBrowser/www/childbrowser/image.jpg | 1 +
.../ChildBrowser/www/childbrowser_file.html | 1 +
.../fixtures/plugins/com.adobe.vars/plugin.xml | 59 +
.../plugins/org.apache.plist/plugin.xml | 54 +
.../plugins/org.test.configtest/plugin.xml | 61 +
.../org.test.multiple-children/plugin.xml | 108 +
.../org.test.plugins.childbrowser/plugin.xml | 124 +
.../src/android/ChildBrowser.java | 1 +
.../src/ios/ChildBrowser.bundle/arrow_left.png | 1 +
.../ios/ChildBrowser.bundle/arrow_left@2x.png | 1 +
.../src/ios/ChildBrowser.bundle/arrow_right.png | 1 +
.../ios/ChildBrowser.bundle/arrow_right@2x.png | 1 +
.../src/ios/ChildBrowser.bundle/but_refresh.png | 1 +
.../ios/ChildBrowser.bundle/but_refresh@2x.png | 1 +
.../src/ios/ChildBrowser.bundle/compass.png | 1 +
.../src/ios/ChildBrowser.bundle/compass@2x.png | 1 +
.../src/ios/ChildBrowserCommand.h | 1 +
.../src/ios/ChildBrowserCommand.m | 1 +
.../src/ios/ChildBrowserViewController.h | 1 +
.../src/ios/ChildBrowserViewController.m | 1 +
.../src/ios/ChildBrowserViewController.xib | 1 +
.../src/ios/TargetDirTest.h | 1 +
.../src/ios/TargetDirTest.m | 1 +
.../src/ios/preserveDirs/PreserveDirsTest.h | 1 +
.../src/ios/preserveDirs/PreserveDirsTest.m | 1 +
.../www/childbrowser.js | 1 +
.../www/childbrowser/image.jpg | 1 +
.../www/childbrowser_file.html | 1 +
.../android-resource.xml | 1 +
.../org.test.plugins.dummyplugin/extra.gradle | 1 +
.../plugin-lib/AndroidManifest.xml | 5 +
.../plugin-lib/libFile | 1 +
.../plugin-lib/project.properties | 1 +
.../org.test.plugins.dummyplugin/plugin.xml | 207 +
.../src/android/DummyPlugin.java | 1 +
.../src/blackberry10/index.js | 1 +
.../src/ios/Custom.framework/someFheader.h | 1 +
.../src/ios/Custom.framework/somebinlib | 1 +
.../src/ios/DummyPlugin.bundle | 1 +
.../src/ios/DummyPluginCommand.h | 1 +
.../src/ios/DummyPluginCommand.m | 1 +
.../src/ios/SourceWithFramework.m | 1 +
.../src/ios/TargetDirTest.h | 1 +
.../src/ios/TargetDirTest.m | 1 +
.../src/ios/libsqlite3.dylib | 1 +
.../src/tizen/dummer.js | 1 +
.../src/windows/dummer.js | 1 +
.../src/windows/dummy1.dll | 0
.../src/windows/dummy1.vcxproj | 7 +
.../src/windows/dummy2.dll | 0
.../src/windows/dummy2.vcxproj | 7 +
.../src/windows/dummy3.dll | 0
.../src/windows/dummy3.vcxproj | 7 +
.../src/windows/dummy4.dll | 0
.../src/windows/dummy4.vcxproj | 7 +
.../src/wp7/DummyPlugin.cs | 1 +
.../src/wp8/DummyPlugin.cs | 1 +
.../www/dummyplugin.js | 1 +
.../www/dummyplugin/image.jpg | 1 +
.../plugins/org.test.shareddeps/plugin.xml | 34 +
.../projects/android/AndroidManifest.xml | 69 +
.../projects/android/assets/www/.gitkeep | 0
.../projects/android/res/xml/config.xml | 54 +
.../spec/fixtures/projects/android/src/.gitkeep | 0
.../projects/android_two/AndroidManifest.xml | 69 +
.../projects/android_two/assets/www/.gitkeep | 0
.../projects/android_two/res/xml/config.xml | 54 +
.../fixtures/projects/android_two/src/.gitkeep | 0
.../android_two_no_perms/AndroidManifest.xml | 49 +
.../android_two_no_perms/assets/www/.gitkeep | 0
.../android_two_no_perms/res/xml/config.xml | 54 +
.../projects/android_two_no_perms/src/.gitkeep | 0
.../CordovaLib.xcodeproj/project.pbxproj | 636 ++
.../projects/ios-config-xml/CordovaLib/VERSION | 1 +
.../SampleApp.xcodeproj/project.orig.pbxproj | 498 ++
.../SampleApp.xcodeproj/project.pbxproj | 496 ++
.../SampleApp/SampleApp-Info.plist | 82 +
.../ios-config-xml/SampleApp/config.xml | 59 +
.../projects/ios-config-xml/www/.gitkeep | 0
.../spec/fixtures/projects/windows/bom_test.xml | 24 +
.../windows8/CordovaApp_TemporaryKey.pfx | Bin 0 -> 2504 bytes
.../fixtures/projects/windows8/TestApp.jsproj | 81 +
.../spec/fixtures/projects/windows8/TestApp.sln | 46 +
.../projects/windows8/package.appxmanifest | 27 +
.../projects/windows8/www/cordova-2.6.0.js | 8075 ++++++++++++++++++
.../projects/windows8/www/css/index.css | 115 +
.../fixtures/projects/windows8/www/img/logo.png | Bin 0 -> 11600 bytes
.../projects/windows8/www/img/smalllogo.png | Bin 0 -> 2831 bytes
.../projects/windows8/www/img/splashscreen.png | Bin 0 -> 24855 bytes
.../projects/windows8/www/img/storelogo.png | Bin 0 -> 4052 bytes
.../fixtures/projects/windows8/www/index.html | 42 +
.../fixtures/projects/windows8/www/js/index.js | 49 +
cordova-common/spec/fixtures/test-config.xml | 108 +
cordova-common/spec/util/xml-helpers.spec.js | 271 +
cordova-common/src/.jshintrc | 10 +
cordova-common/src/ActionStack.js | 85 +
.../src/ConfigChanges/ConfigChanges.js | 325 +
cordova-common/src/ConfigChanges/ConfigFile.js | 208 +
.../src/ConfigChanges/ConfigKeeper.js | 65 +
cordova-common/src/ConfigChanges/munge-util.js | 160 +
cordova-common/src/ConfigParser/ConfigParser.js | 499 ++
cordova-common/src/ConfigParser/README.md | 86 +
cordova-common/src/CordovaError/CordovaError.js | 91 +
.../CordovaExternalToolErrorContext.js | 48 +
cordova-common/src/PlatformJson.js | 155 +
cordova-common/src/PluginInfo/PluginInfo.js | 416 +
.../src/PluginInfo/PluginInfoProvider.js | 82 +
cordova-common/src/events.js | 19 +
cordova-common/src/superspawn.js | 154 +
cordova-common/src/util/plist-helpers.js | 101 +
cordova-common/src/util/xml-helpers.js | 266 +
cordova-lib/.jshintignore | 6 +-
cordova-lib/RELEASENOTES.md | 59 +-
cordova-lib/cordova-lib.js | 13 +-
cordova-lib/package.json | 44 +-
cordova-lib/spec-cordova/ConfigParser.spec.js | 226 -
cordova-lib/spec-cordova/HooksRunner.spec.js | 4 +-
cordova-lib/spec-cordova/PluginInfo.spec.js | 53 -
.../spec-cordova/PluginInfoProvider.spec.js | 36 -
cordova-lib/spec-cordova/build.spec.js | 19 +-
cordova-lib/spec-cordova/cofdova-lib.spec.js | 23 -
cordova-lib/spec-cordova/compile.spec.js | 47 +-
cordova-lib/spec-cordova/cordova-lib.spec.js | 23 +
cordova-lib/spec-cordova/create.spec.js | 4 +-
cordova-lib/spec-cordova/emulate.spec.js | 59 +-
.../projects/ios/test.xcodeproj/project.pbxproj | 513 ++
.../fixtures/projects/ios/test/test-Info.plist | 206 +
.../platforms/android/AndroidManifest.xml | 14 +
.../platformApi/platforms/android/android.json | 11 +
.../platforms/android/res/xml/config.xml | 17 +
.../platforms/windows/cordova/Api.js | 3 +
cordova-lib/spec-cordova/helpers.js | 2 +-
.../metadata/android_parser.spec.js | 24 +-
.../metadata/blackberry_parser.spec.js | 16 +-
.../metadata/browser_parser.spec.js | 21 +-
.../metadata/firefoxos_parser.spec.js | 14 +-
.../spec-cordova/metadata/ios_parser.spec.js | 307 +-
.../metadata/parserhelper/ParserHelper.spec.js | 2 +-
.../metadata/parserhelper/preferences.spec.js | 38 +-
.../spec-cordova/metadata/webos_parser.spec.js | 8 +-
.../metadata/windows8_parser.spec.js | 16 +-
.../spec-cordova/metadata/wp8_parser.spec.js | 18 +-
cordova-lib/spec-cordova/platform.spec.js | 4 +-
.../platforms/PlatformApiPoly.spec.js | 316 +
.../spec-cordova/platforms/platforms.spec.js | 72 +
cordova-lib/spec-cordova/plugin.spec.js | 2 +-
cordova-lib/spec-cordova/prepare.spec.js | 165 +-
cordova-lib/spec-cordova/run.spec.js | 44 +-
cordova-lib/spec-cordova/save.spec.js | 253 +-
cordova-lib/spec-cordova/test-config-2.xml | 25 +
cordova-lib/spec-cordova/test-config.xml | 71 +
cordova-lib/spec-cordova/xml-helpers.spec.js | 139 -
cordova-lib/spec-plugman/create.spec.js | 2 +-
cordova-lib/spec-plugman/fetch.spec.js | 2 +-
.../spec-plugman/install-browserify.spec.js | 519 --
cordova-lib/spec-plugman/install.spec.js | 236 +-
.../spec-plugman/platforms/android.spec.js | 4 +-
.../spec-plugman/platforms/blackberry10.spec.js | 4 +-
.../spec-plugman/platforms/common.spec.js | 2 +-
cordova-lib/spec-plugman/platforms/ios.spec.js | 74 +-
.../spec-plugman/platforms/tizen.spec.js | 2 +-
.../spec-plugman/platforms/windows.spec.js | 157 +-
cordova-lib/spec-plugman/platforms/wp8.spec.js | 6 +-
.../org.test.plugins.dummyplugin/plugin.xml | 7 +
.../src/windows/dummy5.dll | 0
.../src/windows/dummy6.dll | 0
.../src/windows/text_sample1.txt | 0
.../src/windows/text_sample2.txt | 0
.../src/windows/text_sample3.txt | 0
.../src/windows/text_sample4.txt | 0
.../org.test.plugins.faultyplugin/plugin.xml | 4 +
.../src/windows/text_sample1.txt | 0
.../src/windows/text_sample2.txt | 0
.../src/windows/text_sample3.txt | 0
cordova-lib/spec-plugman/prepare.spec.js | 73 -
.../windows/CordovaApp.Windows10.jsproj | 61 +
.../spec-plugman/projects/wp8/config.xml | 12 +
.../spec-plugman/uninstall-browserify.spec.js | 315 -
cordova-lib/spec-plugman/uninstall.spec.js | 121 +-
.../spec-plugman/util/action-stack.spec.js | 77 -
.../spec-plugman/util/config-changes.spec.js | 462 -
.../spec-plugman/util/dependencies.spec.js | 6 +-
.../spec-plugman/util/xml-helpers.spec.js | 172 -
cordova-lib/src/CordovaError.js | 32 -
.../src/CordovaExternalToolErrorContext.js | 48 +
cordova-lib/src/PluginInfo.js | 407 -
cordova-lib/src/PluginInfoProvider.js | 82 -
cordova-lib/src/configparser/ConfigParser.js | 464 -
cordova-lib/src/configparser/README.md | 86 -
cordova-lib/src/cordova/build.js | 9 -
cordova-lib/src/cordova/clean.js | 20 +-
cordova-lib/src/cordova/compile.js | 27 +-
cordova-lib/src/cordova/cordova.js | 2 +-
cordova-lib/src/cordova/create.js | 36 +-
cordova-lib/src/cordova/emulate.js | 18 +-
cordova-lib/src/cordova/info.js | 2 +-
cordova-lib/src/cordova/lazy_load.js | 4 +-
.../cordova/metadata/amazon_fireos_parser.js | 8 +-
.../src/cordova/metadata/android_parser.js | 22 +-
.../src/cordova/metadata/blackberry10_parser.js | 6 +-
.../src/cordova/metadata/browser_parser.js | 8 +
.../src/cordova/metadata/firefoxos_parser.js | 4 +-
cordova-lib/src/cordova/metadata/ios_parser.js | 303 +-
cordova-lib/src/cordova/metadata/osx_parser.js | 160 +
.../metadata/parserhelper/preferences.js | 38 +-
.../src/cordova/metadata/ubuntu_parser.js | 6 +-
.../src/cordova/metadata/windows_parser.js | 8 +-
cordova-lib/src/cordova/metadata/wp8_parser.js | 8 +-
cordova-lib/src/cordova/platform.js | 182 +-
cordova-lib/src/cordova/plugin.js | 169 +-
cordova-lib/src/cordova/plugin_parser.js | 2 +-
cordova-lib/src/cordova/prepare.js | 278 +-
cordova-lib/src/cordova/project_metadata.js | 2 +-
cordova-lib/src/cordova/requirements.js | 47 +-
cordova-lib/src/cordova/restore-util.js | 33 +-
cordova-lib/src/cordova/run.js | 17 +-
cordova-lib/src/cordova/serve.js | 161 +-
cordova-lib/src/cordova/superspawn.js | 154 -
cordova-lib/src/cordova/targets.js | 15 +-
cordova-lib/src/cordova/util.js | 59 +-
cordova-lib/src/events.js | 19 -
cordova-lib/src/gitclone.js | 4 +-
cordova-lib/src/hooks/Context.js | 35 +-
cordova-lib/src/hooks/HooksRunner.js | 9 +-
cordova-lib/src/hooks/scriptsFinder.js | 10 +-
cordova-lib/src/platforms/PlatformApiPoly.js | 698 ++
cordova-lib/src/platforms/platforms.js | 108 +-
cordova-lib/src/platforms/platformsConfig.json | 8 +-
cordova-lib/src/plugman/browserify.js | 182 +
cordova-lib/src/plugman/create.js | 2 +-
cordova-lib/src/plugman/createpackagejson.js | 4 +-
cordova-lib/src/plugman/fetch.js | 14 +-
cordova-lib/src/plugman/install.js | 98 +-
.../src/plugman/platforms/amazon-fireos.js | 11 +-
cordova-lib/src/plugman/platforms/android.js | 6 +-
.../src/plugman/platforms/blackberry10.js | 4 +-
cordova-lib/src/plugman/platforms/browser.js | 192 +-
cordova-lib/src/plugman/platforms/common.js | 32 +-
cordova-lib/src/plugman/platforms/firefoxos.js | 4 +-
cordova-lib/src/plugman/platforms/ios.js | 73 +-
cordova-lib/src/plugman/platforms/tizen.js | 4 +-
cordova-lib/src/plugman/platforms/ubuntu.js | 6 +-
cordova-lib/src/plugman/platforms/webos.js | 4 +-
cordova-lib/src/plugman/platforms/windows.js | 19 +-
cordova-lib/src/plugman/platforms/wp8.js | 4 +-
cordova-lib/src/plugman/plugman.js | 5 +-
cordova-lib/src/plugman/prepare-browserify.js | 214 -
cordova-lib/src/plugman/prepare.js | 159 -
cordova-lib/src/plugman/registry/manifest.js | 2 +-
cordova-lib/src/plugman/registry/registry.js | 103 +-
cordova-lib/src/plugman/uninstall.js | 96 +-
cordova-lib/src/plugman/util/ConfigFile.js | 221 -
cordova-lib/src/plugman/util/ConfigKeeper.js | 65 -
cordova-lib/src/plugman/util/PlatformJson.js | 135 -
cordova-lib/src/plugman/util/action-stack.js | 105 -
cordova-lib/src/plugman/util/config-changes.js | 420 -
cordova-lib/src/plugman/util/default-engines.js | 2 +-
cordova-lib/src/plugman/util/dependencies.js | 2 +-
cordova-lib/src/plugman/util/munge-util.js | 160 -
cordova-lib/src/plugman/util/plugins.js | 4 +-
cordova-lib/src/util/unpack.js | 2 +-
cordova-lib/src/util/windows/csproj.js | 2 +-
cordova-lib/src/util/windows/jsprojManager.js | 74 +-
cordova-lib/src/util/xml-helpers.js | 194 -
cordova-serve/README.md | 86 +-
cordova-serve/RELEASENOTES.md | 3 +
cordova-serve/package.json | 7 +-
cordova-serve/serve.js | 42 +-
cordova-serve/src/browser.js | 101 +-
cordova-serve/src/platform.js | 14 +-
cordova-serve/src/server.js | 124 +-
cordova-serve/src/stream.js | 75 -
293 files changed, 20866 insertions(+), 7045 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e32ca648/cordova-lib/src/plugman/platforms/ubuntu.js
----------------------------------------------------------------------
diff --cc cordova-lib/src/plugman/platforms/ubuntu.js
index 90a066c,3efdabf..6947330
--- a/cordova-lib/src/plugman/platforms/ubuntu.js
+++ b/cordova-lib/src/plugman/platforms/ubuntu.js
@@@ -47,19 -47,19 +47,21 @@@ function getPluginXml(plugin_dir)
function findClassName(pluginxml, plugin_id) {
var class_name;
+
+ /* jshint ignore:start */
// first check if we have a class-name parameter in the plugin config
if (pluginxml) {
- var platform = pluginxml.find("./platform/[@name='ubuntu']/");
- if (platform) {
- var param = platform.find("./config-file/[@target='config.xml']/feature/param/[@name='ubuntu-package']");
- if (param && param.attrib) {
- class_name = param.attrib.value;
- return class_name;
- }
- }
+ var platform = pluginxml.find("./platform/[@name='ubuntu']/");
+ if (platform) {
+ var param = platform.find("./config-file/[@target='config.xml']/feature/param/[@name='ubuntu-package']");
+ if (param && param.attrib) {
+ class_name = param.attrib.value;
+ return class_name;
+ }
+ }
}
+ /* jshint ignore:end */
+
// fallback to guess work, based on the plugin package name
if (plugin_id.match(/\.[^.]+$/)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org