Merge branch 'trunk' into danielbachhuber-patch-1

orrstam · Oct 12, 2015 · 761b260 · 761b260
2 parents 7eae0bf + 1958844
commit 761b260
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/includes/CMB2_Field.php b/includes/CMB2_Field.php
@@ -503,6 +503,10 @@ public function save_field( $meta_value ) {
 			$action  = 'removed';
 		}
 
+		if ( $updated ) {
+			$this->value = $this->get_data();
+		}
+
 		$field_id = $this->id( true );
 
 		/**

diff --git a/js/cmb2.js b/js/cmb2.js
@@ -103,6 +103,7 @@ window.CMB2 = (function(window, document, $, undefined){
 		// and on window resize
 		$(window).on( 'resize', cmb.resizeoEmbeds );
 
+		$(document).trigger( 'cmb_init', cmb );
 	};
 
 	cmb.resetTitlesAndIterator = function() {
@@ -926,7 +927,7 @@ window.CMB2 = (function(window, document, $, undefined){
 		}, 500);
 	};
 
-	$(document).ready(cmb.init);
+	$( cmb.init );
 
 	return cmb;