[GitHub] cordova-mobile-spec pull request: CB-8727 Fix failing WebSQL test ...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-mobile-spec/pull/124 CB-8727 Fix failing WebSQL test on Android 5.1 - scrollByLines is an unknown function in Android 5.1 - removed because it causes the exception and does not affect the test itself You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-mobile-spec master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-mobile-spec/pull/124.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #124 commit 921c2c0c15c1a1a04ceb85949fdb0bf950992714 Author: Karen Tran ktop...@gmail.com Date: 2015-03-22T04:19:06Z CB-8727 Fix failing WebSQL test on Android 5.1 commit 49f7c962debb0da874521c5ee410b17d02fa9694 Author: Karen Tran ktop...@gmail.com Date: 2015-03-22T04:19:06Z CB-8727 Fix failing WebSQL test on Android 5.1 - scrollByLines is an unknown funtion in Android 5.1 - removed because it causes the exception and does not affect the test itself commit 9edf897f9a533f09b742b15660ba264ff96a0b97 Author: Karen Tran ktop...@gmail.com Date: 2015-03-22T04:52:57Z Merge branch 'master' of https://github.com/ktop/cordova-mobile-spec --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-mobile-spec pull request: CB-8727 Fix failing WebSQL test ...
Github user ktop commented on the pull request: https://github.com/apache/cordova-mobile-spec/pull/124#issuecomment-100264782 Can someone take a look at this? I think it should be a simple merge --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-8978 Added new image element tag for ...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/214#issuecomment-101021261 I'll move the discussion to the right place. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-8978 Added new image element tag for ...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/214 CB-8978 Added new image element tag for config.xml You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/214.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #214 commit 1d591965953ceb3273b4d36aeb6015df8805f33f Author: Karen Tran ktop...@gmail.com Date: 2015-05-11T17:37:45Z CB-8978 Added new image element tag for config.xml --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-mobile-spec pull request: CB-8727 Fix failing WebSQL test ...
Github user ktop closed the pull request at: https://github.com/apache/cordova-mobile-spec/pull/124 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #432: CB-11023 Add attribute through config-file ta...
Github user ktop closed the pull request at: https://github.com/apache/cordova-lib/pull/432 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #449: CB-11023 Add edit-config functionality
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/449 CB-11023 Add edit-config functionality New edit-config tag for plugin.xml will allow users to modify xml attributes. Ex. Assumes your AndroidManifest.xml has a second activity element with attribute android:name="SecondActivity" ```xml ``` file: specifies the file location target: specifies an xpath to the element that you want to modify modes: - merge: add attributes in the target with the ones specified by edit-config and will replace if the attribute names are the same - overwrite: replace all of the attributes at the target with the one specified by edit-config children: will only modify one element per edit-config tag There is conflict checking nowif a plugin wants to modify an attribute another plugin has already modified, an error will be thrown and plugin install will fail. The user must fix the conflict or they can use --force to force add the plugin and overwrite the conflict. Lastly, on plugin uninstall, the plugin should restore the attributes to the state it was before installing. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib editconfig Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/449.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #449 commit a3864929400f61fc31d03c3bab1d91a9467a3fbf Author: unknown <ktop...@gmail.com> Date: 2016-05-26T21:36:23Z CB-11023 Add edit-config functionality --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #432: CB-11023 Add attribute through config-file tag
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/432 I'm gonna open a new pull request with new changes. Closing this one --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #449: CB-11023 Add edit-config functionality
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/449 ahh must be because I didn't set up my git config after my computer got re-imaged. I have it set now and hopefully it will appear after I rebase. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #449: CB-11023 Add edit-config functionality
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/449 @riknoll Where does it say "unknown"? I don't see it. If we have plugin-1, plugin-2 --force, and then add plugin-3 with --force, plugin-1 and plugin-2 should not be applied correct? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #449: CB-11023 Add edit-config functionality
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/449 My latest commit will find all conflicts when --force is used and remove them before adding the new plugin. @riknoll or @macdonst can you try it out and let me know if you have any issues? Also looks like my git name got fixed in the latest commit, so I think after I rebase and squash, it'll fix the first commit. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #449: CB-11023 Add edit-config functionality
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/449 Cool, let me rebase --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #449: CB-11023 Add edit-config functionality
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/449 @riknoll I've rebased so this should be ready for merge. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-docs pull request #614: CB-11023 New edit-config tag in plugin.xml
GitHub user ktop opened a pull request: https://github.com/apache/cordova-docs/pull/614 CB-11023 New edit-config tag in plugin.xml Documenting the new edit-config tag in plugin.xml. @riknoll can you review? I tried to keep the examples short, but explain enough to get the point across. Let me know if I need to fix anything. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-docs cb-11023 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-docs/pull/614.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #614 commit 1d8ec834eb5d157ce779cf7517b6670c1ad36a16 Author: ktop <ktop...@gmail.com> Date: 2016-06-23T14:24:09Z CB-11023 New edit-config tag in plugin.xml --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #449: CB-11023 Add edit-config functionality
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/449 @riknoll yea sure. Are there instructions on how/where documentation goes? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-10235 Added clearer error message for...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/379 CB-10235 Added clearer error message for info command When using the cordova info command, if Android isn't set up properly, then the error message printed out isn't too helpful. I added to the error message to tell users to make sure they have the path of Android SDK tools and platform-tools in their PATH environment variable. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib cb-10235 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/379.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #379 commit 8c2111390da3e793651fb0b89e91b9d306ff338a Author: Karen Tran <ktop...@gmail.com> Date: 2016-02-07T02:15:22Z CB-10235 Added clearer error message for info command --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-10553 Fix framework tag handler for A...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/380 CB-10553 Fix framework tag handler for Android The framework tag was not being handled during plugin-install for Android. In the conditional check, it checks for the string literal 'platform' instead of just the platform. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib cb-10553 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/380.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #380 commit 8cd2c9a60397393a3d49e93995fe68c3c9d58704 Author: Karen Tran <ktop...@gmail.com> Date: 2016-02-07T03:01:58Z CB-10553 Fix framework tag handler for Android --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-10235 Added clearer error message for...
Github user ktop closed the pull request at: https://github.com/apache/cordova-lib/pull/357 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-10235 Added clearer error message for...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/357#issuecomment-180583758 I will redo this pull request. I was having some repository problems so I'll just start over. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-10897 Refactor URI Parsing for Wh...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-android/pull/283 CB-10897 Refactor URI Parsing for Whitelist Fix for CB-10897. I moved out the code that parses the 'origin' from the whitelist to a separate function so that it can also be used to parse the URLs that request access instead of using Android's Uri class parse function. Android's Uri parse function does not parse 'host' the same way that Cordova parses the host in origin for whitelist, so host ends up being null and the comparison fails. Using the same parsing methods is the way to go to give accurate comparisons of URLs to those in the whitelist. Also, I can have specific non http/https URLs in my whitelist now. Something like this works now without the wildcard: You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-android CB-10897 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-android/pull/283.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #283 commit 26662acada6f44a83c11c1e13faa8fea3a959720 Author: Karen Tran <ktop...@gmail.com> Date: 2016-03-18T18:45:57Z CB-10897 Refactor URI Parsing for Whitelist --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-android pull request: CB-10897 Refactor URI Parsing for Wh...
Github user ktop commented on the pull request: https://github.com/apache/cordova-android/pull/283#issuecomment-201509250 @infil00p can you review again? see my previous comment. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/432 CB-11023 Add attribute through config-file tag Add functionality to be able to add attributes to xml files through config-file tag. Syntax: Able to add multiple attributes to multiple elements at once (only to direct children of the parent). ``` ``` You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib cb-11023 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/432.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #432 commit aa3427ce38ef0bd2e2ac71e5d56d7d9d0dc6b15c Author: Karen Tran <ktop...@gmail.com> Date: 2016-04-22T14:05:12Z CB-11023 Add attribute through config-file tag Add back comment and fix format --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/432#issuecomment-213530432 If we can modify existing attributes, and then the plugin gets removed, the modified attribute will also get removed. I don't think there is a way to revert it back to what it was before. Is that ok? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/432#issuecomment-215857823 @macdonst I had Edna test the first time around before I opened the PR and she was able to get it working, so that is weird that it is adding a new element for you. Was config-file functional in config.xml before? Or was that something to be done as part of this jira issue? I was only focused on getting it working in plugin.xml, so I can work on it if it isn't implemented yet. Should config.xml handle config-file during prepare? The mode suggestion sounds good. It will give users a lot of utility for modifying xml files. I have just few clarification questions: - If no mode is specified, is the default to add? - For replace, if there is nothing to replace, should it still try to add? - And for delete, should it delete an element even if the element has children? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/432#issuecomment-220440531 @riknoll Vladimir is correct, there is no mechanism for either yet. I think warnings are good, but does that mean the plugins that get installed first get first dibs to modifying xml elements? How do we go about keeping track of whether or not an attribute/element was modified or not? For the second question, that has actually crossed my mind a few times while testing (how I couldn't modify the second activity tag or add children to it). I'm not really sure the best way to handle it. I've thought about adding an identifier attribute to the config-file tag, but that would limit config-file to modify only one element. ```xml ``` End goal would be to be able to modify both activity tags in the same config-file tag, but that may be a stretch. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/432#discussion_r63922339
--- Diff: cordova-lib/src/cordova/prepare.js ---
@@ -116,6 +117,13 @@ function preparePlatforms (platformList, projectRoot,
options) {
var browserify = require('../plugman/browserify');
return browserify(project, platformApi);
}
+})
+.then(function () {
+// Handle config-file in config.xml
+var platformRoot = path.join(projectRoot, 'platforms',
platform);
+var platformJson = PlatformJson.load(platformRoot,
platform);
+var munger = new PlatformMunger(platform, platformRoot,
platformJson);
+munger.add_config_changes(project.projectConfig,
/*should_increment=*/true).save_all();
--- End diff --
Thanks for reviewing, I'll make the change.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/432#issuecomment-220647997 I'd like to clear up some confusion I have on adding attributes. Before, we had decided on going with this syntax where the child elements of config-file tag would point to the child tags of the parent we want to add attributes to, so that we could add attributes to more than one child in a single config-file tag. With the following syntax, I wouldn't be able to at add to the second activity. ```xml ``` Now with your suggestion, the tag would look like this: Here, I would be able to specify the second activity, but this contradicts with what we had before since activity tag isn't a child of the parent. ```xml ``` Would we lose the ability to add attributes to more than one child? Or should we try to do both? Detect that we want to add to the tag that is the same as the parent as well as child tags. (Not sure if this makes sense) ```xml ``` Or any other ideas? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/432#issuecomment-216629805 @macdonst @purplecabbage On my other machine (Mac), I see the same behavior that you both were seeing. I was able to fix it by doing a `cordova-coho/coho npm-link` and re-adding the android platform to the project. What was happening was the cordova-common module inside of cordova-android wasn't being linked to the one in cordova-lib, so it was using a cordova-common without my changes in it, thus using the default functionality of config-file. On a side note (this only happens for me on Mac, works fine on Windows), when coho replaces the cordova-common module with a symlink, this was treated as deleting the cordova-common module, then when I go to add the android platform, I get an error saying `Cannot find module 'cordova-common'` and when I checked the node modules folder, there's only a symlink file of cordova-common. I'm not really sure how symlinks are supposed to work on Mac since I mainly use a Windows machine. The project still runs and cordova-common is actually linked. I'm not sure if this is a Mac issue or something else. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-11023 Add attribute through config-fi...
Github user ktop commented on the pull request: https://github.com/apache/cordova-lib/pull/432#issuecomment-216543951 @purplecabbage My workspace is working off of the master branches with the tools npm linked. I modified the plugin.xml of cordova-plugin-device and added: ``` ``` Then for the project: ``` cordova create myApp cd myApp cordova platform add ../cordova-android cordova plugin add ../cordova-plugin-device ``` I check AndroidManifest.xml and the new attributes are there as expect, without a new tag being added. I'll try testing this PR on another machine and see what result I get. As for getting config-file tag into config.xml, I've been caught up in some other work so will get to this sometime later in the week. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-docs issue #614: CB-11023 New edit-config tag in plugin.xml
Github user ktop commented on the issue: https://github.com/apache/cordova-docs/pull/614 @riknoll I've made the changes here and will open a PR in the CLI doc to mention the plugin conflicts and link to the plugin.xml doc for reference. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-cli pull request #258: CB-11023 Add doc for conflicting plugins
GitHub user ktop opened a pull request: https://github.com/apache/cordova-cli/pull/258 CB-11023 Add doc for conflicting plugins Added a section under plugins for dealing with plugin conflicts involving the new edit-config tag. References the plugin.xml guide for more information and examples. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-cli cb-11023 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-cli/pull/258.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #258 commit 83c4c6bcc04bd5b4d7c22971010b8ba7e9ac7893 Author: ktop <ktop...@gmail.com> Date: 2016-07-18T18:29:00Z CB-11023 Add doc for conflicting plugins --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-docs issue #614: CB-11023 New edit-config tag in plugin.xml
Github user ktop commented on the issue: https://github.com/apache/cordova-docs/pull/614 I shortened the AndroidManifest to snippets. I could see the force add content going into both locations, but in the CLI guide it should be more describing the error about conflicting edit-config and how it is caused. Maybe this section can link to the plugin.xml guide about edit-config for how to resolve the error. It's probably worth it for users to learn about edit-config in the plugin.xml guide before making changes. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-docs pull request #679: CB-12163 Add doc for reference attr for reso...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-docs/pull/679 CB-12163 Add doc for reference attr for resource-file in Windows ### Platforms affected - Windows - plugin.xml doc ### What does this PR do? Adds documentation for the new "reference" attribute for the resource-file tag in plugin.xml for Windows. ### What testing has been done on this change? N/A ### Checklist - [X ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database - [X ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB- is the JIRA ID & "android" is the platform affected. - [X ] Added automated test coverage as appropriate for this change. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-docs cb-12163 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-docs/pull/679.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #679 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-windows issue #213: CB-12163 Make resource-file copy files again
Github user ktop commented on the issue: https://github.com/apache/cordova-windows/pull/213 @daserge Now that there has been a cordova-common release, can we refresh cordova-common in cordova-windows and get this merged? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #214: CB-8978 Added new image element tag for config.xml
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/214 Yep, thanks. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #214: CB-8978 Added new image element tag for confi...
Github user ktop closed the pull request at: https://github.com/apache/cordova-lib/pull/214 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-windows issue #213: CB-12163 Make resource-file copy files again
Github user ktop commented on the issue: https://github.com/apache/cordova-windows/pull/213 @daserge we need to wait for a cordova-common release since the commit I'm dependent on has been merged https://github.com/apache/cordova-lib/pull/509 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #492: CB-11908 Add edit-config to config.xml
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/492 CB-11908 Add edit-config to config.xml Handles edit-config for config.xml. Fixed up the conflict checking so that config.xml will take precedence over plugin.xml changes. Added a remove mode to config.xml only, explained more below. To test out these changes, remember to copy it to the platform's cordova-common. A couple things to discuss/clarify: 1. These changes will make config.xml changes take precedence over plugin.xml changes even if --force is used. Is this alright? Or should --force actually force add the plugin anyways? 2. There's no real way to "undo" edit-config changes in config.xml. As a fix, I've added a "remove" mode that will remove the attributes specified. Do you think this is useful to have? There's no such thing as restoring/reverting the xml elements to what they were before. What was initially the old list of attributes from before the edit-config change will get overwritten on every prepare. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib editconfigxml Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/492.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #492 commit d0ce4c506d2f7f24bda145e21f9b9af1543b1ecd Author: ktop <ktop...@gmail.com> Date: 2016-09-26T21:07:09Z CB-11908 Add edit-config to config.xml --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #493: CB-11908 Handle edit-config in config.xml on ...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/493 CB-11908 Handle edit-config in config.xml on prepare Needs this PR: https://github.com/apache/cordova-lib/pull/492 You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib libEditConfig Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/493.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #493 commit 34b50acee4fa9eb27d7225a3e4497c7917570667 Author: ktop <ktop...@gmail.com> Date: 2016-09-26T21:10:15Z CB-11908 Handle edit-config in config.xml on prepare --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #486: CB-11776 check edit-config target exists
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/486 CB-11776 check edit-config target exists Missing a case in the conflict checking for edit-config. If the target doesn't exist in .json, and cannot resolve to an existing target, then no conflict should be found. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib ecerror Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/486.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #486 commit a7e6634217e187434d560ac2d32bf352662b3a25 Author: ktop <ktop...@gmail.com> Date: 2016-08-26T21:59:46Z CB-11776 check edit-config target exists --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #492: CB-11908 Add edit-config to config.xml
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/492 Thanks, I fixed the errors. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-windows issue #213: CB-12163 Make resource-file copy files again
Github user ktop commented on the issue: https://github.com/apache/cordova-windows/pull/213 @daserge Thanks for the bump, Tim's email was in my spam. Yes, this would be a breaking change as it is now. We should wait until we come to a final decision before proceeding with this pr. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-windows pull request #213: CB-12163 Make resource-file copy files ag...
Github user ktop commented on a diff in the pull request:
https://github.com/apache/cordova-windows/pull/213#discussion_r92438038
--- Diff: template/cordova/lib/PluginHandler.js ---
@@ -53,18 +53,37 @@ var handlers = {
},
'resource-file':{
install:function(obj, plugin, project, options) {
-// do not copy, but reference the file in the plugin folder.
This allows to
-// have multiple source files map to the same target and
select the appropriate
-// one based on the current build settings, e.g. architecture.
-// also, we don't check for existence. This allows to insert
build variables
-// into the source file name, e.g.
-//
-var relativeSrcPath = getPluginFilePath(plugin, obj.src,
project.projectFolder);
-project.addResourceFileToProject(relativeSrcPath, obj.target,
getTargetConditions(obj));
+var targetConditions = getTargetConditions(obj);
+if (targetConditions.reference) {
+// do not copy, but reference the file in the plugin
folder. This allows to
+// have multiple source files map to the same target and
select the appropriate
+// one based on the current build settings, e.g.
architecture.
+// also, we don't check for existence. This allows to
insert build variables
+// into the source file name, e.g.
+//
+var relativeSrcPath = getPluginFilePath(plugin, obj.src,
project.projectFolder);
+project.addResourceFileToProject(relativeSrcPath,
obj.target, targetConditions);
+} else {
+// if target already exists, emit warning to consider
using a reference instead of copying
+if (fs.existsSync(path.resolve(project.root, obj.target)))
{
+events.emit('warn', ' with target ' +
obj.target + ' already exists and will be overwritten ' +
+'by a with the same target. Consider
using the attribute reference="true" in the ' +
+' tag to avoid overwriting files with
the same target. ');
--- End diff --
I agree it would make it clearer for users.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
-
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #509: CB-12163 Add reference attrib to resource-fil...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/509 CB-12163 Add reference attrib to resource-file for Windows ### Platforms affected cordova-common for Windows ### What does this PR do? Adds a new attribute to the resource-file tag for Windows. The attribute is for moving the current functionality of "referencing files" to be switched on by this flag in order to bring back the copy functionality to be default for resource-file. ex. ``` ``` ### What testing has been done on this change? Manual testing and unit testing. Need to pull in changes from the cordova-windows pull request to get it to work properly. ### Checklist - [X] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database - [X] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB- is the JIRA ID & "android" is the platform affected. - [X] Added automated test coverage as appropriate for this change. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib cb12163 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/509.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #509 commit 9d69d3df1d765ad9c05ece48864fc47c6c3e7061 Author: ktop <ktop...@gmail.com> Date: 2016-12-12T19:35:04Z CB-12163 Add reference attrib to resource-file for Windows --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request #508: CB-11908 Add tests for edit-config in config....
GitHub user ktop opened a pull request: https://github.com/apache/cordova-lib/pull/508 CB-11908 Add tests for edit-config in config.xml and fix typo ### Platforms affected cordova-common ### What does this PR do? I had this commit ready to go, but forgot to commit and push it. Here I'm adding tests for the 'edit-config' functionality that was added to config.xml. ### What testing has been done on this change? Manual tests and adding unit tests. ### Checklist - [x ] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database - [x ] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB- is the JIRA ID & "android" is the platform affected. - [x ] Added automated test coverage as appropriate for this change. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-lib editconfigxml Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/508.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #508 commit aa4c6e8380c6e5edf1bf20a508b450e64a1d6e7c Author: ktop <ktop...@gmail.com> Date: 2016-12-09T19:53:50Z CB-11908 Add tests for edit-config in config.xml and fix typo Add one more test case --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib issue #468: CB-8978 Add resource-file parsing to config.xml
Github user ktop commented on the issue: https://github.com/apache/cordova-lib/pull/468 SGTM --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-windows pull request #213: CB-12163 Make resource-file copy files ag...
GitHub user ktop opened a pull request: https://github.com/apache/cordova-windows/pull/213 CB-12163 Make resource-file copy files again ### Platforms affected - Windows ### What does this PR do? - Revert the functionality of resource-file in plugin.xml. It will now copy files again instead of using the references. ### What testing has been done on this change? - Updated the spec tests and ran them - Created a new app with the updated resource-file and check to see if it copies files. ### Checklist - [X] [Reported an issue](http://cordova.apache.org/contribute/issues.html) in the JIRA database - [X] Commit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB- is the JIRA ID & "android" is the platform affected. - [X] Added automated test coverage as appropriate for this change. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ktop/cordova-windows cb12163 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-windows/pull/213.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #213 commit d00e0c33d388f410d6444920d72b7ac1e86df3ef Author: ktop <ktop...@gmail.com> Date: 2016-12-06T20:58:42Z CB-12163 Make resource-file copy files again --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-windows issue #213: CB-12163 Make resource-file copy files again
Github user ktop commented on the issue: https://github.com/apache/cordova-windows/pull/213 @vladimir-kotikov Can you review? This pr reverts resource-file to what it used to do so it will copy files. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
