Added grunt-jscs and updated style to match

Fixes istvan-ujjmeszaros#7
wurmr · Oct 3, 2014 · a94c947 · a94c947
1 parent 02bc9e2
commit a94c947
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 66 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -7,7 +7,7 @@
   "immed": true,
   "noarg": true,
   "onevar": false,
-  "quotmark": "single",
+  "quotmark": "double",
   "smarttabs": true,
   "trailing": true,
   "unused": true,

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,4 +1,5 @@
-module.exports = function (grunt) {
+module.exports = function(grunt) {
+  "use strict";
 
   grunt.initConfig({
 
@@ -20,17 +21,25 @@ module.exports = function (grunt) {
     // Concat definitions
     concat: {
       js: {
-        src: ["src/jquery.bootstrap-autohidingnavbar.js"],
+        src: [ "src/jquery.bootstrap-autohidingnavbar.js" ],
         dest: "dist/jquery.bootstrap-autohidingnavbar.js"
       },
       options: {
         banner: "<%= meta.banner %>"
       }
     },
 
+    // Style checker definitions
+    jscs: {
+      src: [ "src/jquery.bootstrap-autohidingnavbar.js" ],
+      options: {
+        preset: "jquery"
+      }
+    },
+
     // Lint definitions
     jshint: {
-      files: ["src/jquery.bootstrap-autohidingnavbar.js"],
+      files: [ "src/jquery.bootstrap-autohidingnavbar.js" ],
       options: {
         jshintrc: ".jshintrc"
       }
@@ -39,21 +48,21 @@ module.exports = function (grunt) {
     // Minify definitions
     uglify: {
       js: {
-        src: ["dist/jquery.bootstrap-autohidingnavbar.js"],
+        src: [ "dist/jquery.bootstrap-autohidingnavbar.js" ],
         dest: "dist/jquery.bootstrap-autohidingnavbar.min.js"
       },
       options: {
         banner: "<%= meta.banner %>"
       }
-    },
-
+    }
   });
 
   grunt.loadNpmTasks("grunt-contrib-concat");
+  grunt.loadNpmTasks("grunt-jscs");
   grunt.loadNpmTasks("grunt-contrib-jshint");
   grunt.loadNpmTasks("grunt-contrib-uglify");
 
-  grunt.registerTask("default", ["jshint", "concat", "uglify"]);
-  grunt.registerTask("travis", ["jshint"]);
+  grunt.registerTask("default", [ "jshint", "jscs", "concat", "uglify" ]);
+  grunt.registerTask("travis", [ "jshint", "jscs" ]);
 
 };
diff --git a/dist/jquery.bootstrap-autohidingnavbar.js b/dist/jquery.bootstrap-autohidingnavbar.js
@@ -6,8 +6,8 @@
  *  Made by István Ujj-Mészáros
  *  Under Apache License v2.0 License
  */
-;(function($, window, document, undefined) {
-  var pluginName = 'autoHidingNavbar',
+(function($, window, document, undefined) {
+  var pluginName = "autoHidingNavbar",
     $window = $(window),
     $document = $(document),
     _scrollThrottleTimer = null,
@@ -22,7 +22,7 @@
       disableAutohide: false,
       showOnUpscroll: true,
       showOnBottom: true,
-      hideOffset: 'auto', // "auto" means the navbar height
+      hideOffset: "auto", // "auto" means the navbar height
       animationDuration: 200
     };
 
@@ -40,22 +40,22 @@
     }
 
     var align = {};
-    if (autoHidingNavbar.element.hasClass('navbar-fixed-top')) {
+    if (autoHidingNavbar.element.hasClass("navbar-fixed-top")) {
       align = {
         top: -autoHidingNavbar.element.height()
       };
-    } else if (autoHidingNavbar.element.hasClass('navbar-fixed-bottom')) {
+    } else if (autoHidingNavbar.element.hasClass("navbar-fixed-bottom")) {
       align = {
         bottom: -autoHidingNavbar.element.height()
       };
     }
 
-    autoHidingNavbar.element.addClass('navbar-hidden').animate(align, {
+    autoHidingNavbar.element.addClass("navbar-hidden").animate(align, {
       queue: false,
       duration: autoHidingNavbar.settings.animationDuration
     });
 
-    $('.dropdown.open .dropdown-toggle', autoHidingNavbar.element).dropdown('toggle');
+    $(".dropdown.open .dropdown-toggle", autoHidingNavbar.element).dropdown("toggle");
 
     _visible = false;
   }
@@ -66,17 +66,17 @@
     }
 
     var align = {};
-    if (autoHidingNavbar.element.hasClass('navbar-fixed-top')) {
+    if (autoHidingNavbar.element.hasClass("navbar-fixed-top")) {
       align = {
         top: 0
       };
-    } else if (autoHidingNavbar.element.hasClass('navbar-fixed-bottom')) {
+    } else if (autoHidingNavbar.element.hasClass("navbar-fixed-bottom")) {
       align = {
         bottom: 0
       };
     }
 
-    autoHidingNavbar.element.removeClass('navbar-hidden').animate(align, {
+    autoHidingNavbar.element.removeClass("navbar-hidden").animate(align, {
       queue: false,
       duration: autoHidingNavbar.settings.animationDuration
     });
@@ -99,7 +99,8 @@
       }
     } else if (scrollDelta > 0) {
       if (!_visible) {
-        if (autoHidingNavbar.settings.showOnBottom && scrollTop + _windowHeight === $document.height()) {
+        if (autoHidingNavbar.settings.showOnBottom &&
+          scrollTop + _windowHeight === $document.height()) {
           show(autoHidingNavbar);
         }
         return;
@@ -123,7 +124,7 @@
   }
 
   function bindEvents(autoHidingNavbar) {
-    $document.on('scroll.' + pluginName, function() {
+    $document.on("scroll." + pluginName, function() {
       if (new Date().getTime() - _lastScrollHandlerRun > _throttleDelay) {
         scrollHandler(autoHidingNavbar);
       } else {
@@ -134,7 +135,7 @@
       }
     });
 
-    $window.on('resize.' + pluginName, function() {
+    $window.on("resize." + pluginName, function() {
       clearTimeout(_resizeThrottleTimer);
       _resizeThrottleTimer = setTimeout(function() {
         _windowHeight = $window.height();
@@ -143,9 +144,9 @@
   }
 
   function unbindEvents() {
-    $document.off('.' + pluginName);
+    $document.off("." + pluginName);
 
-    $window.off('.' + pluginName);
+    $window.off("." + pluginName);
   }
 
   AutoHidingNavbar.prototype = {
@@ -160,7 +161,8 @@
       this.setHideOffset(this.settings.hideOffset);
       this.setAnimationDuration(this.settings.animationDuration);
 
-      _hideOffset = this.settings.hideOffset === 'auto' ? this.element.height() : this.settings.hideOffset;
+      _hideOffset = this.settings.hideOffset === "auto" ?
+        this.element.height() : this.settings.hideOffset;
       bindEvents(this);
 
       return this.element;
@@ -196,27 +198,26 @@
     destroy: function() {
       unbindEvents(this);
       show(this);
-      $.data(this, 'plugin_' + pluginName, null);
+      $.data(this, "plugin_" + pluginName, null);
       return this.element;
     }
   };
 
   $.fn[pluginName] = function(options) {
-    var args = arguments;
+    var args = arguments,
+      returns;
 
-    if (options === undefined || typeof options === 'object') {
+    if (options === undefined || typeof options === "object") {
       return this.each(function() {
-        if (!$.data(this, 'plugin_' + pluginName)) {
-          $.data(this, 'plugin_' + pluginName, new AutoHidingNavbar(this, options));
+        if (!$.data(this, "plugin_" + pluginName)) {
+          $.data(this, "plugin_" + pluginName, new AutoHidingNavbar(this, options));
         }
       });
-    } else if (typeof options === 'string' && options[0] !== '_' && options !== 'init') {
-      var returns;
-
+    } else if (typeof options === "string" && options[0] !== "_" && options !== "init") {
       this.each(function() {
-        var instance = $.data(this, 'plugin_' + pluginName);
+        var instance = $.data(this, "plugin_" + pluginName);
 
-        if (instance instanceof AutoHidingNavbar && typeof instance[options] === 'function') {
+        if (instance instanceof AutoHidingNavbar && typeof instance[options] === "function") {
           returns = instance[options].apply(instance, Array.prototype.slice.call(args, 1));
         }
       });

diff --git a/dist/jquery.bootstrap-autohidingnavbar.min.js b/dist/jquery.bootstrap-autohidingnavbar.min.js
diff --git a/package.json b/package.json
@@ -6,8 +6,7 @@
     "name": "István Ujj-Mészáros",
     "url": "https://github.com/istvan-ujjmeszaros"
   },
-  "contributors": [
-  ],
+  "contributors": [],
   "repository": {
     "type": "git",
     "url": "http://github.com/istvan-ujjmeszaros/bootstrap-autohidingnavbar.git"
@@ -17,10 +16,11 @@
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-cli": "~0.1.13",
-    "grunt-contrib-jshint": "~0.8.0",
     "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-cssmin": "~0.9.0",
+    "grunt-contrib-jshint": "~0.8.0",
     "grunt-contrib-uglify": "~0.3.2",
-    "grunt-contrib-cssmin": "~0.9.0"
+    "grunt-jscs": "^0.7.1"
   },
   "scripts": {
     "test": "grunt travis --verbose"