diff --git a/css/structure/jquery.mobile.filterbar.css b/css/structure/jquery.mobile.filterbar.css new file mode 100644 index 00000000000..6a400d8634e --- /dev/null +++ b/css/structure/jquery.mobile.filterbar.css @@ -0,0 +1,29 @@ +.ui-filter { + border-width: 0; + overflow: hidden; + margin: -1em -1em 1em -1em; +} +.ui-filter-inset { + margin: 1em -.3125em -1em; + background: transparent; +} +.ui-collapsible-content .ui-filter { + margin: -.625em -1em .625em -1em; + border-bottom: inherit; +} +.ui-collapsible-content .ui-filter-inset { + margin: -.3125em; + border-bottom-width: 0; +} +.ui-filter .ui-input-search { + margin: .3125em; + width: auto; + display: block; +} +.ui-screen-hidden { + display:none; +} + + + + diff --git a/css/structure/jquery.mobile.listview.css b/css/structure/jquery.mobile.listview.css index b2413976370..5b0f13f512c 100644 --- a/css/structure/jquery.mobile.listview.css +++ b/css/structure/jquery.mobile.listview.css @@ -270,28 +270,3 @@ ol.ui-listview > li img:first-child + * ~ * { margin-top: 0; text-indent: 2.04em; /* (1.4em + .3em) * .9em / .75em */ } -.ui-listview-filter { - border-width: 0; - overflow: hidden; - margin: -1em -1em 1em -1em; -} -.ui-listview-filter-inset { - margin: 1em -.3125em -1em; - background: transparent; -} -.ui-collapsible-content .ui-listview-filter { - margin: -.625em -1em .625em -1em; - border-bottom: inherit; -} -.ui-collapsible-content .ui-listview-filter-inset { - margin: -.3125em; - border-bottom-width: 0; -} -.ui-listview-filter .ui-input-search { - margin: .3125em; - width: auto; - display: block; -} -.ui-listview > li.ui-screen-hidden { - display:none; -} diff --git a/css/structure/jquery.mobile.structure.css b/css/structure/jquery.mobile.structure.css index ae21331fc4e..7e664a85eca 100644 --- a/css/structure/jquery.mobile.structure.css +++ b/css/structure/jquery.mobile.structure.css @@ -21,3 +21,4 @@ @import url( "jquery.mobile.table.columntoggle.css" ); @import url( "jquery.mobile.table.reflow.css" ); @import url( "jquery.mobile.panel.css" ); +@import url( "jquery.mobile.filterbar.css" ); diff --git a/demos/_assets/css/jqm-demos.css b/demos/_assets/css/jqm-demos.css index 57e01a22de1..c59ef8fd1ea 100644 --- a/demos/_assets/css/jqm-demos.css +++ b/demos/_assets/css/jqm-demos.css @@ -119,11 +119,14 @@ body, .jqm-demos { display: block; border-top: 1px solid #e0e0e0; } -.jqm-search > .ui-listview-filter { +.jqm-search > .ui-filter { margin: 0 -.3125em; padding: 1px 0; /* to resolve Chrome rendering issue (border-bottom not visible */ } -.jqm-demos .jqm-search > .ui-listview-filter .ui-input-search { +.jqm-content > .ui-filter { + margin-bottom: 1.1em; +} +.jqm-demos .jqm-search > .ui-filter .ui-input-search { margin: 4px .3125em; } .jqm-search > .jqm-list { @@ -434,19 +437,19 @@ h2.jqm-home-widget { } /* List filter */ -.jqm-demos-home .jqm-content > .ui-listview-filter, -.jqm-demos-index .jqm-content > .ui-listview-filter { +.jqm-demos-home .jqm-content > .ui-filter, +.jqm-demos-index .jqm-content > .ui-filter { margin-top: 0; margin-bottom: -.5em; } -.jqm-demos-home .jqm-content > .ui-listview-filter .ui-input-search, -.jqm-demos-index .jqm-content > .ui-listview-filter .ui-input-search, -.jqm-demos-index .jqm-search-results-wrap > .ui-listview-filter .ui-input-search { +.jqm-demos-home .jqm-content > .ui-filter .ui-input-search, +.jqm-demos-index .jqm-content > .ui-filter .ui-input-search, +.jqm-demos-index .jqm-search-results-wrap > .ui-filter .ui-input-search { background-color: #f9f9f9; border-color: #e5e5e5; border-color: rgba(0,0,0,.1); } -.jqm-demos .jqm-search .ui-listview-filter .ui-input-search { +.jqm-demos .jqm-search .ui-filter .ui-input-search { background-color: #f9f9f9; border-color: #e5e5e5; border-color: rgba(0,0,0,.1); @@ -454,9 +457,9 @@ h2.jqm-home-widget { -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.2); box-shadow: inset 0 1px 2px rgba(0,0,0,.2); } -.jqm-demos-home .jqm-content > .ui-listview-filter .ui-input-search.ui-focus, -.jqm-demos-index .jqm-content > .ui-listview-filter .ui-input-search.ui-focus, -.jqm-demos-index .jqm-search-results-wrap > .ui-listview-filter .ui-input-search.ui-focus { +.jqm-demos-home .jqm-content > .ui-filter .ui-input-search.ui-focus, +.jqm-demos-index .jqm-content > .ui-filter .ui-input-search.ui-focus, +.jqm-demos-index .jqm-search-results-wrap > .ui-filter .ui-input-search.ui-focus { background-color: #fff; border-color: #34bae8; border-color: rgba(52,186,232,.2); @@ -464,7 +467,7 @@ h2.jqm-home-widget { -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 0 9px rgba(52,186,232,.2); box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 0 9px rgba(52,186,232,.2); } -.jqm-demos .jqm-search .ui-listview-filter .ui-input-search.ui-focus { +.jqm-demos .jqm-search .ui-filter .ui-input-search.ui-focus { background-color: #fff; border-color: #e5e5e5; border-color: rgba(0,0,0,.1); @@ -472,10 +475,10 @@ h2.jqm-home-widget { -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1); box-shadow: inset 0 1px 2px rgba(0,0,0,.1); } -.jqm-demos .jqm-search > .ui-listview-filter .ui-input-text, -.jqm-demos-home .jqm-content > .ui-listview-filter .ui-input-text, -.jqm-demos-index .jqm-content > .ui-listview-filter .ui-input-text, -.jqm-demos-index .jqm-search-results-wrap > .ui-listview-filter .ui-input-text { +.jqm-demos .jqm-search > .ui-filter .ui-input-text, +.jqm-demos-home .jqm-content > .ui-filter .ui-input-text, +.jqm-demos-index .jqm-content > .ui-filter .ui-input-text, +.jqm-demos-index .jqm-search-results-wrap > .ui-filter .ui-input-text { font-family: 'Open Sans', sans-serif; font-weight: 300; font-size: .95em; @@ -625,7 +628,7 @@ h2.jqm-home-widget { background: none; border: none; } - .jqm-demos .jqm-search > .ui-listview-filter .ui-input-search { + .jqm-demos .jqm-search > .ui-filter .ui-input-search { margin: 0; } .jqm-search > .jqm-list { diff --git a/demos/_assets/js/jqm-demos.js b/demos/_assets/js/jqm-demos.js index 7f5a515d157..1d480c54570 100644 --- a/demos/_assets/js/jqm-demos.js +++ b/demos/_assets/js/jqm-demos.js @@ -84,9 +84,6 @@ $( document ).on( "pageinit", ".jqm-demos", function() { theme: null, dividerTheme: null, icon: false, - filter: true, - filterReveal: true, - filterPlaceholder: "Search...", autodividers: true, autodividersSelector: function ( li ) { return ""; @@ -95,6 +92,9 @@ $( document ).on( "pageinit", ".jqm-demos", function() { enterToNav: true, highlight: true, submitTo: "search-results.php" + }).filterbar({ + filterReveal: true, + filterPlaceholder: "Search...", }); $( this ).find( ".jqm-header .jqm-search-link" ).on( "click", function() { @@ -121,20 +121,22 @@ $( document ).on( "pageinit", ".jqm-demos", function() { $( this ).find( ".jqm-search .ui-input-clear" ).trigger( "click" ); }); - $( this ).find( ".jqm-content ul.jqm-list " ).listview({ + $( this ).find( ".jqm-content ul" ).listview({ globalNav: "demos", inset: true, theme: null, dividerTheme: null, icon: false, - filter: true, - filterReveal: true, - filterPlaceholder: "Search...", arrowKeyNav: true, enterToNav: true, highlight: true }); + $( this ).find( ".jqm-content ul.jqm-widget-list" ).filterbar({ + filterReveal: true, + filterPlaceholder: "Search...", + }); + $( this ).find( ".jqm-search-results-list li, .jqm-search li" ).each(function() { var text = $( this ).attr( "data-filtertext" ); $( this ).find( "a" ).append( "// " + text + "" ); diff --git a/demos/index.php b/demos/index.php index a661b9a6eb2..c784c6ab4ca 100644 --- a/demos/index.php +++ b/demos/index.php @@ -38,7 +38,7 @@ Visit API Site -