jQuery UI Accordion - Collapse content

your bear, you have to admit it!
- No, we aren't selling bears. + No, we aren't selling bears.

We could talk about renting one. diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js index 0d756c97c..92d79c121 100644 --- a/tests/unit/accordion/accordion_core.js +++ b/tests/unit/accordion/accordion_core.js @@ -69,6 +69,46 @@ test( "accessibility", function () { equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "active tabpanel has aria-hidden=true" ); }); -// TODO: keyboard support +asyncTest( "keybaord support", function() { + expect( 13 ); + var element = $( "#list1" ).accordion(), + headers = element.find( ".ui-accordion-header" ), + anchor = headers.eq( 1 ).next().find( "a" ).eq( 0 ), + keyCode = $.ui.keyCode; + equal( headers.filter( ".ui-state-focus" ).length, 0, "no headers focused on init" ); + headers.eq( 0 ).simulate( "focus" ); + setTimeout(function() { + ok( headers.eq( 0 ).is( ".ui-state-focus" ), "first header has focus" ); + headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.DOWN } ); + ok( headers.eq( 1 ).is( ".ui-state-focus" ), "DOWN moves focus to next header" ); + headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.RIGHT } ); + ok( headers.eq( 2 ).is( ".ui-state-focus" ), "RIGHT moves focus to next header" ); + headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.DOWN } ); + ok( headers.eq( 0 ).is( ".ui-state-focus" ), "DOWN wraps focus to first header" ); + + headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.UP } ); + ok( headers.eq( 2 ).is( ".ui-state-focus" ), "UP wraps focus to last header" ); + headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.LEFT } ); + ok( headers.eq( 1 ).is( ".ui-state-focus" ), "LEFT moves focus to previous header" ); + + headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.HOME } ); + ok( headers.eq( 0 ).is( ".ui-state-focus" ), "HOME moves focus to first header" ); + headers.eq( 0 ).simulate( "keydown", { keyCode: keyCode.END } ); + ok( headers.eq( 2 ).is( ".ui-state-focus" ), "END moves focus to last header" ); + + headers.eq( 2 ).simulate( "keydown", { keyCode: keyCode.ENTER } ); + equal( element.accordion( "option", "active" ) , 2, "ENTER activates panel" ); + headers.eq( 1 ).simulate( "keydown", { keyCode: keyCode.SPACE } ); + equal( element.accordion( "option", "active" ), 1, "SPACE activates panel" ); + + anchor.simulate( "focus" ); + setTimeout(function() { + ok( !headers.eq( 1 ).is( ".ui-state-focus" ), "header loses focus when focusing inside the panel" ); + anchor.simulate( "keydown", { keyCode: keyCode.UP, ctrlKey: true } ); + ok( headers.eq( 1 ).is( ".ui-state-focus" ), "CTRL+UP moves focus to header" ); + start(); + }, 1 ); + }, 1 ); +}); }( jQuery ) ); diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html index 583c1adcd..116eb43b5 100644 --- a/tests/unit/accordion/accordion_deprecated.html +++ b/tests/unit/accordion/accordion_deprecated.html @@ -64,7 +64,7 @@

your bear, you have to admit it!
- No, we aren't selling bears. + No, we aren't selling bears.

We could talk about renting one. diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 2e68889ef..ba8fa5e44 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -118,6 +118,8 @@ $.widget( "ui.accordion", { }); } + this._bind( this.headers, { keydown: "_keydown" }); + this._bind( this.headers.next(), { keydown: "_panelKeyDown" }); this._setupEvents( options.event ); }, @@ -198,7 +200,8 @@ $.widget( "ui.accordion", { if ( key === "event" ) { if ( this.options.event ) { - this.headers.unbind( ".accordion" ); + this.headers.unbind( + this.options.event.split( " " ).join( ".accordion " ) + ".accordion" ); } this._setupEvents( value ); } @@ -348,18 +351,14 @@ $.widget( "ui.accordion", { }, _setupEvents: function( event ) { - var events = { - keydown: "_keydown" - }; - if ( event ) { - $.each( event.split(" "), function( index, eventName ) { - events[ eventName ] = "_eventHandler"; - }); + var events = {}; + if ( !event ) { + return; } - this._bind( this.headers, events ); - this._bind( this.headers.next(), { - keydown: "_panelKeyDown" + $.each( event.split(" "), function( index, eventName ) { + events[ eventName ] = "_eventHandler"; }); + this._bind( this.headers, events ); }, _eventHandler: function( event ) { -- cgit v1.2.3 From 4a6692a57aa156dcaa916af66b36f767a25e37c3 Mon Sep 17 00:00:00 2001 From: Scott González Date: Tue, 27 Mar 2012 18:05:51 -0400 Subject: Accordion: Added animation tests. --- tests/unit/accordion/accordion_options.js | 170 +++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 1 deletion(-) diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js index 74a9a3177..2b7176394 100644 --- a/tests/unit/accordion/accordion_options.js +++ b/tests/unit/accordion/accordion_options.js @@ -75,7 +75,175 @@ if ( $.uiBackCompat === false ) { }); } -// TODO: add animation tests +test( "{ animate: false }", function() { + expect( 3 ); + var element = $( "#list1" ).accordion({ + animate: false + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + $.fn.animate = function() { + ok( false, ".animate() called" ); + }; + + ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 1 ); + ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; +}); + +asyncTest( "{ animate: Number }", function() { + expect( 7 ); + var element = $( "#list1" ).accordion({ + animate: 100 + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + // called twice (both panels) + $.fn.animate = function( props, duration, easing ) { + equal( duration, 100, "correct duration" ); + equal( easing, undefined, "default easing" ); + animate.apply( this, arguments ); + }; + + ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 1 ); + panels.promise().done(function() { + ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; + start(); + }); +}); + +asyncTest( "{ animate: String }", function() { + expect( 7 ); + var element = $( "#list1" ).accordion({ + animate: "linear" + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + // called twice (both panels) + $.fn.animate = function( props, duration, easing ) { + equal( duration, undefined, "default duration" ); + equal( easing, "linear", "correct easing" ); + animate.apply( this, arguments ); + }; + + ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 1 ); + panels.promise().done(function() { + ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; + start(); + }); +}); + +asyncTest( "{ animate: {} }", function() { + expect( 7 ); + var element = $( "#list1" ).accordion({ + animate: {} + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + // called twice (both panels) + $.fn.animate = function( props, duration, easing ) { + equal( duration, undefined, "default duration" ); + equal( easing, undefined, "default easing" ); + animate.apply( this, arguments ); + }; + + ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 1 ); + panels.promise().done(function() { + ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; + start(); + }); +}); + +asyncTest( "{ animate: { duration, easing } }", function() { + expect( 7 ); + var element = $( "#list1" ).accordion({ + animate: { duration: 100, easing: "linear" } + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + // called twice (both panels) + $.fn.animate = function( props, duration, easing ) { + equal( duration, 100, "correct duration" ); + equal( easing, "linear", "correct easing" ); + animate.apply( this, arguments ); + }; + + ok( panels.eq( 0 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 1 ); + panels.promise().done(function() { + ok( panels.eq( 0 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 1 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; + start(); + }); +}); + +asyncTest( "{ animate: { duration, easing } }, animate down", function() { + expect( 7 ); + var element = $( "#list1" ).accordion({ + active: 1, + animate: { duration: 100, easing: "linear" } + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + // called twice (both panels) + $.fn.animate = function( props, duration, easing ) { + equal( duration, 100, "correct duration" ); + equal( easing, "linear", "correct easing" ); + animate.apply( this, arguments ); + }; + + ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 0 ); + panels.promise().done(function() { + ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; + start(); + }); +}); + +asyncTest( "{ animate: { duration, easing, down } }, animate down", function() { + expect( 7 ); + var element = $( "#list1" ).accordion({ + active: 1, + animate: { + duration: 100, + easing: "linear", + down: { + easing: "swing" + } + } + }), + panels = element.find( ".ui-accordion-content" ); + animate = $.fn.animate; + // called twice (both panels) + $.fn.animate = function( props, duration, easing ) { + equal( duration, 100, "correct duration" ); + equal( easing, "swing", "correct easing" ); + animate.apply( this, arguments ); + }; + + ok( panels.eq( 1 ).is( ":visible" ), "first panel visible" ); + element.accordion( "option", "active", 0 ); + panels.promise().done(function() { + ok( panels.eq( 1 ).is( ":hidden" ), "first panel hidden" ); + ok( panels.eq( 0 ).is( ":visible" ), "second panel visible" ); + $.fn.animate = animate; + start(); + }); +}); test( "{ collapsible: false }", function() { expect( 4 ); -- cgit v1.2.3 From cd020af6278500b53d7a45d80d00804855e82b14 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Wed, 28 Mar 2012 11:45:27 +0200 Subject: Build/grunt: Extract css related tasks, use grunt-css instead --- grunt.js | 48 ++++++------------------------------------------ package.json | 5 ++--- 2 files changed, 8 insertions(+), 45 deletions(-) diff --git a/grunt.js b/grunt.js index 476fc8516..223225a8d 100644 --- a/grunt.js +++ b/grunt.js @@ -21,6 +21,10 @@ function createBanner( files ) { " Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */"; } +// a working grunt.loadNpmTasks replacement +// gets us csslint and cssmin tasks +require('grunt-css')(grunt); + // allow access from banner template global.stripDirectory = stripDirectory; grunt.registerHelper( "strip_all_banners", function( filepath ) { @@ -91,7 +95,7 @@ grunt.initConfig({ } }, min: minify, - css_min: minifyCSS, + cssmin: minifyCSS, copy: { dist: { src: [ @@ -351,46 +355,6 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() { }); }); -grunt.registerMultiTask( "csslint", "Lint CSS files with csslint", function() { - var csslint = require( "csslint" ).CSSLint; - var files = grunt.file.expandFiles( this.file.src ); - var ruleset = {}; - csslint.getRules().forEach(function( rule ) { - ruleset[ rule.id ] = 1; - }); - for ( var rule in this.data.rules ) { - if ( !this.data.rules[ rule ] ) { - delete ruleset[rule]; - } else { - ruleset[ rule ] = this.data.rules[ rule ]; - } - } - var hadErrors = 0; - files.forEach(function( filepath ) { - grunt.log.writeln( "Linting " + filepath ); - var result = csslint.verify( grunt.file.read( filepath ), ruleset ); - result.messages.forEach(function( message ) { - grunt.log.writeln( "[".red + ( "L" + message.line ).yellow + ":".red + ( "C" + message.col ).yellow + "]".red ); - log[ message.type === "error" ? "error" : "writeln" ]( message.message + " " + message.rule.desc + " (" + message.rule.id + ")" ); - }); - if ( result.messages.length ) { - hadErrors += 1; - } - }); - if (hadErrors) { - return false; - } - grunt.log.writeln( "Lint free" ); -}); - -grunt.registerMultiTask( "css_min", "Minify CSS files with Sqwish.", function() { - var max = grunt.helper( "concat", grunt.file.expandFiles( this.file.src ) ); - var min = require( "sqwish" ).minify( max, false ); - grunt.file.write( this.file.dest, min ); - grunt.log.writeln( "File '" + this.file.dest + "' created." ); - grunt.helper( "min_max_info", min, max ); -}); - grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", function() { // remove dest file before creating it, to make sure itself is not included if ( require( "path" ).existsSync( this.file.dest ) ) { @@ -542,7 +506,7 @@ grunt.registerHelper( "lpad", function( str, len, chr ) { grunt.registerTask( "default", "lint csslint qunit build compare_size" ); grunt.registerTask( "sizer", "concat:ui min:dist/jquery-ui.min.js compare_size" ); -grunt.registerTask( "build", "concat min css_min" ); +grunt.registerTask( "build", "concat min cssmin" ); grunt.registerTask( "release", "clean build copy:dist copy:dist_min copy:dist_min_images copy:dist_css_min md5:dist zip:dist" ); grunt.registerTask( "release_themes", "release download_themes copy_themes copy:themes md5:themes zip:themes" ); grunt.registerTask( "release_cdn", "release_themes copy:cdn copy:cdn_min copy:cdn_i18n copy:cdn_i18n_min copy:cdn_min_images copy:cdn_themes md5:cdn zip:cdn" ); diff --git a/package.json b/package.json index de297f467..a395037f8 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,9 @@ ], "dependencies": {}, "devDependencies": { - "grunt": "0.2.x", - "sqwish": "0.2.x", + "grunt": "0.3.x", + "grunt-css": "0.1.0", "request": "2.9.x", - "csslint": "0.9.x", "adm-zip": "0.1.x", "rimraf": "2.0.1" }, -- cgit v1.2.3 From a1f88869ab6127249271b661d61c8eb93b0f1417 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Wed, 28 Mar 2012 18:50:22 +0200 Subject: Tagging 1.9m7 --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 13c1a7371..7601988c1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9pre +1.9m7 -- cgit v1.2.3 From 68135431295d27f421eedacbb08296db441950a5 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Wed, 28 Mar 2012 18:50:57 +0200 Subject: Bump version --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 7601988c1..13c1a7371 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.9m7 +1.9pre -- cgit v1.2.3 From 08aaa225ce282c6522f446aee98290fff3c87782 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Wed, 28 Mar 2012 19:58:11 +0200 Subject: Build/grunt: Accept more grunt-css versions --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a395037f8..39305f719 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "dependencies": {}, "devDependencies": { "grunt": "0.3.x", - "grunt-css": "0.1.0", + "grunt-css": "0.1.x", "request": "2.9.x", "adm-zip": "0.1.x", "rimraf": "2.0.1" -- cgit v1.2.3 From 3e7504156ac9e2fbef434e109306699ee87ddc9d Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Thu, 29 Mar 2012 12:48:21 +0200 Subject: Build/grunt: Use grunt.loadNpmTasks, now that its actually working --- grunt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt.js b/grunt.js index 223225a8d..ee1e8397f 100644 --- a/grunt.js +++ b/grunt.js @@ -23,7 +23,7 @@ function createBanner( files ) { // a working grunt.loadNpmTasks replacement // gets us csslint and cssmin tasks -require('grunt-css')(grunt); +grunt.loadNpmTasks('grunt-css'); // allow access from banner template global.stripDirectory = stripDirectory; -- cgit v1.2.3 From a51451dc1b19bf6c2e10b1648b57d006bf38c303 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Thu, 29 Mar 2012 09:51:43 -0400 Subject: Datepicker: Fixed nextText, prevText, and Sunday and split words onto multiple lines for readability. Fixes #8225 - Datepicker: Incorrect values in Persian localization. --- ui/i18n/jquery.ui.datepicker-fa.js | 50 ++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/ui/i18n/jquery.ui.datepicker-fa.js b/ui/i18n/jquery.ui.datepicker-fa.js index 1d7fbd23c..be8acd2a5 100644 --- a/ui/i18n/jquery.ui.datepicker-fa.js +++ b/ui/i18n/jquery.ui.datepicker-fa.js @@ -4,15 +4,51 @@ jQuery(function($) { $.datepicker.regional['fa'] = { closeText: 'بستن', - prevText: '<قبلي', - nextText: 'بعدي>', + prevText: '<قبلی', + nextText: 'بعدی>', currentText: 'امروز', - monthNames: ['فروردين','ارديبهشت','خرداد','تير','مرداد','شهريور', - 'مهر','آبان','آذر','دي','بهمن','اسفند'], + monthNames: [ + 'فروردين', + 'ارديبهشت', + 'خرداد', + 'تير', + 'مرداد', + 'شهريور', + 'مهر', + 'آبان', + 'آذر', + 'دی', + 'بهمن', + 'اسفند' + ], monthNamesShort: ['1','2','3','4','5','6','7','8','9','10','11','12'], - dayNames: ['يکشنبه','دوشنبه','سه‌شنبه','چهارشنبه','پنجشنبه','جمعه','شنبه'], - dayNamesShort: ['ي','د','س','چ','پ','ج', 'ش'], - dayNamesMin: ['ي','د','س','چ','پ','ج', 'ش'], + dayNames: [ + 'يکشنبه', + 'دوشنبه', + 'سه‌شنبه', + 'چهارشنبه', + 'پنجشنبه', + 'جمعه', + 'شنبه' + ], + dayNamesShort: [ + 'ی', + 'د', + 'س', + 'چ', + 'پ', + 'ج', + 'ش' + ], + dayNamesMin: [ + 'ی', + 'د', + 'س', + 'چ', + 'پ', + 'ج', + 'ش' + ], weekHeader: 'هف', dateFormat: 'yy/mm/dd', firstDay: 6, -- cgit v1.2.3 From 748702c29ac00df5bfc4090dc3fa1b3a9e65da70 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Thu, 29 Mar 2012 16:29:27 +0200 Subject: Build/grunt: Add download_docs task for 1.8 --- grunt.js | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/grunt.js b/grunt.js index ee1e8397f..ea8b86094 100644 --- a/grunt.js +++ b/grunt.js @@ -372,6 +372,43 @@ grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", fun grunt.log.writeln( "Wrote " + this.file.dest + " with " + hashes.length + " hashes" ); }); +// only needed for 1.8 +grunt.registerTask( "download_docs", function() { + function capitalize(value) { + return value[0].toUpperCase() + value.slice(1); + } + // should be grunt.config("pkg.version")? + var version = "1.8"; + var docsDir = "dist/docs"; + var files = "draggable droppable resizable selectable sortable accordion autocomplete button datepicker dialog progressbar slider tabs position" + .split(" ").map(function(widget) { + return { + url: "http://docs.jquery.com/action/render/UI/API/" + version + "/" + capitalize(widget), + dest: docsDir + '/' + widget + '.html' + }; + }); + files = files.concat("animate addClass effect hide removeClass show switchClass toggle toggleClass".split(" ").map(function(widget) { + return { + url: "http://docs.jquery.com/action/render/UI/Effects/" + widget, + dest: docsDir + '/' + widget + '.html' + }; + })); + files = files.concat("Blind Clip Drop Explode Fade Fold Puff Slide Scale Bounce Highlight Pulsate Shake Size Transfer".split(" ").map(function(widget) { + return { + url: "http://docs.jquery.com/action/render/UI/Effects/" + widget, + dest: docsDir + '/effect-' + widget.toLowerCase() + '.html' + }; + })); + var fs = require( "fs" ); + var request = require( "request" ); + grunt.file.mkdir( "dist/docs" ); + grunt.utils.async.forEach( files, function( file, done ) { + var out = fs.createWriteStream( file.dest ); + out.on( "close", done ); + request( file.url ).pipe( out ); + }, this.async() ); +}); + grunt.registerTask( "download_themes", function() { // var AdmZip = require('adm-zip'); var fs = require( "fs" ); -- cgit v1.2.3 From 56de22eeadb5882ad1d78a207b9fb69247e233ee Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 29 Mar 2012 18:36:38 -0400 Subject: Tooltip: Avoid infinite recursion when disabling a tooltip on close. --- ui/jquery.ui.tooltip.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index eddd9a0c9..dd0a746d3 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -173,6 +173,12 @@ $.widget( "ui.tooltip", { target = $( event ? event.currentTarget : this.element ), tooltip = this._find( target ); + // disabling closes the tooltip, so we need to track when we're closing + // to avoid an infinite loop in case the tooltip becomes disabled on close + if ( this.closing ) { + return; + } + // don't close if the element has focus // this prevents the tooltip from closing if you hover while focused if ( !force && this.document[0].activeElement === target[0] ) { @@ -195,7 +201,9 @@ $.widget( "ui.tooltip", { target.removeData( "tooltip-open" ); target.unbind( "mouseleave.tooltip focusout.tooltip keyup.tooltip" ); + this.closing = true; this._trigger( "close", event, { tooltip: tooltip } ); + this.closing = false; }, _tooltip: function( element ) { -- cgit v1.2.3 From 45a5a24dfe6322cfeb047a2aed566c824f401307 Mon Sep 17 00:00:00 2001 From: Scott González Date: Fri, 30 Mar 2012 09:06:06 -0400 Subject: Tooltip: Store the title in ui-tooltip-title data only if the element has a title. --- ui/jquery.ui.tooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index dd0a746d3..23b3a9b71 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -99,7 +99,7 @@ $.widget( "ui.tooltip", { return; } - if ( !target.data( "ui-tooltip-title" ) ) { + if ( target.attr( "title" ) ) { target.data( "ui-tooltip-title", target.attr( "title" ) ); } -- cgit v1.2.3 From ff72467038f35fd7d031b33cf61d37ee02535a52 Mon Sep 17 00:00:00 2001 From: Scott González Date: Fri, 30 Mar 2012 13:32:23 -0400 Subject: Grunt: Move common modules to top, along with lists of files. --- grunt.js | 144 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 88 insertions(+), 56 deletions(-) diff --git a/grunt.js b/grunt.js index ea8b86094..e18baeece 100644 --- a/grunt.js +++ b/grunt.js @@ -1,5 +1,80 @@ module.exports = function( grunt ) { +var // modules + fs = require( "fs" ), + path = require( "path" ), + request = require( "request" ), + util = require( "util" ), + inspect = util.inspect, + + // files + coreFiles = [ + "jquery.ui.core.js", + "jquery.ui.widget.js", + "jquery.ui.mouse.js", + "jquery.ui.draggable.js", + "jquery.ui.droppable.js", + "jquery.ui.resizable.js", + "jquery.ui.selectable.js", + "jquery.ui.sortable.js", + "jquery.effects.core.js" + ], + + uiFiles = coreFiles.map(function( file ) { + return "ui/" + file; + }).concat( grunt.file.expandFiles( "ui/*.js" ).filter(function( file ) { + return coreFiles.indexOf( file.substring(3) ) === -1; + })), + + allI18nFiles = grunt.file.expandFiles( "ui/i18n/*.js" ), + + cssFiles = [ + "core", + "accordion", + "autocomplete", + "button", + "datepicker", + "dialog", + "menu", + "progressbar", + "resizable", + "selectable", + "slider", + "spinner", + "tabs", + "tooltip", + "theme" + ].map(function( component ) { + return "themes/base/jquery.ui." + component + ".css"; + }), + + // minified files + minify = { + "dist/jquery-ui.min.js": [ "", "dist/jquery-ui.js" ], + "dist/i18n/jquery-ui-i18n.min.js": [ "", "dist/i18n/jquery-ui-i18n.js" ] + }, + + minifyCSS = { + "dist/jquery-ui.min.css": "dist/jquery-ui.css" + }; + + +uiFiles.concat( allI18nFiles ).forEach(function( file ) { + minify[ "dist/" + file.replace( /\.js$/, ".min.js" ).replace( /ui\//, "minified/" ) ] = [ "", file ]; +}); + +cssFiles.forEach(function( file ) { + minifyCSS[ "dist/" + file.replace( /\.css$/, ".min.css" ).replace( /themes\/base\//, "themes/base/minified/" ) ] = [ "", file ]; +}); + + +// csslint and cssmin tasks +grunt.loadNpmTasks( "grunt-css" ); + +grunt.registerHelper( "strip_all_banners", function( filepath ) { + return grunt.file.read( filepath ).replace( /^\s*\/\*[\s\S]*?\*\/\s*/g, "" ); +}); + function stripBanner( files ) { return files.map(function( file ) { return ""; @@ -9,6 +84,8 @@ function stripBanner( files ) { function stripDirectory( file ) { return file.replace( /.+\/(.+)$/, "$1" ); } +// allow access from banner template +global.stripDirectory = stripDirectory; function createBanner( files ) { // strip folders @@ -21,46 +98,6 @@ function createBanner( files ) { " Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */"; } -// a working grunt.loadNpmTasks replacement -// gets us csslint and cssmin tasks -grunt.loadNpmTasks('grunt-css'); - -// allow access from banner template -global.stripDirectory = stripDirectory; -grunt.registerHelper( "strip_all_banners", function( filepath ) { - return grunt.file.read( filepath ).replace( /^\s*\/\*[\s\S]*?\*\/\s*/g, "" ); -}); -var inspect = require( "util" ).inspect; - -var coreFiles = "jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.effects.core.js".split( ", " ); -var uiFiles = coreFiles.map(function( file ) { - return "ui/" + file; -}).concat( grunt.file.expandFiles( "ui/*.js" ).filter(function( file ) { - return coreFiles.indexOf( file.substring(3) ) === -1; -})); - -var minify = { - "dist/jquery-ui.min.js": [ "", "dist/jquery-ui.js" ], - "dist/i18n/jquery-ui-i18n.min.js": [ "", "dist/i18n/jquery-ui-i18n.js" ] -}; -function minFile( file ) { - minify[ "dist/" + file.replace( /\.js$/, ".min.js" ).replace( /ui\//, "minified/" ) ] = [ "", file ]; -} -uiFiles.forEach( minFile ); - -var allI18nFiles = grunt.file.expandFiles( "ui/i18n/*.js" ); -allI18nFiles.forEach( minFile ); - -var cssFiles = "core accordion autocomplete button datepicker dialog menu progressbar resizable selectable slider spinner tabs tooltip theme".split( " " ).map(function( component ) { - return "themes/base/jquery.ui." + component + ".css"; -}); -var minifyCSS = { - "dist/jquery-ui.min.css": "dist/jquery-ui.css" -}; -cssFiles.forEach(function( file ) { - minifyCSS[ "dist/" + file.replace( /\.css$/, ".min.css" ).replace( /themes\/base\//, "themes/base/minified/" ) ] = [ "", file ]; -}); - grunt.initConfig({ pkg: "", files: { @@ -324,16 +361,15 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() { // var files = grunt.file.expandFiles( "dist/" + this.file.src + "/**/*" ); // grunt.log.writeln( "Creating zip file " + this.file.dest ); - // var fs = require( "fs" ); - // var AdmZip = require( "adm-zip" ); - // var zip = new AdmZip(); - // files.forEach(function( file ) { - // grunt.verbose.writeln( "Zipping " + file ); - // // rewrite file names from dist folder (created by build), drop the /dist part - // zip.addFile(file.replace(/^dist/, "" ), fs.readFileSync( file ) ); - // }); - // zip.writeZip( "dist/" + this.file.dest ); - // grunt.log.writeln( "Wrote " + files.length + " files to " + this.file.dest ); + //var AdmZip = require( "adm-zip" ); + //var zip = new AdmZip(); + //files.forEach(function( file ) { + // grunt.verbose.writeln( "Zipping " + file ); + // // rewrite file names from dist folder (created by build), drop the /dist part + // zip.addFile(file.replace(/^dist/, "" ), fs.readFileSync( file ) ); + //}); + //zip.writeZip( "dist/" + this.file.dest ); + //grunt.log.writeln( "Wrote " + files.length + " files to " + this.file.dest ); var done = this.async(); var dest = this.file.dest; @@ -357,8 +393,8 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() { grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", function() { // remove dest file before creating it, to make sure itself is not included - if ( require( "path" ).existsSync( this.file.dest ) ) { - require( "fs" ).unlinkSync( this.file.dest ); + if ( path.existsSync( this.file.dest ) ) { + fs.unlinkSync( this.file.dest ); } var crypto = require( "crypto" ); var dir = this.file.src + "/"; @@ -399,8 +435,6 @@ grunt.registerTask( "download_docs", function() { dest: docsDir + '/effect-' + widget.toLowerCase() + '.html' }; })); - var fs = require( "fs" ); - var request = require( "request" ); grunt.file.mkdir( "dist/docs" ); grunt.utils.async.forEach( files, function( file, done ) { var out = fs.createWriteStream( file.dest ); @@ -411,8 +445,6 @@ grunt.registerTask( "download_docs", function() { grunt.registerTask( "download_themes", function() { // var AdmZip = require('adm-zip'); - var fs = require( "fs" ); - var request = require( "request" ); var done = this.async(); var themes = grunt.file.read( "build/themes" ).split(","); var requests = 0; -- cgit v1.2.3 From 48e5c853f995a825dd9d14cd2d8f592037f8505c Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 2 Apr 2012 10:44:51 +0300 Subject: Datepicker: Changed German translation for weekHeader to "KW". Fixes #8231 - Provide a better German translation for the week header. --- ui/i18n/jquery.ui.datepicker-de.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/i18n/jquery.ui.datepicker-de.js b/ui/i18n/jquery.ui.datepicker-de.js index 52d6c82ce..cfe91759b 100644 --- a/ui/i18n/jquery.ui.datepicker-de.js +++ b/ui/i18n/jquery.ui.datepicker-de.js @@ -13,7 +13,7 @@ jQuery(function($){ dayNames: ['Sonntag','Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag'], dayNamesShort: ['So','Mo','Di','Mi','Do','Fr','Sa'], dayNamesMin: ['So','Mo','Di','Mi','Do','Fr','Sa'], - weekHeader: 'Wo', + weekHeader: 'KW', dateFormat: 'dd.mm.yy', firstDay: 1, isRTL: false, -- cgit v1.2.3 From 37dcc3e21df5f1373ff9963217073a9faecfc057 Mon Sep 17 00:00:00 2001 From: Jo Liss Date: Mon, 27 Feb 2012 01:49:51 +0100 Subject: Protect all copyright notices against minification For instance, this is useful for the jquery-ui-rails gem, which does not use jQuery UI's own minification, but relies on Rails to minify the files where necessary. Rails in turn uses UglifyJS for JS and YUI for CSS, both of which respect the /*! ... */ convention. --- themes/base/jquery.ui.accordion.css | 2 +- themes/base/jquery.ui.all.css | 2 +- themes/base/jquery.ui.autocomplete.css | 2 +- themes/base/jquery.ui.base.css | 2 +- themes/base/jquery.ui.button.css | 2 +- themes/base/jquery.ui.core.css | 2 +- themes/base/jquery.ui.datepicker.css | 2 +- themes/base/jquery.ui.dialog.css | 2 +- themes/base/jquery.ui.menu.css | 2 +- themes/base/jquery.ui.progressbar.css | 2 +- themes/base/jquery.ui.resizable.css | 2 +- themes/base/jquery.ui.selectable.css | 2 +- themes/base/jquery.ui.slider.css | 2 +- themes/base/jquery.ui.spinner.css | 2 +- themes/base/jquery.ui.tabs.css | 2 +- themes/base/jquery.ui.theme.css | 2 +- themes/base/jquery.ui.tooltip.css | 2 +- ui/jquery.effects.blind.js | 2 +- ui/jquery.effects.bounce.js | 2 +- ui/jquery.effects.clip.js | 2 +- ui/jquery.effects.core.js | 2 +- ui/jquery.effects.drop.js | 2 +- ui/jquery.effects.explode.js | 2 +- ui/jquery.effects.fade.js | 2 +- ui/jquery.effects.fold.js | 2 +- ui/jquery.effects.highlight.js | 2 +- ui/jquery.effects.pulsate.js | 2 +- ui/jquery.effects.scale.js | 2 +- ui/jquery.effects.shake.js | 2 +- ui/jquery.effects.slide.js | 2 +- ui/jquery.effects.transfer.js | 2 +- ui/jquery.ui.accordion.js | 2 +- ui/jquery.ui.autocomplete.js | 2 +- ui/jquery.ui.button.js | 2 +- ui/jquery.ui.datepicker.js | 2 +- ui/jquery.ui.dialog.js | 2 +- ui/jquery.ui.draggable.js | 2 +- ui/jquery.ui.droppable.js | 2 +- ui/jquery.ui.menu.js | 2 +- ui/jquery.ui.position.js | 2 +- ui/jquery.ui.progressbar.js | 2 +- ui/jquery.ui.resizable.js | 2 +- ui/jquery.ui.selectable.js | 2 +- ui/jquery.ui.slider.js | 2 +- ui/jquery.ui.sortable.js | 2 +- ui/jquery.ui.spinner.js | 2 +- ui/jquery.ui.tabs.js | 2 +- ui/jquery.ui.tooltip.js | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css index 3e2777adf..c9532a87f 100644 --- a/themes/base/jquery.ui.accordion.css +++ b/themes/base/jquery.ui.accordion.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Accordion @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.all.css b/themes/base/jquery.ui.all.css index 60fd9d6fb..e2310973a 100644 --- a/themes/base/jquery.ui.all.css +++ b/themes/base/jquery.ui.all.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI CSS Framework @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.autocomplete.css b/themes/base/jquery.ui.autocomplete.css index 5ab05e2fd..5e331b63d 100644 --- a/themes/base/jquery.ui.autocomplete.css +++ b/themes/base/jquery.ui.autocomplete.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Autocomplete @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css index 97dfd36f0..f52f00f28 100644 --- a/themes/base/jquery.ui.base.css +++ b/themes/base/jquery.ui.base.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI CSS Framework @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css index be2e71796..87340658a 100644 --- a/themes/base/jquery.ui.button.css +++ b/themes/base/jquery.ui.button.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Button @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css index 1522dabb8..dc27c564a 100644 --- a/themes/base/jquery.ui.core.css +++ b/themes/base/jquery.ui.core.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI CSS Framework @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.datepicker.css b/themes/base/jquery.ui.datepicker.css index d5c81a529..393d86377 100644 --- a/themes/base/jquery.ui.datepicker.css +++ b/themes/base/jquery.ui.datepicker.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Datepicker @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.dialog.css b/themes/base/jquery.ui.dialog.css index 7d6bc0672..0ee0d4dd5 100644 --- a/themes/base/jquery.ui.dialog.css +++ b/themes/base/jquery.ui.dialog.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Dialog @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.menu.css b/themes/base/jquery.ui.menu.css index 1e559e661..4469e74d3 100644 --- a/themes/base/jquery.ui.menu.css +++ b/themes/base/jquery.ui.menu.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Menu @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.progressbar.css b/themes/base/jquery.ui.progressbar.css index e24afc886..d198bb4a3 100644 --- a/themes/base/jquery.ui.progressbar.css +++ b/themes/base/jquery.ui.progressbar.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Progressbar @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.resizable.css b/themes/base/jquery.ui.resizable.css index c652ddb98..0bf680482 100644 --- a/themes/base/jquery.ui.resizable.css +++ b/themes/base/jquery.ui.resizable.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Resizable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.selectable.css b/themes/base/jquery.ui.selectable.css index 0305e2df2..2aa7319aa 100644 --- a/themes/base/jquery.ui.selectable.css +++ b/themes/base/jquery.ui.selectable.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Selectable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.slider.css b/themes/base/jquery.ui.slider.css index e9fc963f2..94d883a44 100644 --- a/themes/base/jquery.ui.slider.css +++ b/themes/base/jquery.ui.slider.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Slider @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.spinner.css b/themes/base/jquery.ui.spinner.css index 2603f2012..7c0737c31 100644 --- a/themes/base/jquery.ui.spinner.css +++ b/themes/base/jquery.ui.spinner.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Spinner @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.tabs.css b/themes/base/jquery.ui.tabs.css index a44242a36..5282817c2 100644 --- a/themes/base/jquery.ui.tabs.css +++ b/themes/base/jquery.ui.tabs.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Tabs @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.theme.css b/themes/base/jquery.ui.theme.css index 94db2c5a7..3a9cfae82 100644 --- a/themes/base/jquery.ui.theme.css +++ b/themes/base/jquery.ui.theme.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI CSS Framework @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/themes/base/jquery.ui.tooltip.css b/themes/base/jquery.ui.tooltip.css index d6cbcb26d..f1fa50cc6 100644 --- a/themes/base/jquery.ui.tooltip.css +++ b/themes/base/jquery.ui.tooltip.css @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Tooltip @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.blind.js b/ui/jquery.effects.blind.js index a5e0d1c8b..005b59ad6 100644 --- a/ui/jquery.effects.blind.js +++ b/ui/jquery.effects.blind.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Blind @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.bounce.js b/ui/jquery.effects.bounce.js index 73fe3c502..94d73644e 100644 --- a/ui/jquery.effects.bounce.js +++ b/ui/jquery.effects.bounce.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Bounce @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.clip.js b/ui/jquery.effects.clip.js index 983ac9c53..861508cd0 100644 --- a/ui/jquery.effects.clip.js +++ b/ui/jquery.effects.clip.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Clip @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 24df7178c..1f074e6e2 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index 54cdc25f3..8ccbfe57d 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Drop @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.explode.js b/ui/jquery.effects.explode.js index 08908d3eb..d030efc70 100644 --- a/ui/jquery.effects.explode.js +++ b/ui/jquery.effects.explode.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Explode @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.fade.js b/ui/jquery.effects.fade.js index b653f1dfd..89784bd08 100644 --- a/ui/jquery.effects.fade.js +++ b/ui/jquery.effects.fade.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Fade @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.fold.js b/ui/jquery.effects.fold.js index 3642edf3f..f33c2d050 100644 --- a/ui/jquery.effects.fold.js +++ b/ui/jquery.effects.fold.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Fold @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.highlight.js b/ui/jquery.effects.highlight.js index 88a69ab51..ac6c269e5 100644 --- a/ui/jquery.effects.highlight.js +++ b/ui/jquery.effects.highlight.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Highlight @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.pulsate.js b/ui/jquery.effects.pulsate.js index e1e4d0631..5b27bb324 100644 --- a/ui/jquery.effects.pulsate.js +++ b/ui/jquery.effects.pulsate.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Pulsate @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js index 64e31ea96..ea849624b 100644 --- a/ui/jquery.effects.scale.js +++ b/ui/jquery.effects.scale.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Scale @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js index 0e12cfe56..d027b740d 100644 --- a/ui/jquery.effects.shake.js +++ b/ui/jquery.effects.shake.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Shake @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js index a376d3c56..e747b2e85 100644 --- a/ui/jquery.effects.slide.js +++ b/ui/jquery.effects.slide.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Slide @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.effects.transfer.js b/ui/jquery.effects.transfer.js index df392339b..3368fb18e 100644 --- a/ui/jquery.effects.transfer.js +++ b/ui/jquery.effects.transfer.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Effects Transfer @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index ba8fa5e44..630d40d4e 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Accordion @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index d95d81bca..866ed7798 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Autocomplete @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index c8e345d93..701cb44d8 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Button @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 5dacd6943..c0de503f5 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Datepicker @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 35b18929f..053b26ab8 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Dialog @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js index 0e4389305..25b256710 100644 --- a/ui/jquery.ui.draggable.js +++ b/ui/jquery.ui.draggable.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Draggable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index 19334bf4d..47d3e38e9 100644 --- a/ui/jquery.ui.droppable.js +++ b/ui/jquery.ui.droppable.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Droppable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 17177a906..aeffea026 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Menu @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index 977e621a6..c88f75f7b 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Position @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js index 26f5e76f0..1504e5bca 100644 --- a/ui/jquery.ui.progressbar.js +++ b/ui/jquery.ui.progressbar.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Progressbar @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.resizable.js b/ui/jquery.ui.resizable.js index 77fe8bcc1..9be33927e 100644 --- a/ui/jquery.ui.resizable.js +++ b/ui/jquery.ui.resizable.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Resizable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.selectable.js b/ui/jquery.ui.selectable.js index ec54b5d9c..3244e654e 100644 --- a/ui/jquery.ui.selectable.js +++ b/ui/jquery.ui.selectable.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Selectable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index 75c6631ca..a8bdb1948 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Slider @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index 4c6a47169..4093be245 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Sortable @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index dab7ce471..bd55a09ea 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Spinner @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index c9300e69b..d3ef33121 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Tabs @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index 23b3a9b71..46c5befaa 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -1,4 +1,4 @@ -/* +/*! * jQuery UI Tooltip @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) -- cgit v1.2.3 From b3374b9063a250214e4939788a99160a5d7c1de2 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Mon, 2 Apr 2012 15:49:34 +0200 Subject: Build/grunt: grunt.file.copy now expects options as third argument. Fixes the version replacing --- grunt.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/grunt.js b/grunt.js index e18baeece..0f72e4842 100644 --- a/grunt.js +++ b/grunt.js @@ -339,7 +339,9 @@ grunt.registerMultiTask( "copy", "Copy files to destination folder and replace @ if ( /png$/.test( fileName ) ) { grunt.file.copy( fileName, target + targetFile ); } else { - grunt.file.copy( fileName, target + targetFile, replaceVersion ); + grunt.file.copy( fileName, target + targetFile, { + process: replaceVersion + }); } }); grunt.log.writeln( "Copied " + files.length + " files." ); -- cgit v1.2.3 From 8769798cb32e95e20ebb9bb9772a6895520a78ac Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Mon, 2 Apr 2012 15:59:32 +0200 Subject: Build/grunt: Fix dependencies to versions we've tested against. No more surprise API changes, for now --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 39305f719..30e2b4898 100644 --- a/package.json +++ b/package.json @@ -26,10 +26,9 @@ ], "dependencies": {}, "devDependencies": { - "grunt": "0.3.x", - "grunt-css": "0.1.x", - "request": "2.9.x", - "adm-zip": "0.1.x", + "grunt": "0.3.7", + "grunt-css": "0.1.1", + "request": "2.9.153", "rimraf": "2.0.1" }, "keywords": [] -- cgit v1.2.3 From 83756a1d874823389f6e378ebdce014efe3d9bf7 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Mon, 2 Apr 2012 16:05:59 +0200 Subject: Build/grunt: Strip existing (protected) headers from to-be-minified CSS files --- grunt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grunt.js b/grunt.js index 0f72e4842..a8ab7c666 100644 --- a/grunt.js +++ b/grunt.js @@ -64,7 +64,7 @@ uiFiles.concat( allI18nFiles ).forEach(function( file ) { }); cssFiles.forEach(function( file ) { - minifyCSS[ "dist/" + file.replace( /\.css$/, ".min.css" ).replace( /themes\/base\//, "themes/base/minified/" ) ] = [ "", file ]; + minifyCSS[ "dist/" + file.replace( /\.css$/, ".min.css" ).replace( /themes\/base\//, "themes/base/minified/" ) ] = [ "", "" ]; }); -- cgit v1.2.3 From 585ef702ef117232778113efc9979d51549abeeb Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 11:12:49 -0400 Subject: Grunt: Copy jquery from root regardless of version; fix include list for minified CSS files. --- grunt.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/grunt.js b/grunt.js index a8ab7c666..3be684908 100644 --- a/grunt.js +++ b/grunt.js @@ -82,7 +82,9 @@ function stripBanner( files ) { } function stripDirectory( file ) { - return file.replace( /.+\/(.+)$/, "$1" ); + // TODO: we're receiving the directive, so we need to strip the trailing > + // we should be receving a clean path without the directive + return file.replace( /.+\/(.+?)>?$/, "$1" ); } // allow access from banner template global.stripDirectory = stripDirectory; @@ -138,7 +140,7 @@ grunt.initConfig({ src: [ "AUTHORS.txt", "GPL-LICENSE.txt", - "jquery-1.7.1.js", + "jquery-*.js", "MIT-LICENSE.txt", "README.md", "grunt.js", -- cgit v1.2.3 From 3876c874e3f311d263aef9f99ed2780afa1d41d7 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 13:15:54 -0400 Subject: Grunt: Whitelist js and css files for @version replacement instead of blacklisting png. --- grunt.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grunt.js b/grunt.js index 3be684908..ad4c8bd40 100644 --- a/grunt.js +++ b/grunt.js @@ -338,12 +338,12 @@ grunt.registerMultiTask( "copy", "Copy files to destination folder and replace @ } files.forEach(function( fileName ) { var targetFile = strip ? fileName.replace( strip, "" ) : fileName; - if ( /png$/.test( fileName ) ) { - grunt.file.copy( fileName, target + targetFile ); - } else { + if ( /(js|css)$/.test( fileName ) ) { grunt.file.copy( fileName, target + targetFile, { process: replaceVersion }); + } else { + grunt.file.copy( fileName, target + targetFile ); } }); grunt.log.writeln( "Copied " + files.length + " files." ); -- cgit v1.2.3 From ccbfd45924d6ddebc7b2bb575a9c8997a3d9ec03 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 15:55:50 -0400 Subject: A few lint fixes. --- ui/jquery.effects.core.js | 18 ++++++++++-------- ui/jquery.effects.drop.js | 13 +++++++------ ui/jquery.effects.scale.js | 31 ++++++++++++++++--------------- ui/jquery.effects.shake.js | 2 +- ui/jquery.effects.slide.js | 5 ++--- ui/jquery.ui.accordion.js | 2 +- ui/jquery.ui.autocomplete.js | 4 ++-- ui/jquery.ui.core.js | 12 ++++++------ ui/jquery.ui.menu.js | 6 +++--- ui/jquery.ui.mouse.js | 2 +- ui/jquery.ui.position.js | 10 +++++----- ui/jquery.ui.tabs.js | 2 +- 12 files changed, 55 insertions(+), 52 deletions(-) diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 1f074e6e2..62d6b2c38 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -171,9 +171,9 @@ $.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopS }); function getElementStyles() { - var style = this.ownerDocument.defaultView - ? this.ownerDocument.defaultView.getComputedStyle( this, null ) - : this.currentStyle, + var style = this.ownerDocument.defaultView ? + this.ownerDocument.defaultView.getComputedStyle( this, null ) : + this.currentStyle, newStyle = {}, key, camelCase, @@ -375,13 +375,13 @@ $.extend( $.effects, { case "middle": y = 0.5; break; case "bottom": y = 1; break; default: y = origin[ 0 ] / original.height; - }; + } switch ( origin[ 1 ] ) { case "left": x = 0; break; case "center": x = 0.5; break; case "right": x = 1; break; default: x = origin[ 1 ] / original.width; - }; + } return { x: x, y: y @@ -523,8 +523,10 @@ function _normalizeArguments( effect, options, speed, callback ) { } speed = speed || options.duration; - effect.duration = $.fx.off ? 0 : typeof speed === "number" - ? speed : speed in $.fx.speeds ? $.fx.speeds[ speed ] : $.fx.speeds._default; + effect.duration = $.fx.off ? 0 : + typeof speed === "number" ? speed : + speed in $.fx.speeds ? $.fx.speeds[ speed ] : + $.fx.speeds._default; effect.complete = callback || options.complete; @@ -701,7 +703,7 @@ $.each( baseEasings, function( name, easeIn ) { return 1 - easeIn( 1 - p ); }; $.easing[ "easeInOut" + name ] = function( p ) { - return p < .5 ? + return p < 0.5 ? easeIn( p * 2 ) / 2 : easeIn( p * -2 + 2 ) / -2 + 1; }; diff --git a/ui/jquery.effects.drop.js b/ui/jquery.effects.drop.js index 8ccbfe57d..6c72be9e5 100644 --- a/ui/jquery.effects.drop.js +++ b/ui/jquery.effects.drop.js @@ -31,19 +31,19 @@ $.effects.effect.drop = function( o, done ) { el.show(); $.effects.createWrapper( el ); - distance = o.distance || el[ ref == "top" ? "outerHeight": "outerWidth" ]({ margin: true }) / 2; + distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]({ margin: true }) / 2; if ( show ) { el .css( "opacity", 0 ) - .css( ref, motion == "pos" ? -distance : distance ); + .css( ref, motion === "pos" ? -distance : distance ); } // Animation animation[ ref ] = ( show ? ( motion === "pos" ? "+=" : "-=" ) : - ( motion === "pos" ? "-=" : "+=" ) ) - + distance; + ( motion === "pos" ? "-=" : "+=" ) ) + + distance; // Animate el.animate( animation, { @@ -51,13 +51,14 @@ $.effects.effect.drop = function( o, done ) { duration: o.duration, easing: o.easing, complete: function() { - mode == "hide" && el.hide(); + if ( mode === "hide" ) { + el.hide(); + } $.effects.restore( el, props ); $.effects.removeWrapper( el ); done(); } }); - }; })(jQuery); diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js index ea849624b..63b95275c 100644 --- a/ui/jquery.effects.scale.js +++ b/ui/jquery.effects.scale.js @@ -30,9 +30,9 @@ $.effects.effect.puff = function( o, done ) { mode: mode, complete: done, percent: hide ? percent : 100, - from: hide - ? original - : { + from: hide ? + original : + { height: original.height * factor, width: original.width * factor } @@ -47,7 +47,7 @@ $.effects.effect.scale = function( o, done ) { var el = $( this ), options = $.extend( true, {}, o ), mode = $.effects.setMode( el, o.mode || "effect" ), - percent = parseInt( o.percent, 10 ) || ( parseInt( o.percent, 10 ) == 0 ? 0 : ( mode == "hide" ? 0 : 100 ) ), + percent = parseInt( o.percent, 10 ) || ( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode == "hide" ? 0 : 100 ) ), direction = o.direction || "both", origin = o.origin, original = { @@ -80,7 +80,8 @@ $.effects.effect.scale = function( o, done ) { outerWidth: original.outerWidth * factor.x }; - if ( options.fade ) { // Fade option to support puff + // Fade option to support puff + if ( options.fade ) { if ( mode == "show" ) { options.from.opacity = 0; options.to.opacity = 1; @@ -89,7 +90,7 @@ $.effects.effect.scale = function( o, done ) { options.from.opacity = 1; options.to.opacity = 0; } - }; + } // Animate el.effect( options ); @@ -152,15 +153,15 @@ $.effects.effect.size = function( o, done ) { props = props.concat( vProps ); el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from ); el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to ); - }; + } // Horizontal props scaling if ( factor.from.x !== factor.to.x ) { props = props.concat( hProps ); el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from ); el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to ); - }; - }; + } + } // Scale the content if ( scale == "content" || scale == "both" ) { @@ -170,9 +171,9 @@ $.effects.effect.size = function( o, done ) { props = props.concat( cProps ); el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from ); el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to ); - }; - }; - + } + } + $.effects.save( el, restore ? props : props1 ); el.show(); $.effects.createWrapper( el ); @@ -217,13 +218,13 @@ $.effects.effect.size = function( o, done ) { if ( factor.from.y != factor.to.y ) { child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from ); child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to ); - }; + } // Horizontal props scaling if ( factor.from.x != factor.to.x ) { child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from ); child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to ); - }; + } // Animate children child.css( child.from ); @@ -233,7 +234,7 @@ $.effects.effect.size = function( o, done ) { if (restore) $.effects.restore( child, props2 ); }); }); - }; + } // Animate el.animate( el.to, { diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js index d027b740d..c6276d15e 100644 --- a/ui/jquery.effects.shake.js +++ b/ui/jquery.effects.shake.js @@ -49,7 +49,7 @@ $.effects.effect.shake = function( o, done ) { // Shakes for ( i = 1; i < times; i++ ) { el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing ); - }; + } el .animate( animation1, speed, o.easing ) .animate( animation, speed / 2, o.easing ) diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js index e747b2e85..5c8eb2566 100644 --- a/ui/jquery.effects.slide.js +++ b/ui/jquery.effects.slide.js @@ -44,8 +44,8 @@ $.effects.effect.slide = function( o, done ) { // Animation animation[ ref ] = ( show ? ( positiveMotion ? "+=" : "-=") : - ( positiveMotion ? "-=" : "+=")) - + distance; + ( positiveMotion ? "-=" : "+=")) + + distance; // Animate el.animate( animation, { @@ -61,7 +61,6 @@ $.effects.effect.slide = function( o, done ) { done(); } }); - }; })(jQuery); diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 630d40d4e..92245d28e 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -695,7 +695,7 @@ if ( $.uiBackCompat !== false ) { easing: "easeOutBounce", duration: 1000 } - } + }; } else { options.animate = options.animated; } diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index 866ed7798..07992ab2e 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -108,7 +108,7 @@ $.widget( "ui.autocomplete", { suppressKeyPress = true; event.preventDefault(); } - //passthrough - ENTER and TAB both select the current element + // passthrough - ENTER and TAB both select the current element case keyCode.TAB: if ( !self.menu.active ) { return; @@ -270,7 +270,7 @@ $.widget( "ui.autocomplete", { .data( "menu" ); if ( $.fn.bgiframe ) { - this.menu.element.bgiframe(); + this.menu.element.bgiframe(); } // turning off autocomplete prevents the browser from remembering the diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index 574256cad..f66b71c6e 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -176,13 +176,13 @@ function focusable( element, isTabIndexNotNaN ) { img = $( "img[usemap=#" + mapName + "]" )[0]; return !!img && visible( img ); } - return ( /input|select|textarea|button|object/.test( nodeName ) - ? !element.disabled - : "a" == nodeName - ? element.href || isTabIndexNotNaN - : isTabIndexNotNaN) + return ( /input|select|textarea|button|object/.test( nodeName ) ? + !element.disabled : + "a" == nodeName ? + element.href || isTabIndexNotNaN : + isTabIndexNotNaN) && // the element and all of its ancestors must be visible - && visible( element ); + visible( element ); } function visible( element ) { diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index aeffea026..6d00f66ae 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -368,9 +368,9 @@ $.widget( "ui.menu", { var position = $.extend({}, { of: this.active - }, $.type(this.options.position) == "function" - ? this.options.position(this.active) - : this.options.position + }, $.type(this.options.position) == "function" ? + this.options.position(this.active) : + this.options.position ); submenu.show() diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js index 5e7744418..53b3dcc20 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -53,7 +53,7 @@ $.widget("ui.mouse", { _mouseDown: function(event) { // don't let more than one widget handle mouseStart - if( mouseHandled ) { return }; + if( mouseHandled ) { return; } // we may have missed mouseup (out of window) (this._mouseStarted && this._mouseUp(event)); diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index c88f75f7b..7fe31626d 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -152,13 +152,13 @@ $.fn.position = function( options ) { var elem = $( this ), elemWidth = elem.outerWidth(), elemHeight = elem.outerHeight(), - marginLeft = parseInt( $.css( this, "marginLeft" ) ) || 0, - marginTop = parseInt( $.css( this, "marginTop" ) ) || 0, + marginLeft = parseInt( $.css( this, "marginLeft" ), 10 ) || 0, + marginTop = parseInt( $.css( this, "marginTop" ), 10 ) || 0, scrollInfo = $.position.getScrollInfo( within ), collisionWidth = elemWidth + marginLeft + - ( parseInt( $.css( this, "marginRight" ) ) || 0 ) + scrollInfo.width, + ( parseInt( $.css( this, "marginRight" ), 10 ) || 0 ) + scrollInfo.width, collisionHeight = elemHeight + marginTop + - ( parseInt( $.css( this, "marginBottom" ) ) || 0 ) + scrollInfo.height, + ( parseInt( $.css( this, "marginBottom" ), 10 ) || 0 ) + scrollInfo.height, position = $.extend( {}, basePosition ), myOffset = [ parseInt( offsets.my[ 0 ], 10 ) * @@ -483,7 +483,7 @@ if ( $.uiBackCompat !== false ) { at: at[ 0 ] + offset[ 0 ] + " " + at[ 1 ] + offset[ 1 ], offset: undefined } ) ); - } + }; }( jQuery ) ); } diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index d3ef33121..45888220d 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -966,7 +966,7 @@ if ( $.uiBackCompat !== false ) { }, _cookie: function( active ) { var cookie = [ this.cookie || - ( this.cookie = this.options.cookie.name || "ui-tabs-" + ++listId ) ]; + ( this.cookie = this.options.cookie.name || "ui-tabs-" + (++listId) ) ]; if ( arguments.length ) { cookie.push( active === false ? -1 : active ); cookie.push( this.options.cookie ); -- cgit v1.2.3 From 3e6877a892b8fb70f1130f639dfde09ce5af6236 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 19:12:10 -0400 Subject: Grunt: Fixed jshint options. --- grunt.js | 93 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 37 deletions(-) diff --git a/grunt.js b/grunt.js index ad4c8bd40..1e8a197dc 100644 --- a/grunt.js +++ b/grunt.js @@ -278,52 +278,71 @@ grunt.initConfig({ } } }, - jshint: { - options: { + jshint: (function() { + var defaults = { curly: true, + eqnull: true, eqeqeq: true, - immed: true, + expr: true, latedef: true, newcap: true, noarg: true, - sub: true, - undef: true, - eqnull: true - }, - grunt: { - options: { - node: true - }, - globals: { - task: true, - config: true, - file: true, - log: true, - template: true + onevar: true, + // TODO: limit to multi-line comments https://github.com/jshint/jshint/issues/503 + smarttabs: true, + // TODO: use "faux strict mode" https://github.com/jshint/jshint/issues/504 + // strict: true, + // TODO: enable trailing + // trailing: true, + undef: true + }; + + function extend( a, b ) { + for ( var prop in b ) { + a[ prop ] = b[ prop ]; } - }, - ui: { - options: { - browser: true + return a; + } + + return { + options: defaults, + grunt: { + options: extend({ + node: true + }, defaults ), + globals: { + task: true, + config: true, + file: true, + log: true, + template: true + } }, - globals: { - jQuery: true - } - }, - tests: { - options: { - jquery: true + ui: { + options: extend({ + browser: true, + jquery: true + }, defaults ), + globals: { + Globalize: true + } }, - globals: { - module: true, - test: true, - ok: true, - equal: true, - deepEqual: true, - QUnit: true + tests: { + options: extend({ + browser: true, + jquery: true + }, defaults ), + globals: { + module: true, + test: true, + ok: true, + equal: true, + deepEqual: true, + QUnit: true + } } - } - } + }; + })() }); grunt.registerMultiTask( "copy", "Copy files to destination folder and replace @VERSION with pkg.version", function() { -- cgit v1.2.3 From 639afa595465f6a1f61e080f2b671af4aac69b4a Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 19:12:21 -0400 Subject: Lint fixes. --- ui/jquery.effects.core.js | 74 +++++++++++++++++++++++++++----------------- ui/jquery.effects.explode.js | 16 +++++----- ui/jquery.effects.fold.js | 5 +-- ui/jquery.effects.scale.js | 37 ++++++++++++---------- ui/jquery.effects.shake.js | 5 ++- ui/jquery.effects.slide.js | 4 +-- ui/jquery.ui.accordion.js | 36 +++++++++++---------- ui/jquery.ui.autocomplete.js | 8 ++--- ui/jquery.ui.button.js | 9 +++--- ui/jquery.ui.core.js | 20 ++++++------ ui/jquery.ui.dialog.js | 45 ++++++++++++++------------- ui/jquery.ui.menu.js | 42 +++++++++++++------------ ui/jquery.ui.mouse.js | 6 ++-- ui/jquery.ui.progressbar.js | 4 +-- ui/jquery.ui.slider.js | 5 +-- ui/jquery.ui.tabs.js | 33 ++++++++++++-------- ui/jquery.ui.tooltip.js | 2 +- ui/jquery.ui.widget.js | 20 ++++++------ 18 files changed, 207 insertions(+), 164 deletions(-) diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 62d6b2c38..1d56ae62f 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -7,9 +7,11 @@ * * http://docs.jquery.com/UI/Effects/ */ -;jQuery.effects || (function($, undefined) { +;(jQuery.effects || (function($, undefined) { -var backCompat = $.uiBackCompat !== false; +var backCompat = $.uiBackCompat !== false, + // prefix used for storing data on .data() + dataSpace = "ui-effects-"; $.effects = { effect: {} @@ -18,6 +20,7 @@ $.effects = { /******************************************************************************/ /****************************** COLOR ANIMATIONS ******************************/ /******************************************************************************/ +(function() { // override the animation for color styles $.each(["backgroundColor", "borderBottomColor", "borderLeftColor", @@ -46,28 +49,34 @@ function getRGB(color) { var result; // Check if we're already dealing with an array of colors - if ( color && color.constructor === Array && color.length === 3 ) - return color; + if ( color && color.constructor === Array && color.length === 3 ) { + return color; + } // Look for rgb(num,num,num) - if (result = /rgb$\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*$/.exec(color)) - return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)]; + if (result = /rgb$\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*$/.exec(color)) { + return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)]; + } // Look for rgb(num%,num%,num%) - if (result = /rgb$\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*$/.exec(color)) - return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55]; + if (result = /rgb$\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*$/.exec(color)) { + return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55]; + } // Look for #a0b1c2 - if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) - return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)]; + if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) { + return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)]; + } // Look for #fff - if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) - return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)]; + if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) { + return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)]; + } // Look for rgba(0, 0, 0, 0) == transparent in Safari 3 - if (result = /rgba$0, 0, 0, 0$/.exec(color)) - return colors["transparent"]; + if (result = /rgba$0, 0, 0, 0$/.exec(color)) { + return colors.transparent; + } // Otherwise, we're most likely dealing with a named color return colors[$.trim(color).toLowerCase()]; @@ -80,14 +89,15 @@ function getColor(elem, attr) { color = $.css(elem, attr); // Keep going until we find an element that has color, or we hit the body - if ( color != "" && color !== "transparent" || $.nodeName(elem, "body") ) - break; + if ( color && color !== "transparent" || $.nodeName(elem, "body") ) { + break; + } attr = "backgroundColor"; } while ( elem = elem.parentNode ); return getRGB(color); -}; +} // Some named colors to work with // From Interface by Stefan Petre @@ -140,11 +150,12 @@ var colors = { transparent: [255,255,255] }; - +})(); /******************************************************************************/ /****************************** CLASS ANIMATIONS ******************************/ /******************************************************************************/ +(function() { var classAnimationActions = [ "add", "remove", "toggle" ], shorthandStyles = { @@ -157,9 +168,7 @@ var classAnimationActions = [ "add", "remove", "toggle" ], borderWidth: 1, margin: 1, padding: 1 - }, - // prefix used for storing data on .data() - dataSpace = "ui-effects-"; + }; $.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) { $.fx.step[ prop ] = function( fx ) { @@ -206,7 +215,7 @@ function styleDifference( oldStyle, newStyle ) { for ( name in newStyle ) { value = newStyle[ name ]; - if ( oldStyle[ name ] != value ) { + if ( oldStyle[ name ] !== value ) { if ( !shorthandStyles[ name ] ) { if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) { diff[ name ] = value; @@ -332,12 +341,14 @@ $.fn.extend({ } }); - +})(); /******************************************************************************/ /*********************************** EFFECTS **********************************/ /******************************************************************************/ +(function() { + $.extend( $.effects, { version: "@VERSION", @@ -473,9 +484,11 @@ $.extend( $.effects, { setTransition: function( element, list, factor, value ) { value = value || {}; - $.each( list, function(i, x){ + $.each( list, function( i, x ) { var unit = element.cssUnit( x ); - if ( unit[ 0 ] > 0 ) value[ x ] = unit[ 0 ] * factor + unit[ 1 ]; + if ( unit[ 0 ] > 0 ) { + value[ x ] = unit[ 0 ] * factor + unit[ 1 ]; + } }); return value; } @@ -651,19 +664,22 @@ $.fn.extend({ val = []; $.each( [ "em", "px", "%", "pt" ], function( i, unit ) { - if ( style.indexOf( unit ) > 0 ) + if ( style.indexOf( unit ) > 0 ) { val = [ parseFloat( style ), unit ]; + } }); return val; } }); - +})(); /******************************************************************************/ /*********************************** EASING ***********************************/ /******************************************************************************/ +(function() { + // based on easing equations from Robert Penner (http://www.robertpenner.com/easing) var baseEasings = {}; @@ -709,4 +725,6 @@ $.each( baseEasings, function( name, easeIn ) { }; }); -})(jQuery); +})(); + +})(jQuery)); diff --git a/ui/jquery.effects.explode.js b/ui/jquery.effects.explode.js index d030efc70..ae3efb21e 100644 --- a/ui/jquery.effects.explode.js +++ b/ui/jquery.effects.explode.js @@ -31,6 +31,14 @@ $.effects.effect.explode = function( o, done ) { // loop i, j, left, top, mx, my; + // children animate complete: + function childComplete() { + pieces.push( this ); + if ( pieces.length === rows * cells ) { + animComplete(); + } + } + // clone the element for each row and cell. for( i = 0; i < rows ; i++ ) { // ===> top = offset.top + i * height; @@ -73,14 +81,6 @@ $.effects.effect.explode = function( o, done ) { } } - // children animate complete: - function childComplete() { - pieces.push( this ); - if ( pieces.length == rows * cells ) { - animComplete(); - } - } - function animComplete() { el.css({ visibility: "visible" diff --git a/ui/jquery.effects.fold.js b/ui/jquery.effects.fold.js index f33c2d050..17aa9a36b 100644 --- a/ui/jquery.effects.fold.js +++ b/ui/jquery.effects.fold.js @@ -23,11 +23,12 @@ $.effects.effect.fold = function( o, done ) { size = o.size || 15, percent = /([0-9]+)%/.exec( size ), horizFirst = !!o.horizFirst, - widthFirst = show != horizFirst, + widthFirst = show !== horizFirst, ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ], duration = o.duration / 2, wrapper, distance, - animation1 = {}, animation2 = {}; + animation1 = {}, + animation2 = {}; $.effects.save( el, props ); el.show(); diff --git a/ui/jquery.effects.scale.js b/ui/jquery.effects.scale.js index 63b95275c..83b41d3c2 100644 --- a/ui/jquery.effects.scale.js +++ b/ui/jquery.effects.scale.js @@ -47,7 +47,8 @@ $.effects.effect.scale = function( o, done ) { var el = $( this ), options = $.extend( true, {}, o ), mode = $.effects.setMode( el, o.mode || "effect" ), - percent = parseInt( o.percent, 10 ) || ( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode == "hide" ? 0 : 100 ) ), + percent = parseInt( o.percent, 10 ) || + ( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ), direction = o.direction || "both", origin = o.origin, original = { @@ -57,8 +58,8 @@ $.effects.effect.scale = function( o, done ) { outerWidth: el.outerWidth() }, factor = { - y: direction != "horizontal" ? (percent / 100) : 1, - x: direction != "vertical" ? (percent / 100) : 1 + y: direction !== "horizontal" ? (percent / 100) : 1, + x: direction !== "vertical" ? (percent / 100) : 1 }; // We are going to pass this effect to the size effect: @@ -67,12 +68,12 @@ $.effects.effect.scale = function( o, done ) { options.complete = done; // Set default origin and restore for show/hide - if ( mode != "effect" ) { + if ( mode !== "effect" ) { options.origin = origin || ["middle","center"]; options.restore = true; } - options.from = o.from || ( mode == "show" ? { height: 0, width: 0 } : original ); + options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original ); options.to = { height: original.height * factor.y, width: original.width * factor.x, @@ -82,11 +83,11 @@ $.effects.effect.scale = function( o, done ) { // Fade option to support puff if ( options.fade ) { - if ( mode == "show" ) { + if ( mode === "show" ) { options.from.opacity = 0; options.to.opacity = 1; } - if ( mode == "hide" ) { + if ( mode === "hide" ) { options.from.opacity = 1; options.to.opacity = 0; } @@ -146,7 +147,7 @@ $.effects.effect.size = function( o, done ) { }; // Scale the css box - if ( scale == "box" || scale == "both" ) { + if ( scale === "box" || scale === "both" ) { // Vertical props scaling if ( factor.from.y !== factor.to.y ) { @@ -164,7 +165,7 @@ $.effects.effect.size = function( o, done ) { } // Scale the content - if ( scale == "content" || scale == "both" ) { + if ( scale === "content" || scale === "both" ) { // Vertical props scaling if ( factor.from.y !== factor.to.y ) { @@ -190,7 +191,7 @@ $.effects.effect.size = function( o, done ) { el.css( el.from ); // set top & left // Animate - if ( scale == "content" || scale == "both" ) { // Scale the children + if ( scale === "content" || scale === "both" ) { // Scale the children // Add margins/font-size vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps); @@ -203,8 +204,10 @@ $.effects.effect.size = function( o, done ) { height: child.height(), width: child.width() }; - if (restore) $.effects.save(child, props2); - + if (restore) { + $.effects.save(child, props2); + } + child.from = { height: c_original.height * factor.from.y, width: c_original.width * factor.from.x @@ -215,13 +218,13 @@ $.effects.effect.size = function( o, done ) { }; // Vertical props scaling - if ( factor.from.y != factor.to.y ) { + if ( factor.from.y !== factor.to.y ) { child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from ); child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to ); } // Horizontal props scaling - if ( factor.from.x != factor.to.x ) { + if ( factor.from.x !== factor.to.x ) { child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from ); child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to ); } @@ -231,7 +234,9 @@ $.effects.effect.size = function( o, done ) { child.animate( child.to, o.duration, o.easing, function() { // Restore children - if (restore) $.effects.restore( child, props2 ); + if ( restore ) { + $.effects.restore( child, props2 ); + } }); }); } @@ -245,7 +250,7 @@ $.effects.effect.size = function( o, done ) { if ( el.to.opacity === 0 ) { el.css( "opacity", el.from.opacity ); } - if( mode == "hide" ) { + if( mode === "hide" ) { el.hide(); } $.effects.restore( el, restore ? props : props1 ); diff --git a/ui/jquery.effects.shake.js b/ui/jquery.effects.shake.js index c6276d15e..700c6df3d 100644 --- a/ui/jquery.effects.shake.js +++ b/ui/jquery.effects.shake.js @@ -22,8 +22,8 @@ $.effects.effect.shake = function( o, done ) { times = o.times || 3, anims = times * 2 + 1, speed = o.duration, - ref = (direction == "up" || direction == "down") ? "top" : "left", - positiveMotion = (direction == "up" || direction == "left"), + ref = (direction === "up" || direction === "down") ? "top" : "left", + positiveMotion = (direction === "up" || direction === "left"), animation = {}, animation1 = {}, animation2 = {}, @@ -32,7 +32,6 @@ $.effects.effect.shake = function( o, done ) { // we will need to re-assemble the queue to stack our animations in place queue = el.queue(), queuelen = queue.length; - $.effects.save( el, props ); el.show(); diff --git a/ui/jquery.effects.slide.js b/ui/jquery.effects.slide.js index 5c8eb2566..77d540a9c 100644 --- a/ui/jquery.effects.slide.js +++ b/ui/jquery.effects.slide.js @@ -20,8 +20,8 @@ $.effects.effect.slide = function( o, done ) { mode = $.effects.setMode( el, o.mode || "show" ), show = mode === "show", direction = o.direction || "left", - ref = (direction == "up" || direction == "down") ? "top" : "left", - positiveMotion = (direction == "up" || direction == "left"), + ref = (direction === "up" || direction === "down") ? "top" : "left", + positiveMotion = (direction === "up" || direction === "left"), distance, animation = {}, size; diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 92245d28e..00ecd1b64 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -12,7 +12,22 @@ * jquery.ui.widget.js */ (function( $, undefined ) { - var uid = 0; + var uid = 0, + hideProps = {}, + showProps = {}, + showPropsAdjust = {}; + +hideProps.height = hideProps.paddingTop = hideProps.paddingBottom = + hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide"; +showProps.height = showProps.paddingTop = showProps.paddingBottom = + showProps.borderTopWidth = showProps.borderBottomWidth = "show"; +$.extend( showPropsAdjust, showProps, { accordionHeight: "show" } ); + +$.fx.step.accordionHeight = function( fx ) { + var elem = $( fx.elem ), + data = elem.data( "ui-accordion-height" ); + elem.height( data.total - elem.outerHeight() - data.toHide.outerHeight() + elem.height() ); +}; $.widget( "ui.accordion", { version: "@VERSION", @@ -151,7 +166,8 @@ $.widget( "ui.accordion", { }, _destroy: function() { - var accordionId = this.accordionId; + var contents, + accordionId = this.accordionId; // clean up main element this.element @@ -173,7 +189,7 @@ $.widget( "ui.accordion", { this._destroyIcons(); // clean up content panels - var contents = this.headers.next() + contents = this.headers.next() .css( "display", "" ) .removeAttr( "role" ) .removeAttr( "aria-expanded" ) @@ -514,20 +530,6 @@ $.widget( "ui.accordion", { } }); -$.fx.step.accordionHeight = function( fx ) { - var elem = $( fx.elem ), - data = elem.data( "ui-accordion-height" ); - elem.height( data.total - elem.outerHeight() - data.toHide.outerHeight() + elem.height() ); -}; -var hideProps = {}, - showProps = {}, - showPropsAdjust = {}; -hideProps.height = hideProps.paddingTop = hideProps.paddingBottom = - hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide"; -showProps.height = showProps.paddingTop = showProps.paddingBottom = - showProps.borderTopWidth = showProps.borderBottomWidth = "show"; -$.extend( showPropsAdjust, showProps, { accordionHeight: "show" } ); - // DEPRECATED diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index 07992ab2e..5ec5790ed 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -1,4 +1,4 @@ -/*! +/* * jQuery UI Autocomplete @VERSION * * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about) @@ -108,7 +108,7 @@ $.widget( "ui.autocomplete", { suppressKeyPress = true; event.preventDefault(); } - // passthrough - ENTER and TAB both select the current element + //passthrough - ENTER and TAB both select the current element case keyCode.TAB: if ( !self.menu.active ) { return; @@ -238,7 +238,7 @@ $.widget( "ui.autocomplete", { select: function( event, ui ) { // back compat for _renderItem using item.autocomplete, via #7810 // TODO remove the fallback, see #8156 - var item = ui.item.data( "ui-autocomplete-item" ) || ui.item.data( "item.autocomplete" ); + var item = ui.item.data( "ui-autocomplete-item" ) || ui.item.data( "item.autocomplete" ), previous = self.previous; // only trigger when focus was lost (click on menu) @@ -270,7 +270,7 @@ $.widget( "ui.autocomplete", { .data( "menu" ); if ( $.fn.bgiframe ) { - this.menu.element.bgiframe(); + this.menu.element.bgiframe(); } // turning off autocomplete prevents the browser from remembering the diff --git a/ui/jquery.ui.button.js b/ui/jquery.ui.button.js index 701cb44d8..f84d748cf 100644 --- a/ui/jquery.ui.button.js +++ b/ui/jquery.ui.button.js @@ -186,7 +186,7 @@ $.widget( "ui.button", { if ( options.disabled ) { return false; } - if ( event.keyCode == $.ui.keyCode.SPACE || event.keyCode == $.ui.keyCode.ENTER ) { + if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) { $( this ).addClass( "ui-state-active" ); } }) @@ -212,6 +212,7 @@ $.widget( "ui.button", { }, _determineButtonType: function() { + var ancestor, labelSelector, checked; if ( this.element.is(":checkbox") ) { this.type = "checkbox"; @@ -226,8 +227,8 @@ $.widget( "ui.button", { if ( this.type === "checkbox" || this.type === "radio" ) { // we don't search against the document in case the element // is disconnected from the DOM - var ancestor = this.element.parents().last(), - labelSelector = "label[for='" + this.element.attr("id") + "']"; + ancestor = this.element.parents().last(); + labelSelector = "label[for='" + this.element.attr("id") + "']"; this.buttonElement = ancestor.find( labelSelector ); if ( !this.buttonElement.length ) { ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings(); @@ -238,7 +239,7 @@ $.widget( "ui.button", { } this.element.addClass( "ui-helper-hidden-accessible" ); - var checked = this.element.is( ":checked" ); + checked = this.element.is( ":checked" ); if ( checked ) { this.buttonElement.addClass( "ui-state-active" ); } diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index f66b71c6e..93353996e 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -165,11 +165,11 @@ $.each( [ "Width", "Height" ], function( i, name ) { // selectors function focusable( element, isTabIndexNotNaN ) { - var nodeName = element.nodeName.toLowerCase(); + var map, mapName, img, + nodeName = element.nodeName.toLowerCase(); if ( "area" === nodeName ) { - var map = element.parentNode, - mapName = map.name, - img; + map = element.parentNode; + mapName = map.name; if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) { return false; } @@ -178,7 +178,7 @@ function focusable( element, isTabIndexNotNaN ) { } return ( /input|select|textarea|button|object/.test( nodeName ) ? !element.disabled : - "a" == nodeName ? + "a" === nodeName ? element.href || isTabIndexNotNaN : isTabIndexNotNaN) && // the element and all of its ancestors must be visible @@ -242,19 +242,21 @@ $.extend( $.ui, { // $.ui.plugin is deprecated. Use the proxy pattern instead. plugin: { add: function( module, option, set ) { - var proto = $.ui[ module ].prototype; - for ( var i in set ) { + var i, + proto = $.ui[ module ].prototype; + for ( i in set ) { proto.plugins[ i ] = proto.plugins[ i ] || []; proto.plugins[ i ].push( [ option, set[ i ] ] ); } }, call: function( instance, name, args ) { - var set = instance.plugins[ name ]; + var i, + set = instance.plugins[ name ]; if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) { return; } - for ( var i = 0; i < set.length; i++ ) { + for ( i = 0; i < set.length; i++ ) { if ( instance.options[ set[ i ][ 0 ] ] ) { set[ i ][ 1 ].apply( instance.element, args ); } diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 053b26ab8..3a9bd5dc6 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -201,13 +201,13 @@ $.widget("ui.dialog", { }, close: function( event ) { - if ( !this._isOpen ) { - return self; - } - var self = this, maxZ, thisZ; + if ( !this._isOpen ) { + return; + } + if ( false === self._trigger( "beforeClose", event ) ) { return; } @@ -292,7 +292,8 @@ $.widget("ui.dialog", { return; } - var self = this, + var hasFocus, + self = this, options = self.options, uiDialog = self.uiDialog; @@ -325,7 +326,7 @@ $.widget("ui.dialog", { // set focus to the first tabbable element in the content area or the first button // if there are no tabbable elements, set focus on the dialog itself - var hasFocus = self.element.find( ":tabbable" ); + hasFocus = self.element.find( ":tabbable" ); if ( !hasFocus.length ) { hasFocus = uiDialog.find( ".ui-dialog-buttonpane :tabbable" ); if ( !hasFocus.length ) { @@ -341,7 +342,8 @@ $.widget("ui.dialog", { }, _createButtons: function( buttons ) { - var self = this, + var uiDialogButtonPane, uiButtonSet, + self = this, hasButtons = false; // if we already have a button pane, remove it @@ -353,11 +355,11 @@ $.widget("ui.dialog", { }); } if ( hasButtons ) { - var uiDialogButtonPane = $( "

" ) - .addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" ), - uiButtonSet = $( "

" ) - .addClass( "ui-dialog-buttonset" ) - .appendTo( uiDialogButtonPane ); + uiDialogButtonPane = $( "

" ) + .addClass( "ui-dialog-buttonpane ui-widget-content ui-helper-clearfix" ); + uiButtonSet = $( "

" ) + .addClass( "ui-dialog-buttonset" ) + .appendTo( uiDialogButtonPane ); $.each( buttons, function( name, props ) { props = $.isFunction( props ) ? @@ -547,7 +549,8 @@ $.widget("ui.dialog", { }, _setOption: function( key, value ) { - var self = this, + var isDraggable, isResizable, + self = this, uiDialog = self.uiDialog; switch ( key ) { @@ -571,7 +574,7 @@ $.widget("ui.dialog", { } break; case "draggable": - var isDraggable = uiDialog.is( ":data(draggable)" ); + isDraggable = uiDialog.is( ":data(draggable)" ); if ( isDraggable && !value ) { uiDialog.draggable( "destroy" ); } @@ -585,7 +588,7 @@ $.widget("ui.dialog", { break; case "resizable": // currently resizable, becoming non-resizable - var isResizable = uiDialog.is( ":data(resizable)" ); + isResizable = uiDialog.is( ":data(resizable)" ); if ( isResizable && !value ) { uiDialog.resizable( "destroy" ); } @@ -614,9 +617,8 @@ $.widget("ui.dialog", { /* If the user has resized the dialog, the .ui-dialog and .ui-dialog-content * divs will both have width and height set, so we need to reset them */ - var options = this.options, - nonContentHeight, - minContentHeight, + var nonContentHeight, minContentHeight, autoHeight, + options = this.options, isVisible = this.uiDialog.is( ":visible" ); // reset content sizing @@ -648,7 +650,7 @@ $.widget("ui.dialog", { }); } else { this.uiDialog.show(); - var autoHeight = this.element.css( "height", "auto" ).height(); + autoHeight = this.element.css( "height", "auto" ).height(); if ( !isVisible ) { this.uiDialog.hide(); } @@ -740,7 +742,9 @@ $.extend( $.ui.dialog.overlay, { }, destroy: function( $el ) { - var indexOf = $.inArray( $el, this.instances ); + var indexOf = $.inArray( $el, this.instances ), + maxZ = 0; + if ( indexOf !== -1 ) { this.oldInstances.push( this.instances.splice( indexOf, 1 )[ 0 ] ); } @@ -752,7 +756,6 @@ $.extend( $.ui.dialog.overlay, { $el.height( 0 ).width( 0 ).remove(); // adjust the maxZ to allow other modal dialogs to continue to work (see #4309) - var maxZ = 0; $.each( this.instances, function() { maxZ = Math.max( maxZ, this.css( "z-index" ) ); }); diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 6d00f66ae..af22c19b0 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -85,9 +85,9 @@ $.widget( "ui.menu", { "mouseleave": "collapseAll", "mouseleave .ui-menu": "collapseAll", "focus": function( event ) { - var firstItem = this.element.children( ".ui-menu-item" ).not( ".ui-state-disabled" ).eq( 0 ); + var menu = this.element, + firstItem = menu.children( ".ui-menu-item" ).not( ".ui-state-disabled" ).eq( 0 ); if ( this._hasScroll() && !this.active ) { - var menu = this.element; menu.children().each( function() { var currentItem = $( this ); if ( currentItem.offset().top - menu.offset().top >= 0 ) { @@ -183,7 +183,7 @@ $.widget( "ui.menu", { character = String.fromCharCode( event.keyCode ), skip = false; - if (character == prev) { + if (character === prev) { skip = true; } else { character = prev + character; @@ -195,7 +195,7 @@ $.widget( "ui.menu", { return new RegExp("^" + escape(character), "i") .test( $( this ).children( "a" ).text() ); }); - match = skip && match.index(this.active.next()) != -1 ? this.active.nextAll(".ui-menu-item") : match; + match = skip && match.index(this.active.next()) !== -1 ? this.active.nextAll(".ui-menu-item") : match; if ( !match.length ) { character = String.fromCharCode(event.keyCode); match = this.activeMenu.children(".ui-menu-item").filter( function() { @@ -260,15 +260,18 @@ $.widget( "ui.menu", { refresh: function() { // initialize nested menus - var submenus = this.element.find( this.options.menus + ":not( .ui-menu )" ) - .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) - .attr( "role", "menu" ) - .hide() - .attr( "aria-hidden", "true" ) - .attr( "aria-expanded", "false" ); + var menuId, + submenus = this.element.find( this.options.menus + ":not( .ui-menu )" ) + .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) + .hide() + .attr({ + role: "menu", + "aria-hidden": "true", + "aria-expanded": "false" + }); // don't refresh list items that are already adapted - var menuId = this.menuId; + menuId = this.menuId; submenus.add( this.element ).children( ":not( .ui-menu-item ):has( a )" ) .addClass( "ui-menu-item" ) .attr( "role", "presentation" ) @@ -291,15 +294,16 @@ $.widget( "ui.menu", { }, focus: function( event, item ) { + var nested, borderTop, paddingTop, offset, scroll, elementHeight, itemHeight; this.blur( event ); if ( this._hasScroll() ) { - var borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0, - paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0, - offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop, - scroll = this.activeMenu.scrollTop(), - elementHeight = this.activeMenu.height(), - itemHeight = item.height(); + borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0; + paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0; + offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop; + scroll = this.activeMenu.scrollTop(); + elementHeight = this.activeMenu.height(); + itemHeight = item.height(); if ( offset < 0 ) { this.activeMenu.scrollTop( scroll + offset ); @@ -321,7 +325,7 @@ $.widget( "ui.menu", { this._close(); }, this.delay ); - var nested = $( "> .ui-menu", item ); + nested = $( "> .ui-menu", item ); if ( nested.length && ( /^mouse/.test( event.type ) ) ) { this._startOpening(nested); } @@ -368,7 +372,7 @@ $.widget( "ui.menu", { var position = $.extend({}, { of: this.active - }, $.type(this.options.position) == "function" ? + }, $.type(this.options.position) === "function" ? this.options.position(this.active) : this.options.position ); diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js index 53b3dcc20..eaa953ad0 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -61,10 +61,10 @@ $.widget("ui.mouse", { this._mouseDownEvent = event; var that = this, - btnIsLeft = (event.which == 1), + btnIsLeft = (event.which === 1), // event.target.nodeName works around a bug in IE 8 with // disabled inputs (#7620) - elIsCancel = (typeof this.options.cancel == "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false); + elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false); if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) { return true; } @@ -134,7 +134,7 @@ $.widget("ui.mouse", { if (this._mouseStarted) { this._mouseStarted = false; - if (event.target == this._mouseDownEvent.target) { + if (event.target === this._mouseDownEvent.target) { $.data(event.target, this.widgetName + '.preventClickEvent', true); } diff --git a/ui/jquery.ui.progressbar.js b/ui/jquery.ui.progressbar.js index 1504e5bca..68cccc554 100644 --- a/ui/jquery.ui.progressbar.js +++ b/ui/jquery.ui.progressbar.js @@ -85,8 +85,8 @@ $.widget( "ui.progressbar", { }, _refreshValue: function() { - var value = this.value(); - var percentage = this._percentage(); + var value = this.value(), + percentage = this._percentage(); if ( this.oldValue !== value ) { this.oldValue = value; diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js index a8bdb1948..b355f8c7e 100644 --- a/ui/jquery.ui.slider.js +++ b/ui/jquery.ui.slider.js @@ -35,7 +35,8 @@ $.widget( "ui.slider", $.ui.mouse, { }, _create: function() { - var self = this, + var i, + self = this, o = this.options, existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ), handle = "", @@ -78,7 +79,7 @@ $.widget( "ui.slider", $.ui.mouse, { ( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) ); } - for ( var i = existingHandles.length; i < handleCount; i += 1 ) { + for ( i = existingHandles.length; i < handleCount; i++ ) { handles.push( handle ); } diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 45888220d..68c182c31 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -20,13 +20,13 @@ function getNextTabId() { return ++tabId; } -var isLocal = function( anchor ) { +function isLocal( anchor ) { // clone the node to work around IE 6 not normalizing the href property // if it's manually set, i.e., a.href = "#foo" kills the normalization anchor = anchor.cloneNode( false ); return anchor.hash.length > 1 && anchor.href.replace( rhash, "" ) === location.href.replace( rhash, "" ); -}; +} $.widget( "ui.tabs", { version: "@VERSION", @@ -44,7 +44,8 @@ $.widget( "ui.tabs", { }, _create: function() { - var that = this, + var panel, + that = this, options = that.options, active = options.active; @@ -110,7 +111,7 @@ $.widget( "ui.tabs", { // check for length avoids error when initializing empty list if ( options.active !== false && this.anchors.length ) { this.active = this._findActive( options.active ); - var panel = that._getPanelForTab( this.active ); + panel = that._getPanelForTab( this.active ); panel.show(); this.lis.eq( options.active ).addClass( "ui-tabs-active ui-state-active" ); @@ -128,7 +129,7 @@ $.widget( "ui.tabs", { }, _setOption: function( key, value ) { - if ( key == "active" ) { + if ( key === "active" ) { // _activate() will handle invalid values and update this.options this._activate( value ); return; @@ -166,7 +167,8 @@ $.widget( "ui.tabs", { }, refresh: function() { - var self = this, + var next, + self = this, options = this.options, lis = this.list.children( ":has(a[href])" ); @@ -187,7 +189,7 @@ $.widget( "ui.tabs", { // was active, but active tab is gone } else if ( this.active.length && !$.contains( this.list[ 0 ], this.active[ 0 ] ) ) { // activate previous tab - var next = options.active - 1; + next = options.active - 1; this._activate( next >= 0 ? next : 0 ); // was active, active tab still exists } else { @@ -224,7 +226,7 @@ $.widget( "ui.tabs", { this.panels = $( [] ); this.anchors.each(function( i, a ) { - var selector, panel; + var selector, panel, id; // inline tab if ( isLocal( a ) ) { @@ -232,7 +234,7 @@ $.widget( "ui.tabs", { panel = self.element.find( self._sanitizeSelector( selector ) ); // remote tab } else { - var id = self._tabId( a ); + id = self._tabId( a ); selector = "#" + id; panel = self.element.find( selector ); if ( !panel.length ) { @@ -433,7 +435,7 @@ $.widget( "ui.tabs", { _getIndex: function( index ) { // meta-function to give users option to provide a href string instead of a numerical index. // also sanitizes numerical indexes to valid values. - if ( typeof index == "string" ) { + if ( typeof index === "string" ) { index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) ); } @@ -747,7 +749,8 @@ if ( $.uiBackCompat !== false ) { index = this.anchors.length; } - var options = this.options, + var doInsertAfter, panel, + options = this.options, li = $( options.tabTemplate .replace( /#\{href\}/g, url ) .replace( /#\{label\}/g, label ) ), @@ -758,10 +761,10 @@ if ( $.uiBackCompat !== false ) { li.addClass( "ui-state-default ui-corner-top" ).data( "ui-tabs-destroy", true ); li.find( "a" ).attr( "aria-controls", id ); - var doInsertAfter = index >= this.lis.length; + doInsertAfter = index >= this.lis.length; // try to find an existing element before creating a new one - var panel = this.element.find( "#" + id ); + panel = this.element.find( "#" + id ); if ( !panel.length ) { panel = this._createPanel( id ); if ( doInsertAfter ) { @@ -946,6 +949,8 @@ if ( $.uiBackCompat !== false ) { }); // cookie option + (function() { + var listId = 0; $.widget( "ui.tabs", $.ui.tabs, { @@ -993,6 +998,8 @@ if ( $.uiBackCompat !== false ) { } }); + })(); + // load event $.widget( "ui.tabs", $.ui.tabs, { _trigger: function( type, event, data ) { diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js index 46c5befaa..97895a6a8 100644 --- a/ui/jquery.ui.tooltip.js +++ b/ui/jquery.ui.tooltip.js @@ -159,7 +159,7 @@ $.widget( "ui.tooltip", { mouseleave: "close", focusout: "close", keyup: function( event ) { - if ( event.keyCode == $.ui.keyCode.ESCAPE ) { + if ( event.keyCode === $.ui.keyCode.ESCAPE ) { var fakeEvent = $.Event(event); fakeEvent.currentTarget = target[0]; this.close( fakeEvent, true ); diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js index 1b7405e28..3e3723398 100644 --- a/ui/jquery.ui.widget.js +++ b/ui/jquery.ui.widget.js @@ -9,9 +9,8 @@ */ (function( $, undefined ) { -var slice = Array.prototype.slice; - -var _cleanData = $.cleanData; +var slice = Array.prototype.slice, + _cleanData = $.cleanData; $.cleanData = function( elems ) { for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { try { @@ -73,11 +72,11 @@ $.widget = function( name, base, prototype ) { if ( $.isFunction( value ) ) { prototype[ prop ] = (function() { var _super = function() { - return base.prototype[ prop ].apply( this, arguments ); - }; - var _superApply = function( args ) { - return base.prototype[ prop ].apply( this, args ); - }; + return base.prototype[ prop ].apply( this, arguments ); + }, + _superApply = function( args ) { + return base.prototype[ prop ].apply( this, args ); + }; return function() { var __super = this._super, __superApply = this._superApply, @@ -163,7 +162,8 @@ $.widget.bridge = function( name, object ) { if ( isMethodCall ) { this.each(function() { - var instance = $.data( this, fullName ); + var methodValue, + instance = $.data( this, fullName ); if ( !instance ) { return $.error( "cannot call methods on " + name + " prior to initialization; " + "attempted to call method '" + options + "'" ); @@ -171,7 +171,7 @@ $.widget.bridge = function( name, object ) { if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) { return $.error( "no such method '" + options + "' for " + name + " widget instance" ); } - var methodValue = instance[ options ].apply( instance, args ); + methodValue = instance[ options ].apply( instance, args ); if ( methodValue !== instance && methodValue !== undefined ) { returnValue = methodValue && methodValue.jquery ? returnValue.pushStack( methodValue.get() ) : -- cgit v1.2.3 From ea4345db06222225f47d2ef9af6121d34e6e497e Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 22:20:18 -0400 Subject: Grunt: Removed newcap option from jshint task. --- grunt.js | 1 - 1 file changed, 1 deletion(-) diff --git a/grunt.js b/grunt.js index 1e8a197dc..74713be5d 100644 --- a/grunt.js +++ b/grunt.js @@ -285,7 +285,6 @@ grunt.initConfig({ eqeqeq: true, expr: true, latedef: true, - newcap: true, noarg: true, onevar: true, // TODO: limit to multi-line comments https://github.com/jshint/jshint/issues/503 -- cgit v1.2.3 From 0624c74929b60104cfcdd2463619e903fcfd0792 Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 2 Apr 2012 22:35:42 -0400 Subject: Effects core: Properly handle defaults for effects that are called with a single hash. --- ui/jquery.effects.core.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 1d56ae62f..626ab1a89 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -497,9 +497,10 @@ $.extend( $.effects, { // return an effect options object for the given parameters: function _normalizeArguments( effect, options, speed, callback ) { - // short path for passing an effect options object: + // allow passing all optinos as the first parameter if ( $.isPlainObject( effect ) ) { - return effect; + options = effect; + effect = effect.effect; } // convert to an object @@ -518,7 +519,7 @@ function _normalizeArguments( effect, options, speed, callback ) { } // catch (effect, speed, ?) - if ( $.type( options ) === "number" || $.fx.speeds[ options ]) { + if ( typeof options === "number" || $.fx.speeds[ options ] ) { callback = speed; speed = options; options = {}; -- cgit v1.2.3 From b2f8814d0a7c9321ecff421b3aaeb80cd49be0d6 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Tue, 3 Apr 2012 10:35:42 +0200 Subject: Tooltip: Remove old callout test page. Completely broken at this point, not worth fixing --- tests/visual/tooltip/callout.html | 213 -------------------------------------- 1 file changed, 213 deletions(-) delete mode 100644 tests/visual/tooltip/callout.html diff --git a/tests/visual/tooltip/callout.html b/tests/visual/tooltip/callout.html deleted file mode 100644 index af89157a2..000000000 --- a/tests/visual/tooltip/callout.html +++ /dev/null @@ -1,213 +0,0 @@ - - - - Tooltip Visual Test: Default - - - - - - - - - - - - - -

- -

- collision detection should kick in around here -

- -

- I'm a link to a footnote. -

- -

- right aligned with custom position -

- -

- gets its content via ajax -

- -

- span -

- div - nested span -

- - - -

This is the footnote, including other elements

- - - -

- - - - -- cgit v1.2.3 From 037db084f20d952558e4529a8b7394d562241a97 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Tue, 3 Apr 2012 10:49:34 +0200 Subject: Position: Extend main visual test page with simple 'arrow' callouts, as a starting pointing for a better collision notification API --- tests/visual/position/position.html | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/visual/position/position.html b/tests/visual/position/position.html index 9a9fb831e..b9b769d9b 100644 --- a/tests/visual/position/position.html +++ b/tests/visual/position/position.html @@ -24,9 +24,9 @@ collision: "none" }); $(this).next().menu().position({ - my: "left top", + my: "left top+20", at: "left bottom", - of: this + of: this, }); }); }).resize(); @@ -37,6 +37,22 @@ .ui-menu { width: 200px; } html, body { width: 99%; height: 99%; min-height:700px; min-width:700px; } #container { width: 95%; height: 95%; border: 1px solid black; margin: auto; } + .ui-menu:before { + font-size: 12pt; + content: "↑"; + position: absolute; + top: -22px; + left: 5px; + } + .ui-flipped-left:before { + left: auto; + right: 5px; + } + .ui-flipped-top:before { + content: "↓"; + top: auto; + bottom: -19px; + } -- cgit v1.2.3