From 754e0ed5895ec7e6822f433c51fad21fbaf3a40b Mon Sep 17 00:00:00 2001 From: Anssi Kostiainen Date: Mon, 16 Mar 2015 11:29:34 +0200 Subject: [PATCH 01/12] Fix This Charter URL --- charter/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charter/index.html b/charter/index.html index 3ada47e..c08694a 100644 --- a/charter/index.html +++ b/charter/index.html @@ -29,7 +29,7 @@

Web NFC API Community Group Charter

@@ -378,8 +378,7 @@

Decision Process

Transparency

-

The group will conduct all of its technical work on its The group will - conduct all of its technical work in public.

+

The group will conduct all of its technical work in public.

Discussions MAY take place on the group's public mailing list. Other discussions MAY take place using Issues in the group's GitHub repository. From d15e320fb26d0ba1a3bbbdfecaeb356c58d8ddd6 Mon Sep 17 00:00:00 2001 From: wcarr Date: Mon, 6 Apr 2015 14:52:07 -0700 Subject: [PATCH 05/12] Update index.html --- charter/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charter/index.html b/charter/index.html index c1f95fa..9135d48 100644 --- a/charter/index.html +++ b/charter/index.html @@ -399,7 +399,7 @@

Chair Selection

Participants in this group choose their Chair(s) and can replace their Chair(s) at any time using whatever means they prefer.

The following process is used if the less formal process above is not - acceeptable to group members. If 5 participants, no two from the same + acceptable to group members. If 5 participants, no two from the same organization, (or 50% of the organizations and individuals, whichever is smaller) call for an election, the group must use the following process to replace any current Chair(s) with a new Chair, consulting the From f1c8f634d767458b6975f68404cc4bf68f52207f Mon Sep 17 00:00:00 2001 From: wcarr Date: Tue, 7 Apr 2015 10:18:34 -0700 Subject: [PATCH 06/12] [charter] fixed typo s/Consenus/Consensus/ --- charter/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charter/index.html b/charter/index.html index 9135d48..c377a53 100644 --- a/charter/index.html +++ b/charter/index.html @@ -354,7 +354,7 @@

Decision Process

objections.

A common way to determine consensus for important decisions is to - conduct a Call for Consenus (CfC) where the Chair puts a proposal to the + conduct a Call for Consensus (CfC) where the Chair puts a proposal to the group on the public mail list and asks for feedback from the Participants within some period of time that is at least 7 days. Not responding indicates going along with the proposal. Direct feedback is encouraged, From 5653805f27ad3749e4fc1fd39b5bc0125ee8f8a8 Mon Sep 17 00:00:00 2001 From: Wayne Carr Date: Wed, 6 May 2015 02:39:56 -0700 Subject: [PATCH 07/12] point to LICENSE instead of repeating it What the license is should be in the LICENSE.md file. Currently the CONTRIBUTING text repeats it, meaning if LICENSE changes this would have to change to match. Better to just refer to the LICENSE file. --- CONTRIBUTING.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aa5f31f..b431cf6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ This repository is being used for work in the W3C Web NFC Community Group. All contributions are made under the -[W3C CLA](https://www.w3.org/community/about/agreements/cla/). +terms described in the LICENSE.md file. To contribute, you must join the W3C Web NFC Community Group at [https://www.w3.org/community/web-nfc/](https://www.w3.org/community/web-nfc/). We intend to reject Pull Requests from anyone who has not joined the Community @@ -8,5 +8,4 @@ Group (which requires agreement to the terms of the W3C CLA). If any Pull Requests from you are inadvertently accepted and you are not a W3C Web NFC Community Group member, the act of making a Pull Request indicates that you represent that you have received permission to make Contributions on behalf of -your employer and that the Contribution is made under the terms of the W3C -CLA. +your employer and that the Contribution is made under the terms described in the LICENSE.md file in this repository. From 8135d3c2bf36b8b6bbac6c99bdd202e0b0ebc971 Mon Sep 17 00:00:00 2001 From: Wayne Carr Date: Wed, 13 May 2015 12:37:04 -0700 Subject: [PATCH 08/12] Update LICENSE.md --- LICENSE.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 31749b2..1210f1d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,2 +1,5 @@ -Contents of this repository are licensed under the -[W3C CLA](https://www.w3.org/community/about/agreements/cla/). \ No newline at end of file +All Reports in this Repository are licensed by Contributors +under the +[W3C Software and Document License](http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document). +Contributions to Specifications are made under the +[W3C CLA](https://www.w3.org/community/about/agreements/cla/). From 88806d9edb04886a4070bc5a609a0417b334ae8e Mon Sep 17 00:00:00 2001 From: Wayne Carr Date: Fri, 3 Jul 2015 00:11:12 -0700 Subject: [PATCH 09/12] Match W3C authored CONTRIBUTING.MD and LICENSE.md files W3C authored CONTRIBUTING.MD and LICENSE.MD files for all the repositories in the new Web Platform Incubator CG (WICG). They adopted the LICENSE.MD file from the Web NFC CG, but modified the CONTRIBUTING.MD file. The big change is a format for listing Contributors that will allow automating checking where Contributions came from. W3C will create tools based on this format. This change is to match the new CONTRIBUTING.md file. https://github.com/w3c/licenses/blob/master/CG-contributing.md --- CONTRIBUTING.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b431cf6..47b1b7f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,11 +1,8 @@ -This repository is being used for work in the W3C Web NFC Community Group. All -contributions are made under the -terms described in the LICENSE.md file. -To contribute, you must join the W3C Web NFC Community Group at [https://www.w3.org/community/web-nfc/](https://www.w3.org/community/web-nfc/). +W3C Web NFC Community Group -We intend to reject Pull Requests from anyone who has not joined the Community -Group (which requires agreement to the terms of the W3C CLA). If any Pull -Requests from you are inadvertently accepted and you are not a W3C Web NFC -Community Group member, the act of making a Pull Request indicates that you -represent that you have received permission to make Contributions on behalf of -your employer and that the Contribution is made under the terms described in the LICENSE.md file in this repository. +This repository is being used for work in the [W3C Web NFC Community Group](https://www.w3.org/community/web-nfc/), governed by the [W3C Community License Agreement (CLA)](http://www.w3.org/community/about/agreements/cla/). +To contribute, you must join the [W3C Web NFC Community Group](https://www.w3.org/community/web-nfc/). + +If you are not the sole contributor to a contribution (pull request), please identify all contributors in the +commit message. In the commit, include on a new line, +

Contributors: +@githubusername1, +@githubusername2, ...
From 47d6af571e7bbcef9beb8d56dcecefa60d84f5f8 Mon Sep 17 00:00:00 2001 From: Wayne Carr Date: Fri, 3 Jul 2015 00:17:08 -0700 Subject: [PATCH 10/12] removed heading heading made the diff miss the actual changes and the heading isn't important or can be added later --- CONTRIBUTING.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47b1b7f..71e52c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,4 @@ -W3C Web NFC Community Group - -This repository is being used for work in the [W3C Web NFC Community Group](https://www.w3.org/community/web-nfc/), governed by the [W3C Community License Agreement (CLA)](http://www.w3.org/community/about/agreements/cla/). +This repository is being used for work in the W3C Web NFC Community Group, governed by the [W3C Community License Agreement (CLA)](http://www.w3.org/community/about/agreements/cla/). To contribute, you must join the [W3C Web NFC Community Group](https://www.w3.org/community/web-nfc/). If you are not the sole contributor to a contribution (pull request), please identify all contributors in the From 0c0acd4342efa20e8ef59ecb32c6186361f410bb Mon Sep 17 00:00:00 2001 From: Wayne Carr Date: Fri, 3 Jul 2015 00:21:26 -0700 Subject: [PATCH 11/12] put the header back with the right format --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71e52c1..59c245b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,5 @@ +# W3C Web NFC Community Group + This repository is being used for work in the W3C Web NFC Community Group, governed by the [W3C Community License Agreement (CLA)](http://www.w3.org/community/about/agreements/cla/). To contribute, you must join the [W3C Web NFC Community Group](https://www.w3.org/community/web-nfc/). From 1aa321be48cedc0744d3302018c270bdb7cbb195 Mon Sep 17 00:00:00 2001 From: Kenneth Rohde Christiansen Date: Tue, 21 Jul 2015 11:13:57 +0200 Subject: [PATCH 12/12] Change Nfc to NFC as suggested by Domenic This is to be more consistent with the Web Platform and follows the new web guidelines --- index.html | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/index.html b/index.html index caeb14e..cc5cbf6 100644 --- a/index.html +++ b/index.html @@ -675,21 +675,21 @@ NDEF messages.

+ title = "typedef (DOMString or URL or Blob or JSON) NFCData">

- NfcData denotes the data types + NFCData denotes the data types supported as NDEF record payload in read and send operations in this API.

- The mapping from supported NfcData to + The mapping from supported NFCData to NDEF record types, as used in the send() method is as follows:

- + @@ -722,14 +722,14 @@
NfcDataNFCData NDEF record type

- The mapping from NDEF record types to NfcData, + The mapping from NDEF record types to NFCData, as used for incoming NDEF messages exposed by the - NfcMessageEvent, is as follows: + NFCMessageEvent, is as follows:

- + @@ -783,25 +783,25 @@ extends.

-
readonly attribute Nfc nfc
+
readonly attribute NFC nfc

The nfc attribute

When getting the nfc attribute, the - user agent MUST return the Nfc object, which provides + user agent MUST return the NFC object, which provides NFC related functionality.

-

The Nfc interface

-
-
Promise<NfcAdapter> requestAdapter()
+

The NFC interface

+
+
Promise<NFCAdapter> requestAdapter()

Implementations MAY expose multiple NFC adapters. By using the - + requestAdapter() method, web apps can obtain an adapter object providing NFC functionality. When this method is invoked, the user agent MUST run the following @@ -865,23 +865,23 @@

-

The NfcAdapter interface

-
+

The NFCAdapter interface

+
attribute EventHandler onmessage
-
Promise<void> send(NfcMessage message, optional NfcSendOptions options)
+
Promise<void> send(NFCMessage message, optional NFCSendOptions options)

- The NfcAdapter interface handles incoming NDEF messages, - exposed by the NfcMessageEvent event, either from an + The NFCAdapter interface handles incoming NDEF messages, + exposed by the NFCMessageEvent event, either from an NFC tag or an NFC peer. By default, listening to this event SHOULD be disabled.

-

Events used with the NfcAdapter interface

+

Events used with the NFCAdapter interface

The following are the event handlers implemented by the - NfcAdapter interface. + NFCAdapter interface.

NDEF record typeNfcDataNFCData
NFC Forum Well Known Type (TNF=1) with type Text
@@ -890,9 +890,9 @@ - + - +
event type
onmessageonmessage messageNfcMessageEventNFCMessageEvent
@@ -903,51 +903,51 @@

- -

The NfcMessageEvent interface

+ +

The NFCMessageEvent interface

In this specification, NDEF message content is delivered by an - NfcMessageEvent event. + NFCMessageEvent event.

-
-
readonly attribute NfcMessage message
+
+
readonly attribute NFCMessage message

- The message - property MUST return the NfcMessage representing the + The message + property MUST return the NFCMessage representing the payload data of the NDEF message.

-
+
- -

The NfcMessage interface

+ +

The NFCMessage interface

The content of the NDEF message is exposed by the following interface:

-
+
readonly attribute USVString scope
readonly attribute sequence<any> data
// (DOMString or URL or Blob or JSON)

- The scope + The scope property MUST return the URL scope which has written the message.

The - data property MUST return the + data property MUST return the payload data of the NDEF message as an array of either DOMString, or URL object, or Blob object, or serializable JSON object as a generic Object.

-
+

The send() method

The - + send() method is used for sending an NDEF message to either an NFC tag for writing, or to an NFC peer device, next time when they get into proximity range. @@ -1038,8 +1038,8 @@

-

The NfcSendOptions dictionary

-
+

The NFCSendOptions dictionary

+
tag
Only NFC tags are targeted.
@@ -1050,11 +1050,11 @@
Both NFC tags and NFC peers are targeted.
-
-
NfcTarget target
+
+
NFCTarget target

- The target property + The target property denotes the intended target for the pending send() operation. The default value is "any".

@@ -1073,7 +1073,7 @@ class="example highlight"> navigator.permissions.query({name: 'nfc'}).then((result) => { if (result.status == 'granted') { - enableNfcUseCase(); // Do things here. + enableNFCUseCase(); // Do things here. } else if (result.status == 'prompt') { // The user agent will prompt. } @@ -1102,7 +1102,7 @@ } else if (data instanceof URL) { console.log(“Data is URL: “ + data.toString()); } else if (typeof data == ‘object’) { - processJson(data); + processJSON(data); } }; @@ -1126,7 +1126,7 @@ reader.readAsText(data); }; - function processJson(data) { + function processJSON(data) { if (myCondition(data.myKnownProperty)) { adapter.send({data: “Custom data”}); };