Merge branch 'develop'

Conflicts:
	includes/db.php

Author: sheabunge

.gitignore

@@ -7,6 +7,7 @@ composer.lock
 deploy
 css/build
 css/min
+js/min
 
 # Grunt (via NPM)
 node_modules

.travis.yml

@@ -45,6 +45,8 @@ before_script:
   - composer self-update
   - composer install
   - npm install
+  # Register WPCS with PHPCS (doesn't seem to do this automatically)
+  - vendor/bin/phpcs --config-set installed_paths vendor/wp-coding-standards/wpcs
 
   # set up WP install
   - export WP_DEVELOP_DIR=/tmp/wordpress
@@ -74,7 +76,7 @@ before_script:
 script:
 
   # Search for PHP syntax errors.
-  - find . \( -name '*.php' \) -maxdepth 1 -exec php -lf {} \;
+  - find . -maxdepth 1 \( -name '*.php' \) -exec php -lf {} \;
   - find includes \( -name '*.php' \) -exec php -lf {} \;
 
   # Run Grunt tests

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.2.0
+* Introduced CodeSniffer testing on code
+* Fixed description heading disappearing when media buttons enabled
+* Added snippet scope selector
+* Minified all CSS and JS in plugin
+* Made CodeMirror theme names more readable
+* Fixed bug causing translations to not be loaded
+
 ## 2.1.0
 * Added additional setting descriptions
 * Added settings for code and description editor height
@@ -16,8 +24,8 @@
 
 ## 2.0.1
 
-* Fix table creation code not running on upgrade
-* Fix snippets per page option not saving
+* Fixed table creation code not running on upgrade
+* Fixed snippets per page option not saving
 
 ## 2.0
 

Gruntfile.js

@@ -43,6 +43,39 @@ module.exports = function(grunt) {
 				flatten: true,
 				src: 'css/build/*.css',
 				dest: 'css/min'
+			},
+			codemirror_themes: {
+				expand: true,
+				flatten: true,
+				src: 'vendor/codemirror/theme/*.css',
+				dest: 'css/min/cmthemes'
+			},
+			vendor: {
+				files: {
+					'css/min/codemirror.css': [
+						'vendor/codemirror/lib/codemirror.css'
+					],
+					'css/min/tagit.css': [
+						'js/vendor/jquery.tagit.css',
+						'js/vendor/tagit.ui-zendesk.css'
+					]
+				}
+			}
+		},
+
+		uglify: {
+			vendor: {
+				files: {
+					'js/min/codemirror.js': [
+						'vendor/codemirror/lib/codemirror.js',
+						'vendor/codemirror/mode/clike/clike.js',
+						'vendor/codemirror/mode/php/php.js',
+						'vendor/codemirror/addon/search/searchcursor.js',
+						'vendor/codemirror/addon/search/search.js',
+						'vendor/codemirror/addon/edit/matchbrackets.js'
+					],
+					'js/min/tag-it.js': ['js/vendor/tag-it.js']
+				}
 			}
 		},
 
@@ -74,18 +107,9 @@ module.exports = function(grunt) {
 						'includes/**/*',
 						'admin/**/*',
 						'languages/**/*',
-						'css/**/*',
-						'js/**/*',
-
-						// CodeMirror
-						'vendor/codemirror/lib/codemirror.css',
-						'vendor/codemirror/lib/codemirror.js',
-						'vendor/codemirror/mode/clike/clike.js',
-						'vendor/codemirror/mode/php/php.js',
-						'vendor/codemirror/theme/*.css',
-						'vendor/codemirror/addon/search/searchcursor.js',
-						'vendor/codemirror/addon/search/search.js',
-						'vendor/codemirror/addon/edit/matchbrackets.js'
+						'css/min/**/*',
+						'css/font/**/*',
+						'js/min/**/*'
 					],
 					dest: 'deploy/plugin',
 					filter: 'isFile'
@@ -116,6 +140,17 @@ module.exports = function(grunt) {
 			}
 		},
 
+		phpcs: {
+			application: {
+				src: ['*.php', 'includes/**/*.php']
+			},
+			options: {
+				bin: 'vendor/bin/phpcs',
+				standard: 'codesniffer.ruleset.xml',
+				showSniffCodes: true
+			}
+		},
+
 		wp_deploy: {
 			release: {
 				options: {
@@ -155,10 +190,10 @@ module.exports = function(grunt) {
 
 	grunt.registerTask( 'css', ['sass', 'autoprefixer', 'csso'] );
 	grunt.registerTask( 'l18n', ['pot', 'potomo'] );
-	grunt.registerTask( 'test', ['jshint', 'phpunit'] );
+	grunt.registerTask( 'test', ['jshint', 'phpcs', 'phpunit'] );
 
 	grunt.registerTask( 'deploy', ['imagemin', 'clean:deploy', 'copy:plugin', 'copy:assets'] );
 	grunt.registerTask( 'release', ['default', 'deploy', 'wp_deploy'] );
 
-	grunt.registerTask( 'default', ['css', 'l18n'] );
+	grunt.registerTask( 'default', ['css', 'uglify', 'l18n'] );
 };

code-snippets.php

@@ -7,7 +7,7 @@
  * contribute to the localization, please see http://code-snippets.bungeshea.com
  *
  * @package   Code_Snippets
- * @version   2.1.0
+ * @version   2.2.0
  * @author    Shea Bunge <http://bungeshea.com/>
  * @copyright Copyright (c) 2012-2014, Shea Bunge
  * @link      http://code-snippets.bungeshea.com
@@ -20,15 +20,16 @@
 Description: An easy, clean and simple way to add code snippets to your site. No need to edit to your theme's functions.php file again!
 Author:      Shea Bunge
 Author URI:  http://bungeshea.com
-Version:     2.1.0
+Version:     2.2.0
 License:     MIT
 License URI: license.txt
 Text Domain: code-snippets
-Domain Path: /languages/
+Domain Path: /languages
 */
 
 /* Exit if accessed directly */
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined( 'ABSPATH' ) ) {lcs
+
 	exit;
 }
 
@@ -42,7 +43,7 @@
  * @since 2.0
  * @var string A PHP-standardized version number string
  */
-define( 'CODE_SNIPPETS_VERSION', '2.1.0' );
+define( 'CODE_SNIPPETS_VERSION', '2.2.0' );
 
 /**
  * The full path to the main file of this plugin
@@ -53,7 +54,7 @@
  *
  * @since 2.0
  * @var string
-  */
+ */
 define( 'CODE_SNIPPETS_FILE', __FILE__ );
 
 /**
@@ -107,13 +108,13 @@
 
 /**
  * Load up the localization file if we're using WordPress in a different language.
- * Place it in this plugin's "languages" folder and name it "code-snippets-[value in wp-config].mo"
+ * Place it in this plugin's "languages" folder and name it "code-snippets-[language_COUNTRY].mo"
  *
  * If you wish to contribute a language file to be included in the Code Snippets package,
  * please see create an issue on GitHub: https://github.com/sheabunge/code-snippets/issues
  */
 function code_snippets_load_textdomain() {
-	load_plugin_textdomain( 'code-snippets', false, dirname( basename( __FILE__ ) ) . '/languages/' );
+	load_plugin_textdomain( 'code-snippets', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
 }
 
 add_action( 'plugins_loaded', 'code_snippets_load_textdomain' );

codesniffer.ruleset.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<ruleset name="Code Snippets">
+	<!-- See https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
+	<!-- See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/blob/develop/WordPress-Core/ruleset.xml -->
+	<!-- Include the WordPress ruleset, with exclusions. -->
+	<rule ref="WordPress-Core">
+
+		<!-- I like to have a newline after closing brace, sometimes -->
+		<exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" />
+	</rule>
+</ruleset>

composer.json

@@ -25,7 +25,8 @@
 		"codemirror": "5.2"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "3.7.*"
+		"phpunit/phpunit": "3.7.*",
+		"wp-coding-standards/wpcs": "dev-master"
 	},
 	"repositories": [
 		{

css/edit-snippet.scss renamed to css/edit.scss

@@ -22,6 +22,11 @@ label[for='snippet_description'] h3 div {
 	margin-right: .5em;
 }
 
+.snippet-scope div {
+	margin-right: 30px;
+	display: inline-block;
+}
+
 /**
  * Customize the CodeMirror editor
  * to look nice and support auto-resizing

css/manage-snippets.scss renamed to css/manage.scss

@@ -0,0 +1,8 @@
+
+.form-table th {
+	font-weight: normal;
+}
+
+#code_snippets_editor_preview .CodeMirror {
+	height: 200px;
+}