Update JSCS. Fix code styling issues

SC5 · Mar 20, 2015 · 5db742f · 5db742f
1 parent 33c60ef
commit 5db742f
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 92 deletions.
diff --git a/.jscsrc b/.jscsrc
@@ -1,5 +1,6 @@
 {
   "preset": "airbnb",
   "validateIndentation": 2,
+  "disallowMultipleVarDecl": null,
   "requireMultipleVarDecl": true
 }
diff --git a/lib/app/js/controllers/appCtrl.js b/lib/app/js/controllers/appCtrl.js
@@ -2,47 +2,46 @@
 
 angular.module('sgApp')
   .controller('AppCtrl', function($scope, ngProgress) {
+    // ngProgress do not respect styles assigned via CSS if we do not pass empty parameters
+    // See: https://github.com/VictorBjelkholm/ngProgress/issues/33
+    ngProgress.height('');
+    ngProgress.color('');
+
+    // Scroll top when page is changed
+    $scope.$on('$viewContentLoaded', function() {
+      window.scrollTo(0, 0);
+    });
 
-      // ngProgress do not respect styles assigned via CSS if we do not pass empty parameters
-      // See: https://github.com/VictorBjelkholm/ngProgress/issues/33
-      ngProgress.height('');
-      ngProgress.color('');
-
-      // Scroll top when page is changed
-      $scope.$on('$viewContentLoaded', function() {
-        window.scrollTo(0, 0);
-      });
-
-      $scope.$on('progress start', function() {
-        ngProgress.start();
-      });
-
-      $scope.$on('progress end', function() {
-        ngProgress.complete();
-      });
+    $scope.$on('progress start', function() {
+      ngProgress.start();
+    });
 
-      // Reload styles when server notifies about the changes
-      // Add cache buster to every stylesheet on the page forcing them to reload
-      $scope.$on('styles changed', function() {
-        var links = Array.prototype.slice.call(document.getElementsByTagName('link'));
-        links.forEach(function(link) {
-          if (typeof link === 'object' && link.getAttribute('type') === 'text/css' && link.getAttribute('data-noreload') === null) {
-            link.href = link.href.split('?')[0] + '?id=' + new Date().getTime();
-          }
-        });
-      });
+    $scope.$on('progress end', function() {
+      ngProgress.complete();
+    });
 
-      $scope.$on('socket connected', function() {
-        console.log('Socket connection established');
+    // Reload styles when server notifies about the changes
+    // Add cache buster to every stylesheet on the page forcing them to reload
+    $scope.$on('styles changed', function() {
+      var links = Array.prototype.slice.call(document.getElementsByTagName('link'));
+      links.forEach(function(link) {
+        if (typeof link === 'object' && link.getAttribute('type') === 'text/css' && link.getAttribute('data-noreload') === null) {
+          link.href = link.href.split('?')[0] + '?id=' + new Date().getTime();
+        }
       });
+    });
 
-      $scope.$on('socket disconnected', function() {
-        console.error('Socket connection dropped');
-        ngProgress.reset();
-      });
+    $scope.$on('socket connected', function() {
+      console.log('Socket connection established');
+    });
 
-      $scope.$on('socket error', function(err) {
-        console.error('Socket error:', err);
-      });
+    $scope.$on('socket disconnected', function() {
+      console.error('Socket connection dropped');
+      ngProgress.reset();
+    });
 
+    $scope.$on('socket error', function(err) {
+      console.error('Socket error:', err);
     });
+
+  });
diff --git a/lib/app/js/controllers/element.js b/lib/app/js/controllers/element.js
@@ -71,7 +71,7 @@ angular.module('sgApp')
     }
 
     function updatePageData() {
-      var sections, result, element;
+      var sections, result, element, modifierStr;
       if (!Styleguide.sections.data) {
         return;
       }
@@ -87,7 +87,7 @@ angular.module('sgApp')
 
         // Set page title
         if (Styleguide.config.data) {
-          var modifierStr = modifier ? '-' + modifier.toString() : '';
+          modifierStr = modifier ? '-' + modifier.toString() : '';
           $rootScope.pageTitle = element.reference + modifierStr + ' ' + element.header + ' - ' + Styleguide.config.data.title;
         }
 

diff --git a/lib/app/js/controllers/sections.js b/lib/app/js/controllers/sections.js
@@ -31,8 +31,7 @@ angular.module('sgApp')
           return item.reference === section;
         });
         if (result.length > 0) {
-          var element = result[0];
-          $rootScope.pageTitle = element.reference + ' ' + element.header + ' - ' + Styleguide.config.data.title;
+          $rootScope.pageTitle = result[0].reference + ' ' + result[0].header + ' - ' + Styleguide.config.data.title;
         }
       }
     }

diff --git a/lib/app/js/services/Variables.js b/lib/app/js/services/Variables.js
@@ -65,11 +65,11 @@
     };
 
     this.refreshValues = function() {
+      var oldIndex, oldValue, newObject, i;
       if (serverData.length === 0) {
         this.variables = [];
       } else {
-        for (var i = 0; i < serverData.length; i++) {
-          var oldIndex;
+        for (i = 0; i < serverData.length; i++) {
           if (this.variables[i] && !this.variableMatches(this.variables[i], serverData[i])) {
             if (!this.getServerVar(this.variables[i])) {
               // This variable does not exists anymore on the server. Remove it
@@ -84,9 +84,9 @@
               // The variable already exists but in another position
               // It is changed so we need to keep the old values
               oldIndex = this.getLocalIndex(serverData[i]);
-              var oldValue = this.variables[oldIndex].value;
+              oldValue = this.variables[oldIndex].value;
               this.variables.splice(oldIndex, 1);
-              var newObject = angular.copy(serverData[i]);
+              newObject = angular.copy(serverData[i]);
               newObject.value = oldValue;
               this.variables.splice(i, 0, newObject);
             } else {

diff --git a/lib/modules/cli/styleguide-cli.js b/lib/modules/cli/styleguide-cli.js
@@ -10,7 +10,8 @@ module.exports = function(argv) {
 
   try {
 
-    var styleguide = require(path.resolve(__dirname, '../../styleguide'));
+    var styleguide = require(path.resolve(__dirname, '../../styleguide')),
+      tasks = ['styleguide:generate', 'styleguide:applystyles'];
 
     gulp.task('styleguide:generate', function() {
       console.log('Generating style guide to output dir:', argv.output);
@@ -43,7 +44,6 @@ module.exports = function(argv) {
       return gulp.watch(argv.styleSource, ['styleguide:applystyles']);
     });
 
-    var tasks = ['styleguide:generate', 'styleguide:applystyles'];
     if (argv.watch) {
       tasks.push('watch:styles');
       tasks.push('watch:kss');

diff --git a/lib/modules/kss-sanitize-params.js b/lib/modules/kss-sanitize-params.js
@@ -5,8 +5,8 @@ module.exports = function(source) {
   var pass = true;
 
   source = source.split('\n').filter(function(line) {
-
-    var varName = line.match(/([\w\-]*):[\s]*$/);
+    var varName = line.match(/([\w\-]*):[\s]*$/),
+      isEmptyLine = /^[\s\/]*$/.test(line);
 
     if (varName) {
       // Named parangraph begins
@@ -20,7 +20,6 @@ module.exports = function(source) {
     }
 
     // When meets empty line, pass everything again
-    var isEmptyLine = /^[\s\/]*$/.test(line);
     if (isEmptyLine) {
       pass = true;
     }

diff --git a/lib/modules/markdown.js b/lib/modules/markdown.js
@@ -32,12 +32,13 @@ module.exports = {
       return '<li class="sg">' + text + '</li>\n';
     };
     renderer.link = function(href, title, text) {
+      var out, prot;
       if (excludeLinks.indexOf(href) >= 0) {
         return '';
       }
 
       if (this.options.sanitize) {
-        var prot = '';
+        prot = '';
         try {
           prot = decodeURIComponent(href)
             .replace(/[^\w:]/g, '')
@@ -51,15 +52,15 @@ module.exports = {
         }
         //jshint +W107
       }
-      var out = '<a class="sg" href="' + href + '"';
+      out = '<a class="sg" href="' + href + '"';
       if (title) {
         out += ' title="' + title + '"';
       }
       out += '>' + text + '</a>';
       return out;
     };
     renderer.code = function(code, lang, escaped) {
-      var htmlEscape = function(html, encode) {
+      var out, htmlEscape = function(html, encode) {
         return html
           .replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
           .replace(/</g, '&lt;')
@@ -69,7 +70,7 @@ module.exports = {
       };
 
       if (this.options.highlight) {
-        var out = this.options.highlight(code, lang);
+        out = this.options.highlight(code, lang);
         if (out !== null && out !== code) {
           escaped = true;
           code = out;

diff --git a/lib/modules/wrapper-markup.js b/lib/modules/wrapper-markup.js
@@ -7,9 +7,9 @@ function buildReferenceDictionary(sections) {
     cursor = nested.sections;
 
   sections.forEach(function(section) {
+    var ref = section.reference, par, length;
     /* Check if the parent section was already mentioned
      * in the tree */
-    var ref = section.reference;
     /* Put cursor to the root for the root elements */
     if (ref.indexOf('.') === -1 || ref.indexOf('.0', ref.length - 2) !== -1) {
       cursor = nested.sections;
@@ -18,7 +18,7 @@ function buildReferenceDictionary(sections) {
       ref = ref.substring(0, ref.lastIndexOf('.'));
 
       /* Parent section */
-      var par = prevSections[prevSections.indexOf(ref)];
+      par = prevSections[prevSections.indexOf(ref)];
       if (par) {
         section.parentReference = par;
         /* Create nested container if it does not exists yet */
@@ -29,7 +29,7 @@ function buildReferenceDictionary(sections) {
     }
     prevSections.push(section.reference);
     /* Remember where we put current section */
-    var length = cursor.push(section);
+    length = cursor.push(section);
     index[section.reference] = cursor[length - 1];
   });
 

diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
     "gulp-plumber": "~1.0.0",
     "gulp-sourcemaps": "~1.5.1",
     "istanbul": "~0.3.8",
-    "jscs": "~1.10.0",
+    "jscs": "~1.11.3",
     "karma": "~0.12.31",
     "karma-coverage": "~0.2.7",
     "karma-mocha": "~0.1.10",