Merge pull request #6 from abdonrd/abdonrd-patch-1

Update .travis.yml and add ESLint

Author: abdonrd

.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "extends": "ibmresearch/html",
+  "globals": {
+    "Polymer": false
+  }
+}

.travis.yml

@@ -1,21 +1,22 @@
-sudo: required
-dist: trusty
 language: node_js
-node_js:
-  - '6'
+dist: trusty
+sudo: false
+node_js: stable
+cache:
+  directories:
+    - "node_modules"
 addons:
-  firefox: '46.0'
+  firefox: latest
   apt:
     sources:
-    - google-chrome
+      - google-chrome
     packages:
-    - google-chrome-stable
-cache:
-  directories:
-    - node_modules
+      - google-chrome-stable
 install:
-  - npm install -g web-component-tester
-  - npm install -g bower
-  - bower install
+  - npm install -g polymer-cli
+  - npm install -g eslint eslint-plugin-html eslint-config-ibmresearch
+  - polymer install --variants
+before_script:
+  - eslint . --ext js,html --ignore-path .gitignore
 script:
-  - xvfb-run wct
+  - xvfb-run polymer test

gdg-logo.html

@@ -43,6 +43,8 @@
   </template>
 
   <script>
+    /* global WebFont:false */
+
     Polymer({
       is: 'gdg-logo',
 
@@ -118,6 +120,7 @@
         }
       },
 
+      // eslint-disable-next-line max-len
       _computedResourcesLoaded: function(_fontLoaded, _gdgIconLoaded, _gdgLogotypeLoaded) {
         if (_fontLoaded && _gdgIconLoaded && _gdgLogotypeLoaded) {
           this._drawImage();
@@ -153,10 +156,17 @@
       },
 
       _drawImage: function() {
+        var canvasWith;
+
         var ctx = this._canvas.getContext('2d');
         ctx.font = '128px "Product Sans"';
 
-        var canvasWith = this.name ? (ctx.measureText(this.name).width + 460 + 128) : (532 + 15);
+        if (this.name) {
+          canvasWith = ctx.measureText(this.name).width + 460 + 128;
+        } else {
+          canvasWith = 532 + 15;
+        }
+
         this._canvas.setAttribute('width', canvasWith * this._scale);
         this._canvas.setAttribute('height', 190 * this._scale);
 

test/.eslintrc.json

@@ -0,0 +1,10 @@
+{
+  "env": {
+    "mocha": true
+  },
+  "globals": {
+    "assert": false,
+    "fixture": false,
+    "WCT": false
+  }
+}