Merge pull request #1154 from Gregable/closurefixes

AMP Validator: shortened variable names for closure and README correction
ampproject · Dec 14, 2015 · 7a33c5b · 7a33c5b
2 parents acbca0b + b008063
commit 7a33c5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/validator/README.md b/validator/README.md
@@ -32,16 +32,16 @@ Install these packages using apt-get:
 * python-protobuf
 * python2.7
 
-Then, run `build.py`. It creates `codegen/validate`, a script which
+Then, run `build.py`. It creates `dist/validate`, a script which
 can print AMP HTML validation errors to the console.
 
 ```
-$ codegen/validate
+$ dist/validate
 usage: validate <file.html>
-$ codegen/validate testdata/minimum_valid_amp.html
+$ dist/validate testdata/minimum_valid_amp.html
 PASS
 $ touch empty.html
-$ codegen/validate empty.html
+$ dist/validate empty.html
 FAIL
 empty.html:1:0 MANDATORY_TAG_MISSING html ⚡ for top-level html (see https://github.com/ampproject/amphtml/blob/master/spec/amp-html-format.md#ampd)
 empty.html:1:0 MANDATORY_TAG_MISSING head (see https://github.com/ampproject/amphtml/blob/master/spec/amp-html-format.md#crps)

diff --git a/validator/validator.js b/validator/validator.js
@@ -1068,13 +1068,13 @@ function parseLayout(layout) {
   if (layout === undefined) {
     return amp.validator.AmpLayout.Layout.UNKNOWN;
   }
-  const value = amp.validator.AmpLayout.Layout[
-    layout.toUpperCase().replace('-', '_')];
-  if (value) {
-    return value;
-  } else {
-    return amp.validator.AmpLayout.Layout.UNKNOWN;
+  const normLayout = layout.toUpperCase().replace('-', '_');
+  for (const k in amp.validator.AmpLayout.Layout) {
+    if (amp.validator.AmpLayout.Layout[k] == normLayout) {
+      return amp.validator.AmpLayout.Layout[k];
+    }
   }
+  return amp.validator.AmpLayout.Layout.UNKNOWN;
 }