Skip to content
This repository was archived by the owner on Sep 4, 2019. It is now read-only.

Updating the Action bar to fix a number of issues #100

Merged
jasondscott merged 18 commits into from
Jan 22, 2013
Merged

Updating the Action bar to fix a number of issues #100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0526b21
Actionbar: Large refactor using the JQM panel
Jan 12, 2013
6d5936c
Actionbar: Adding new sample
Jan 12, 2013
5d131b0
Updating latest
Jan 12, 2013
2a24c9f
Fixing up the panels
Jan 17, 2013
a890d71
Actionbar: Fixing the tab overflow icon position
Jan 18, 2013
4054be2
Actionbar: Adding landscape css
Jan 18, 2013
e0da618
Actionbar: Chaning js to match new css
Jan 18, 2013
4b82ab7
Actionbar: Updating builds
Jan 18, 2013
72c88b4
Actionbar: Updating sample
Jan 21, 2013
f2f5184
Updating latest
Jan 21, 2013
feb6207
Actionbar: Fixing height of titlebars in landscape and hiding footer
Jan 21, 2013
8119e35
Updating latest
Jan 21, 2013
c7ba15d
Actionbar Sample: Close panels when clicked
Jan 22, 2013
3ce4716
Actionbar: Fixed tabover flow button icon was not visble when active
Jan 22, 2013
ad023b3
Actionbar Sample: Tab overflow button was not positioned correctly
Jan 22, 2013
418b33e
Actionbar: Adding pressed state to tab button on vmousedown
Jan 22, 2013
096a3d8
Updating latest
Jan 22, 2013
aaf08c6
Merge branch 'actionbar-refactor' into master
Jan 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing up the panels
  • Loading branch information
Jason Scott committed Jan 17, 2013
commit 2a24c9ff6ddc56f264ddd36a7c02df110a874320
30 changes: 25 additions & 5 deletions kitchenSink/actionbar_sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,27 @@
<title>Action Bar</title>
<!--<meta name="viewport" content="width=device-width, initial-scale=1">-->
<link rel="stylesheet" href="lib/BlackBerry-JQM-all.css" />


<script>
var meta = document.createElement("meta");
meta.setAttribute('name','viewport');
meta.setAttribute('content','initial-scale='+ (1/window.devicePixelRatio) + ',user-scalable=no');
document.getElementsByTagName('head')[0].appendChild(meta);
</script>

<script src="lib/BlackBerry-JQM-all.js"></script>
</head>
<body>
<div data-role="page">
<div data-role="panel" id="left" data-position="left" data-display="reveal" data-theme="a">
<div data-role="panel" id="left" data-position="left" data-display="reveal" data-theme="a" class="bb10-panel">
<ul data-role="listview" data-theme="a">
<li><a href="#">Acura</a></li>
<li class="ui-btn-active"><a href="#">Acura</a></li>
<li><a href="#">Audi</a></li>
<li><a href="#">BMW</a></li>
</ul>
</div>
<div data-role="panel" id="right" data-position="right" data-display="overlay" data-theme="a">
<div data-role="panel" id="right" data-position="right" data-display="overlay" data-theme="a" class="bb10-panel">
<div>
<ul data-role="listview" data-theme="a">
<li><a href="#">Acura</a></li>
Expand All @@ -57,7 +66,7 @@ <h1>Action Bar</h1>
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
<div data-role="tab" data-href="buttons.html">
<div data-role="tab" data-href="#page2">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
Expand All @@ -73,6 +82,13 @@ <h1>Action Bar</h1>

</div>
</div><!-- /page -->
<div data-role="page" id="page2">
<div data-role="header" data-theme="c">
<h1>Page 2</h1>
</div><!-- /header -->
<div data-role="content">
</div><!-- /content -->
</div><!-- /page -->
<script>
$(document).one("pageinit", function() {
$("#aover").bind("vclick", function() {
Expand All @@ -84,8 +100,12 @@ <h1>Action Bar</h1>
console.log("tab overflow pressed");
$("#left").panel("open");
});
$("li").bind("vclick", function() {
$(".bb10-panel li").bind("vclick", function() {
$("#tover").empty().removeClass("hasContent");
$(".ui-panel").panel("close");
$(".bb10-panel li").removeClass("ui-btn-active");
$(this).addClass("ui-btn-active");
$("#tover").html('<img src="img/generic_81_81_placeholder.png" alt=""><p>Audo Settings</p>').addClass("hasContent");
});
$("[data-role='tab']").bind("vclick", function() {
if($(this).data("href")) {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/jquery.mobile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8709,7 +8709,7 @@ $( document ).bind( "pagecreate create", function( e ) {
transition: "slide", //can be none, fade, slide (slide maps to slideup or slidedown)
fullscreen: false,
tapToggle: true,
tapToggleBlacklist: "a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup",
tapToggleBlacklist: "a, button, input, select, textarea, .ui-header-fixed, .ui-footer-fixed, .ui-popup, .ui-panel, .ui-panel-dismiss-open",
hideDuringFocus: "input, textarea, select",
updatePagePadding: true,
trackPersistentToolbars: true,
Expand Down Expand Up @@ -8867,7 +8867,7 @@ $( document ).bind( "pagecreate create", function( e ) {
if ( this.options.fullscreen ) { return; }

tbPage = tbPage || $el.closest( ".ui-page" );
$( tbPage ).css( "padding-" + ( header ? "top" : "bottom" ), $el.outerHeight() );
//$( tbPage ).css( "padding-" + ( header ? "top" : "bottom" ), $el.outerHeight() );
},

_useTransition: function( notransition ) {
Expand Down
Loading