From 6fc2cb3c7c8459c82accc05b2b41d5a909eacec5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jo=CC=88rn=20Zaefferer?= Date: Wed, 30 Sep 2015 15:38:42 +0200 Subject: [PATCH] Controlgroup: Rename excludeInvisible to onlyVisible Gets rid of the double negative. --- tests/unit/controlgroup/common.js | 2 +- tests/unit/controlgroup/methods.js | 6 +++--- tests/unit/controlgroup/options.js | 10 +++++----- ui/widgets/controlgroup.js | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/unit/controlgroup/common.js b/tests/unit/controlgroup/common.js index e072535d2..70fcfc3e9 100644 --- a/tests/unit/controlgroup/common.js +++ b/tests/unit/controlgroup/common.js @@ -17,7 +17,7 @@ common.testWidget( "controlgroup", { "controlgroupLabel": ".ui-controlgroup-label" }, direction: "horizontal", - excludeInvisible: true, + onlyVisible: true, classes: {}, // Callbacks diff --git a/tests/unit/controlgroup/methods.js b/tests/unit/controlgroup/methods.js index b0d711ee7..77715f8b8 100644 --- a/tests/unit/controlgroup/methods.js +++ b/tests/unit/controlgroup/methods.js @@ -83,7 +83,7 @@ $.each( tests, function( widget, html ) { } // Hide each element and check the corner classes - function iterateHidden( excludeInvisible ) { + function iterateHidden( onlyVisible ) { for ( i = 0; i < 4; i++ ) { $( controls ).each( showElements ); @@ -91,7 +91,7 @@ $.each( tests, function( widget, html ) { controls[ i ][ widget ]( "widget" ).hide(); currentClasses = classes.slice( 0 ); - if ( excludeInvisible ) { + if ( onlyVisible ) { if ( i === 0 ) { currentClasses[ i + 1 ] = classes[ i ]; currentClasses[ i ] = false; @@ -128,7 +128,7 @@ $.each( tests, function( widget, html ) { iterateHidden( true ); // Set the exclude option to false so we no longer care about hidden - element.controlgroup( "option", "excludeInvisible", false ); + element.controlgroup( "option", "onlyVisible", false ); // Iterate hiding the elements again and check their corner classes iterateHidden(); diff --git a/tests/unit/controlgroup/options.js b/tests/unit/controlgroup/options.js index 90a57e093..0a1b88f1b 100644 --- a/tests/unit/controlgroup/options.js +++ b/tests/unit/controlgroup/options.js @@ -73,21 +73,21 @@ test( "items: custom widget", function() { "Custom widget called" ); } ); -test( "excludeInvisible", function( assert ) { +test( "onlyVisible", function( assert ) { expect( 4 ); var element = $( ".controlgroup" ).controlgroup( { - excludeInvisible: false + onlyVisible: false } ), buttons = element.children( ".ui-button" ); assert.lacksClassStart( buttons.eq( 1 ), "ui-corner" ); assert.hasClasses( buttons.eq( 0 ), "ui-corner-left", - "ExcludeInvisible: false: First button hidden second button doesn't get a corner class" ); + "onlyVisible: false: First button hidden second button doesn't get a corner class" ); - element.controlgroup( "option", "excludeInvisible", true ); + element.controlgroup( "option", "onlyVisible", true ); assert.lacksClassStart( buttons.eq( 0 ), "ui-corner" ); assert.hasClasses( buttons.eq( 1 ), "ui-corner-left", - "ExcludeInvisible: true: First button is hidden second button get corner class" ); + "onlyVisible: true: First button is hidden second button get corner class" ); } ); test( "direction", function( assert ) { diff --git a/ui/widgets/controlgroup.js b/ui/widgets/controlgroup.js index 4fc348e28..5974d51c9 100644 --- a/ui/widgets/controlgroup.js +++ b/ui/widgets/controlgroup.js @@ -36,7 +36,7 @@ return $.widget( "ui.controlgroup", { options: { direction: "horizontal", disabled: null, - excludeInvisible: true, + onlyVisible: true, items: { "button": "input[type=button], input[type=submit], input[type=reset], button, a", "controlgroupLabel": ".ui-controlgroup-label", @@ -209,7 +209,7 @@ return $.widget( "ui.controlgroup", { children = this.childWidgets; // We filter here because we need to track all childWidgets not just the visible ones - if ( this.options.excludeInvisible ) { + if ( this.options.onlyVisible ) { children = children.filter( ":visible" ); } -- 2.39.5