From a2b68c63c5b3ccccaee14f0f2da95f7d340ddcd8 Mon Sep 17 00:00:00 2001 From: Ryan Guest Date: Tue, 4 Apr 2017 09:28:22 -0700 Subject: [PATCH 1/3] Fix a few small typos --- js/tree.js | 2 +- less/repeater.less | 2 +- test/scheduler-test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/tree.js b/js/tree.js index 347526b12..017311f6b 100644 --- a/js/tree.js +++ b/js/tree.js @@ -149,7 +149,7 @@ } // Decorate $entity with data or other attributes making the - // element easily accessable with libraries like jQuery. + // element easily accessible with libraries like jQuery. // // Values are contained within the object returned // for folders and items as attr: diff --git a/less/repeater.less b/less/repeater.less index def8474a8..3e82ae672 100755 --- a/less/repeater.less +++ b/less/repeater.less @@ -113,7 +113,7 @@ /* * reinforce spacing around control buttons */ - &-itemization .selectlist, // TODO add specfic class for page size dropdown + &-itemization .selectlist, // TODO add specific class for page size dropdown &-filters, &-secondaryPaging, &-primaryPaging, diff --git a/test/scheduler-test.js b/test/scheduler-test.js index c304e5e50..feb0aeea3 100644 --- a/test/scheduler-test.js +++ b/test/scheduler-test.js @@ -208,7 +208,7 @@ define( function ( require ) { $scheduler.scheduler( "value", { recurrencePattern: "FREQ=DAILY;INTERVAL=9;COUNT=4" } ); assert.ok( ( $scheduler.find( ".repeat-end .selectlist .selected-label" ).html() === "After" && $scheduler.find( ".repeat-end .spinbox" ).spinbox( "value" ) === "4" ), - "end after occurence(s) set correctly" ); + "end after occurrence(s) set correctly" ); $scheduler.scheduler( "value", { recurrencePattern: "FREQ=DAILY;INTERVAL=9;UNTIL=20510331" } ); From de36f31794995dffd96fb95c66216c0c870617a9 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Wed, 19 Apr 2017 11:46:25 -0400 Subject: [PATCH 2/3] update repeater test to only assert on appropriate instance of trigger --- test/repeater-test.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/repeater-test.js b/test/repeater-test.js index 6d83bab72..3d6e05396 100644 --- a/test/repeater-test.js +++ b/test/repeater-test.js @@ -380,14 +380,12 @@ define( function ( require ) { QUnit.test( 'rendered.fu.repeater callback should receive correct data when called by renderItems function', function dataSourceCallbackTest( assert ) { var ready = assert.async(); var $repeater = $( this.$markup ); - var count = 0; $repeater.on( 'rendered.fu.repeater', function rendered ( e, state ) { - count++; + // rendered is triggered on `this.$search` and `this.$element` in repeater.js + if ( e.target.id === $repeater.attr('id') ) { + assert.ok( state.data, 'data object exists' ); + assert.equal( state.data.myVar, 'passalong', 'data returned from datasource was passed along' ); - assert.ok( state.data, 'data object exists' ); - assert.equal( state.data.myVar, 'passalong', 'data returned from datasource was passed along' ); - - if ( count === 2 ) { ready(); } } ); From 5c61b38fed0aa98cee55b86fe2c98651921b0794 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Wed, 19 Apr 2017 14:23:30 -0400 Subject: [PATCH 3/3] bowered qunit >2.3.0 fails on `rendered.fu.repeater` test. pinning to 2.3.0 --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 63936ced7..2319aea33 100644 --- a/bower.json +++ b/bower.json @@ -25,7 +25,7 @@ "devDependencies": { "jquery": null, "jquery-1.9.1": "jquery#1.9.1", - "qunit": "2.x", + "qunit": "2.3.0", "requirejs-text": "2.x", "underscore": "1.x", "blanket": "1.x",