Updated master

Gruntfile.js

@@ -1,9 +1,8 @@
 module.exports = function( grunt ) {
 
 	'use strict';
-
+	var remapify = require('remapify');
 	var banner = '/**\n * <%= pkg.homepage %>\n * Copyright (c) <%= grunt.template.today("yyyy") %>\n * This file is generated automatically. Do not edit.\n */\n';
-
 	// Project configuration
 	grunt.initConfig( {
 
@@ -35,6 +34,51 @@ module.exports = function( grunt ) {
 
 		},
 
+		browserify : {
+			options: {
+				preBundleCB: function(b) {
+
+					b.plugin(remapify, [
+						{
+							cwd: 'js/models',
+							src: '**/*.js',
+							expose: 'sui-models'
+						},
+						{
+							cwd: 'js/controllers',
+							src: '**/*.js',
+							expose: 'sui-controllers'
+						},
+						{
+							cwd: 'js/collections',
+							src: '**/*.js',
+							expose: 'sui-collections'
+						},
+						{
+							cwd: 'js/views',
+							src: '**/*.js',
+							expose: 'sui-views'
+						},
+						{
+							cwd: 'js/utils',
+							src: '**/*.js',
+							expose: 'sui-utils'
+						}
+					]);
+
+				}
+			},
+			dist: {
+				files : {
+					'js/build/shortcode-ui.js' : ['js/**/*.js', '!js/build/**', '!js/field-attachment.js', '!js/field-color.js']
+				},
+				options: {
+					transform: ['browserify-shim']
+				}
+			},
+
+		},
+
 		addtextdomain: {
 		    options: {
 		        textdomain: 'shortcode-ui',    // Project text domain.
@@ -65,11 +109,12 @@ module.exports = function( grunt ) {
 
 	grunt.loadNpmTasks('grunt-sass');
 	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-browserify');
     grunt.loadNpmTasks("grunt-wp-i18n");
 
-	grunt.registerTask( 'default', ['sass' ] );
+	grunt.registerTask( 'default', [ 'sass', 'browserify' ] );
 	grunt.registerTask( 'i18n', ['addtextdomain', 'makepot'] );
 
 	grunt.util.linefeed = '\n';
 
-};
+};

inc/class-shortcode-ui.php

@@ -75,7 +75,7 @@ public function action_wp_enqueue_editor() {
 		$shortcodes = array_values( $this->shortcodes );
 		usort( $shortcodes, array( $this, 'compare_shortcodes_by_label' ) );
 
-		wp_enqueue_script( 'shortcode-ui', $this->plugin_url . 'js/shortcode-ui.js', array( 'jquery', 'backbone', 'mce-view' ), $this->plugin_version );
+		wp_enqueue_script( 'shortcode-ui', $this->plugin_url . 'js/build/shortcode-ui.js', array( 'jquery', 'backbone', 'mce-view' ), $this->plugin_version );
 		wp_enqueue_style( 'shortcode-ui', $this->plugin_url . 'css/shortcode-ui.css', array(), $this->plugin_version );
 		wp_localize_script( 'shortcode-ui', ' shortcodeUIData', array(
 			'shortcodes' => $shortcodes,

inc/templates/edit-form.tpl.php

@@ -73,8 +73,10 @@
 
 <script type="text/html" id="tmpl-shortcode-ui-field-checkbox">
 	<div class="field-block">
-		<label for="{{ data.attr }}">{{ data.label }}</label>
-		<input type="checkbox" name="{{ data.attr }}" id="{{ data.attr }}" value="{{ data.value }}" <# if ( 'true' == data.value ){ print('checked'); } #>>
+		<label for="{{ data.attr }}">
+			<input type="checkbox" name="{{ data.attr }}" id="{{ data.attr }}" value="{{ data.value }}" <# if ( 'true' == data.value ){ print('checked'); } #>>
+			{{ data.label }}
+		</label>
 		<# if ( typeof data.description == 'string' ) { #>
 			<p class="description">{{ data.description }}</p>
 		<# } #>