Permalink
Browse files

Merge branch 'master' of github.com:azicchetti/jquerymobile-router

Conflicts:
	js/jquery.mobile.router.js
  • Loading branch information...
2 parents ec6c95b + 0cdc684 commit 3d47a42cec25a290ca2767ef8d8713ecbf6cf8f5 @azicchetti committed Mar 1, 2013
View
@@ -28,6 +28,8 @@ In addition, if you want to use standard hashchange-based routers, you have to d
What's new in the latest versions
=====================
+* Support for jQM 1.3.0. Older jQM version are still supported in the legacy version
+ (jquery.mobile.router-legacy.js)
* Form parameters are now correctly handled
* support for pagebeforechange, pagebeforeload, pageload
* Added a parameter in the configuration object to execute only the first route handler found
@@ -5,9 +5,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQM-router example</title>
- <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css" />
-
- <script data-main="js/main" src="js/libs/require-1.0.4.js" type="text/javascript"></script>
+ <link rel="stylesheet" href="http://code.jquery.com/mobile/1.2.0/jquery.mobile-1.2.0.css" />
+
+ <script data-main="js/main" src="js/libs/require-2.1.1.min.js" type="text/javascript"></script>
</head>
<!-- Will be set to show in app.init() -->
@@ -20,9 +20,9 @@
</div>
<div data-role="content">
- <a data-role="button" href="#detail?id=1">Detail 1</a>
- <a data-role="button" href="#detail?id=2">Detail 2</a>
- <a data-role="button" href="#detail?id=3">Detail 3</a>
+ <a data-role="button" data-transition="slide" href="#detail?id=1">Detail 1</a>
+ <a data-role="button" data-transition="slide" href="#detail?id=2">Detail 2</a>
+ <a data-role="button" data-transition="slide" href="#detail?id=3">Detail 3</a>
</div>
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 3d47a42

Please sign in to comment.