diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
| commit | 0f575e03bb9af0b09d18a9207d9f589e05f44d50 (patch) | |
| tree | 18251a2d3e7c51adb8f265158ca0361f5cca73d1 /demos/menu | |
| parent | af1576280a807dcc166ddf619abab1fc24cac664 (diff) | |
| parent | 9df981d268b4029065247cf230a4e988946b7799 (diff) | |
| download | jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.tar.gz jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.zip | |
Merge branch 'master' into position-notification
Conflicts:
tests/unit/position/position_core_within.js
Diffstat (limited to 'demos/menu')
| -rw-r--r-- | demos/menu/default.html | 4 | ||||
| -rw-r--r-- | demos/menu/navigationmenu.html | 2 | ||||
| -rw-r--r-- | demos/menu/topalignmenu.html | 17 |
3 files changed, 12 insertions, 11 deletions
diff --git a/demos/menu/default.html b/demos/menu/default.html index 9f2e21622..b1c0b9fbb 100644 --- a/demos/menu/default.html +++ b/demos/menu/default.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en"> <head> - <meta charset="UTF-8" /> + <meta charset="utf-8"> <title>jQuery UI Menu - Default demo</title> <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" /> <script src="../../jquery-1.7.2.js"></script> @@ -15,7 +15,7 @@ }); </script> <style> - + </style> </head> <body> diff --git a/demos/menu/navigationmenu.html b/demos/menu/navigationmenu.html index 970b20890..8c7b2b993 100644 --- a/demos/menu/navigationmenu.html +++ b/demos/menu/navigationmenu.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en"> <head> - <meta charset="UTF-8" /> + <meta charset="utf-8"> <title>jQuery UI Menu - Navigation Menu demo</title> <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" /> <script src="../../jquery-1.7.2.js"></script> diff --git a/demos/menu/topalignmenu.html b/demos/menu/topalignmenu.html index deb8fbb6f..7b7e052e4 100644 --- a/demos/menu/topalignmenu.html +++ b/demos/menu/topalignmenu.html @@ -1,15 +1,16 @@ <!doctype html> <html> <head> + <meta charset="utf-8"> <title>Menu Demo: Top-aligned Menu</title> - <link rel="stylesheet" href="../demos.css" type="text/css" /> - <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" title="ui-theme" /> - <script type="text/javascript" src="../../jquery-1.7.2.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.menu.js"></script> - <script type="text/javascript"> + <link type="text/css" href="../demos.css" rel="stylesheet" /> + <link type="text/css" href="../../themes/base/jquery.ui.all.css" rel="stylesheet" /> + <script src="../../jquery-1.7.2.js"></script> + <script src="../../ui/jquery.ui.core.js"></script> + <script src="../../ui/jquery.ui.widget.js"></script> + <script src="../../ui/jquery.ui.position.js"></script> + <script src="../../ui/jquery.ui.menu.js"></script> + <script> $(function() { $("#topMenu").menu({ position: { of: "ul:has(a.ui-state-focus):last" } |