PhoneGap config file adjustments

toddwprice · Oct 14, 2011 · c218b72 · c218b72
1 parent 6b211a5
commit c218b72
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/config.xml b/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns	= "http://www.w3.org/ns/widgets"
 	xmlns:gap	= "http://phonegap.com/ns/1.0"
-	id			= "w20touch"
-	version 	= "1.0.0">
+	id			= "Web20TouchDemo"
+	version 	= "1.0">
 
 	<name>Web 2.0 Touch Demo</name>
 

diff --git a/css/ipad-dark.css b/css/ipad-dark.css
@@ -171,7 +171,7 @@ div.jsTouch div.toolbar h1{
 	right: -10px;
 	height: 27px;
 	width: 12px;
-	background: #555;
+	background: #000;
 	-webkit-mask-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAACk0lEQVRoQ8WZP2gUQRTGLwYCVlaBgK1tOokgBI50QTFgJQqBlBaWgoFgq72FZSrFSjAk2NkKtgEr25AiELASLgTz/ULmuGRvdmdn3rx78DW3cL/58755b2fnRmfnx4PB4L50JLnFLZGWpO/SHTeqQICJZemrtOAFD2B4a9LuLMAwn0tvPeBzSq7/U0Av9NvnmgOIgUeCrks/asEn93iSQZKRbCRdlYiBgWEvbLZYg9wGhndX2pduW8O7wPBWpC/SvCU8BQzvifRhFmCYL6XXVvCYnWL/f64HT6W90gH0BcP7Jw2lXyXw1D2eZJDhZPo9bzA8vF3k8ZwZh4kyY2yWVUpLwAwgu5SWgoFTSt/13W8LMMw3Vz5P5ufYKfbnvUqp1YwZTK9SagkGHkopVa01rMHAgHa2yzXAwOlcPknRUloLDPyRFC2lNcHAKaVYrRGWdmpLpka77AXG40PpZxhd7aUOHDz+TRqXUi8wA7hWSj3BwJkxTcSC1x7fTLwt7xmHASzPCjy+EWjzYI1nh7PYY9riVe+l/iPoY2nkCf4rIC/7J+ydF5gjk1cfZnwZXuAtsa5da3iAdwRtXOTUzmqAlMRG1ASztCQT++sG/i3SQ4lMnho19hi7bLRBa2Q1L+0cEGPbeM34mUBJNwWWS70taPLdiBX4o6DvY8taK6sPrpKJG6HkKPXxoUirXRk8bTQlS83HEw6IqFfbpp8LDiUu+8tNDpi93JRY5uzIAb/qYxurAwTLYJ3i6JPVHA50Eb1sExthKphjcChxFptEyh6HztAMysi7wNiG5b3sDC2jDRw6wyLb5GR1ozP0mDG2cf/EF+0MLWd8006tnWEtMLZ5IJ1aArqSC7tQ4lygwcfJnaHlSlwADTGshYz22ugAAAAASUVORK5CYII=);
 	-webkit-mask-size: 13px 27px;
 	-webkit-mask-repeat: no-repeat;

diff --git a/includes/jsTouch.js b/includes/jsTouch.js
@@ -247,9 +247,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0);';
 				div_new.style.cssText += comcss +'-webkit-transform: translate3d('+ width +'px, 0, 0);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: translate3d(0px, 0, 0);';
@@ -262,9 +259,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0);';
 				div_new.style.cssText += comcss +'-webkit-transform: translate3d(-'+ width +'px, 0, 0);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: translate3d(0px, 0, 0);';
@@ -277,9 +271,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'z-index: 1; -webkit-transform: translate3d(0, 0, 0);';
 				div_new.style.cssText += comcss +'z-index: 0; -webkit-transform: translate3d(0, 0, 0);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: translate3d(0, 0, 0);';
@@ -292,9 +283,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0);';
 				div_new.style.cssText += comcss +'-webkit-transform: translate3d(0, '+ height +'px, 0);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: translate3d(0, 0, 0);';
@@ -307,9 +295,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: rotateY(0deg);';
 				div_new.style.cssText += comcss +'-webkit-transform: rotateY(-180deg);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: rotateY(0deg);';
@@ -322,9 +307,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: rotateY(0deg);';
 				div_new.style.cssText += comcss +'-webkit-transform: rotateY(180deg);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: rotateY(0deg);';
@@ -352,9 +334,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: rotateX(0deg);';
 				div_new.style.cssText += comcss +'-webkit-transform: rotateX(-180deg);';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: rotateX(0deg);';
@@ -367,9 +346,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0);';
 				div_new.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0); -webkit-transform: scale(.8); opacity: 0;';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; -webkit-transform: scale(1); opacity: 1;';
@@ -382,9 +358,6 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0); -webkit-transform: scale(1); opacity: 1;';
 				div_new.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0); opacity: 0;';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; opacity: 1;';
@@ -397,16 +370,21 @@ function jsTouchBox(name, params) {
 				div_old.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0); opacity: 1;';
 				div_new.style.cssText += comcss +'-webkit-transform: translate3d(0, 0, 0); opacity: 0;';
 				div_new.innerHTML = HTML;
-				// isert another DIV (needed for iScroll)
-				var tmp = $('.content', div_new)[0];
-				if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
 				// -- need a timing function because otherwise not working
 				window.setTimeout(function() {
 					div_new.style.cssText += '-webkit-transition: .5s; opacity: 1;';
 					div_old.style.cssText += '-webkit-transition: .5s; opacity: 1;';
 				}, 1);
 				break;
 		}
+		// isert another DIV (needed for iScroll)
+		var tmp = $('.content', div_new)[0];
+		if (tmp) tmp.innerHTML = '<div>' + tmp.innerHTML + '</div>';
+		// insert <span> for back and forward buttons
+		var tmp = $('.toolbar .button.back', div_new)[0];
+		if (tmp) tmp.innerHTML = '<span class="s1"></span><span class="s2"></span>' + tmp.innerHTML;		
+		var tmp = $('.toolbar .button.next', div_new)[0];
+		if (tmp) tmp.innerHTML = '<span class="s1"></span><span class="s2"></span>' + tmp.innerHTML;		
 		// execute scripts
 		var d =	div_new.getElementsByTagName("script");
 		var t = d.length;