svn commit: r16494 - in /dev/cordova/CB-12003: ./ cordova-common-1.5.1.tgz cordova-common-1.5.1.tgz.asc cordova-common-1.5.1.tgz.md5 cordova-common-1.5.1.tgz.sha
Author: steven Date: Thu Oct 13 05:43:20 2016 New Revision: 16494 Log: CB-12003 Uploading release candidates for common release Added: dev/cordova/CB-12003/ dev/cordova/CB-12003/cordova-common-1.5.1.tgz (with props) dev/cordova/CB-12003/cordova-common-1.5.1.tgz.asc dev/cordova/CB-12003/cordova-common-1.5.1.tgz.md5 dev/cordova/CB-12003/cordova-common-1.5.1.tgz.sha Added: dev/cordova/CB-12003/cordova-common-1.5.1.tgz == Binary file - no diff available. Propchange: dev/cordova/CB-12003/cordova-common-1.5.1.tgz -- svn:mime-type = application/octet-stream Added: dev/cordova/CB-12003/cordova-common-1.5.1.tgz.asc == --- dev/cordova/CB-12003/cordova-common-1.5.1.tgz.asc (added) +++ dev/cordova/CB-12003/cordova-common-1.5.1.tgz.asc Thu Oct 13 05:43:20 2016 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQEcBAABAgAGBQJX/x6fAAoJEDhDuPn/ymi+7KkH/2ZGv4oZDmBCUT/gZFjDnYUA +lzU2BjckH5HDGJVx7pPFrlqSM6tBj1j6y8ayRYbsTjPIyCGw3VQuwlXklHALOr+W +yY8bkJYwJcdJgDuTUu+3HHl28dXB/GM9qkoy0ZG/s5xEQGOHXy4+WNs+wNeshvfP +uFb7GzdRVkxZzO1Sic/6gsRyyvmW4xmQydeYML4vL+FfJnZCHPrFjGIJNAfKwoiE +EfVtnpiMOvlSgvsLuGGWyjy6nKuByctzNmJ7wlk3dMrt0Qp+IiNlWPHREVav2QN4 +dZaxLoxZ62D4xvP0SMbGwInY+fADmmOBIJ6VUdSM2VSWcvVO0WHVJXxkilhtVxs= +=EMLw +-END PGP SIGNATURE- Added: dev/cordova/CB-12003/cordova-common-1.5.1.tgz.md5 == --- dev/cordova/CB-12003/cordova-common-1.5.1.tgz.md5 (added) +++ dev/cordova/CB-12003/cordova-common-1.5.1.tgz.md5 Thu Oct 13 05:43:20 2016 @@ -0,0 +1 @@ +dc0caf0334dd9795f618ca8159ef026d Added: dev/cordova/CB-12003/cordova-common-1.5.1.tgz.sha == --- dev/cordova/CB-12003/cordova-common-1.5.1.tgz.sha (added) +++ dev/cordova/CB-12003/cordova-common-1.5.1.tgz.sha Thu Oct 13 05:43:20 2016 @@ -0,0 +1 @@ +4d47a8f7f5b7ab00ad013a4a6e1cc3083483a5135f55e3b28b10eda7cef10dacc6bc7f4d19bb2e2ebc62bf594d85212cd958a6376b05d1724169d09a4dc0b092 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[2/2] cordova-lib git commit: CB-12003 Incremented package version to -dev
CB-12003 Incremented package version to -dev Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/e7f3e624 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/e7f3e624 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/e7f3e624 Branch: refs/heads/master Commit: e7f3e624d47ed05049c44f10da4aea45eca7d65a Parents: 1711157 Author: Steve GillAuthored: Wed Oct 12 22:39:56 2016 -0700 Committer: Steve Gill Committed: Wed Oct 12 22:39:56 2016 -0700 -- cordova-common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e7f3e624/cordova-common/package.json -- diff --git a/cordova-common/package.json b/cordova-common/package.json index 623d504..b113344 100644 --- a/cordova-common/package.json +++ b/cordova-common/package.json @@ -3,7 +3,7 @@ "name": "cordova-common", "description": "Apache Cordova tools and platforms shared routines", "license": "Apache-2.0", - "version": "1.5.1", + "version": "1.5.2-dev", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[cordova-lib] Git Push Summary
Repository: cordova-lib Updated Tags: refs/tags/common-1.5.1 [created] 1711157d8 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[1/2] cordova-lib git commit: CB-12003 Updated version and RELEASENOTES.md for release 1.5.1
Repository: cordova-lib Updated Branches: refs/heads/master 6a3c76326 -> e7f3e624d CB-12003 Updated version and RELEASENOTES.md for release 1.5.1 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/1711157d Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/1711157d Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/1711157d Branch: refs/heads/master Commit: 1711157d8cf4474153dad10b562a98815fe50123 Parents: 6a3c763 Author: Steve GillAuthored: Wed Oct 12 21:59:07 2016 -0700 Committer: Steve Gill Committed: Wed Oct 12 22:36:39 2016 -0700 -- cordova-common/RELEASENOTES.md | 4 cordova-common/package.json| 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1711157d/cordova-common/RELEASENOTES.md -- diff --git a/cordova-common/RELEASENOTES.md b/cordova-common/RELEASENOTES.md index f237f69..02dbcee 100644 --- a/cordova-common/RELEASENOTES.md +++ b/cordova-common/RELEASENOTES.md @@ -20,6 +20,10 @@ --> # Cordova-common Release Notes +### 1.5.1 (Oct 12, 2016) +* [CB-12002](https://issues.apache.org/jira/browse/CB-12002) Add `getAllowIntents()` to `ConfigParser` +* [CB-11998](https://issues.apache.org/jira/browse/CB-11998) `cordova platform add` error with `cordova-common@1.5.0` + ### 1.5.0 (Oct 06, 2016) * [CB-11776](https://issues.apache.org/jira/browse/CB-11776) Add test case for different `edit-config` targets * [CB-11908](https://issues.apache.org/jira/browse/CB-11908) Add `edit-config` to `config.xml` http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1711157d/cordova-common/package.json -- diff --git a/cordova-common/package.json b/cordova-common/package.json index 4771e7d..623d504 100644 --- a/cordova-common/package.json +++ b/cordova-common/package.json @@ -3,7 +3,7 @@ "name": "cordova-common", "description": "Apache Cordova tools and platforms shared routines", "license": "Apache-2.0", - "version": "1.5.1-dev", + "version": "1.5.1", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-common.git" - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[cordova-lib] Git Push Summary
Repository: cordova-lib Updated Branches: refs/heads/common-1.5.x [created] 1711157d8 - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-plugin-inappbrowser git commit: CB-11955 Added Initial OSX platform support
Repository: cordova-plugin-inappbrowser Updated Branches: refs/heads/master d4156fb19 -> 32253b96a CB-11955 Added Initial OSX platform support - Added src/osx plugin folder structure. - Added OSX platform to plugin.xml and package.json files. - Added _system target functionality for OSX. - Modified README.md to include information about OSX support. - Disabled 'open method' jasmine tests for OSX. This closes #190 Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/32253b96 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/32253b96 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/32253b96 Branch: refs/heads/master Commit: 32253b96a61b3ac68f2eec9ec2ee225f87b92793 Parents: d4156fb Author: pwlinAuthored: Thu Oct 6 18:39:10 2016 +0200 Committer: Tobias Bocanegra Committed: Thu Oct 13 12:43:39 2016 +0900 -- README.md | 9 - package.json | 2 + plugin.xml| 16 src/osx/CDVInAppBrowser.h | 30 ++ src/osx/CDVInAppBrowser.m | 89 ++ tests/tests.js| 5 +++ 6 files changed, 150 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/32253b96/README.md -- diff --git a/README.md b/README.md index e7e9697..3eecf1a 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Although `window.open` is in the global scope, InAppBrowser is not available unt Report issues with this plugin on the [Apache Cordova issue tracker](https://issues.apache.org/jira/issues/?jql=project%20%3D%20CB%20AND%20status%20in%20%28Open%2C%20%22In%20Progress%22%2C%20Reopened%29%20AND%20resolution%20%3D%20Unresolved%20AND%20component%20%3D%20%22Plugin%20InAppBrowser%22%20ORDER%20BY%20priority%20DESC%2C%20summary%20ASC%2C%20updatedDate%20DESC) -## Reference +## Reference ## Installation cordova plugin add cordova-plugin-inappbrowser @@ -145,6 +145,7 @@ instance, or the system browser. - BlackBerry 10 - Firefox OS - iOS +- OSX - Windows 8 and 8.1 - Windows Phone 7 and 8 - Browser @@ -185,6 +186,12 @@ opened with `target='_blank'`. The rules might look like these } ``` +### OSX Quirks + +At the moment the only supported target in OSX is `_system`. + +`_blank` and `_self` targets are not yet implemented and are ignored silently. Pull requests and patches to get these to work are greatly appreciated. + ### Windows Quirks Windows 8.0, 8.1 and Windows Phone 8.1 don't support remote urls to be opened in the Cordova WebView so remote urls are always showed in the system's web browser if opened with `target='_self'`. http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/32253b96/package.json -- diff --git a/package.json b/package.json index 7acaf87..334d7c9 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "amazon-fireos", "ubuntu", "ios", + "osx", "wp7", "wp8", "windows8", @@ -31,6 +32,7 @@ "cordova-amazon-fireos", "cordova-ubuntu", "cordova-ios", +"cordova-osx", "cordova-wp7", "cordova-wp8", "cordova-windows8", http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/32253b96/plugin.xml -- diff --git a/plugin.xml b/plugin.xml index 42018a5..388e767 100644 --- a/plugin.xml +++ b/plugin.xml @@ -131,6 +131,22 @@ + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/32253b96/src/osx/CDVInAppBrowser.h -- diff --git a/src/osx/CDVInAppBrowser.h b/src/osx/CDVInAppBrowser.h new file mode 100644 index 000..742af70 --- /dev/null +++ b/src/osx/CDVInAppBrowser.h @@ -0,0 +1,30 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, +
cordova-paramedic git commit: CB-12006 Add OSX support for paramedic
Repository: cordova-paramedic Updated Branches: refs/heads/master 538aa2627 -> f2d0b9d08 CB-12006 Add OSX support for paramedic - updated readme Project: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/commit/f2d0b9d0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/tree/f2d0b9d0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/diff/f2d0b9d0 Branch: refs/heads/master Commit: f2d0b9d08540ae0e712ee535275d7cd156f4aa62 Parents: 538aa26 Author: Tobias BocanegraAuthored: Thu Oct 13 11:46:31 2016 +0900 Committer: Tobias Bocanegra Committed: Thu Oct 13 11:46:31 2016 +0900 -- README.md | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/f2d0b9d0/README.md -- diff --git a/README.md b/README.md index b21ac41..f7e64f0 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Runs cordova medic/buildbot tests locally. - Windows Phone 8 - Windows (Windows 8.1, Windows Phone 8.1, Windows 10 Tablet/PC) - Browser +- OSX # Usage - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
android commit: Fix tab/space issue
Repository: cordova-android Updated Branches: refs/heads/master f838db4e1 -> 77b9fd62a Fix tab/space issue Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/77b9fd62 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/77b9fd62 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/77b9fd62 Branch: refs/heads/master Commit: 77b9fd62a723a1f9b86955578e454447311cbe05 Parents: f838db4 Author: Simon MacDonaldAuthored: Wed Oct 12 22:21:14 2016 -0400 Committer: Simon MacDonald Committed: Wed Oct 12 22:21:14 2016 -0400 -- bin/templates/project/Activity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/77b9fd62/bin/templates/project/Activity.java -- diff --git a/bin/templates/project/Activity.java b/bin/templates/project/Activity.java index 7cd0f97..567b6c7 100644 --- a/bin/templates/project/Activity.java +++ b/bin/templates/project/Activity.java @@ -32,7 +32,7 @@ public class __ACTIVITY__ extends CordovaActivity // enable Cordova apps to be started in the background Bundle extras = getIntent().getExtras(); if (extras != null && extras.getBoolean("cdvStartInBackground", false)) { - moveTaskToBack(true); +moveTaskToBack(true); } // Set by in config.xml - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
js commit: Update connect dependency to 1.9.2 for node version incompatibility
Repository: cordova-js Updated Branches: refs/heads/master e6803db1e -> 53ea19137 Update connect dependency to 1.9.2 for node version incompatibility Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/53ea1913 Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/53ea1913 Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/53ea1913 Branch: refs/heads/master Commit: 53ea1913735222d326e65326e03391405df3cd4e Parents: e6803db Author: Shazron AbdullahAuthored: Wed Oct 12 13:39:57 2016 -0700 Committer: Shazron Abdullah Committed: Wed Oct 12 13:39:57 2016 -0700 -- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-js/blob/53ea1913/package.json -- diff --git a/package.json b/package.json index 217c869..b3645ad 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ } ], "devDependencies": { -"connect": "1.8.5", +"connect": "1.9.2", "grunt": "0.4.1", "grunt-cli": "0.1.13", "grunt-contrib-clean": "0.6.0", - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-lib git commit: CB-12002 - Add getAllowIntents() to ConfigParser
Repository: cordova-lib Updated Branches: refs/heads/master c44db3d7a -> 6a3c76326 CB-12002 - Add getAllowIntents() to ConfigParser This closes #502 Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/6a3c7632 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/6a3c7632 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/6a3c7632 Branch: refs/heads/master Commit: 6a3c76326811768c310a0c97942bc397183c0144 Parents: c44db3d Author: Darryl PogueAuthored: Wed Oct 12 10:48:26 2016 -0700 Committer: Steve Gill Committed: Wed Oct 12 13:32:26 2016 -0700 -- cordova-common/spec/ConfigParser/ConfigParser.spec.js | 4 cordova-common/spec/fixtures/test-config.xml | 3 +++ cordova-common/src/ConfigParser/ConfigParser.js | 9 + 3 files changed, 16 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6a3c7632/cordova-common/spec/ConfigParser/ConfigParser.spec.js -- diff --git a/cordova-common/spec/ConfigParser/ConfigParser.spec.js b/cordova-common/spec/ConfigParser/ConfigParser.spec.js index 097fe61..22fbc99 100644 --- a/cordova-common/spec/ConfigParser/ConfigParser.spec.js +++ b/cordova-common/spec/ConfigParser/ConfigParser.spec.js @@ -227,6 +227,10 @@ describe('config.xml parser', function () { var navigations = cfg.getAllowNavigations(); expect(navigations.length).not.toEqual(0); }); +it('it should read tag entries', function(){ +var intents = cfg.getAllowIntents(); +expect(intents.length).not.toEqual(0); +}); }); describe('static resources', function() { var hasPlatformPropertyDefined = function (e) { return !!e.platform; }; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6a3c7632/cordova-common/spec/fixtures/test-config.xml -- diff --git a/cordova-common/spec/fixtures/test-config.xml b/cordova-common/spec/fixtures/test-config.xml index df47948..a656143 100644 --- a/cordova-common/spec/fixtures/test-config.xml +++ b/cordova-common/spec/fixtures/test-config.xml @@ -74,6 +74,9 @@ +https://*; /> + + http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/6a3c7632/cordova-common/src/ConfigParser/ConfigParser.js -- diff --git a/cordova-common/src/ConfigParser/ConfigParser.js b/cordova-common/src/ConfigParser/ConfigParser.js index f23df4d..6e74ce3 100644 --- a/cordova-common/src/ConfigParser/ConfigParser.js +++ b/cordova-common/src/ConfigParser/ConfigParser.js @@ -480,6 +480,15 @@ ConfigParser.prototype = { }; }); }, +/* Get all the allow-intent tags */ +getAllowIntents: function() { +var allow_intents = this.doc.findall('./allow-intent'); +return allow_intents.map(function(allow_intent){ +return { +'href': allow_intent.attrib.href +}; +}); +}, /* Get all edit-config tags */ getEditConfigs: function(platform) { var platform_tag = this.doc.find('./platform[@name="' + platform + '"]'); - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
ios commit: This closes #225, closes #268
Repository: cordova-ios Updated Branches: refs/heads/master 2cdb60746 -> e17ddc12c This closes #225, closes #268 Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/e17ddc12 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/e17ddc12 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/e17ddc12 Branch: refs/heads/master Commit: e17ddc12c3524e2397afe5a479d5adeec19334a7 Parents: 2cdb607 Author: Shazron AbdullahAuthored: Wed Oct 12 12:08:24 2016 -0700 Committer: Shazron Abdullah Committed: Wed Oct 12 12:08:24 2016 -0700 -- -- - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
android commit: CB-11999 add message, catch exception if require fails
Repository: cordova-android Updated Branches: refs/heads/master 2532c4a39 -> b2d712442 CB-11999 add message, catch exception if require fails Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/b2d71244 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/b2d71244 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/b2d71244 Branch: refs/heads/master Commit: b2d7124424340b3c6534c0701bd10f9697be3433 Parents: 2532c4a Author: Jesse MacFadyenAuthored: Tue Oct 11 17:19:10 2016 -0700 Committer: Jesse MacFadyen Committed: Wed Oct 12 11:48:06 2016 -0700 -- bin/templates/cordova/Api.js | 42 ++- 1 file changed, 28 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/b2d71244/bin/templates/cordova/Api.js -- diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js index bec578c..28a0ab5 100644 --- a/bin/templates/cordova/Api.js +++ b/bin/templates/cordova/Api.js @@ -109,13 +109,20 @@ function Api(platform, platformRootDir, events) { */ Api.createPlatform = function (destination, config, options, events) { events = setupEvents(events); - -return require('../../lib/create') -.create(destination, config, options, events) -.then(function (destination) { -var PlatformApi = require(path.resolve(destination, 'cordova/Api')); -return new PlatformApi(PLATFORM, destination, events); -}); +var result; +try { +result = require('../../lib/create') +.create(destination, config, options, events) +.then(function (destination) { +var PlatformApi = require(path.resolve(destination, 'cordova/Api')); +return new PlatformApi(PLATFORM, destination, events); +}); +} +catch (e) { +events.emit('error','createPlatform is not callable from the android project API.'); +throw(e); +} +return result; }; /** @@ -136,13 +143,20 @@ Api.createPlatform = function (destination, config, options, events) { */ Api.updatePlatform = function (destination, options, events) { events = setupEvents(events); - -return require('../../lib/create') -.update(destination, options, events) -.then(function (destination) { -var PlatformApi = require(path.resolve(destination, 'cordova/Api')); -return new PlatformApi('android', destination, events); -}); +var result; +try { +result = require('../../lib/create') +.update(destination, options, events) +.then(function (destination) { +var PlatformApi = require(path.resolve(destination, 'cordova/Api')); +return new PlatformApi('android', destination, events); +}); +} +catch (e) { +events.emit('error','updatePlatform is not callable from the android project API, you will need to do this manually.'); +throw(e); +} +return result; }; /** - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
cordova-windows git commit: CB-11825 Windows dll file won't be copied as resource while adding custom plugin to a UWP project
Repository: cordova-windows Updated Branches: refs/heads/master 50730294f -> 1417b932c CB-11825 Windows dll file won't be copied as resource while adding custom plugin to a UWP project Changing Package action from Content to None because Content does not work for Mobile - dlls were not being packaged into appx Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/1417b932 Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/1417b932 Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/1417b932 Branch: refs/heads/master Commit: 1417b932c836c0fe21cca902e5098fa12e98fe82 Parents: 5073029 Author: dasergeAuthored: Wed Oct 5 19:01:26 2016 +0300 Committer: daserge Committed: Wed Oct 12 12:25:26 2016 +0300 -- spec/unit/pluginHandler/windows.spec.js | 10 +- template/cordova/lib/JsprojManager.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/1417b932/spec/unit/pluginHandler/windows.spec.js -- diff --git a/spec/unit/pluginHandler/windows.spec.js b/spec/unit/pluginHandler/windows.spec.js index 161f6f5..ae2cd56 100644 --- a/spec/unit/pluginHandler/windows.spec.js +++ b/spec/unit/pluginHandler/windows.spec.js @@ -216,16 +216,16 @@ describe('windows project handler', function () { // project files, which is not needed. it('should write to correct project files when conditions are specified', function () { -var xpath = 'Content[@Include="' + computeResourcePath(resourceFiles[0]) + '"][@Condition="\'$(Platform)\'==\'x86\'"]'; +var xpath = 'None[@Include="' + computeResourcePath(resourceFiles[0]) + '"][@Condition="\'$(Platform)\'==\'x86\'"]'; validateInstalledProjects('resource-file', resourceFiles[0], xpath, ['all']); -xpath = 'Content[@Include="' + computeResourcePath(resourceFiles[1]) + '"]'; +xpath = 'None[@Include="' + computeResourcePath(resourceFiles[1]) + '"]'; validateInstalledProjects('resource-file', resourceFiles[1], xpath, ['windows', 'phone', 'windows10']); -xpath = 'Content[@Include="' + computeResourcePath(resourceFiles[2]) + '"]'; +xpath = 'None[@Include="' + computeResourcePath(resourceFiles[2]) + '"]'; validateInstalledProjects('resource-file', resourceFiles[2], xpath, ['phone']); -xpath = 'Content[@Include="' + computeResourcePath(resourceFiles[3]) + '"][@Condition="\'$(Platform)\'==\'x64\'"]'; +xpath = 'None[@Include="' + computeResourcePath(resourceFiles[3]) + '"][@Condition="\'$(Platform)\'==\'x64\'"]'; validateInstalledProjects('resource-file', resourceFiles[3], xpath, ['windows8']); }); @@ -454,7 +454,7 @@ describe('windows project handler', function () { resourcefiles.forEach(function(resourceFile) { install(resourceFile, dummyPluginInfo, dummyProject); }); -var path = 'ItemGroup/Content'; +var path = 'ItemGroup/None'; var incText = computeResourcePath(resourcefiles[0]); var targetConditions = {versions: undefined, deviceTarget: undefined, arch: 'x86'}; validateUninstalledProjects('resource-file', resourcefiles[0], path, incText, targetConditions, ['all']); http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/1417b932/template/cordova/lib/JsprojManager.js -- diff --git a/template/cordova/lib/JsprojManager.js b/template/cordova/lib/JsprojManager.js index 21ee808..3bd7ac6 100644 --- a/template/cordova/lib/JsprojManager.js +++ b/template/cordova/lib/JsprojManager.js @@ -121,7 +121,7 @@ jsprojManager.prototype = { copyToOutputDirectory.text = 'Always'; children.push(copyToOutputDirectory); -var item = createItemGroupElement('ItemGroup/Content', sourcePath, targetConditions, children); +var item = createItemGroupElement('ItemGroup/None', sourcePath, targetConditions, children); this._getMatchingProjects(targetConditions).forEach(function (project) { project.appendToRoot(item); }); @@ -130,7 +130,7 @@ jsprojManager.prototype = { removeResourceFileFromProject: function (relPath, targetConditions) { events.emit('verbose', 'jsprojManager.removeResourceFile(relPath: ' + relPath + ', targetConditions: ' + JSON.stringify(targetConditions) + ')');
[2/2] cordova-plugin-media-capture git commit: CB-11996 Added a new manual test to capture multiple images
CB-11996 Added a new manual test to capture multiple images Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/cd7d40d5 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/cd7d40d5 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/cd7d40d5 Branch: refs/heads/master Commit: cd7d40d5dc80755fb6798b839383cdae73bd01ab Parents: 108c2ef Author: Alexander SorokinAuthored: Tue Oct 11 18:53:39 2016 +0300 Committer: Alexander Sorokin Committed: Tue Oct 11 18:53:39 2016 +0300 -- tests/tests.js | 42 +- 1 file changed, 41 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/cd7d40d5/tests/tests.js -- diff --git a/tests/tests.js b/tests/tests.js index 7336b8a..c3177f4 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -156,6 +156,30 @@ exports.defineManualTests = function (contentEl, createActionButton) { document.getElementById('camera_image').src = path; } +function captureImagesWin(mediaFiles) { +var path = mediaFiles[0].fullPath; +// Necessary since windows doesn't allow file URLs for elements +if (cordova.platformId == 'windows' || cordova.platformId == 'windows8' || cordova.platformId === 'browser') { +path = mediaFiles[0].localURL; +} +var path2 = mediaFiles[1].fullPath; +// Necessary since windows doesn't allow file URLs for elements +if (cordova.platformId == 'windows' || cordova.platformId == 'windows8' || cordova.platformId === 'browser') { +path = mediaFiles[1].localURL; +} +var path3 = mediaFiles[2].fullPath; +// Necessary since windows doesn't allow file URLs for elements +if (cordova.platformId == 'windows' || cordova.platformId == 'windows8' || cordova.platformId === 'browser') { +path = mediaFiles[2].localURL; +} +log('Image captured: ' + path); +log('Image captured: ' + path2); +log('Image captured: ' + path3); +document.getElementById('camera_image').src = path; +document.getElementById('camera_image2').src = path2; +document.getElementById('camera_image3').src = path3; +} + function captureImageFail(e) { log('Error getting image: ' + e.code); } @@ -166,6 +190,12 @@ exports.defineManualTests = function (contentEl, createActionButton) { navigator.device.capture.captureImage(captureImageWin, captureImageFail, options); } +function getImages() { +clearStatus(); +var options = { limit: 3 }; +navigator.device.capture.captureImage(captureImagesWin, captureImageFail, options); +} + function captureVideoWin(mediaFiles) { var path = mediaFiles[0].fullPath; log('Video captured: ' + path); @@ -231,18 +261,24 @@ exports.defineManualTests = function (contentEl, createActionButton) { function clearStatus() { document.getElementById('camera_status').innerHTML = ''; document.getElementById('camera_image').src = 'about:blank'; +document.getElementById('camera_image2').src = 'about:blank'; +document.getElementById('camera_image3').src = 'about:blank'; } /**/ contentEl.innerHTML = '' + 'Status: ' + -'img: ' + +'img1: ' + +'img2: ' + +'img3: ' + 'video: ' + '' + 'Expected result: Audio recorder will come up. Press record button to record for 10 seconds. Press Done. Status box will update with audio file and automatically play recording.' + ' ' + 'Expected result: Status box will update with image just taken.' + +' ' + +'Expected result: Status box will update with images just taken.' + ' ' + 'Expected result: Record 10 second video. Status box will update with video file that you can play.' + ' ' + @@ -256,6 +292,10 @@ exports.defineManualTests = function (contentEl, createActionButton) { getImage(); }, 'image'); +createActionButton('Capture 3 images', function () { +getImages(); +}, 'images'); + createActionButton('Capture 10 sec of video', function () { getVideo(); }, 'video'); - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[1/2] cordova-plugin-media-capture git commit: CB-11995 (android) Do not pass a file URI to the camera
Repository: cordova-plugin-media-capture Updated Branches: refs/heads/master 21bb35e46 -> cd7d40d5d CB-11995 (android) Do not pass a file URI to the camera Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/commit/108c2eff Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/tree/108c2eff Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/diff/108c2eff Branch: refs/heads/master Commit: 108c2eff02700c90103e63c09e8144d965aff03f Parents: 21bb35e Author: Alexander SorokinAuthored: Tue Oct 11 18:04:32 2016 +0300 Committer: Alexander Sorokin Committed: Tue Oct 11 18:04:32 2016 +0300 -- src/android/Capture.java | 74 +++ 1 file changed, 18 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture/blob/108c2eff/src/android/Capture.java -- diff --git a/src/android/Capture.java b/src/android/Capture.java index 73781b8..1f7030b 100644 --- a/src/android/Capture.java +++ b/src/android/Capture.java @@ -44,6 +44,7 @@ import org.json.JSONObject; import android.Manifest; import android.app.Activity; +import android.content.ContentResolver; import android.content.ContentValues; import android.content.Intent; import android.content.pm.PackageManager; @@ -78,6 +79,7 @@ public class Capture extends CordovaPlugin { private final PendingRequests pendingRequests = new PendingRequests(); private int numPics;// Number of pictures before capture activity +private Uri imageUri; //public void setContext(Context mCtx) //{ @@ -266,16 +268,13 @@ public class Capture extends CordovaPlugin { Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE); -// Specify file so that large image is captured and returned -File photo = new File(getTempDirectoryPath(), "Capture.jpg"); -try { -// the ACTION_IMAGE_CAPTURE is run under different credentials and has to be granted write permissions -createWritableFile(photo); -} catch (IOException ex) { -pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_INTERNAL_ERR, ex.toString())); -return; -} -intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, Uri.fromFile(photo)); +ContentResolver contentResolver = this.cordova.getActivity().getContentResolver(); +ContentValues cv = new ContentValues(); +cv.put(MediaStore.Images.Media.MIME_TYPE, IMAGE_JPEG); +imageUri = contentResolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, cv); +LOG.d(LOG_TAG, "Taking a picture and saving to: " + imageUri.toString()); + +intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, imageUri); this.cordova.startActivityForResult((CordovaPlugin) this, intent, req.requestCode); } @@ -377,54 +376,17 @@ public class Capture extends CordovaPlugin { } public void onImageActivityResult(Request req) { -// For some reason if I try to do: -// Uri data = intent.getData(); -// It crashes in the emulator and on my phone with a null pointer exception -// To work around it I had to grab the code from CameraLauncher.java -try { -// Create entry in media store for image -// (Don't use insertImage() because it uses default compression setting of 50 - no way to change it) -ContentValues values = new ContentValues(); -values.put(android.provider.MediaStore.Images.Media.MIME_TYPE, IMAGE_JPEG); -Uri uri = null; -try { -uri = this.cordova.getActivity().getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); -} catch (UnsupportedOperationException e) { -LOG.d(LOG_TAG, "Can't write to external media storage."); -try { -uri = this.cordova.getActivity().getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values); -} catch (UnsupportedOperationException ex) { -LOG.d(LOG_TAG, "Can't write to internal media storage."); -pendingRequests.resolveWithFailure(req, createErrorObject(CAPTURE_INTERNAL_ERR, "Error capturing image - no media storage found.")); -return; -} -} -FileInputStream fis
cordova-windows git commit: output message, catch exception if require fails, change eventEmitter to events to be consistent with ios+android
Repository: cordova-windows Updated Branches: refs/heads/master bf505cc69 -> 50730294f output message, catch exception if require fails, change eventEmitter to events to be consistent with ios+android Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/50730294 Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/50730294 Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/50730294 Branch: refs/heads/master Commit: 50730294f4d041f11f83d69dce6739674ff4d4e7 Parents: bf505cc Author: Jesse MacFadyenAuthored: Tue Oct 11 23:26:01 2016 -0700 Committer: Jesse MacFadyen Committed: Tue Oct 11 23:27:56 2016 -0700 -- template/cordova/Api.js | 50 +--- 1 file changed, 33 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/50730294/template/cordova/Api.js -- diff --git a/template/cordova/Api.js b/template/cordova/Api.js index 1fb62ce..70e4797 100644 --- a/template/cordova/Api.js +++ b/template/cordova/Api.js @@ -86,14 +86,24 @@ function Api(platform, platformRootDir, eventEmitter) { * @return {Promise} Promise either fulfilled with PlatformApi * instance or rejected with CordovaError. */ -Api.createPlatform = function (destinationDir, projectConfig, options, eventEmitter) { -setupEvents(eventEmitter); -return require('../../bin/lib/create') -.create(destinationDir, projectConfig, options) -.then(function () { -var PlatformApi = require(path.resolve(destinationDir, 'cordova/Api')); -return new PlatformApi(PLATFORM, destinationDir, eventEmitter); -}); +Api.createPlatform = function (destinationDir, projectConfig, options, events) { +setupEvents(events); +var result; + +try { +result = require('../../bin/lib/create') +.create(destinationDir, projectConfig, options) +.then(function () { +var PlatformApi = require(path.resolve(destinationDir, 'cordova/Api')); +return new PlatformApi(PLATFORM, destinationDir, events); +}); +} +catch(e) { +events.emit('error','createPlatform is not callable from the windows project API.'); +throw(e); +} + +return result; }; /** @@ -106,19 +116,25 @@ Api.createPlatform = function (destinationDir, projectConfig, options, eventEmit * should override the default one from platform. * @param {Boolean} [options.link=false] Flag that indicates that platform's sources * will be linked to installed platform instead of copying. - * @param {EventEmitter} [eventEmitter] The emitter that will be used for logging + * @param {EventEmitter} [events] The emitter that will be used for logging * * @return {Promise} Promise either fulfilled with PlatformApi * instance or rejected with CordovaError. */ -Api.updatePlatform = function (destinationDir, options, eventEmitter) { -setupEvents(eventEmitter); -return require('../../bin/lib/update') -.update(destinationDir, options) -.then(function () { -var PlatformApi = require(path.resolve(destinationDir, 'cordova/Api')); -return new PlatformApi(PLATFORM, destinationDir, eventEmitter); -}); +Api.updatePlatform = function (destinationDir, options, events) { +setupEvents(events); +try { +return require('../../bin/lib/update') +.update(destinationDir, options) +.then(function () { +var PlatformApi = require(path.resolve(destinationDir, 'cordova/Api')); +return new PlatformApi(PLATFORM, destinationDir, events); +}); +} +catch(e) { +events.emit('error','updatePlatform is not callable from the windows project API.'); +throw(e); +} }; /** - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org