Merge 2ccb682 into d27cb58

jquery-archive · Feb 2, 2015 · daefec1 · daefec1
2 parents d27cb58 + 2ccb682
commit daefec1
Show file tree

Hide file tree

Showing 31 changed files with 290 additions and 255 deletions.
diff --git a/css/structure/jquery.mobile.filterable.css b/css/structure/jquery.mobile.filterable.css
@@ -5,7 +5,7 @@ html .ui-filterable.ui-listview {
 .ui-collapsible-content > form.ui-filterable {
 	margin-top: -.5em;
 }
-.ui-collapsible-content > .ui-input-search.ui-filterable {
+.ui-collapsible-content > .ui-textinput-search.ui-filterable {
 	margin-top: 0;
 }
 .ui-collapsible-content > .ui-filterable + .ui-listview:not(.ui-listview-inset) > li.ui-first-child,

diff --git a/css/structure/jquery.mobile.forms.textinput.autogrow.css b/css/structure/jquery.mobile.forms.textinput.autogrow.css
@@ -1,4 +1,4 @@
-textarea.ui-input-text.ui-textinput-autogrow {
+textarea.ui-textinput-text.ui-textinput-autogrow {
 	overflow: hidden;
 }
 

diff --git a/css/structure/jquery.mobile.forms.textinput.css b/css/structure/jquery.mobile.forms.textinput.css
@@ -1,15 +1,15 @@
-.ui-input-text,
-.ui-input-search {
+.ui-textinput-text,
+.ui-textinput-search {
 	margin: .5em 0;
 	border-width: 1px;
 	border-style: solid;
 }
 .ui-mini {
 	margin: .446em;
 }
-.ui-input-text input,
-.ui-input-search input,
-textarea.ui-input-text {
+.ui-textinput-text input,
+.ui-textinput-search input,
+textarea.ui-textinput-text {
 	padding: .4em;
 	line-height: 1.4em;
 	display: block;
@@ -19,8 +19,8 @@ textarea.ui-input-text {
 	box-sizing: border-box;
 	outline: 0;
 }
-.ui-input-text input,
-.ui-input-search input {
+.ui-textinput-text input,
+.ui-textinput-search input {
 	margin: 0;
 	min-height: 2.2em;
 	text-align: left; /* Opera aligns type="date" right by default */
@@ -30,35 +30,35 @@ textarea.ui-input-text {
 	-webkit-border-radius: inherit;
 	border-radius: inherit;
 }
-textarea.ui-input-text {
+textarea.ui-textinput-text {
 	overflow: auto;
 	resize: vertical;
 }
-.ui-mini .ui-input-text input,
-.ui-mini .ui-input-search input,
-.ui-input-text.ui-mini input,
-.ui-input-search.ui-mini input,
-.ui-mini textarea.ui-input-text,
+.ui-mini .ui-textinput-text input,
+.ui-mini .ui-textinput-search input,
+.ui-textinput-text.ui-mini input,
+.ui-textinput-search.ui-mini input,
+.ui-mini textarea.ui-textinput-text,
 textarea.ui-mini {
 	font-size: 14px;
 }
 /* Same margin for mini textareas as other mini sized widgets (12.5/14 * 0.5em) */
-.ui-mini textarea.ui-input-text,
+.ui-mini textarea.ui-textinput-text,
 textarea.ui-mini {
 	margin: .446em 0;
 }
-.ui-input-has-clear,
-.ui-input-search {
+.ui-textinput-has-clear,
+.ui-textinput-search {
 	position: relative;
 }
 /* Padding on the div instead of input because of browser spinners etc. */
-.ui-input-has-clear {
+.ui-textinput-has-clear {
 	padding-right: 2.375em;
 }
-.ui-mini.ui-input-has-clear {
+.ui-mini.ui-textinput-has-clear {
 	padding-right: 2.923em;
 }
-.ui-input-has-clear input {
+.ui-textinput-has-clear input {
 	padding-right: 0;
 	/* Autofill on Chrome has bg color so we unset corners right as well. */
 	-webkit-border-top-right-radius: 0;
@@ -67,10 +67,10 @@ textarea.ui-mini {
 	border-bottom-right-radius: 0;
 }
 /* Search icon */
-.ui-input-search input {
+.ui-textinput-search input {
 	padding-left: 1.75em;
 }
-.ui-input-search .ui-icon {
+.ui-textinput-search .ui-icon {
 	position: absolute;
 	left: .3125em;
 	top: 50%;
@@ -82,44 +82,44 @@ textarea.ui-mini {
 	filter: Alpha(Opacity=50);
 	opacity: .5;
 }
-.ui-input-search.ui-input-has-clear .ui-button.ui-input-clear,
-.ui-input-text.ui-input-has-clear .ui-button.ui-input-clear {
+.ui-textinput-search.ui-textinput-has-clear .ui-button.ui-textinput-clear,
+.ui-textinput-text.ui-textinput-has-clear .ui-button.ui-textinput-clear {
 	position: absolute;
 	right: 0;
 	top: 50%;
 	margin: -14px .3125em 0;
 	border: 0;
 	background-color: transparent;
 }
-.ui-input-search .ui-input-clear-hidden,
-.ui-input-text .ui-input-clear-hidden {
+.ui-textinput-search .ui-textinput-clear-hidden,
+.ui-textinput-text .ui-textinput-clear-hidden {
 	display: none;
 }
 /* Resolves issue #5166: Added to support issue introduced in Firefox 15. We can likely remove this in the future. */
-.ui-input-text input::-moz-placeholder,
-.ui-input-search input::-moz-placeholder,
-textarea.ui-input-text::-moz-placeholder {
+.ui-textinput-text input::-moz-placeholder,
+.ui-textinput-search input::-moz-placeholder,
+textarea.ui-textinput-text::-moz-placeholder {
 	color: #aaa;
 }
 /* Same for IE10 */
-.ui-input-text input:-ms-input-placeholder,
-.ui-input-search input:-ms-input-placeholder,
-textarea.ui-input-text:-ms-input-placeholder {
+.ui-textinput-text input:-ms-input-placeholder,
+.ui-textinput-search input:-ms-input-placeholder,
+textarea.ui-textinput-text:-ms-input-placeholder {
 	color: #aaa;
 }
 
 /* Resolves issue #5131: Width of textinput depends on its type,
 for Android 4.1 */
-.ui-input-text input[type=number]::-webkit-outer-spin-button {
+.ui-textinput-text input[type=number]::-webkit-outer-spin-button {
 	margin: 0;
 }
 /* Resolves issue #5756: Textinput in IE10 has a default clear button */
-.ui-input-text input::-ms-clear,
-.ui-input-search input::-ms-clear {
+.ui-textinput-text input::-ms-clear,
+.ui-textinput-search input::-ms-clear {
 	display: none;
 }
-.ui-input-text input:focus,
-.ui-input-search input:focus {
+.ui-textinput-text input:focus,
+.ui-textinput-search input:focus {
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
 	box-shadow: none;

diff --git a/css/themes/default/jquery.mobile.icons.css b/css/themes/default/jquery.mobile.icons.css
diff --git a/css/themes/default/jquery.mobile.icons.external-png.css b/css/themes/default/jquery.mobile.icons.external-png.css
@@ -334,7 +334,7 @@
 }
 .ui-alt-icon.ui-icon-search,
 .ui-alt-icon .ui-icon-search,
-.ui-input-search {
+.ui-textinput-search {
 	background-image: url("images/icons-png/search-black.png");
 }
 .ui-alt-icon.ui-icon-shop,

diff --git a/css/themes/default/jquery.mobile.icons.inline-png.css b/css/themes/default/jquery.mobile.icons.inline-png.css
@@ -334,7 +334,7 @@
 }
 .ui-alt-icon.ui-icon-search,
 .ui-alt-icon .ui-icon-search,
-.ui-input-search {
+.ui-textinput-search {
 	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAOZJREFUOMuV0U8rxFEUxvFPSjMUG/oRio2ivAZLG3ulZGsjzevwBpTZzAuYlD3Zi2JhZKEs7Aclf/Jvc3D7dX8TT906Pc/5nu49l1/VsYUjXOME25jUQ9O4xGfmPGA5B9XRiaYOVjCLReyF/4SFMriZQMOZwc3I98vBQQSrFc8YxRte4nY/ugpwvscObqJn5tvoQzfqiQqohiLqbgoeRt2oADcwgFPcp8E47uIqLYwl227gNbK13NQlPEbDO27xXPrPM4zk4Dm0E+ADx1jHRXjnseWs+jGFocQr/grnlMI7/qkCuxj8AkXLP4FD310vAAAAAElFTkSuQmCC");
 }
 .ui-alt-icon.ui-icon-shop,

diff --git a/css/themes/default/jquery.mobile.icons.inline-svg.css b/css/themes/default/jquery.mobile.icons.inline-svg.css
diff --git a/css/themes/default/jquery.mobile.theme.css b/css/themes/default/jquery.mobile.theme.css
@@ -17,8 +17,8 @@ button,
 	font-family: sans-serif /*{global-font-family}*/;
 }
 legend,
-.ui-input-text input,
-.ui-input-search input {
+.ui-textinput-text input,
+.ui-textinput-search input {
 	color: inherit;
 	text-shadow: inherit;
 }

diff --git a/demos/_assets/css/jqm-demos.css b/demos/_assets/css/jqm-demos.css
@@ -249,10 +249,10 @@
 .jqm-search-panel .ui-panel-inner {
 	padding-top: 0;
 }
-.jqm-search-panel .ui-input-search {
+.jqm-search-panel .ui-textinput-search {
 	margin: 1em 0;
 }
-.jqm-search-panel .ui-input-search.ui-focus {
+.jqm-search-panel .ui-textinput-search.ui-focus {
 	-webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.2);
 	-moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.2);
 	box-shadow: inset 0 1px 3px rgba(0,0,0,.2);

diff --git a/demos/filterable/index.php b/demos/filterable/index.php
@@ -285,7 +285,7 @@
 	<p>The filterable widget is able to use the search input whether or not the search input is itself pre-rendered. In the example below, both the search input and the filterable are pre-rendered.</p>
 	<div data-demo-html="true">
 		<form>
-			<div class="ui-input-search ui-body-inherit ui-corner-all ui-shadow-inset ui-input-has-clear">
+			<div class="ui-textinput-search ui-body-inherit ui-corner-all ui-shadow-inset ui-textinput-has-clear">
 				<input data-type="search" data-enhanced="true" data-inset="false" id="pre-rendered-example-input" placeholder="Filter items..." value="au">
 			</div>
 			<div data-role="controlgroup" data-enhanced="true" data-filter="true" data-filter-reveal="true" data-input="#pre-rendered-example-input" class="ui-controlgroup ui-controlgroup-vertical ui-corner-all">

diff --git a/demos/intro/index.php b/demos/intro/index.php
@@ -85,7 +85,7 @@
 		<div data-demo-html="true">
 		<form>
 			<label for="textinput-s">Text Input:</label>
-			<input type="text" name="textinput-s" id="textinput-s" placeholder="Text input" value="" data-clear-button="true">
+			<input type="text" name="textinput-s" id="textinput-s" placeholder="Text input" value="" data-clear-btn="true">
 
 			<label for="select-native-s">Select:</label>
 			<select name="select-native-s" id="select-native-s">

diff --git a/demos/listview/index.php b/demos/listview/index.php
@@ -313,7 +313,7 @@
 					<ul data-role="listview" data-inset="true">
                         <li class="ui-field-contain">
                             <label for="name2">Text Input:</label>
-                            <input type="text" name="name2" id="name2" value="" data-clear-button="true">
+                            <input type="text" name="name2" id="name2" value="" data-clear-btn="true">
                         </li>
                         <li class="ui-field-contain">
                             <label for="textarea2">Textarea:</label>

diff --git a/demos/panel-fixed/index.php b/demos/panel-fixed/index.php
@@ -114,10 +114,10 @@
         	<h2>Login</h2>
 
             <label for="name">Username:</label>
-            <input type="text" name="name" id="name" value="" data-clear-button="true" data-mini="true">
+            <input type="text" name="name" id="name" value="" data-clear-btn="true" data-mini="true">
 
             <label for="password">Password:</label>
-            <input type="password" name="password" id="password" value="" data-clear-button="true" autocomplete="off" data-mini="true">
+            <input type="password" name="password" id="password" value="" data-clear-btn="true" autocomplete="off" data-mini="true">
 
             <div class="ui-grid-a">
                 <div class="ui-block-a"><a href="#" data-rel="close" class="ui-button ui-shadow ui-corner-all ui-button-b ui-mini">Cancel</a></div>

diff --git a/demos/panel-responsive/index.php b/demos/panel-responsive/index.php
@@ -85,10 +85,10 @@
         	<h2>Login</h2>
 
             <label for="name">Username:</label>
-            <input type="text" name="name" id="name" value="" data-clear-button="true" data-mini="true">
+            <input type="text" name="name" id="name" value="" data-clear-btn="true" data-mini="true">
 
             <label for="password">Password:</label>
-            <input type="password" name="password" id="password" value="" data-clear-button="true" autocomplete="off" data-mini="true">
+            <input type="password" name="password" id="password" value="" data-clear-btn="true" autocomplete="off" data-mini="true">
 
             <div class="ui-grid-a">
                 <div class="ui-block-a"><a href="#" data-rel="close" class="ui-button ui-shadow ui-corner-all ui-button-b ui-mini">Cancel</a></div>

diff --git a/demos/selectmenu-custom-filter/index.php b/demos/selectmenu-custom-filter/index.php
@@ -111,7 +111,7 @@ function pageIsSelectmenuDialog( page ) {
 })( jQuery );
 	</script>
 	<style>
-		.ui-selectmenu.ui-popup .ui-input-search {
+		.ui-selectmenu.ui-popup .ui-textinput-search {
 			margin-left: .5em;
 			margin-right: .5em;
 		}