8000 Merge branch 'master' into widget-delegation · q13/jquery-ui@5a45f48 · GitHub
Skip to content

Commit 5a45f48

Browse files
jzaeffererjzaefferer
committed
Merge branch 'master' into widget-delegation
2 parents 5297b7b + 0ba493d commit 5a45f48

355 files changed

Lines changed: 4226 additions & 2504 deletions

File tree

  • slider_horizontal_range.html
  • slider_horizontal_range_max.html
  • slider_horizontal_range_min.html
  • slider_vertical.html
  • slider_vertical_range.html
  • slider_vertical_range_max.html
  • slider_vertical_range_min.html
  • unit
  • visual
  • ui

    • Some content is hidden

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

    ‎.gitignore‎

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -5,3 +5,4 @@ docs
    55
    *.diff
    66
    *.patch
    77
    .DS_Store
    8+
    .settings
    Collapse file

    ‎AUTHORS.txt‎

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@ Bohdan Ganicky
    1717
    Scott González
    1818
    Marc Grabanski (m@marcgrabanski.com)
    1919
    Klaus Hartl (stilbuero.de)
    20+
    Hans Hillen (TPG, funded through AEGIS: http://www.aegis-project.eu/)
    2021
    Scott Jehl
    2122
    Cody Lindley
    2223
    Eduardo Lundgren (eduardolundgren@gmail.com)

    ‎README.md‎

    Lines changed: 12 additions & 0 deletions

    ‎demos/accordion/collapsible.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - Collapse content</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.accordion.js"></script>

    ‎demos/accordion/custom-icons.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - Customize icons</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.accordion.js"></script>

    ‎demos/accordion/default.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - Default functionality</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.accordion.js"></script>

    ‎demos/accordion/fillspace.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - Fill space</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.mouse.js"></script>

    ‎demos/accordion/hoverintent.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - Open on hoverintent</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.accordion.js"></script>

    ‎demos/accordion/mouseover.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - Open on mouseover</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.accordion.js"></script>

    ‎demos/accordion/no-auto-height.html‎

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -4,7 +4,7 @@
    44
    <meta charset="utf-8">
    55
    <title>jQuery UI Accordion - No auto height</title>
    66
    <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
    7-
    <script src="../../jquery-1.5.1.js"></script>
    7+
    <script src="../../jquery-1.6.2.js"></script>
    88
    <script src="../../ui/jquery.ui.core.js"></script>
    99
    <script src="../../ui/jquery.ui.widget.js"></script>
    1010
    <script src="../../ui/jquery.ui.accordion.js"></script>

    0 commit comments

    Comments
     (0)