Skip to content

Commit 07470ac

Browse files
arschmitzarschmitz
committed
Merge remote-tracking branch 'remotes/origin/master' into slide-panel-refactor
Conflicts: js/jquery.mobile.support.js
2 parents 0aecce4 + acf1621 commit 07470ac

File tree

161 files changed

+6198
-2268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+6198
-2268
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ It is IMPORTANT that you always provide a test page when submitting an issue!
2626

2727
* What? - Keep the test page as simple as possible. Only include markup/code that is required to reproduce the issue.
2828

29-
* How? - Use our [JS Bin template](http://jsbin.com/uzaret/edit) which uses latest code on branch "master". Copy the updated url when you are done editing.
29+
* How? - Use our [JS Bin template](http://jsbin.com/amozef/1/edit) which uses latest code on branch "master". When you start editing the JS Bin, the url will update and contain a new version number. As long as you keep the JS Bin open in your browser this url won't change. Copy the url in your issue report when you are done editing. If your test case requires multiple "single" jQuery Mobile pages, open the JS Bin on multiple tabs on your browser and each of them will get an unique url. Link to this url without "/edit" at the end on your other page(s).
3030
* You will notice if the issue has been fixed already
3131
* It enables us to edit your code if necessary
3232
* The test page won't disappear or change while we are looking into the issue

‎build/tasks/config.js‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ module.exports = function( grunt ) {
2727
});
2828

2929
grunt.registerTask( 'config:test:pages', 'glob and log all possible tests', function( a, b ) {
30-
var test_paths = [], global_config = grunt.config.get( 'global' ), env = process.env;
30+
var test_paths = [], filtered_paths = [], global_config = grunt.config.get( 'global' ), env = process.env;
3131

3232
// TODO move the glob to a legit config or pull the one from the qunit config
3333
test_paths = glob.glob( 'tests/unit/*/' );
34+
35+
// TODO this captures a few straggling subdirectories with index based tests
36+
// it could cause build failures but that will be immediately obvious
37+
test_paths = test_paths.concat( glob.glob('tests/unit/*/*/index.html') );
3438
test_paths = test_paths.concat( glob.glob('tests/unit/**/*-tests.html') );
3539

3640
// append the jquery version query param where defined
@@ -45,14 +49,23 @@ module.exports = function( grunt ) {
4549
test_paths = paths_with_jquery;
4650
}
4751

48-
// if this test is not a dependency log pages
49-
if( this.name.indexOf('config:test:page') > -1 ) {
52+
if( env.TEST_PATH ) {
5053
test_paths.forEach(function( path ) {
51-
grunt.log.writeln( (env.ROOT_DOMAIN || "") + path );
54+
if( path.indexOf(env.TEST_PATH) >= 0 ) {
55+
filtered_paths.push( path );
56+
}
5257
});
58+
} else {
59+
filtered_paths = test_paths;
5360
}
5461

55-
global_config.test_paths = test_paths;
62+
// if this test is not a dependency log pages
63+
grunt.log.writeln( "Pages to be tested: " );
64+
filtered_paths.forEach(function( path ) {
65+
grunt.log.writeln( (env.ROOT_DOMAIN || "") + path );
66+
});
67+
68+
global_config.test_paths = filtered_paths;
5669
grunt.config.set( 'global', global_config );
5770
});
5871

@@ -66,13 +79,7 @@ module.exports = function( grunt ) {
6679

6780
// select the proper domain + paths
6881
test_paths.forEach( function( file_path ) {
69-
var full_path = env.ROOT_DOMAIN + file_path;
70-
71-
// if no test path is defined or if the path matches that specified in the env
72-
// add it to the config
73-
if( !process.env.TEST_PATH || file_path.indexOf(process.env.TEST_PATH) >= 0 ) {
74-
server_paths.push( full_path );
75-
}
82+
server_paths.push( env.ROOT_DOMAIN + file_path );
7683
});
7784

7885
grunt.config.set( 'qunit', { all: server_paths });

‎css/structure/jquery.mobile.controlgroup.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
.ui-bar .ui-controlgroup { margin: 0 5px; }
55

66
.ui-controlgroup-label { font-size: 16px; line-height: 1.4; font-weight: normal; margin: 0 0 .4em; }
7-
.ui-controlgroup-controls label.ui-select { position: absolute; left: -9999px; }
7+
.ui-controlgroup-controls label.ui-select,
8+
.ui-controlgroup-controls label.ui-submit { position: absolute; left: -9999px; }
89
.ui-controlgroup li { list-style: none; }
910

1011
.ui-controlgroup .ui-btn { margin: 0; }

‎css/structure/jquery.mobile.fixedToolbar.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
.ui-page-footer-fixed {
3535
padding-bottom: 2.6875em;
3636
}
37-
.ui-page-header-fullscreen .ui-content,
38-
.ui-page-footer-fullscreen .ui-content {
37+
.ui-page-header-fullscreen > .ui-content,
38+
.ui-page-footer-fullscreen > .ui-content {
3939
padding: 0;
4040
}
4141
.ui-fixed-hidden {

‎css/structure/jquery.mobile.forms.rangeslider.css‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
.ui-rangeslider {
2+
zoom: 1;
3+
margin: 0;
4+
}
5+
.ui-rangeslider:before,
6+
.ui-rangeslider:after {
7+
content: "";
8+
display: table;
9+
}
10+
.ui-rangeslider:after {
11+
clear: both;
12+
}
13+
/* Margin-top/bottom: .5em * 16px/14px to make it equal to ui-rangeslider-sliders margin (input font-size is 14px) */
14+
.ui-rangeslider input.ui-input-text.ui-slider-input {
15+
margin: .57143em 0;
16+
}
17+
.ui-rangeslider.ui-mini input.ui-slider-input {
18+
margin: .28571em 0;
19+
}
20+
.ui-rangeslider input.ui-slider-input.ui-rangeslider-last {
21+
float: right;
22+
}
23+
.ui-rangeslider .ui-rangeslider-sliders {
24+
position: relative;
25+
overflow: visible;
26+
height: 30px;
27+
margin: .5em 68px;
28+
}
29+
.ui-rangeslider.ui-mini .ui-rangeslider-sliders {
30+
margin: .25em 68px;
31+
}
32+
.ui-field-contain .ui-rangeslider input.ui-slider-input,
33+
.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input,
34+
.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,
35+
.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders {
36+
margin-top: 0;
37+
margin-bottom: 0;
38+
}
39+
.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track {
40+
position: absolute;
41+
top: 6px;
42+
right: 0;
43+
left: 0;
44+
margin: 0;
45+
}
46+
.ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track {
47+
top: 8px;
48+
}
49+
.ui-rangeslider .ui-slider-track:first-child .ui-slider-bg {
50+
display: none;
51+
}
52+
.ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child {
53+
background-color: transparent;
54+
background: none;
55+
border-width: 0;
56+
height: 0;
57+
}
58+
59+
/* this makes ie6 and ie7 set height to 0 to fix z-index problem */
60+
html >/**/body .ui-rangeslider .ui-rangeslider-sliders .ui-slider-track:first-child {
61+
height: 15px;
62+
border-width: 1px;
63+
}
64+
html >/**/body .ui-rangeslider.ui-mini .ui-rangeslider-sliders .ui-slider-track:first-child {
65+
height: 12px;
66+
}
67+
68+
@media all and (min-width: 28em){
69+
.ui-field-contain .ui-rangeslider label.ui-slider {
70+
float: left;
71+
}
72+
.ui-field-contain .ui-rangeslider input.ui-slider-input {
73+
position: relative;
74+
z-index: 1;
75+
}
76+
.ui-field-contain .ui-rangeslider input.ui-slider-input.ui-rangeslider-first,
77+
.ui-field-contain .ui-rangeslider.ui-mini input.ui-slider-input.ui-rangeslider-first {
78+
margin-right: 17px;
79+
}
80+
.ui-field-contain .ui-rangeslider .ui-rangeslider-sliders,
81+
.ui-field-contain .ui-rangeslider.ui-mini .ui-rangeslider-sliders {
82+
float: left;
83+
width: 78%;
84+
margin: 0 -68px;
85+
}
86+
.ui-field-contain .ui-rangeslider .ui-slider-track,
87+
.ui-field-contain .ui-rangeslider.ui-mini .ui-slider-track {
88+
right: 68px;
89+
left: 68px;
90+
}
91+
.ui-field-contain.ui-hide-label .ui-rangeslider input.ui-slider-input.ui-rangeslider-first {
92+
margin: 0;
93+
}
94+
.ui-field-contain.ui-hide-label .ui-rangeslider .ui-rangeslider-sliders,
95+
.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-rangeslider-sliders {
96+
width: auto;
97+
float: none;
98+
margin: 0 68px;
99+
}
100+
.ui-field-contain.ui-hide-label .ui-rangeslider .ui-slider-track,
101+
.ui-field-contain.ui-hide-label .ui-rangeslider.ui-mini .ui-slider-track {
102+
right: 0;
103+
left: 0;
104+
}
105+
}

0 commit comments

Comments
 (0)