Author: scottbw
Date: Mon Mar 14 12:07:47 2011
New Revision: 1081343
URL: http://svn.apache.org/viewvc?rev=1081343&view=rev
Log:
Also override the history.back button in dialogs as well as pages
Modified:
incubator/wookie/trunk/features/jqmobile/shared/jquery.mobile-1.0a3.min.js
Modified:
incubator/wookie/trunk/features/jqmobile/shared/jquery.mobile-1.0a3.min.js
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/features/jqmobile/shared/jquery.mobile-1.0a3.min.js?rev=1081343&r1=1081342&r2=1081343&view=diff
==============================================================================
--- incubator/wookie/trunk/features/jqmobile/shared/jquery.mobile-1.0a3.min.js
(original)
+++ incubator/wookie/trunk/features/jqmobile/shared/jquery.mobile-1.0a3.min.js
Mon Mar 14 12:07:47 2011
@@ -126,6 +126,17 @@ b.headerTheme+"'><div class='ui-title'>"
(function(a){a.mobile.listview.prototype.options.filter=false;a("[data-role='listview']").live("listviewcreate",function(){var
d=a(this);if(d.data("listview").options.filter){var
c=a("<form>",{"class":"ui-listview-filter
ui-bar-c",role:"search"});a("<input>",{placeholder:"Filter
results...","data-type":"search"}).bind("keyup change",function(){var
f=this.value.toLowerCase();d.children().show();f&&d.children().filter(function(){return
a(this).text().toLowerCase().indexOf(f)===-1}).hide()}).appendTo(c).textinput();
c.insertBefore(d)}})})(jQuery);
(function(a){a.widget("mobile.dialog",a.mobile.widget,{options:{},_create:function(){this.element.attr("role","dialog").addClass("ui-page
ui-dialog ui-body-a").find("[data-role=header]").addClass("ui-corner-top
ui-overlay-shadow").prepend('<a href="#" data-icon="delete" data-rel="back"
data-iconpos="notext">Close</a>').end().find('.ui-content:not([class*="ui-body-"])').addClass("ui-body-c").end().find(".ui-content,[data-role=footer]").last().addClass("ui-corner-bottom
ui-overlay-shadow");this.element.bind("click submit",
-function(d){d=d.type=="click"?a(d.target).closest("a"):a(d.target).closest("form");d.length&&!d.data("transition")&&d.attr("data-transition",a.mobile.urlHistory.getActive().transition).attr("data-direction","reverse")})},close:function(){history.back()}})})(jQuery);
+function(d){d=d.type=="click"?a(d.target).closest("a"):a(d.target).closest("form");d.length&&!d.data("transition")&&d.attr("data-transition",a.mobile.urlHistory.getActive().transition).attr("data-direction","reverse")})},close:function(){
+
+
+var url = $.mobile.urlHistory.getPrev().url;
+if (url === null || url == "") url = $.mobile.firstPage.attr("data-url");
+url = "#" + url;
+$.mobile.changePage(url, "slide", true, true, true);
+
+//window.history.back()
+
+
+}})})(jQuery);
(function(a,d){a.widget("mobile.navbar",a.mobile.widget,{options:{iconpos:"top",grid:null},_create:function(){var
c=this.element,f=c.find("a"),b=f.filter("[data-icon]").length?this.options.iconpos:d;c.addClass("ui-navbar").attr("role","navigation").find("ul").grid({grid:this.options.grid});b||c.addClass("ui-navbar-noicons");f.buttonMarkup({corners:false,shadow:false,iconpos:b});c.delegate("a","click",function(){f.removeClass("ui-btn-active");a(this).addClass("ui-btn-active")})}})})(jQuery);
(function(a){a.fn.grid=function(d){return this.each(function(){var
c=a.extend({grid:null},d),f=a(this).children(),b={a:2,b:3,c:4,d:5};c=c.grid;if(!c)if(f.length<=5)for(var
g in b){if(b[g]==f.length)c=g}else
c="a";b=b[c];a(this).addClass("ui-grid-"+c);f.filter(":nth-child("+b+"n+1)").addClass("ui-block-a");f.filter(":nth-child("+b+"n+2)").addClass("ui-block-b");b>2&&f.filter(":nth-child(3n+3)").addClass("ui-block-c");b>3&&f.filter(":nth-child(4n+4)").addClass("ui-block-d");b>4&&f.filter(":nth-child(5n+5)").addClass("ui-block-e")})}})(jQuery);
