Add option for closeCallback and openCallback to be either functions …

…or stringified functions
ghengeveld · Dec 12, 2011 · f401ded · f401ded
1 parent f4fbd58
commit f401ded
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/js/jquery.mobile.datebox.js b/js/jquery.mobile.datebox.js
@@ -1823,8 +1823,15 @@
 	open: function() {
 		// Call the open callback if provided. Additionally, if this
 		// returns falsy then the open of the dialog will be canceled
-		if (this.options.openCallback !== false && !this.options.openCallback()) {
-			return false;
+		if (this.options.openCallback !== false ) {
+			if ( $.isFunction(this.options.openCallback()) && !this.options.openCallback()) {
+				return false;
+			} else {
+				callback = new Function(this.options.openCallback);
+				if ( !callback() ) {
+					return false;
+				}
+			}
 		}
 
 		var self = this,
@@ -1881,7 +1888,7 @@
 				$(activePage).append(self.pickerContent);
 				$(activePage).append(self.screen);
 			}
-			if ( o.useModal ) { // If model, fade the background screen
+			if ( o.useModal === true ) { // If model, fade the background screen
 				self.screen.fadeIn('slow');
 			} else { // Else just unhide it since it's transparent
 				self.screen.removeClass('ui-datebox-hidden');
@@ -1931,7 +1938,13 @@
 		}
 		self.focusedEl.removeClass('ui-focus');
 
-		if ( self.options.closeCallback !== false ) { callback = new Function(self.options.closeCallback); callback(self.theDate, self); }
+		if ( self.options.closeCallback !== false ) { 
+			if ( $.isFunction(self.options.closeCallback) ) {
+				self.options.closeCallback(self.theDate, self);
+			} else {
+				callback = new Function(self.options.closeCallback); callback(self.theDate, self); 
+			}
+		}
 	},
 	disable: function(){
 		// Disable the element

diff --git a/tests/dev.html b/tests/dev.html
@@ -17,7 +17,7 @@
 
 	<script type="text/javascript">
 		jQuery.extend(jQuery.mobile.datebox.prototype.options, {
-			//useModal: true
+			useModal: false
 			//forceInheritTheme: true
 			//useDialogForceTrue: true
 		});
@@ -32,7 +32,7 @@ <h1>jQueryMobile - Dev Page</h1>
 	<div data-role="content">
 		<div data-role="fieldcontain">
 			<label for="lang1">calbox</label>
-			<input name="lang1" type="text" data-role="datebox" data-options='{"mode": "calbox", "useModal": true}' id="lang1" />
+			<input name="lang1" type="text" data-role="datebox" data-options='{"mode": "calbox", "useModal": false}' id="lang1" />
 		</div>
 		<div data-role="fieldcontain">
 			<label for="aa1">text comparison</label>