Merge pull request #264 from vaadin/lint/js-indentation

Enable JS indentation check and fix incorrect indentation
vaadin · Jun 27, 2016 · 74419c7 · 74419c7
2 parents ca7bef9 + 0ba81b7
commit 74419c7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -2,7 +2,6 @@
   "preset": "google",
   "maximumLineLength": 140,
   "disallowMultipleVarDecl": false,
-  "validateIndentation": false,
   "disallowTrailingWhitespace": false,
   "jsDoc": {
     "checkAnnotations": {

diff --git a/gulpfile.js b/gulpfile.js
@@ -102,7 +102,8 @@ gulp.task('lint:html', function() {
         'test/*.html'
       ])
       .pipe(htmlExtract({
-        sel: 'script, code-example code'
+        sel: 'script, code-example code',
+        strip: true
       }))
       .pipe(jshint())
       .pipe(jshint.reporter())

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "chalk": "^1.1.1",
     "es6-shim": "^0.35.0",
     "gulp": "latest",
-    "gulp-html-extract": "0.0.3",
+    "gulp-html-extract": "^0.1.0",
     "gulp-jscs": "^3.0.2",
     "gulp-jshint": "^2.0.0",
     "gulp-sourcemaps": "^1.6.0",

diff --git a/test/selecting-items.html b/test/selecting-items.html
@@ -156,15 +156,15 @@
     });
 
     it('should clear the selection when closing the overlay and input is cleared', function() {
-        combobox.value = 'foo';
+      combobox.value = 'foo';
 
-        combobox.$.input.bindValue = '';
-        combobox.$.input.fire('input');
+      combobox.$.input.bindValue = '';
+      combobox.$.input.fire('input');
 
-        combobox.close();
+      combobox.close();
 
-        expect(combobox.value).to.be.empty;
-        expect(combobox.$.overlay.$.selector.selectedItem).to.be.null;
+      expect(combobox.value).to.be.empty;
+      expect(combobox.$.overlay.$.selector.selectedItem).to.be.null;
     });
   });
 </script>

diff --git a/test/toggling-dropdown.html b/test/toggling-dropdown.html
@@ -134,25 +134,25 @@
           });
 
           it('should not refocus the input field when closed from icon', function() {
-           tapToggleIcon();
+            tapToggleIcon();
 
-           var focusedInput = Polymer.dom(combobox.root).querySelector('input:focus');
+            var focusedInput = Polymer.dom(combobox.root).querySelector('input:focus');
 
-           expect(focusedInput).to.be.null;
+            expect(focusedInput).to.be.null;
           });
         } else if (!safari) { // TODO: Sauce Labs bug doesn't allow Safari in OS X to focus.
           it('should focus input on dropdown open', function() {
             var focusedInput = Polymer.dom(combobox.root).querySelector('input:focus');
             expect(focusedInput).to.equal(combobox.$.input);
           });
 
-         it('should refocus the input field when closed from icon', function() {
-           tapToggleIcon();
+          it('should refocus the input field when closed from icon', function() {
+            tapToggleIcon();
 
-           var focusedInput = Polymer.dom(combobox.root).querySelector('input:focus');
+            var focusedInput = Polymer.dom(combobox.root).querySelector('input:focus');
 
-           expect(focusedInput).to.eql(combobox.$.input);
-         });
+            expect(focusedInput).to.eql(combobox.$.input);
+          });
         }
       });
     });
@@ -162,12 +162,12 @@
         it('should close popup when tapping outside overlay', function() {
           combobox.open();
 
-            Polymer.Base.fire('tap', {}, {
-              bubbles: true,
-              node: document.body
-            });
+          Polymer.Base.fire('tap', {}, {
+            bubbles: true,
+            node: document.body
+          });
 
-            expect(combobox.opened).to.be.false;
+          expect(combobox.opened).to.be.false;
         });
       } else {
         it('should close popup when clicking outside overlay', function() {

diff --git a/vaadin-dropdown-behavior.html b/vaadin-dropdown-behavior.html
@@ -134,11 +134,11 @@
 
     _removeOutsideClickListener: function() {
       if (this.$.overlay.touchDevice) {
-       // Not sure if this is a good idea to remove this Gesture globally, but that's how the iron-overlay-behavior does it.
-       Polymer.Gestures.remove(document, 'tap', null);
-       document.removeEventListener('tap', this._outsideClickListener.bind(this), true);
+        // Not sure if this is a good idea to remove this Gesture globally, but that's how the iron-overlay-behavior does it.
+        Polymer.Gestures.remove(document, 'tap', null);
+        document.removeEventListener('tap', this._outsideClickListener.bind(this), true);
       } else {
-       document.removeEventListener('click', this._outsideClickListener.bind(this), true);
+        document.removeEventListener('click', this._outsideClickListener.bind(this), true);
       }
     }
   };