Merge branch 'release/1.0.6'

build-config.js

@@ -24,6 +24,9 @@ module.exports = {
             '!{tmp,tmp/**}'                     // Ignore dist/ and contents
         ]
     },
+    bust: {
+        src: []
+    },
     copy: {
         src: [
             '**/!(*.js|*.less)',                // Everything except .js and .less files

js/editor.js

@@ -270,7 +270,9 @@
                     ( e.keyCode === 51 && e.shiftKey ) ||
                     ( e.keyCode === 189 && e.shiftKey )
                 ) {
-                    cm.showHint(e);
+                    cm.showHint( {
+                        completeSingle: false
+                    } );
                 }
             });
         },

lib/codemirror/addon/lint/css-lint.js

@@ -18,7 +18,15 @@
 CodeMirror.registerHelper("lint", "css", function(text) {
   var found = [];
   if (!window.CSSLint) return found;
-  var results = CSSLint.verify(text), messages = results.messages, message = null;
+  //  This has been modified to only display certain errors
+  var results = CSSLint.verify(text, {
+    "box-model": 1,
+    "display-property-grouping": 1,
+    "duplicate-properties": 1,
+    "empty-rules": 1,
+    "known-properties": 1
+  }), messages = results.messages, message = null;
+
   for ( var i = 0; i < messages.length; i++) {
     message = messages[i];
     var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;

readme.txt

@@ -3,6 +3,7 @@ Tags: css, design, edit, customize
 Requires at least: 3.9
 Tested up to: 4.4.1
 Stable tag: trunk
+Build time: unbuilt
 License: GPLv2 or later
 Contributors: gpriday
 
@@ -61,6 +62,11 @@ We offer free support on the [SiteOrigin support forums](https://siteorigin.com/
 
 == Changelog ==
 
+= 1.0.6 - 24 February 2016=
+* Disabled autocompletion on single item (automatic autocompletion).
+* Fixed conflict with NextGen Gallery.
+* Only display relevant linting messages.
+
 = 1.0.5 - 21 January 2016=
 * Updated to latest version of Code Mirror.
 

so-css.php

@@ -13,7 +13,7 @@
 // Handle the legacy CSS editor that came with SiteOrigin themes
 include plugin_dir_path(__FILE__) . '/inc/legacy.php';
 
-define('SOCSS_VERSION', '1.0.2');
+define('SOCSS_VERSION', 'dev');
 define('SOCSS_JS_SUFFIX', '');
 
 /**
@@ -41,6 +41,8 @@ function __construct(){
 		add_action( 'wp_ajax_socss_hide_getting_started', array( $this, 'admin_action_hide_getting_started' ) );
 
 		if( isset($_GET['so_css_preview']) && !is_admin() ) {
+
+			add_action('plugins_loaded', array($this, 'disable_ngg_resource_manager'));
 			add_filter( 'show_admin_bar', '__return_false' );
 			add_filter( 'wp_enqueue_scripts', array($this, 'enqueue_inspector_scripts') );
 			add_filter( 'wp_footer', array($this, 'inspector_templates') );
@@ -50,6 +52,13 @@ function __construct(){
 		}
 	}
 
+	function disable_ngg_resource_manager() {
+		if( !current_user_can('edit_theme_options') ) return;
+
+		//The NextGen Gallery plugin does some weird interfering with the output buffer.
+		define('NGG_DISABLE_RESOURCE_MANAGER', true);
+	}
+
 	/**
 	 * Get a singleton of the SiteOrigin CSS.
 	 *