Merge branch 'master' into feature/vaadin-number-field

vaadin · Aug 28, 2017 · d74ad8d · d74ad8d
2 parents a76295d + c91bd02
commit d74ad8d
Show file tree

Hide file tree

Showing 13 changed files with 1,505 additions and 3,505 deletions.
diff --git a/analysis.json b/analysis.json
diff --git a/demo/common.html b/demo/common.html
@@ -12,11 +12,11 @@
 <!-- Menu Items -->
 <script>
   window.demos = [
-     {name: 'index', title: 'Basic Examples'},
-     {name: 'password', title: 'Password Field'},
-     {name: 'number-field', title: 'Number Field'},
-     {name: 'validators', title: 'Custom Validators'},
-     {name: 'styling', title: 'Styling'}
+    {name: 'index', title: 'Basic Examples'},
+    {name: 'password', title: 'Password Field'},
+    {name: 'number-field', title: 'Number Field'},
+    {name: 'validators', title: 'Custom Validators'},
+    {name: 'styling', title: 'Styling'}
   ];
 </script>
 <link rel="import" href="../../elements-demo-resources/demo-navigation.html">
@@ -27,7 +27,7 @@
 <link rel="import" href="../vaadin-number-field.html">
 
 <script>
-   window.addEventListener('WebComponentsReady', () => {
-     document.body.removeAttribute('unresolved');
-   });
+  window.addEventListener('WebComponentsReady', () => {
+    document.body.removeAttribute('unresolved');
+  });
 </script>
diff --git a/demo/password.html b/demo/password.html
@@ -27,7 +27,7 @@ <h3>Default Password Field</h3>
     <h3>Password Field with Hidden Eye Icon</h3>
     <demo-snippet>
       <template>
-        <vaadin-password-field placeholder="Password" hide-toggle-button></vaadin-password-field>
+        <vaadin-password-field placeholder="Password" reveal-button-hidden></vaadin-password-field>
       </template>
     </demo-snippet>
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -24,9 +24,9 @@ gulp.task('lint:js', function() {
     '*.js',
     'test/**/*.js'
   ])
-  .pipe(eslint())
-  .pipe(eslint.format())
-  .pipe(eslint.failAfterError('fail'));
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError('fail'));
 });
 
 gulp.task('lint:html', function() {
@@ -35,12 +35,13 @@ gulp.task('lint:html', function() {
     'demo/**/*.html',
     'test/**/*.html'
   ])
-  .pipe(htmlExtract({
-    sel: 'script, code-example code'
-  }))
-  .pipe(eslint())
-  .pipe(eslint.format())
-  .pipe(eslint.failAfterError('fail'));
+    .pipe(htmlExtract({
+      sel: 'script, code-example code',
+      strip: true
+    }))
+    .pipe(eslint())
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError('fail'));
 });
 
 gulp.task('lint:css', function() {
@@ -49,14 +50,14 @@ gulp.task('lint:css', function() {
     'demo/**/*.html',
     'test/**/*.html'
   ])
-  .pipe(htmlExtract({
-    sel: 'style'
-  }))
-  .pipe(stylelint({
-    reporters: [
-      {formatter: 'string', console: true}
-    ]
-  }));
+    .pipe(htmlExtract({
+      sel: 'style'
+    }))
+    .pipe(stylelint({
+      reporters: [
+        {formatter: 'string', console: true}
+      ]
+    }));
 });
 
 function runCommand(cmd, cb) {