Make software keyboard actually work on the device

Khan · Oct 18, 2011 · 6fa68b5 · 6fa68b5
1 parent 0fa9dc2
commit 6fa68b5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/khan-exercise.js b/khan-exercise.js
@@ -523,10 +523,7 @@ Khan.loadScripts( scripts, function() {
 	Khan.require( [ "answer-types", "tmpl" ] );
 
 	if ( true || typeof userExercise !== "undefined" && userExercise.tablet ) {
-		jQuery( document ).bind( "mobileinit", function() {
-			jQuery.mobile.autoInitializePage = false;
-		} );
-		Khan.require( [ "jquery.mobile-1.0rc1", "software-keyboard" ] );
+		Khan.require( [ "software-keyboard" ] );
 	}
 
 	Khan.require( document.documentElement.getAttribute("data-require") );

diff --git a/utils/software-keyboard.js b/utils/software-keyboard.js
@@ -3,9 +3,8 @@ jQuery.fn["software-keyboardPost"] = function() {
 	var solutionarea = jQuery("#solutionarea");
 
 	var inputs = solutionarea.find( ":input" );
-	inputs.prop( "readonly", true ).bind( "vclick", function() {
-		alert("hey");
-	} );
+	inputs.prop( "readonly", true )
+		.css( "-webkit-tap-highlight-color", "rgba(0, 0, 0, 0)" );
 
 	var keyPressed = function( key ) {
 		var field = solutionarea.find( ":input" ).first();
@@ -41,19 +40,24 @@ jQuery.fn["software-keyboardPost"] = function() {
 					.appendTo( rowDiv );
 				var canceled = false, downTime;
 
-				keySpan.bind( "vmousemove", function() {
-					// Prevent weirdo scrolling
-					return false;
-				} );
-				keySpan.bind( "vmousecancel", function() {
-					keySpan.removeClass( "down" );
-					canceled = true;
-				} );
-				keySpan.bind( "vmousedown", function() {
+				var evtPrefix = "";
+				if ( jQuery.mobile != null ) {
+					evtPrefix = "v";
+					keySpan.bind( "vmousecancel", function() {
+						keySpan.removeClass( "down" );
+						canceled = true;
+					} );
+					keySpan.bind( "vmousemove", function() {
+						// Prevent weirdo scrolling
+						return false;
+					} );
+				}
+
+				keySpan.bind( evtPrefix + "mousedown", function() {
 					keySpan.addClass( "down" );
 					canceled = false;
 				} );
-				keySpan.bind( "vmouseup", function() {
+				keySpan.bind( evtPrefix + "mouseup", function() {
 					keySpan.removeClass( "down" );
 
 					if ( !canceled ) {