overhaulin'

reswordpress · Aug 16, 2014 · 4d11c11 · 4d11c11
1 parent 9d79b77
commit 4d11c11
Show file tree

Hide file tree

Showing 21 changed files with 3,189 additions and 3,019 deletions.
diff --git a/CMB2.php b/CMB2.php
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -24,8 +24,8 @@ module.exports = function(grunt) {
 		// 	},
 		// 	'': {
 		// 		src: [
-		// 			'js/cmb.js',
-		// 			'js/cmb.js',
+		// 			'js/cmb2.js',
+		// 			'js/cmb2.js',
 		// 		],
 		// 		dest: 'assets/js/{%= dir_name %}.js'
 		// 	}
@@ -41,7 +41,7 @@ module.exports = function(grunt) {
 			},
 			minify: {
 				expand: true,
-				src: ['css/style.css'],
+				src: ['css/cmb2.css'],
 				// dest: '',
 				ext: '.min.css'
 			}
@@ -54,15 +54,15 @@ module.exports = function(grunt) {
 					lineNumbers: true
 				},
 				files: {
-				  'css/style.css': 'css/style.scss',
+				  'css/cmb2.css': 'css/cmb2.scss',
 				}
 			}
 		},
 
 		jshint: {
 			all: [
 				'Gruntfile.js',
-				'js/cmb.js'
+				'js/cmb2.js'
 			],
 			options: {
 				curly   : true,
@@ -80,7 +80,7 @@ module.exports = function(grunt) {
 					exports : true,
 					module  : false
 				},
-				predef  :['document','window','jQuery','cmb_l10','wp','tinyMCEPreInit','tinyMCE','console']
+				predef  :['document','window','jQuery','cmb2_l10','wp','tinyMCEPreInit','tinyMCE','console']
 			}
 		},
 
@@ -97,7 +97,7 @@ module.exports = function(grunt) {
 		uglify: {
 			all: {
 				files: {
-					'js/cmb.min.js': ['js/cmb.js']
+					'js/cmb2.min.js': ['js/cmb2.js']
 				},
 				options: {
 					// banner: '/*! <%= pkg.title %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
@@ -116,7 +116,7 @@ module.exports = function(grunt) {
 				tasks: ['sass', 'cssmin']
 			},
 			scripts: {
-				files: ['js/cmb.js'],
+				files: ['js/cmb2.js'],
 				tasks: ['js'],
 				options: {
 					debounceDelay: 500