.gitattributes

@@ -0,0 +1,5 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# JS files must always use LF for tools to work
+*.js eol=lf

.gitignore

@@ -1,9 +1,3 @@
-dist
-node_modules
-config.json
-.project
-*~
-*.diff
-*.patch
-.DS_Store
-.settings
+/dist/
+/node_modules/
+config.js*

.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - "0.12"
+before_script:
+  - npm install -g grunt-cli

CONTRIBUTING.md

@@ -2,4 +2,4 @@ Welcome! Thanks for your interest in contributing to api.jquerymobile.com. You'r
 
 You may also want to take a look at our [commit & pull request guide](http://contribute.jquery.org/commits-and-pull-requests/) and [style guides](http://contribute.jquery.org/style-guide/) for instructions on how to maintain your fork and submit your code. Before we can merge any pull request, we'll also need you to sign our [contributor license agreement](http://contribute.jquery.org/cla).
 
-You can find us on [IRC](http://irc.jquery.org), specifically in [#jquerymobile-dev](irc://irc.freenode.net/#jquerymobile-dev) and [#jquery-content](irc://irc.freenode.net/#jquery-content) should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/).
+You can find us on [IRC](http://irc.jquery.org), specifically in #jqueryui-dev and #jquery-content should you have any questions. If you've never contributed to open source before, we've put together [a short guide with tips, tricks, and ideas on getting started](http://contribute.jquery.org/open-source/).

Gruntfile.js

@@ -0,0 +1,46 @@
+module.exports = function( grunt ) {
+
+grunt.loadNpmTasks( "grunt-jquery-content" );
+
+grunt.initConfig({
+	xmllint: {
+		all: [
+			"entries/**",
+			"includes/**",
+			"categories.xml",
+			"entries2html.xsl",
+			"notes.xsl"
+		]
+	},
+	"build-posts": {
+		page: "pages/**"
+	},
+	"build-xml-entries": {
+		all: "entries/**"
+	},
+	"build-resources": {
+		all: "resources/**"
+	},
+	wordpress: (function() {
+
+		// There's no config for CI, but we don't need one for basic testing
+		var config = {};
+		try {
+			config = require( "./config" );
+		} catch ( error ) {}
+		config.dir = "dist/wordpress";
+		return config;
+	})()
+});
+
+grunt.registerTask( "lint", [ "xmllint" ] );
+
+grunt.registerTask( "build", [
+	"build-posts",
+	"build-resources",
+	"build-xml-entries",
+	"build-xml-categories",
+	"build-xml-full"
+]);
+
+};

LICENSE-MIT.txt → LICENSE.txt

@@ -1,8 +1,13 @@
-Copyright (c) 2013 jQuery Foundation, https://jquery.org/
+Copyright jQuery Foundation and other contributors, https://jquery.org/
 
 This software consists of voluntary contributions made by many
 individuals. For exact contribution history, see the revision history
-and logs, available at https://github.com/jquery/api.jquerymobile.com
+available at https://github.com/jquery/api.jquerymobile.com
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -22,3 +27,18 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation and all examples and demos.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+All files located in the node_modules directory are externally
+maintained libraries used by this software which have their own
+licenses; we recommend you read them, as their terms may differ from the
+terms above.

README.md

@@ -1,15 +1,12 @@
-api.jquerymobile.com
-====================
+# api.jquerymobile.com
 
-## Building
+## Building and Deploying
 
-### Requirements
-* <a href="http://www.xmlsoft.org/">libxml2</a>
-* <a href="http://xmlsoft.org/XSLT/">libxslt</a>
-
-The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Windows, you can get libxml2 and libxslt from <a href="http://sourceforge.net/projects/gnuwin32/files/">GnuWin32</a>.
+To build and deploy your changes for previewing in a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/).
 
-### Build
+### Requirements
 
-To build and deploy your changes for previewing in a [`jquery-wp-content`](https://github.com/jquery/jquery-wp-content) instance, follow the [workflow instructions](http://contribute.jquery.org/web-sites/#workflow) from our documentation on [contributing to jQuery Foundation web sites](http://contribute.jquery.org/web-sites/).
+* [libxml2](http://xmlsoft.org/)
+* [libxslt](http://xmlsoft.org/libxslt/)
 
+The `xmllint` and `xsltproc` utilities need to be in your path. If you are on Windows, you can get libxml2 and libxslt from <a href="http://sourceforge.net/projects/gnuwin32/files/">GnuWin32</a>.

config-sample.json

@@ -1,5 +1,5 @@
 {
-	"url": "local.api.jquerymobile.com",
+	"url": "vagrant.api.jquerymobile.com",
 	"username": "admin",
 	"password": "secret"
 }

entries/buttonMarkup.xml

@@ -4,7 +4,7 @@
 	<title>.buttonMarkup()</title>
 	<desc>Adds button styling to an element</desc>
 	<longdesc>
-		<strong>Note: .buttonMarkup() is deprecated as of jQuery Mobile 1.4.0 and will be removed in 1.5.0. You can now assign the full range of button style options to your <code>button</code> or <code>a</code> elements by simply adding classes.</strong>
+		<div class="warning"><strong>Note:</strong> .buttonMarkup() is deprecated as of jQuery Mobile 1.4.0 and will be removed in 1.5.0. You can now assign the full range of button style options to your <code>button</code> or <code>a</code> elements by simply adding classes.</div>
 		<p></p>
 		<h2 id="migration">Transition to class-based styling</h2>
 		Keeping in mind the followings will make it easy for you to transition from the button styling based on data attributes to the class-based process:

entries/checkboxradio.xml

@@ -16,7 +16,7 @@
 <label for="checkbox-1">I agree</label>
 ]]></code></pre>
 		<p>The above snippets will produce two basic checkboxes. The default styles will set the width of the element to 100% of the parent container.
-		<iframe src="/resources/checkbox/example1.html" style="width:100%;height:120px;border:0px"></iframe></p>
+		<iframe src="/resources/checkbox/example1.html" style="width:100%;height:130px;border:0px"></iframe></p>
 
 		<h3>Mini version</h3>
 
@@ -46,7 +46,7 @@
 	</fieldset>
 </div>
 ]]></code></pre>
-		<iframe src="/resources/checkbox/example3.html" style="width:100%;height:100px;border:0px"></iframe>
+		<iframe src="/resources/checkbox/example3.html" style="width:100%;height:120px;border:0px"></iframe>
 
 		<h3>Vertically grouped checkboxes</h3>
 
@@ -71,7 +71,7 @@
 </div>
 ]]></code></pre>
 
-		<iframe src="/resources/checkbox/example4.html" style="width:100%;height:220px;border:0px"></iframe>
+		<iframe src="/resources/checkbox/example4.html" style="width:100%;height:240px;border:0px"></iframe>
 
 		<h3>Horizontal toggle sets</h3>
 
@@ -123,7 +123,7 @@
 ]]></code></pre>
 
 		<p>This will produce a vertically grouped radio button set. The default styles set the width of the button group to 100% of the parent container and stacks the label on a separate line.
-		<iframe src="/resources/radiobutton/example1.html" style="width:100%;height:210px;border:0px"></iframe></p>
+		<iframe src="/resources/radiobutton/example1.html" style="width:100%;height:240px;border:0px"></iframe></p>
 
 		<h3>Mini version</h3>
 
@@ -169,7 +169,7 @@
 </div>
 ]]></code></pre>
 
-		<iframe src="/resources/radiobutton/example3.html" style="width:100%;height:210px;border:0px"></iframe>
+		<iframe src="/resources/radiobutton/example3.html" style="width:100%;height:230px;border:0px"></iframe>
 
 		<h3>Horizontal radio button sets</h3>
 

entries/classes.xml

@@ -50,8 +50,7 @@
 			</tr>
 			<tr>
 				<td class="enum-value"><div style="white-space: nowrap;">ui-shadow-icon</div></td>
-				<td>Draws a shadow around the icon.
-					<p class="warning"><strong>Note:</strong> This class is deprecated as of jQuery Mobile 1.4.0 and will be removed in 1.5.0.</p></td>
+				<td>Draws a shadow around the icon.</td>
 			</tr>
 			<tr><th colspan="2">Icon positioning</th></tr>
 			<tr>
@@ -117,11 +116,11 @@
 			</tr>
 			<tr>
 				<td class="enum-value"><div style="white-space: nowrap;">ui-icon-<strong>carat-l</strong></div></td>
-				<td>A carat pointing left (&gt;).</td>
+				<td>A carat pointing left (&lt;).</td>
 			</tr>
 			<tr>
 				<td class="enum-value"><div style="white-space: nowrap;">ui-icon-<strong>carat-r</strong></div></td>
-				<td>A carat pointing right (&lt;).</td>
+				<td>A carat pointing right (&gt;).</td>
 			</tr>
 			<tr>
 				<td class="enum-value"><div style="white-space: nowrap;">ui-icon-<strong>carat-t</strong></div></td>
@@ -185,7 +184,7 @@
 			</tr>
 			<tr>
 				<td class="enum-value" id="theme-classes-ui-body"><div style="white-space: nowrap;">ui-body-[a-z]</div></td>
-				<td>Sets the color scheme (swatch) for a content block. This includes page content panes (<strong>deprecated as of 1.4.0</strong>), listview items, popups, collapsibles, the loader widget, sliders, and panels.</td>
+				<td>Sets the color scheme (swatch) for a content block. This includes page content panes (<span class="warning">deprecated as of 1.4.0</span>), listview items, popups, collapsibles, the loader widget, sliders, and panels.</td>
 			</tr>
 			<tr>
 				<td class="enum-value" id="theme-classes-ui-btn"><div style="white-space: nowrap;">ui-btn-[a-z]</div></td>

entries/collapsible.xml

@@ -16,7 +16,7 @@
 </div>
 ]]></code></pre>
 		<p>This code will create a collapsible widget like this:
-		<iframe src="/resources/collapsible/example1.html" style="width:100%;height:140px;border:0px"></iframe>
+		<iframe src="/resources/collapsible/example1.html" style="width:100%;height:150px;border:0px"></iframe>
 		</p>
 
 		<h3>Initially expanded collapsibles</h3>
@@ -28,7 +28,7 @@
 ]]></code></pre>
 
 		<p>This code will create a collapsible widget like this:
-		<iframe src="/resources/collapsible/example2.html" style="width:100%;height:140px;border:0px"></iframe></p>
+		<iframe src="/resources/collapsible/example2.html" style="width:100%;height:170px;border:0px"></iframe></p>
 
 		<h3>Non-inset collapsibles</h3>
 
@@ -43,7 +43,7 @@
 
 		<h3>Mini collapsibles</h3>
 
-		<p>For a more compact version that is useful in toolbars and tight spaces, add the <code>data-mini="true"</code> attribute to the element to create a <a href="../forms/forms-all-mini.html">mini version</a>.</p>
+		<p>For a more compact version that is useful in toolbars and tight spaces, add the <code>data-mini="true"</code> attribute to the element to create a mini version.</p>
 
 <pre><code><![CDATA[
 <div data-role="collapsible" data-mini="true">
@@ -55,12 +55,12 @@
 		<h3>Custom icons</h3>
 
 		<p>The default icon of collapsible headings can be overridden by using the <code>data-collapsed-icon</code> and <code>data-expanded-icon</code> attributes. The example below uses <code>data-collapsed-icon="arrow-r"</code> and <code>data-expanded-icon="arrow-d"</code>.
-		<iframe src="/resources/collapsible/example5.html" style="width:100%;height:140px;border:0px"></iframe></p>
+		<iframe src="/resources/collapsible/example5.html" style="width:100%;height:150px;border:0px"></iframe></p>
 
 		<h3>Icon positioning</h3>
 
 		<p>The default icon positioning of collapsible headings can be overridden by using the <code>data-iconpos</code> attribute. The example below uses <code>data-iconpos="right"</code>.
-		<iframe src="/resources/collapsible/example6.html" style="width:100%;height:140px;border:0px"></iframe></p>
+		<iframe src="/resources/collapsible/example6.html" style="width:100%;height:150px;border:0px"></iframe></p>
 
 		<h3>Theming collapsible content</h3>
 
@@ -75,7 +75,7 @@
 </div>
 ]]></code></pre>
 
-		<iframe src="/resources/collapsible/example7.html" style="width:100%;height:140px;border:0px"></iframe>
+		<iframe src="/resources/collapsible/example7.html" style="width:100%;height:150px;border:0px"></iframe>
 
 		<h3>Theming collapsible headers</h3>
 
@@ -88,12 +88,12 @@
 </div>
 ]]></code></pre>
 
-		<iframe src="/resources/collapsible/example8.html" style="width:100%;height:260px;border:0px"></iframe>
+		<iframe src="/resources/collapsible/example8.html" style="width:100%;height:270px;border:0px"></iframe>
 
 		<h3>Nested Collapsibles</h3>
 
 		<p>Collapsibles can be nested inside each other if needed. In this example, we're setting the content theme to provide clearer visual connection between the levels.
-		<iframe src="/resources/collapsible/example9.html" style="width:100%;height:540px;border:0px"></iframe></p>
+		<iframe src="/resources/collapsible/example9.html" style="width:100%;height:770px;border:0px"></iframe></p>
 
 		<h3>Collapsible sets (accordions)</h3>
 
@@ -148,6 +148,14 @@
 				</desc>
 			</type>
 		</option>
+		<option name="contentTheme" default="null" example-value='"b"'>
+			<desc>Sets the color scheme (swatch) for the collapsible content. It accepts a single letter from a-z that maps to the swatches included in your theme.
+				<p>If the value is unset for an individual collapsible container, but that container is part of a collapsible set, then the value is inherited from the parent collapsible set.</p>
+				<p>Possible values: swatch letter (a-z).</p>
+				<p>This option is also exposed as a data attribute: <code>data-content-theme="b"</code>.</p>
+			</desc>
+			<type name="String" />
+		</option>
 		<option name="corners" default="true" example-value="false">
 			<desc>Applies the theme border-radius if set to true.
 				<p>If the value is unset for an individual collapsible container, but that container is part of a collapsible set, then the value is inherited from the parent collapsible set.</p>
@@ -201,7 +209,7 @@
 			</desc>
 			<type name="Boolean" />
 		</option>
-		<option name="theme" default="null, inherited from parent" example-value='"b"'>
+		<option name="theme" default="null" example-value='"b"'>
 			<desc>Sets the color scheme (swatch) for the collapsible. It accepts a single letter from a-z that maps to the swatches included in your theme.
 				<p>If the value is unset for an individual collapsible container, but that container is part of a collapsible set, then the value is inherited from the parent collapsible set.</p>
 				<p>Possible values: swatch letter (a-z).</p>
@@ -234,14 +242,25 @@
 		</event>
 	</events>
 	<methods>
+		<method name="collapse">
+			<desc>
+				Collapses the <placeholder name="name"/>.
+			</desc>
+		</method>
 		<xi:include href="../includes/widget-method-destroy.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 		<xi:include href="../includes/widget-method-disable.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 		<xi:include href="../includes/widget-method-enable.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
+		<method name="expand">
+			<desc>
+				Expands the <placeholder name="name"/>.
+			</desc>
+		</method>
 		<xi:include href="../includes/widget-method-option.xml" xmlns:xi="http://www.w3.org/2003/XInclude"/>
 	</methods>
 	<example>
 		<desc>A basic example of a collapsible content block.</desc>
 		<html><![CDATA[
+<div data-role="page" id="page1">
 	<div data-role="header">
 		<h1>jQuery Mobile Example</h1>
 	</div>
@@ -251,6 +270,7 @@
 			<p>I'm the collapsible content. By default I'm closed, but you can click the header to open me.</p>
 		</div>
 	</div>
+</div>
 ]]></html>
 	</example>
 	<category slug="widgets"/>

entries/collapsibleset.xml

@@ -26,7 +26,7 @@
 ]]></code></pre>
 
 		<p>Here is an example of a <placeholder name="name"/> widget with 5 sections.
-		<iframe src="/resources/collapsibleset/example1.html" style="width:100%;height:310px;border:0px"></iframe></p>
+		<iframe src="/resources/collapsibleset/example1.html" style="width:100%;height:360px;border:0px"></iframe></p>
 
 		<h3>Non-inset <placeholder name="name"/> widgets</h3>
 

entries/controlgroup.xml

@@ -89,7 +89,7 @@ $( ".selector" ).controlgroup( "container" );
 		<desc>A basic example of a controlgroup.</desc>
 		<html><![CDATA[
 <div data-role="page" id="page1">
-	<div data-role="content">
+	<div role="main" class="ui-content">
 		<div data-role="controlgroup">
 			<a href="#" class="ui-btn ui-corner-all">Yes</a>
 			<a href="#" class="ui-btn ui-corner-all">No</a>

entries/dialog.xml

@@ -5,7 +5,7 @@
 	<desc>Opens content in an interactive overlay.</desc>
 	<longdesc>
 		<div class="warning">
-		<strong>Dialogs are deprecated as of jQuery Mobile 1.4.0 and will be removed in 1.5.0. The <code>dialog</code> option provided by the <code>page.dialog</code> extension of the <a href="/page/">page</a> widget allows you to style a page as a dialog, however, the special navigational handling will be removed. You may also consider implementing dialogs using <a href="/popup/">popup</a> widgets.</strong></div>
+		<strong>Note:</strong> Dialogs are deprecated as of jQuery Mobile 1.4.0 and will be removed in 1.5.0. The <code>dialog</code> option provided by the <code>page.dialog</code> extension of the <a href="/page/">page</a> widget allows you to style a page as a dialog, however, the special navigational handling will be removed. You may also consider implementing dialogs using <a href="/popup/">popup</a> widgets.</div>
 		<p>Any page can be presented as a modal dialog by adding the <code>data-rel="dialog"</code> attribute to the page anchor link. When the "dialog" attribute is applied, the framework adds styles to add rounded corners, margins around the page and a dark background to make the "dialog" appear to be suspended above the page.</p>
 <pre><code><![CDATA[
 <a href="foo.html" data-rel="dialog">Open dialog</a>
@@ -15,7 +15,7 @@
 
 		<p>You can open a dialog programmatically by calling the <a href="/jQuery.mobile.changePage/"><strong>$.mobile.changePage</strong></a> method:</p>
 <pre><code><![CDATA[
-// Dialog loaded via AJAX
+// Dialog loaded via Ajax
 $.mobile.changePage( "path/to/dialog.html", { role: "dialog" } );
 
 // Dialog present in a multipage document