Merge pull request #338 from katzwebservices/dev/1.7.2

Dev/1.7.2

.gitignore

@@ -1,17 +1,63 @@
+# Help from https://www.gitignore.io
 
-*.sublime-project
+### Mac ###
+.DS_Store
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
 
+### SublimeText ###
+*.sublime-project
 *.sublime-workspace
 
+### Composer ###
 composer.lock
 
+### Libraries ###
 vendor/.git
 vendor/*/.git
 
+### Grunt ###
 node_modules/*
+
+### CodeKit ####
 .sass-cache
 *.codekit
+
+### Transifex ####
 .tx
-.idea
 languages/gravityview-pt.mo
-languages/gravityview-pt.po
+languages/gravityview-pt.po
+
+### PhpStorm ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+
+*.iml
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/deployment.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml

Gruntfile.js

@@ -28,6 +28,14 @@ module.exports = function(grunt) {
 			}
 		},
 
+		jshint: [
+			"assets/js/admin-views.js",
+			"assets/js/admin-post-edit.js",
+			"assets/js/admin-widgets.js",
+			"assets/js/admin-entries-list.js",
+			"assets/js/fe-views.js"
+		],
+
         imagemin: {
             dynamic: {
                 files: [{
@@ -65,9 +73,9 @@ module.exports = function(grunt) {
 		},
 
 		watch: {
-			main: {
-				files: ['assets/js/*.js','!assets/js/*.min.js','readme.txt'],
-				tasks: ['uglify:main','wp_readme_to_markdown','newer:jshint:all']
+			scripts: {
+				files: ['assets/js/*.js','!assets/js/*.min.js'],
+				tasks: ['uglify:main','newer:jshint']
 			},
 			extension_js: {
 				files: ['includes/extensions/**/*.js','!includes/extensions/**/*.min.js'],
@@ -114,6 +122,7 @@ module.exports = function(grunt) {
 	});
 
 	grunt.loadNpmTasks('grunt-sass');
+	grunt.loadNpmTasks("grunt-contrib-jshint");
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-wp-readme-to-markdown');