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
Next Next commit
Actionbar: Large refactor using the JQM panel 
Fixes: #71 - Small graphical glitch with tabs
Fixes: #72 - Closing the menu
Fixes: #78 - Action bar links not working
Fixes: #80 - Actionbar data-overflow="true" onClick not working
Fixes: #82 - Dialog and several transitions show actionbar overflowMenu
Fixes: #92 - Multiple issues for overflow menu with example code
  • Loading branch information
Jason Scott committed Jan 12, 2013
commit 0526b216e88d47965eb1aab252f4dd64bd4df839
4 changes: 2 additions & 2 deletions grunt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ module.exports = function(grunt) {
},
all_js: {
src: ['src/lib/jquery-1.7.1.js', '<config:min.init.src>',
'src/lib/jquery.mobile.js', '<config:concat.theme_js.dest>'
'src/lib/jquery.mobile.js', 'src/lib/panel.js', '<config:concat.theme_js.dest>'
],
dest: 'compiled/<%= pkg.name %>-all.js'
},
all_css: {
src: ['src/lib/jquery.mobile.structure.css', '<config:concat.theme_css.dest>'],
src: ['src/lib/jquery.mobile.structure.css', 'src/lib/jquery.mobile.panel.css', '<config:concat.theme_css.dest>'],
dest: 'compiled/<%= pkg.name %>-all.css'
}
},
Expand Down
108 changes: 50 additions & 58 deletions kitchenSink/actionbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,7 @@ <h1>Action Bar</h1>
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>7 Options</p>
</div>
<div data-role="action">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>7 Options</p>
<div data-role="action-overflow">
</div>
</div>
<div data-role="actionbar">
Expand All @@ -109,14 +107,10 @@ <h1>Action Bar</h1>
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>7 Options</p>
</div>
<div data-role="action" data-overflow="true">
<div data-role="action-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>7 Options</p>
</div>
<div data-role="action" data-overflow="true">
<img src="img//generic_81_81_placeholder.png" alt="" />
<p>7 Options</p>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab">
Expand All @@ -129,11 +123,11 @@ <h1>Action Bar</h1>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab">
<div data-role="tab" class="active">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab">
<div data-role="tab" class="pressed">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
Expand All @@ -147,7 +141,7 @@ <h1>Action Bar</h1>
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab">
<div data-role="tab" class="active">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
Expand Down Expand Up @@ -183,43 +177,56 @@ <h1>Action Bar</h1>
</div>
</div>
<div id="action-bar-area10" data-role="actionbar">
<div data-role="tab">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>

<div id="action-bar-area10" data-role="actionbar">
<div data-role="tab">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab" >
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
</div>

<div data-role="actionbar">
<div data-role="tab">
<div id="action-bar-area10" data-role="actionbar">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
</div>

<div data-role="actionbar">
<div data-role="tab-overflow">
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
Expand All @@ -234,9 +241,7 @@ <h1>Action Bar</h1>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
<div data-role="tab-overflow">
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
Expand All @@ -250,21 +255,21 @@ <h1>Action Bar</h1>
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
<div data-role="action" data-overflow="true">
<div data-role="action-overflow" >
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
Expand All @@ -274,30 +279,30 @@ <h1>Action Bar</h1>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>2 Options</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
<div data-role="action" data-overflow="true">
<div data-role="action-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>

<div data-role="actionbar">
<div data-role="tab">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
Expand All @@ -307,48 +312,44 @@ <h1>Action Bar</h1>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>1 Settings</p>
</div>
<div data-role="tab" data-overflow="true">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
<div data-role="action" data-overflow="true">
<div data-role="action-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab" data-overflow="true">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
<div data-role="tab-overflow">
</div>
<div data-role="action">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab" data-overflow="true">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
<div data-role="action">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
<div data-role="action" data-overflow="true">
<div data-role="action-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>

<div data-role="actionbar">
<div data-role="tab" data-overflow="true">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
<div data-role="tab-overflow">
</div>
<div data-role="action">
<img src="img/generic_81_81_placeholder.png" alt="" />
Expand All @@ -360,7 +361,7 @@ <h1>Action Bar</h1>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab" data-overflow="true">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
Expand All @@ -372,13 +373,13 @@ <h1>Action Bar</h1>
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
<div data-role="action" data-overflow="true">
<div data-role="action-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab" data-overflow="true">
<div data-role="tab-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
Expand All @@ -396,23 +397,14 @@ <h1>Action Bar</h1>
</div>
</div>
<div data-role="actionbar">
<div data-role="tab" data-overflow="true">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>3 Options</p>
</div>
<div data-role="action">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
<div data-role="action">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
<div data-role="tab-overflow">
</div>
<div data-role="action">
<div data-role="tab">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
<p>3 Options</p>
</div>
<div data-role="action" data-overflow="true">

<div data-role="action-overflow">
<img src="img/generic_81_81_placeholder.png" alt="" />
<p>4 Options</p>
</div>
Expand Down
Loading