Skip to content
Permalink
Browse files

Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu

  • Loading branch information...
fnagel committed Nov 25, 2013
2 parents c20f1f8 + 9a5f20b commit 5bc7fc2b1a248063b4d52086dfc32fae8601680e
Showing with 60,025 additions and 3,286 deletions.
  1. +23 −0 .jscs.json
  2. +9 −1 Gruntfile.js
  3. +1 −1 demos/autocomplete/categories.html
  4. +0 −1 demos/dialog/modal-confirmation.html
  5. +1 −0 demos/selectmenu/custom_render.html
  6. +2 −1 demos/selectmenu/default.html
  7. +1 −0 demos/selectmenu/index.html
  8. +1 −1 demos/spinner/latlong.html
  9. +1 −1 demos/tabs/manipulation.html
  10. +1 −1 demos/tooltip/video-player.html
  11. +1 −1 demos/widget/default.html
  12. +59,224 −2,617 external/jshint.js
  13. +1 −0 package.json
  14. +1 −0 tests/.jshintrc
  15. +3 −3 tests/index.html
  16. +2 −0 tests/unit/dialog/dialog.html
  17. +82 −14 tests/unit/dialog/dialog_core.js
  18. +5 −0 tests/unit/dialog/dialog_methods.js
  19. +4 −0 tests/unit/menu/menu.html
  20. +1 −1 tests/unit/menu/menu_common.js
  21. +5 −5 tests/unit/menu/menu_events.js
  22. +3 −6 tests/unit/menu/menu_options.js
  23. +3 −1 tests/unit/testsuite.js
  24. +515 −522 tests/visual/theme.html
  25. +1 −0 ui/.jshintrc
  26. +2 −3 ui/jquery.ui.autocomplete.js
  27. +0 −4 ui/jquery.ui.core.js
  28. +96 −62 ui/jquery.ui.dialog.js
  29. +2 −2 ui/jquery.ui.droppable.js
  30. +1 −1 ui/jquery.ui.effect-blind.js
  31. +2 −2 ui/jquery.ui.effect-explode.js
  32. +1 −1 ui/jquery.ui.effect-scale.js
  33. +1 −1 ui/jquery.ui.effect-shake.js
  34. +2 −2 ui/jquery.ui.effect-size.js
  35. +4 −4 ui/jquery.ui.effect-transfer.js
  36. +11 −15 ui/jquery.ui.effect.js
  37. +5 −3 ui/jquery.ui.mouse.js
  38. +3 −5 ui/jquery.ui.position.js
  39. +2 −2 ui/jquery.ui.selectable.js
  40. +1 −1 ui/jquery.ui.slider.js
  41. +1 −1 ui/jquery.ui.spinner.js
@@ -0,0 +1,23 @@
{
"requireCurlyBraces": [ "if", "else", "for", "while", "do" ],
"requireSpaceAfterKeywords": [ "if", "else", "for", "while", "do", "switch", "return" ],
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInFunctionExpression": {
"beforeOpeningRoundBrace": true
},
"requireMultipleVarDecl": true,
"requireSpacesInsideObjectBrackets": "all",
"requireSpacesInsideArrayBrackets": "all",
"disallowLeftStickedOperators": [ "?", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=" ],
"disallowRightStickedOperators": [ "?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"requireRightStickedOperators": [ "!" ],
"requireLeftStickedOperators": [ "," ],
"disallowKeywords": [ "with" ],
"disallowMultipleLineBreaks": true,
"disallowKeywordsOnNewLine": [ "else" ],
"requireLineFeedAtFileEnd": true,

"excludeFiles": [ "src/intro.js", "src/outro.js" ]
}
@@ -106,6 +106,7 @@ grunt.loadNpmTasks( "grunt-contrib-uglify" );
grunt.loadNpmTasks( "grunt-contrib-concat" );
grunt.loadNpmTasks( "grunt-contrib-qunit" );
grunt.loadNpmTasks( "grunt-contrib-csslint" );
grunt.loadNpmTasks( "grunt-jscs-checker" );
grunt.loadNpmTasks( "grunt-html" );
grunt.loadNpmTasks( "grunt-compare-size" );
grunt.loadNpmTasks( "grunt-git-authors" );
@@ -162,6 +163,13 @@ grunt.initConfig({
dest: "dist/jquery-ui.css"
}
},
jscs: {
// datepicker, sortable, resizable and draggable are getting rewritten, ignore until that's done
ui: [ "ui/jquery.ui.*.js", "!ui/jquery.ui.datepicker.js", "!ui/jquery.ui.sortable.js", "!ui/jquery.ui.resizable.js", "!ui/jquery.ui.draggable.js" ],
// TODO enable this once we have a tool that can help with fixing formatting of existing files
// tests: "tests/unit/**/*.js",
grunt: "Gruntfile.js"
},
uglify: minify,
htmllint: {
// ignore files that contain invalid html, used only for ajax content testing
@@ -198,7 +206,7 @@ grunt.initConfig({
});

grunt.registerTask( "default", [ "lint", "test" ] );
grunt.registerTask( "lint", [ "asciilint", "jshint", "csslint", "htmllint" ] );
grunt.registerTask( "lint", [ "asciilint", "jshint", "jscs", "csslint", "htmllint" ] );
grunt.registerTask( "test", [ "qunit" ] );
grunt.registerTask( "sizer", [ "concat:ui", "uglify:main", "compare_size:all" ] );
grunt.registerTask( "sizer_all", [ "concat:ui", "uglify", "compare_size" ] );
@@ -23,7 +23,7 @@
$.widget( "custom.catcomplete", $.ui.autocomplete, {
_create: function() {
this._super();
this.menu.option( "items", "> :not(.ui-autocomplete-category)" );
this.widget().menu( "option", "items", "> :not(.ui-autocomplete-category)" );
},
_renderMenu: function( ul, items ) {
var that = this,
@@ -11,7 +11,6 @@
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.draggable.js"></script>
<script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.dialog.js"></script>
<link rel="stylesheet" href="../demos.css">
<script>
@@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery UI Selectmenu - Default functionality</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.10.2.js"></script>
@@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery UI Selectmenu - Default functionality</title>
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
<script src="../../jquery-1.10.2.js"></script>
@@ -90,7 +91,7 @@
<option value="19">19</option>
</select>
</fieldset>

</form>

</div>
@@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>jQuery UI Selectmenu Demos</title>
</head>
<body>
@@ -51,7 +51,7 @@
<div id="map"></div>

<div class="demo-description">
<p>Google Maps integration, using spinners to change latidude and longitude.</p>
<p>Google Maps integration, using spinners to change latitude and longitude.</p>
</div>
</body>
</html>
@@ -29,7 +29,7 @@
var tabs = $( "#tabs" ).tabs();
// modal dialog init: custom buttons and a "close" callback reseting the form inside
// modal dialog init: custom buttons and a "close" callback resetting the form inside
var dialog = $( "#dialog" ).dialog({
autoOpen: false,
modal: true,
@@ -107,7 +107,7 @@
<button class="menu" data-icon="ui-icon-triangle-1-s">Add to favorites or playlist</button>
</div>
<button title="Share this video">Share</button>
<button data-icon="ui-icon-alert">Flag as inappropiate</button>
<button data-icon="ui-icon-alert">Flag as inappropriate</button>
</div>

<div class="demo-description">
@@ -149,7 +149,7 @@
}
});
// click to set options after initalization
// click to set options after initialization
$( "#black" ).click( function() {
$( ":custom-colorize" ).colorize( "option", {
red: 0,

0 comments on commit 5bc7fc2

Please sign in to comment.
You can’t perform that action at this time.