BAM-2585 Fix validator, copyright, and whitespace (#7)

* alphabetize validator, fix whitespace, and add valid tag * update year in copyright statement
hellonarrativ · Jan 31, 2019 · 1368887 · 1368887
1 parent b1a9380
commit 1368887
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 41 deletions.
diff --git a/extensions/amp-smartlinks/0.1/amp-smartlinks.js b/extensions/amp-smartlinks/0.1/amp-smartlinks.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/constants.js b/extensions/amp-smartlinks/0.1/constants.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/link-rewriter/constants.js b/extensions/amp-smartlinks/0.1/link-rewriter/constants.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/link-rewriter/link-replacement-cache.js b/extensions/amp-smartlinks/0.1/link-rewriter/link-replacement-cache.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/link-rewriter/link-rewriter-manager.js b/extensions/amp-smartlinks/0.1/link-rewriter/link-rewriter-manager.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/link-rewriter/link-rewriter.js b/extensions/amp-smartlinks/0.1/link-rewriter/link-rewriter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/link-rewriter/two-steps-response.js b/extensions/amp-smartlinks/0.1/link-rewriter/two-steps-response.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/linkmate-options.js b/extensions/amp-smartlinks/0.1/linkmate-options.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/linkmate.js b/extensions/amp-smartlinks/0.1/linkmate.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js b/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/test/test-link-rewriter.js b/extensions/amp-smartlinks/0.1/test/test-link-rewriter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/test/test-linkmate.js b/extensions/amp-smartlinks/0.1/test/test-linkmate.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/0.1/test/validator-amp-smartlinks.html b/extensions/amp-smartlinks/0.1/test/validator-amp-smartlinks.html
@@ -1,5 +1,5 @@
 <!--
-	Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+	Copyright 2019 The AMP HTML Authors. All Rights Reserved.
 	Licensed 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
@@ -12,7 +12,7 @@
 -->
 <!--
 	Test Description:
-	Valid amp-smartlinks tag
+	amp-smartlinks tag
 -->
 <!doctype html>
 <html ⚡>
@@ -25,6 +25,7 @@
 	<script async src="https://cdn.ampproject.org/v0.js"></script>
 </head>
 <body>
+    <!-- Valid -->
     <amp-smartlinks
         layout="nodisplay"
         nrtv-account-name="examplepublisher"

diff --git a/extensions/amp-smartlinks/0.1/test/validator-amp-smartlinks.out b/extensions/amp-smartlinks/0.1/test/validator-amp-smartlinks.out
@@ -1,30 +1,32 @@
+PASS
 |  <!--
-|    Copyright 2018 The AMP HTML Authors. All Rights Reserved.
-|    Licensed 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, software
-|    distributed under the License is distributed on an "AS-IS" BASIS,
-|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-|    See the License for the specific language governing permissions and
-|    limitations under the license.
+|  	Copyright 2019 The AMP HTML Authors. All Rights Reserved.
+|  	Licensed 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, software
+|  	distributed under the License is distributed on an "AS-IS" BASIS,
+|  	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+|  	See the License for the specific language governing permissions and
+|  	limitations under the license.
 |  -->
 |  <!--
-|    Test Description:
-|    Valid amp-smartlinks tag
+|  	Test Description:
+|  	amp-smartlinks tag
 |  -->
 |  <!doctype html>
 |  <html ⚡>
 |  <head>
-|    <meta charset="utf-8">
-|    <link rel="canonical" href="./regular-html-version.html">
-|    <meta name="viewport" content="width=device-width,minimum-scale=1">
-|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
-|    <script async custom-element="amp-smartlinks" src="https://cdn.ampproject.org/v0/amp-smartlinks-0.1.js"></script>
-|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|  	<meta charset="utf-8">
+|  	<link rel="canonical" href="./regular-html-version.html">
+|  	<meta name="viewport" content="width=device-width,minimum-scale=1">
+|  	<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|  	<script async custom-element="amp-smartlinks" src="https://cdn.ampproject.org/v0/amp-smartlinks-0.1.js"></script>
+|  	<script async src="https://cdn.ampproject.org/v0.js"></script>
 |  </head>
 |  <body>
+|      <!-- Valid -->
 |      <amp-smartlinks
 |          layout="nodisplay"
 |          nrtv-account-name="examplepublisher"

diff --git a/extensions/amp-smartlinks/amp-smartlinks.md b/extensions/amp-smartlinks/amp-smartlinks.md
@@ -1,5 +1,5 @@
 <!---
-Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+Copyright 2019 The AMP HTML Authors. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/extensions/amp-smartlinks/validator-amp-smartlinks.protoascii b/extensions/amp-smartlinks/validator-amp-smartlinks.protoascii
@@ -1,5 +1,5 @@
 #
-# Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+# Copyright 2019 The AMP HTML Authors. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,21 +30,25 @@ tags: {  # <amp-smartlinks>
   tag_name: "AMP-SMARTLINKS"
   requires_extension: "amp-smartlinks"
   attrs: {
-    name: "nrtv-account-name"
-    mandatory: true
+    name: "exclusive-links"
+    value: "true"
+    value: "false"
   }
   attrs: {
-    name: "linkmate"
-    mandatory: true
+    name: "link-attribute"
   }
   attrs: {
-    name: "exclusive-links"
+    name: "link-selector"
   }
   attrs: {
-    name: "link-attribute"
+    name: "linkmate"
+    mandatory: true
+    value: "true"
+    value: "false"
   }
   attrs: {
-    name: "link-selector"
+    name: "nrtv-account-name"
+    mandatory: true
   }
   attr_lists: "extended-amp-global"
   amp_layout: {