diff --git a/script/iphone/iphone.js b/script/iphone/iphone.js
index 5d68d2c2f..5653a93ad 100644
--- a/script/iphone/iphone.js
+++ b/script/iphone/iphone.js
@@ -1,12 +1,12 @@
 /*
- 	 Copyright (c) 2007, iUI Project Members
-	 See LICENSE.txt for licensing terms
+   Copyright (c) 2007-9, iUI Project Members
+   See LICENSE.txt for licensing terms
  */
 
 
 (function() {
 
-var slideSpeed = 25;
+var slideSpeed = 30;
 var slideInterval = 0;
 
 var currentPage = null;
@@ -17,368 +17,501 @@ var hashPrefix = "#_";
 var pageHistory = [];
 var newPageCount = 0;
 var checkTimer;
+var hasOrientationEvent = false;
+var portraitVal = "portrait";
+var landscapeVal = "landscape";
 
 // *************************************************************************************************
 
 window.iui =
 {
-    showPage: function(page, backwards)
-    {
-        if (page)
-        {
-            if (currentDialog)
-            {
-                currentDialog.removeAttribute("selected");
-                currentDialog = null;
-            }
-
-            if (hasClass(page, "dialog"))
-                showDialog(page);
-            else
-            {
-                var fromPage = currentPage;
-                currentPage = page;
-
-                if (fromPage)
-                    setTimeout(slidePages, 0, fromPage, page, backwards);
-                else
-                    updatePage(page, fromPage);
-            }
-        }
-    },
-
-    showPageById: function(pageId)
-    {
-        var page = $(pageId);
-        if (page)
-        {
-            var index = pageHistory.indexOf(pageId);
-            var backwards = index != -1;
-            if (backwards)
-                pageHistory.splice(index, pageHistory.length);
-
-            iui.showPage(page, backwards);
-        }
-    },
-
-    showPageByHref: function(href, args, method, replace, cb)
-    {
-        var req = new XMLHttpRequest();
-        req.onerror = function()
-        {
-            if (cb)
-                cb(false);
-        };
-        
-        req.onreadystatechange = function()
-        {
-            if (req.readyState == 4)
-            {
-                if (replace)
-                    replaceElementWithSource(replace, req.responseText);
-                else
-                {
-                    var frag = document.createElement("div");
-                    frag.innerHTML = req.responseText;
-                    iui.insertPages(frag.childNodes);
-                }
-                if (cb)
-                    setTimeout(cb, 1000, true);
-            }
-        };
-
-        if (args)
-        {
-			req.open(method || "GET", (href + "?" + args.join("&")), true);
+	animOn: true,	// Slide animation with CSS transition is now enabled by default where supported
+
+	showPage: function(page, backwards)
+	{
+		if (page)
+		{
+			if (currentDialog)
+			{
+				currentDialog.removeAttribute("selected");
+				currentDialog = null;
+			}
+
+			if (hasClass(page, "dialog"))
+				showDialog(page);
+			else
+			{
+				var fromPage = currentPage;
+				currentPage = page;
+
+				if (fromPage)
+					setTimeout(slidePages, 0, fromPage, page, backwards);
+				else
+					updatePage(page, fromPage);
+			}
+		}
+	},
+
+	showPageById: function(pageId)
+	{
+		var page = $(pageId);
+		if (page)
+		{
+			var index = pageHistory.indexOf(pageId);
+			var backwards = index != -1;
+			if (backwards)
+				pageHistory.splice(index, pageHistory.length);
+
+			iui.showPage(page, backwards);
+		}
+	},
+
+	showPageByHref: function(href, args, method, replace, cb)
+	{
+		var req = new XMLHttpRequest();
+		req.onerror = function()
+		{
+			if (cb)
+				cb(false);
+		};
+		
+		req.onreadystatechange = function()
+		{
+			if (req.readyState == 4)
+			{
+				if (replace)
+					replaceElementWithSource(replace, req.responseText);
+				else
+				{
+					var frag = document.createElement("div");
+					frag.innerHTML = req.responseText;
+					iui.insertPages(frag.childNodes);
+				}
+				if (cb)
+					setTimeout(cb, 1000, true);
+			}
+		};
+
+		if (args)
+		{
+			href = href  + "?" +args.join("&"); 
+			req.open(method || "GET", href, true);
 			req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
 			req.setRequestHeader("Content-Length", args.length);
-			req.send();
-        }
-        else
-        {
-            req.open(method || "GET", href, true);
-            req.send(null);
-        }
-    },
-    
-    insertPages: function(nodes)
-    {
-        var targetPage;
-        for (var i = 0; i < nodes.length; ++i)
-        {
-            var child = nodes[i];
-            if (child.nodeType == 1)
-            {
-                if (!child.id)
-                    child.id = "__" + (++newPageCount) + "__";
-
-                var clone = $(child.id);
-                if (clone)
-                    clone.parentNode.replaceChild(child, clone);
-                else
-                    document.body.appendChild(child);
-
-                if (child.getAttribute("selected") == "true" || !targetPage)
-                    targetPage = child;
-                
-                --i;
-            }
-        }
-
-        if (targetPage)
-            iui.showPage(targetPage);    
-    },
-
-    getSelectedPage: function()
-    {
-        for (var child = document.body.firstChild; child; child = child.nextSibling)
-        {
-            if (child.nodeType == 1 && child.getAttribute("selected") == "true")
-                return child;
-        }    
-    }    
+			req.send(null); 
+		}
+		else
+		{
+			req.open(method || "GET", href, true);
+			req.send(null);
+		}
+	},
+	
+	insertPages: function(nodes)
+	{
+		var targetPage;
+		for (var i = 0; i < nodes.length; ++i)
+		{
+			var child = nodes[i];
+			if (child.nodeType == 1)
+			{
+				if (!child.id)
+					child.id = "__" + (++newPageCount) + "__";
+
+				var clone = $(child.id);
+				if (clone)
+					clone.parentNode.replaceChild(child, clone);
+				else
+					document.body.appendChild(child);
+
+				if (child.getAttribute("selected") == "true" || !targetPage)
+					targetPage = child;
+				
+				--i;
+			}
+		}
+
+		if (targetPage)
+			iui.showPage(targetPage);	 
+	},
+
+	getSelectedPage: function()
+	{
+		for (var child = document.body.firstChild; child; child = child.nextSibling)
+		{
+			if (child.nodeType == 1 && child.getAttribute("selected") == "true")
+				return child;
+		}	 
+	},
+	isNativeUrl: function(href)
+	{
+		for(var i = 0; i < iui.nativeUrlPatterns.length; i++)
+		{
+			if(href.match(iui.nativeUrlPatterns[i])) return true;
+		}
+		return false;
+	},
+	nativeUrlPatterns: [
+		new RegExp("^http:\/\/maps.google.com\/maps\?"),
+		new RegExp("^mailto:"),
+		new RegExp("^tel:"),
+		new RegExp("^http:\/\/www.youtube.com\/watch\\?v="),
+		new RegExp("^http:\/\/www.youtube.com\/v\/"),
+		new RegExp("^javascript:"),
+
+	]
 };
 
 // *************************************************************************************************
 
 addEventListener("load", function(event)
 {
-    var page = iui.getSelectedPage();
-    if (page)
-        iui.showPage(page);
+	var page = iui.getSelectedPage();
+	var locPage = getPageFromLoc();
+		
+	if (page)
+			iui.showPage(page);
+	
+	if (locPage && (locPage != page))
+		iui.showPage(locPage);
+	
+	setTimeout(preloadImages, 0);
+	if (typeof window.onorientationchange == "object")
+	{
+		window.onorientationchange=orientChangeHandler;
+		hasOrientationEvent = true;
+		setTimeout(orientChangeHandler, 0);
+	}
+	setTimeout(checkOrientAndLocation, 0);
+	checkTimer = setInterval(checkOrientAndLocation, 300);
+}, false);
 
-    setTimeout(preloadImages, 0);
-    setTimeout(checkOrientAndLocation, 0);
-    checkTimer = setInterval(checkOrientAndLocation, 300);
+addEventListener("unload", function(event)
+{
+	return;
 }, false);
-    
+	
 addEventListener("click", function(event)
 {
-    var link = findParent(event.target, "a");
-    if (link)
-    {
-        function unselect() { link.removeAttribute("selected"); }
-        
-        if (link.href && link.hash && link.hash != "#")
-        {
-            link.setAttribute("selected", "true");
-            iui.showPage($(link.hash.substr(1)));
-            setTimeout(unselect, 500);
-        }
-        else if (link == $("backButton"))
-            history.back();
-        else if (link.getAttribute("type") == "submit")
-            submitForm(findParent(link, "form"));
-        else if (link.getAttribute("type") == "cancel")
-            cancelDialog(findParent(link, "form"));
-        else if (link.target == "_replace")
-        {
-            link.setAttribute("selected", "progress");
-            iui.showPageByHref(link.href, null, null, link, unselect);
-        }
-        else if (!link.target)
-        {
-            link.setAttribute("selected", "progress");
-            iui.showPageByHref(link.href, null, null, null, unselect);
-        }
-        else
-            return;
-        
-        event.preventDefault();        
-    }
+	var link = findParent(event.target, "a");
+	if (link)
+	{
+		function unselect() { link.removeAttribute("selected"); }
+		
+		if (link.href && link.hash && link.hash != "#" && !link.target)
+		{
+			link.setAttribute("selected", "true");
+			iui.showPage($(link.hash.substr(1)));
+			setTimeout(unselect, 500);
+		}
+		else if (link == $("backButton"))
+			history.back();
+		else if (link.getAttribute("type") == "submit")
+		{
+			var form = findParent(link, "form");
+			if (form.target == "_self")
+			{
+			    form.submit();
+			    return;  // return so we don't preventDefault
+			}
+			submitForm(form);
+		}
+		else if (link.getAttribute("type") == "cancel")
+			cancelDialog(findParent(link, "form"));
+		else if (link.target == "_replace")
+		{
+			link.setAttribute("selected", "progress");
+			iui.showPageByHref(link.href, null, null, link, unselect);
+		}
+		else if (iui.isNativeUrl(link.href))
+		{
+			return;
+		}
+		else if (link.target == "_webapp")
+		{
+			location.href = link.href;
+		}
+		else if (!link.target)
+		{
+			link.setAttribute("selected", "progress");
+			iui.showPageByHref(link.href, null, null, null, unselect);
+		}
+		else
+			return;
+		
+		event.preventDefault();		   
+	}
 }, true);
 
 addEventListener("click", function(event)
 {
-    var div = findParent(event.target, "div");
-    if (div && hasClass(div, "toggle"))
-    {
-        div.setAttribute("toggled", div.getAttribute("toggled") != "true");
-        event.preventDefault();       
-
-    }
+	var div = findParent(event.target, "div");
+	if (div && hasClass(div, "toggle"))
+	{
+		div.setAttribute("toggled", div.getAttribute("toggled") != "true");
+		event.preventDefault();		   
+	}
 }, true);
 
+function getPageFromLoc()
+{
+	var page;
+	var result = location.hash.match(/#_([^\?_]+)/);
+	if (result)
+		page = result[1];
+	if (page)
+		page = $(page);
+	return page;
+}
+
+function orientChangeHandler()
+{
+	var orientation=window.orientation;
+	switch(orientation)
+	{
+	case 0:
+		setOrientation(portraitVal);
+		break;	
+		
+	case 90:
+	case -90: 
+		setOrientation(landscapeVal);
+		break;
+	}
+}
+
+
 function checkOrientAndLocation()
 {
-    if (window.innerWidth != currentWidth)
-    {   
-        currentWidth = window.innerWidth;
-        var orient = currentWidth == 320 ? "profile" : "landscape";
-        document.body.setAttribute("orient", orient);
-        setTimeout(scrollTo, 100, 0, 1);
-    }
-
-    if (location.hash != currentHash)
-    {
-        var pageId = location.hash.substr(hashPrefix.length)
-        iui.showPageById(pageId);
-    }
+	if (!hasOrientationEvent)
+	{
+	  if (window.innerWidth != currentWidth)
+	  {	  
+		  currentWidth = window.innerWidth;
+		  var orient = currentWidth == 320 ? portraitVal : landscapeVal;
+		  setOrientation(orient);
+	  }
+	}
+
+	if (location.hash != currentHash)
+	{
+		var pageId = location.hash.substr(hashPrefix.length);
+		iui.showPageById(pageId);
+	}
+}
+
+function setOrientation(orient)
+{
+	document.body.setAttribute("orient", orient);
+	setTimeout(scrollTo, 100, 0, 1);
 }
 
 function showDialog(page)
 {
-    currentDialog = page;
-    page.setAttribute("selected", "true");
-    
-    if (hasClass(page, "dialog") && !page.target)
-        showForm(page);
+	currentDialog = page;
+	page.setAttribute("selected", "true");
+	
+	if (hasClass(page, "dialog") && !page.target)
+		showForm(page);
 }
 
 function showForm(form)
 {
-    form.onsubmit = function(event)
-    {
-        event.preventDefault();
-        submitForm(form);
-    };
-    
-    form.onclick = function(event)
-    {
-        if (event.target == form && hasClass(form, "dialog"))
-            cancelDialog(form);
-    };
+	form.onsubmit = function(event)
+	{
+		event.preventDefault();
+		submitForm(form);
+	};
+	
+	form.onclick = function(event)
+	{
+		if (event.target == form && hasClass(form, "dialog"))
+			cancelDialog(form);
+	};
 }
 
 function cancelDialog(form)
 {
-    form.removeAttribute("selected");
+	form.removeAttribute("selected");
 }
 
 function updatePage(page, fromPage)
 {
-    if (!page.id)
-        page.id = "__" + (++newPageCount) + "__";
-
-    location.href = currentHash = hashPrefix + page.id;
-    pageHistory.push(page.id);
-
-    var pageTitle = $("pageTitle");
-    if (page.title)
-        pageTitle.innerHTML = page.title;
-
-    if (page.localName.toLowerCase() == "form" && !page.target)
-        showForm(page);
-        
-    var backButton = $("backButton");
-    if (backButton)
-    {
-        var prevPage = $(pageHistory[pageHistory.length-2]);
-        if (prevPage && !page.getAttribute("hideBackButton"))
-        {
-            backButton.style.display = "inline";
-            backButton.innerHTML = prevPage.title ? prevPage.title : "Back";
-        }
-        else
-            backButton.style.display = "none";
-    }    
+	if (!page.id)
+		page.id = "__" + (++newPageCount) + "__";
+
+	location.hash = currentHash = hashPrefix + page.id;
+	pageHistory.push(page.id);
+
+	var pageTitle = $("pageTitle");
+	if (page.title)
+		pageTitle.innerHTML = page.title;
+
+	if (page.localName.toLowerCase() == "form" && !page.target)
+		showForm(page);
+		
+	var backButton = $("backButton");
+	if (backButton)
+	{
+		var prevPage = $(pageHistory[pageHistory.length-2]);
+		if (prevPage && !page.getAttribute("hideBackButton"))
+		{
+			backButton.style.display = "inline";
+			backButton.innerHTML = prevPage.title ? prevPage.title : "Back";
+		}
+		else
+			backButton.style.display = "none";
+	}	 
 }
 
 function slidePages(fromPage, toPage, backwards)
-{        
-    var axis = (backwards ? fromPage : toPage).getAttribute("axis");
-    if (axis == "y")
-        (backwards ? fromPage : toPage).style.top = "100%";
-    else
-        toPage.style.left = "100%";
-
-    toPage.setAttribute("selected", "true");
-    scrollTo(0, 1);
-    clearInterval(checkTimer);
-    
-    var percent = 100;
-    slide();
-    var timer = setInterval(slide, slideInterval);
-
-    function slide()
-    {
-        percent -= slideSpeed;
-        if (percent <= 0)
-        {
-            percent = 0;
-            if (!hasClass(toPage, "dialog"))
-                fromPage.removeAttribute("selected");
-            clearInterval(timer);
-            checkTimer = setInterval(checkOrientAndLocation, 300);
-            setTimeout(updatePage, 0, toPage, fromPage);
-        }
-    
-        if (axis == "y")
-        {
-            backwards
-                ? fromPage.style.top = (100-percent) + "%"
-                : toPage.style.top = percent + "%";
-        }
-        else
-        {
-            fromPage.style.left = (backwards ? (100-percent) : (percent-100)) + "%"; 
-            toPage.style.left = (backwards ? -percent : percent) + "%"; 
-        }
-		window.scroll(0,0);
-    }
+{		 
+	var axis = (backwards ? fromPage : toPage).getAttribute("axis");
+
+	clearInterval(checkTimer);
+	
+	if (canDoSlideAnim() && axis != 'y')
+	{
+	  slide2(fromPage, toPage, backwards, slideDone);
+	}
+	else
+	{
+	  slide1(fromPage, toPage, backwards, axis, slideDone);
+	}
+
+	function slideDone()
+	{
+	  if (!hasClass(toPage, "dialog"))
+		  fromPage.removeAttribute("selected");
+	  checkTimer = setInterval(checkOrientAndLocation, 300);
+	  setTimeout(updatePage, 0, toPage, fromPage);
+	  fromPage.removeEventListener('webkitTransitionEnd', slideDone, false);
+	}
+}
+
+function canDoSlideAnim()
+{
+  return (iui.animOn) && (typeof WebKitCSSMatrix == "object");
+}
+
+function slide1(fromPage, toPage, backwards, axis, cb)
+{
+	if (axis == "y")
+		(backwards ? fromPage : toPage).style.top = "100%";
+	else
+		toPage.style.left = "100%";
+
+	scrollTo(0, 1);
+	toPage.setAttribute("selected", "true");
+	var percent = 100;
+	slide();
+	var timer = setInterval(slide, slideInterval);
+
+	function slide()
+	{
+		percent -= slideSpeed;
+		if (percent <= 0)
+		{
+			percent = 0;
+			clearInterval(timer);
+			cb();
+		}
+	
+		if (axis == "y")
+		{
+			backwards
+				? fromPage.style.top = (100-percent) + "%"
+				: toPage.style.top = percent + "%";
+		}
+		else
+		{
+			fromPage.style.left = (backwards ? (100-percent) : (percent-100)) + "%"; 
+			toPage.style.left = (backwards ? -percent : percent) + "%"; 
+		}
+	}
+}
+
+
+function slide2(fromPage, toPage, backwards, cb)
+{
+	toPage.style.webkitTransitionDuration = '0ms'; // Turn off transitions to set toPage start offset
+	// fromStart is always 0% and toEnd is always 0%
+	// iPhone won't take % width on toPage
+	var toStart = 'translateX(' + (backwards ? '-' : '') + window.innerWidth +	'px)';
+	var fromEnd = 'translateX(' + (backwards ? '100%' : '-100%') + ')';
+	toPage.style.webkitTransform = toStart;
+	toPage.setAttribute("selected", "true");
+	toPage.style.webkitTransitionDuration = '';	  // Turn transitions back on
+	function startTrans()
+	{
+		fromPage.style.webkitTransform = fromEnd;
+		toPage.style.webkitTransform = 'translateX(0%)'; //toEnd
+	}
+	fromPage.addEventListener('webkitTransitionEnd', cb, false);
+	setTimeout(startTrans, 0);
 }
 
 function preloadImages()
 {
-    var preloader = document.createElement("div");
-    preloader.id = "preloader";
-    document.body.appendChild(preloader);
+	var preloader = document.createElement("div");
+	preloader.id = "preloader";
+	document.body.appendChild(preloader);
 }
 
 function submitForm(form)
 {
-    iui.showPageByHref(form.action || "POST", encodeForm(form), form.method);
+	iui.showPageByHref(form.action || "POST", encodeForm(form), form.method);
 	closeKeypad();
 }
 
 function encodeForm(form)
 {
-    function encode(inputs)
-    {
-        for (var i = 0; i < inputs.length; ++i)
-        {
-            if (inputs[i].name)
-                args.push(inputs[i].name + "=" + looseURIEncode(inputs[i].value));
-        }
-    }
-
-    var args = [];
-    encode(form.getElementsByTagName("input"));
-    encode(form.getElementsByTagName("select"));
-    encode(form.getElementsByTagName("textarea"));
-    return args;    
+	function encode(inputs)
+	{
+		for (var i = 0; i < inputs.length; ++i)
+		{
+			if (inputs[i].name)
+				args.push(inputs[i].name + "=" + looseURIEncode(inputs[i].value));
+		}
+	}
+
+	var args = [];
+	encode(form.getElementsByTagName("input"));
+	encode(form.getElementsByTagName("textarea"));
+	encode(form.getElementsByTagName("select"));
+	return args;	
 }
 
 function findParent(node, localName)
 {
-    while (node && (node.nodeType != 1 || node.localName.toLowerCase() != localName))
-        node = node.parentNode;
-    return node;
+	while (node && (node.nodeType != 1 || node.localName.toLowerCase() != localName))
+		node = node.parentNode;
+	return node;
 }
 
 function hasClass(self, name)
 {
-    var re = new RegExp("(^|\\s)"+name+"($|\\s)");
-    return re.exec(self.getAttribute("class")) != null;
+	var re = new RegExp("(^|\\s)"+name+"($|\\s)");
+	return re.exec(self.getAttribute("class")) != null;
 }
 
 function replaceElementWithSource(replace, source)
 {
-    var page = replace.parentNode;
-    var parent = replace;
-    while (page.parentNode != document.body)
-    {
-        page = page.parentNode;
-        parent = parent.parentNode;
-    }
+	var page = replace.parentNode;
+	var parent = replace;
+	while (page.parentNode != document.body)
+	{
+		page = page.parentNode;
+		parent = parent.parentNode;
+	}
 
-    var frag = document.createElement(parent.localName);
-    frag.innerHTML = source;
+	var frag = document.createElement(parent.localName);
+	frag.innerHTML = source;
 
-    page.removeChild(parent);
+	page.removeChild(parent);
 
-    while (frag.firstChild)
-        page.appendChild(frag.firstChild);
+	while (frag.firstChild)
+		page.appendChild(frag.firstChild);
 }
 
 function $(id) { return document.getElementById(id); }
@@ -445,4 +578,4 @@ function closeKeypad(){
 	if (searchButton != null){
 		searchButton.focus();
 	} 
-}
\ No newline at end of file
+}