Merging master to keep up to date.

.gitignore

@@ -4,4 +4,4 @@ inc/a8c.php
 inc/wpcom.php
 bin/autortl
 sftp-config.json
-
+node_modules

.jshintrc

@@ -0,0 +1,28 @@
+{
+	"boss": true,
+	"curly": true,
+	"eqeqeq": true,
+	"eqnull": true,
+	"es3": true,
+	"expr": true,
+	"immed": true,
+	"noarg": true,
+	"nonbsp": true,
+	"onevar": true,
+	"quotmark": "single",
+	"trailing": true,
+	"undef": true,
+	"unused": true,
+
+	"browser": true,
+
+	"globals": {
+		"_": false,
+		"Backbone": false,
+		"jQuery": false,
+		"JSON": false,
+		"wp": false,
+		"Cocktail": false,
+		"o2": true
+	}
+}

Gruntfile.js

@@ -0,0 +1,64 @@
+/* global module */
+module.exports = function(grunt) {
+	var cfg = {
+			pkg: grunt.file.readJSON('package.json'),
+			phplint: {
+				files: [
+					'*.php',
+					'**/*.php'
+				]
+			},
+			jshint: {
+				options: grunt.file.readJSON('.jshintrc'),
+				src: [
+					'js/**/*.js',
+					'modules/**/*.js',
+					// External libraries:
+					'!js/utils/caret.js',
+					'!js/utils/cocktail.js',
+					'!js/utils/enquire.js',
+					'!js/utils/jquery.highlight.js',
+					'!js/utils/jquery.hotkeys.js',
+					'!js/utils/jquery.placeholder.js',
+					'!js/utils/moment.js'
+				]
+			},
+			makepot: {
+				o2: {
+					options: {
+						domainPath: '/languages',
+						exclude: [
+							'node_modules'
+						],
+						mainFile:    'o2.php',
+						potFilename: 'o2.pot'
+					}
+				}
+			},
+			addtextdomain: {
+				o2: {
+					options: {
+						textdomain: 'o2'
+					},
+					files: {
+						src: [
+							'*.php',
+							'**/*.php',
+							'!node_modules/**'
+						]
+					}
+				}
+			}
+		};
+
+	grunt.initConfig( cfg );
+
+	grunt.loadNpmTasks('grunt-phplint');
+	grunt.loadNpmTasks('grunt-contrib-jshint');
+	grunt.loadNpmTasks('grunt-wp-i18n');
+
+	grunt.registerTask('default', [
+		'phplint',
+		'jshint'
+	]);
+};

inc/editor.php

@@ -7,12 +7,12 @@ function __construct() {
 	}
 
 	public function register_scripts() {
-		wp_enqueue_script( 'o2-jquery-hotkeys', plugins_url( 'o2/js/utils/jquery.hotkeys.js' ), array( 'jquery' ) );
+		wp_enqueue_script( 'o2-jquery-hotkeys', plugins_url( 'js/utils/jquery.hotkeys.js', O2__FILE__ ), array( 'jquery' ) );
 		// @todo Copy autoresize into position as part of the .org build process
 		if ( !defined( 'IS_WPCOM' ) || !IS_WPCOM ) {
-			wp_enqueue_script( 'jquery.autoresize', plugins_url( 'o2/js/editor/jquery.autoresize.js' ), array( 'jquery' ) );
+			wp_enqueue_script( 'jquery.autoresize', plugins_url( 'js/editor/jquery.autoresize.js', O2__FILE__ ), array( 'jquery' ) );
 		}
-		wp_enqueue_script( 'o2-editor', plugins_url( 'o2/js/editor/editor.js' ), array( 'jquery', 'o2-jquery-hotkeys', 'jquery.autoresize', 'o2-plugin-caret', 'o2-events' ) );
+		wp_enqueue_script( 'o2-editor', plugins_url( 'js/editor/editor.js', O2__FILE__ ), array( 'jquery', 'o2-jquery-hotkeys', 'jquery.autoresize', 'o2-plugin-caret', 'o2-events' ) );
 	}
 
 	function wp_footer() {

inc/keyboard.php

@@ -7,8 +7,8 @@ function __construct() {
 	}
 
 	public function register_scripts() {
-		wp_register_script( 'o2-hotkeys', plugins_url( 'o2/js/utils/jquery.hotkeys.js' ), array( 'jquery' ) );
-		wp_enqueue_script( 'o2-keyboard', plugins_url( 'o2/js/utils/keyboard.js' ), array( 'jquery' ) );
+		wp_register_script( 'o2-hotkeys', plugins_url( 'js/utils/jquery.hotkeys.js', O2__FILE__ ), array( 'jquery' ) );
+		wp_enqueue_script( 'o2-keyboard', plugins_url( 'js/utils/keyboard.js', O2__FILE__ ), array( 'jquery' ) );
 	}
 
 	public function help_link( $controls ) {

inc/read-api.php

@@ -104,7 +104,11 @@ function o2_date_sort( $a, $b ) {
 			if ( isset( $_REQUEST['scripts'] ) ) {
 
 				// Parse and sanitize the script handles already output
-				$initial_scripts = isset( $_REQUEST['scripts'] ) && is_array( $_REQUEST['scripts'] ) ? array_map( 'sanitize_text_field', $_REQUEST['scripts'] ) : false;
+				if ( ! is_array( $_REQUEST['scripts'] ) ) {
+					$_REQUEST['scripts'] = explode( ',', $_REQUEST['scripts'] );
+				}
+
+				$initial_scripts = is_array( $_REQUEST['scripts'] ) ? array_map( 'sanitize_text_field', $_REQUEST['scripts'] ) : null;
 
 				if ( is_array( $initial_scripts ) ) {
 					global $wp_scripts;
@@ -167,8 +171,13 @@ function o2_date_sort( $a, $b ) {
 			// Attach styles
 			if ( isset( $_REQUEST['styles'] ) ) {
 
+				// Parse and sanitize the script handles already output
+				if ( ! is_array( $_REQUEST['styles'] ) ) {
+					$_REQUEST['styles'] = explode( ',', $_REQUEST['styles'] );
+				}
+
 				// Parse and sanitize the style handles already output
-				$initial_styles = isset( $_REQUEST['styles'] ) && is_array( $_REQUEST['styles'] ) ? array_map( 'sanitize_text_field', $_REQUEST['styles'] ) : false;
+				$initial_styles = is_array( $_REQUEST['styles'] ) ? array_map( 'sanitize_text_field', $_REQUEST['styles'] ) : null;
 
 				if ( is_array( $initial_styles ) ) {
 					global $wp_styles;

inc/tags.php

@@ -358,7 +358,7 @@ public function tag_search() {
 			// translators: 'tag name (count)'
 			$label = sprintf( __( '%1$s (%2$s)', 'o2' ), $result->name, $result->count );
 
-			$count_posts = sprintf( _n( '1 post', '%s posts', $result->count ), number_format_i18n( $result->count ) );
+			$count_posts = sprintf( _n( '1 post', '%s posts', $result->count, 'o2' ), number_format_i18n( $result->count ) );
 
 			$tags[] = array(
 				'label'       => $label, // @todo remove

inc/template-tags.php

@@ -103,7 +103,7 @@ function o2_post_action_states_in_footer() {
 
 if ( !function_exists( 'o2_post_actions_scripts' ) ) {
 	function o2_post_actions_scripts() {
-		wp_enqueue_script( 'jquery-actionstate', plugins_url( 'o2/js/utils/post-action-states.js' ), array( 'jquery' ) );
+		wp_enqueue_script( 'jquery-actionstate', plugins_url( 'js/utils/post-action-states.js', O2__FILE__ ), array( 'jquery' ) );
 	}
 
 	add_action( 'wp_enqueue_scripts', 'o2_post_actions_scripts' );

inc/xposts.php

@@ -416,11 +416,11 @@ function create_post( $_blog_id, $post, $tags = array(), $post_parent_id = 0 ) {
 			$post           = get_post( $post->comment_post_ID );
 			$origin_post_id = $post->ID;
 			$x_permalink    = get_comment_link( $comment->comment_ID );
-			$format         = __( 'X-comment from %1$s: Comment on %2$s' );
+			$format         = __( 'X-comment from %1$s: Comment on %2$s', 'o2' );
 			$author         = $comment->user_id;
 		} else {
 			// It's a post
-			$format         = __( 'X-post from %1$s: %2$s' );
+			$format         = __( 'X-post from %1$s: %2$s', 'o2' );
 			$origin_post_id = $post->ID;
 			$x_permalink    = get_permalink( $post->ID );
 			$author         = $post->post_author;