Skip to content

Commit aecd69b

Browse files
asyraf9asyraf9
committed
Merge branch 'rc1'
Conflicts: README.md
2 parents 5e95345 + a5e8de6 commit aecd69b

File tree

462 files changed

+29796
-9172
lines changed

Some content is hidden

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

462 files changed

+29796
-9172
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ combine/
99
compiled/
1010
gitstatus.log
1111
refreshCDN
12+
*.swp
13+
.gitignore

‎.htaccess‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Makefile‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ DATE = $(shell date "+%Y%m%d")
55
VER = $(shell cat version.txt)
66

77
# The command to replace the @VERSION in the files with the actual version
8-
SED_VER = sed "s/@VERSION/$(shell git log -1 --format=format:" Git Build\n * Git Info SHA1: %H Date: %cd")/"
8+
SED_VER = sed "s/@VERSION/$(shell git log -1 --format=format:" Git || Date: %cd Info SHA1: %H")/"
99
deploy: SED_VER = sed "s/@VERSION/${VER}/"
1010

1111
# The version of jQuery core used
1212
JQUERY = $(shell grep Library js/jquery.js | sed s'/ \* jQuery JavaScript Library v//')
1313

1414
# The directory to create the zipped files in and also serves as the filenames
1515
DIR = jquery.mobile-${VER}
16+
nightly: DIR = jquery.mobile
1617

1718
# The output folder for the finished files
1819
OUTPUT = compiled
@@ -24,7 +25,6 @@ RMLATEST = echo ""
2425
NIGHTLY_OUTPUT = nightlies/${DATE}
2526
ifeq (${NIGHTLY_OUTPUT}, latest)
2627
RMLATEST = ssh jqadmin@code.origin.jquery.com 'rm -rf /var/www/html/code.jquery.com/mobile/latest'
27-
DIR = jquery.mobile
2828
endif
2929
NIGHTLY_WEBPATH = http://code.jquery.com/mobile/${NIGHTLY_OUTPUT}
3030

@@ -45,22 +45,29 @@ JSFILES = js/jquery.ui.widget.js \
4545
js/jquery.mobile.page.js \
4646
js/jquery.mobile.core.js \
4747
js/jquery.mobile.navigation.js \
48+
js/jquery.mobile.navigation.pushstate.js \
4849
js/jquery.mobile.transition.js \
49-
js/jquery.mobile.fixHeaderFooter.js \
50+
js/jquery.mobile.degradeInputs.js \
51+
js/jquery.mobile.dialog.js \
52+
js/jquery.mobile.page.sections.js \
53+
js/jquery.mobile.collapsible.js \
54+
js/jquery.mobile.fieldContain.js \
55+
js/jquery.mobile.grid.js \
56+
js/jquery.mobile.navbar.js \
57+
js/jquery.mobile.listview.js \
58+
js/jquery.mobile.listview.filter.js \
59+
js/jquery.mobile.nojs.js \
5060
js/jquery.mobile.forms.checkboxradio.js \
61+
js/jquery.mobile.forms.button.js \
62+
js/jquery.mobile.forms.slider.js \
5163
js/jquery.mobile.forms.textinput.js \
64+
js/jquery.mobile.forms.select.custom.js \
5265
js/jquery.mobile.forms.select.js \
5366
js/jquery.mobile.buttonMarkup.js \
54-
js/jquery.mobile.forms.button.js \
55-
js/jquery.mobile.forms.slider.js \
56-
js/jquery.mobile.collapsible.js \
5767
js/jquery.mobile.controlGroup.js \
58-
js/jquery.mobile.fieldContain.js \
59-
js/jquery.mobile.listview.js \
60-
js/jquery.mobile.listview.filter.js \
61-
js/jquery.mobile.dialog.js \
62-
js/jquery.mobile.navbar.js \
63-
js/jquery.mobile.grid.js \
68+
js/jquery.mobile.links.js \
69+
js/jquery.mobile.fixHeaderFooter.js \
70+
js/jquery.mobile.fixHeaderFooter.native.js \
6471
js/jquery.mobile.init.js
6572

6673
# The files to include when compiling the CSS files
@@ -110,7 +117,7 @@ init:
110117

111118
# Build the minified JS file
112119
min: init js
113-
# Build the minified Javascript file
120+
# Build the minified JavaScript file
114121
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${MIN}
115122
@@java -jar build/google-compiler-20110405.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
116123
@@cat ${MIN}.tmp >> ${OUTPUT}/${MIN}
@@ -121,7 +128,7 @@ notify:
121128
@@echo "The files have been built and are in " $$(pwd)/${OUTPUT}
122129

123130
# Pull the latest commits. This is used for the nightly build but can be used to save some keystrokes
124-
pull:
131+
pull:
125132
@@git pull --quiet
126133

127134
# Zip the 4 files and the theme images into one convenient package
@@ -136,12 +143,6 @@ zip: init js min css cssmin
136143

137144
# Used by the jQuery team to make the nightly builds
138145
nightly: pull zip
139-
# Create a log that lists the current version according to the code and the git information for the last commit
140-
@@echo $$"\nGit Release Version: " >> ${OUTPUT}/log.txt
141-
@@cat version.txt >> ${OUTPUT}/log.txt
142-
@@echo $$"\nGit Information for this build:" >> ${OUTPUT}/log.txt
143-
@@git log -1 --format=format:"SHA1: %H \nDate: %cd \nTitle: %s" >> ${OUTPUT}/log.txt
144-
145146
# Create the folder to hold the files for the demos
146147
@@mkdir -p ${VER}
147148

@@ -162,7 +163,7 @@ nightly: pull zip
162163
# Change the empty paths to the location of this nightly file
163164
@@find ${VER} -type f -name '*.html' -exec sed -i 's|href="themes/default/"|href="${NIGHTLY_WEBPATH}/${DIR}.min.css"|g' {} \;
164165
@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/jquery.js"|src="http://code.jquery.com/jquery-${JQUERY}.min.js"|' {} \;
165-
@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/"|src="${NIGHTLY_WEBPATH}/${DIR}.min.js"|g' {} \;
166+
@@find ${VER} -type f -name '*.html' -exec sed -i 's|src="js/"|src="${NIGHTLY_WEBPATH}/${DIR}.min.js"|g' {} \;
166167

167168
# Move the demos into the output folder
168169
@@mv ${VER} ${OUTPUT}/demos

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ Panel settings
8585
===================================
8686
there are two settings for panel divs:
8787

88-
1) data-hash - takes the following values: true(default), false, and crumbs
88+
1. data-hash - takes the following values: true(default), false, and crumbs
8989
this attribute tells splitview to track history for the panel or not (true and false), or to set a 'crumb' (crumbs) button at the top left portion of the header for each page.
9090

91-
2) data-context - takes a jQuery selector value, or a hash of the following: url, panel, refresh.
91+
2. data-context - takes a jQuery selector value, or a hash of the following: url, panel, refresh.
9292
data-context tells splitview to load another page whose link can be found in the active page by the jQuery selector value, or a page which is pointed to by the hash. example:
9393

9494
<div data-role="panel" data-id="menu" data-hash="crumbs" data-context="a#default">

‎build.xml‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,39 @@
2020
jquery.mobile.listview.css,
2121
jquery.mobile.forms.slider.css"/>
2222
<property name="js-sources" value="jquery.ui.widget.js,
23-
jquery.mobile.widget.js,
24-
jquery.mobile.media.js,
25-
jquery.mobile.support.js,
26-
jquery.mobile.vmouse.js,
27-
jquery.mobile.event.js,
28-
jquery.mobile.hashchange.js,
29-
jquery.mobile.page.js,
30-
jquery.mobile.core.js,
31-
jquery.mobile.navigation.js,
32-
jquery.mobile.transition.js,
33-
jquery.mobile.fixHeaderFooter.js,
34-
jquery.mobile.forms.checkboxradio.js,
35-
jquery.mobile.forms.textinput.js,
36-
jquery.mobile.forms.select.js,
37-
jquery.mobile.buttonMarkup.js,
38-
jquery.mobile.forms.button.js,
39-
jquery.mobile.forms.slider.js,
40-
jquery.mobile.collapsible.js,
41-
jquery.mobile.controlGroup.js,
42-
jquery.mobile.fieldContain.js,
43-
jquery.mobile.listview.js,
44-
jquery.mobile.listview.filter.js,
45-
jquery.mobile.dialog.js,
46-
jquery.mobile.navbar.js,
47-
jquery.mobile.grid.js,
48-
jquery.mobile.init.js"/>
23+
jquery.mobile.widget.js,
24+
jquery.mobile.media.js,
25+
jquery.mobile.support.js,
26+
jquery.mobile.vmouse.js,
27+
jquery.mobile.event.js,
28+
jquery.mobile.hashchange.js,
29+
jquery.mobile.page.js,
30+
jquery.mobile.core.js,
31+
jquery.mobile.navigation.js,
32+
jquery.mobile.navigation.pushstate.js,
33+
jquery.mobile.transition.js,
34+
jquery.mobile.degradeInputs.js,
35+
jquery.mobile.dialog.js,
36+
jquery.mobile.page.sections.js,
37+
jquery.mobile.collapsible.js,
38+
jquery.mobile.fieldContain.js,
39+
jquery.mobile.grid.js,
40+
jquery.mobile.navbar.js,
41+
jquery.mobile.listview.js,
42+
jquery.mobile.listview.filter.js,
43+
jquery.mobile.nojs.js,
44+
jquery.mobile.forms.checkboxradio.js,
45+
jquery.mobile.forms.button.js,
46+
jquery.mobile.forms.slider.js,
47+
jquery.mobile.forms.textinput.js,
48+
jquery.mobile.forms.select.custom.js,
49+
jquery.mobile.forms.select.js,
50+
jquery.mobile.buttonMarkup.js,
51+
jquery.mobile.controlGroup.js,
52+
jquery.mobile.links.js,
53+
jquery.mobile.fixHeaderFooter.js,
54+
jquery.mobile.fixHeaderFooter.native.js,
55+
jquery.mobile.init.js"/>
4956

5057
<target name="merge">
5158
<antcall target="merge_css" />

‎combine.php‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
<?php
2-
3-
if (!isset($type) || !isset($elements))
2+
// Get the filetype and array of files
3+
if ( ! isset($type) || ! isset($files) )
44
{
5-
echo "\$type and \$elements must be specified!";
5+
echo '$type and $files must be specified!';
66
exit;
77
}
88

99
$contents = '';
10-
reset($elements);
11-
while (list(,$element) = each($elements)) {
12-
$contents .= "\n\n" . file_get_contents($element);
10+
11+
// Loop through the files adding them to a string
12+
foreach ( $files as $file ) {
13+
$contents .= file_get_contents($file). "\n\n";
1314
}
1415

15-
header("Content-Type: " . $type);
16-
header("Content-Length: " . strlen($contents));
16+
// Set the content type, filesize and an expiration so its not cached
17+
header('Content-Type: ' . $type);
18+
header('Content-Length: ' . strlen($contents));
19+
header('Expires: Fri, 01 Jan 2010 05:00:00 GMT');
20+
21+
// Deliver the file
1722
echo $contents;
18-
?>

0 commit comments

Comments
 (0)