Merge branch 'master' into greenkeeper-grunt-contrib-uglify-2.3.0

Author: swilliamset

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",

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:

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,

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();
 			}
 		} );

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" } );