Spelling

build/data.json

@@ -44,7 +44,7 @@
         "first_name": "Cedric",
         "last_name": "Kelly",
         "age": "22",
-        "position": "Senior Javascript Developer",
+        "position": "Senior JavaScript Developer",
         "salary": "433060",
         "start_date": "2012-03-29",
         "extn": "6224",
@@ -109,7 +109,7 @@
         "first_name": "Colleen",
         "last_name": "Hurst",
         "age": "39",
-        "position": "Javascript Developer",
+        "position": "JavaScript Developer",
         "salary": "205500",
         "start_date": "2009-09-15",
         "extn": "2360",
@@ -642,7 +642,7 @@
         "first_name": "Jennifer",
         "last_name": "Acosta",
         "age": "43",
-        "position": "Junior Javascript Developer",
+        "position": "Junior JavaScript Developer",
         "salary": "75650",
         "start_date": "2013-02-01",
         "extn": "3431",
@@ -720,7 +720,7 @@
         "first_name": "Michael",
         "last_name": "Bruce",
         "age": "29",
-        "position": "Javascript Developer",
+        "position": "JavaScript Developer",
         "salary": "183000",
         "start_date": "2011-06-27",
         "extn": "5384",

build/examples-format.sh

@@ -2,7 +2,7 @@
 
 #
 # Can be used on both examples directories and docs. Each has
-# slightly different processing - the docs is more aggrasive
+# slightly different processing - the docs is more aggressive
 # in updating code style.
 #
 # Call with the path to the directory with the xml files you

build/examples.php

@@ -336,7 +336,7 @@
 function multiple ( $value, $fn )
 {
 	if ( is_array( $value ) ) {
-		for ( $i=0, $ien=count($value) ; $i<$ien ; $i++ ) {
+		for ( $i=0, $iLen=count($value) ; $i<$iLen ; $i++ ) {
 			$fn( $value[$i] );
 		}
 	}
@@ -660,7 +660,7 @@ function sql_files ( $out_dir )
 	);
 
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = "( ".
 			    $json[$i]['id'].", ".
 			"'".$json[$i]['first_name']."', ".
@@ -771,7 +771,7 @@ function sql_files ( $out_dir )
 	VALUES
 EOD;
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = "( ".
 				$json[$i]['id'].", ".
 			"'".$json[$i]['first_name']."', ".
@@ -823,7 +823,7 @@ function sql_files ( $out_dir )
 	VALUES
 EOD;
 	$insert = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$insert[] = "\t\t( ".
 			$json[$i]['id'].", ".
 		"'".$json[$i]['first_name']."', ".
@@ -882,7 +882,7 @@ function sql_files ( $out_dir )
 
 EOD;
 
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$str .= "INSERT INTO \"datatables_demo\" ".
 			"( \"first_name\", \"last_name\", \"age\", \"position\", \"salary\", \"start_date\", \"extn\", \"email\", \"office\", \"seq\" ) ".
 			"VALUES ";
@@ -926,7 +926,7 @@ function sql_files ( $out_dir )
 
 EOD;
 
-		for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+		for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 			$str .= "INSERT INTO \"datatables_demo\" ".
 				"( \"first_name\", \"last_name\", \"age\", \"position\", \"salary\", \"start_date\", \"extn\", \"email\", \"office\", \"seq\" ) ".
 				"VALUES ";
@@ -971,7 +971,7 @@ function json_files ( $out_dir )
 
 	// Plain arrays
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = [
 			$json[$i]['first_name'].' '.$json[$i]['last_name'],
 			$json[$i]['position'],
@@ -995,7 +995,7 @@ function json_files ( $out_dir )
 
 	// Arrays with sub objects
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = [
 			$json[$i]['first_name'].' '.$json[$i]['last_name'],
 			'hr' => [
@@ -1017,7 +1017,7 @@ function json_files ( $out_dir )
 
 	// Simple object base case
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = [
 			'id'         => $json[$i]['id'],
 			'name'       => $json[$i]['first_name'] .' '. $json[$i]['last_name'],
@@ -1042,7 +1042,7 @@ function json_files ( $out_dir )
 
 	// Objects with sub objects and arrays
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = [
 			'name' => $json[$i]['first_name'].' '.$json[$i]['last_name'],
 			'hr' => [
@@ -1064,7 +1064,7 @@ function json_files ( $out_dir )
 
 	// Salary without formatting
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$country = $json[$i]['office'];
 		if ( $country === 'Singapore' ) {
 			$country = 'Argentina';
@@ -1086,7 +1086,7 @@ function json_files ( $out_dir )
 
 	// Objects with sub objects
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$out[] = [
 			'name'       => [ $json[$i]['last_name'], $json[$i]['first_name'] ],
 			'hr'         => [
@@ -1106,7 +1106,7 @@ function json_files ( $out_dir )
 
 	// Orthogonal date data
 	$out = [];
-	for ( $i=0, $ien=count($json) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($json) ; $i<$iLen ; $i++ ) {
 		$t = strtotime( $json[$i]['start_date'] );
 		$out[] = [
 			'name'       => $json[$i]['first_name'] .' '. $json[$i]['last_name'],
@@ -1240,7 +1240,7 @@ function tidy_structure ( &$examples, $order )
 
 function dump_structure( &$examples, $pre="" )
 {
-	for ( $i=0, $ien=count($examples) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($examples) ; $i<$iLen ; $i++ ) {
 		$example = $examples[$i];
 
 		if ( $example['type'] === 'dir' ) {
@@ -1256,7 +1256,7 @@ function dump_structure( &$examples, $pre="" )
 
 function process_structure ( &$examples, $toc='', $cat='' )
 {
-	for ( $i=0, $ien=count($examples) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($examples) ; $i<$iLen ; $i++ ) {
 		$example = $examples[$i];
 
 		if ( $example['type'] === 'dir' ) {
@@ -1305,7 +1305,7 @@ function build_toc ( $examples, $example, $category )
 		// Use all examples
 		$out = '';
 
-		for ( $i=0, $ien=count($examples) ; $i<$ien ; $i++ ) {
+		for ( $i=0, $iLen=count($examples) ; $i<$iLen ; $i++ ) {
 			if ( $examples[$i]['type'] === 'dir' && $examples[$i]['name'] !== 'private' ) {
 				$out .= build_toc_category( $examples[$i], $example );
 			}
@@ -1321,7 +1321,7 @@ function build_toc_category ( $category, $current=null )
 	$inCategory = false;
 	$out = '';
 
-	for ( $i=0, $ien=count($category['files']) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($category['files']) ; $i<$iLen ; $i++ ) {
 		$example = $category['files'][$i];
 
 		if ( $example['name'] !== 'index' ) {
@@ -1360,7 +1360,7 @@ function build_toc_category ( $category, $current=null )
 
 function has_files ( $files )
 {
-	for ( $i=0, $ien=count($files) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($files) ; $i<$iLen ; $i++ ) {
 		if ( $files[$i]['type'] === 'file' ) {
 			return true;
 		}
@@ -1376,7 +1376,7 @@ function has_files ( $files )
 
 function toc_structure ( &$examples )
 {
-	for ( $i=0, $ien=count($examples) ; $i<$ien ; $i++ ) {
+	for ( $i=0, $iLen=count($examples) ; $i<$iLen ; $i++ ) {
 		$group = &$examples[$i];
 
 		if ( $group['type'] === 'dir' ) {

build/include.sh

@@ -62,7 +62,7 @@ function css_compress {
 		echo_msg "CSS compressing $FILE.css"
 		$SASS --no-charset --stop-on-error --style compressed $DIR/$FILE.css > $DIR/$FILE.min.css
 
-		# compressed style will add a UTF8 BOM which messes with concatination - remove it.
+		# compressed style will add a UTF8 BOM which messes with concatenation - remove it.
 		sed -i '1s/^\xEF\xBB\xBF//' $DIR/$FILE.min.css
 
 		echo_msg "  File size: $(ls -l $DIR/$FILE.min.css | awk -F" " '{ print $5 }')"

build/lib/DT_Example.php

@@ -394,7 +394,7 @@ public function build_table ( $type, $idIn=null )
 			$a = explode('|', $type);
 			$t = '';
 
-			for ( $i=0, $ien=count($a) ; $i<$ien ; $i++ ) {
+			for ( $i=0, $iLen=count($a) ; $i<$iLen ; $i++ ) {
 				$t .= $this->build_table( $a[$i] );
 			}
 
@@ -453,7 +453,7 @@ public function build_table ( $type, $idIn=null )
 			}
 			else {
 				$cells = '';
-				for ( $i=0, $ien=count($columns) ; $i<$ien ; $i++ ) {
+				for ( $i=0, $iLen=count($columns) ; $i<$iLen ; $i++ ) {
 					$cells .= '<th>'.$this->_column( $columns[$i], 'title' ).'</th>';
 				}
 				$t .= '<thead>';
@@ -479,7 +479,7 @@ public function build_table ( $type, $idIn=null )
 					}
 
 					$cells = '';
-					for ( $i=0, $ien=count($columns) ; $i<$ien ; $i++ ) {
+					for ( $i=0, $iLen=count($columns) ; $i<$iLen ; $i++ ) {
 						$cell = $this->_column( $columns[$i], 'data', $this->_data[$j] );
 
 						if ( strpos( $cell, '<td' ) === 0 ) {
@@ -508,7 +508,7 @@ public function build_table ( $type, $idIn=null )
 			}
 			else {
 				$cells = '';
-				for ( $i=0, $ien=count($columns) ; $i<$ien ; $i++ ) {
+				for ( $i=0, $iLen=count($columns) ; $i<$iLen ; $i++ ) {
 					$cells .= '<th>'.$this->_column( $columns[$i], 'title' ).'</th>';
 				}
 				$t .= '<tfoot>';
@@ -558,7 +558,7 @@ private function _format_libs ( $type )
 		$out = array();
 		$libs = $this->_libs[ $type ];
 
-		for ( $i=0, $ien=count($libs) ; $i<$ien ; $i++ ) {
+		for ( $i=0, $iLen=count($libs) ; $i<$iLen ; $i++ ) {
 			$file = $libs[$i]; // needs a path
 
 			if ( strpos($file, '//') !== 0 &&
@@ -608,7 +608,7 @@ private function _resolve_xml_libs ( $framework, $type, $libs )
 			if ( isset( $lib['lib'] ) ) {
 				$split_attr = explode( ' ', (string)$lib['lib'] );
 
-				for ( $i=0, $ien=count($split_attr) ; $i<$ien ; $i++ ) {
+				for ( $i=0, $iLen=count($split_attr) ; $i<$iLen ; $i++ ) {
 					$a[] = $split_attr[$i];
 					$this->_xml_libs[ $type ][] = $split_attr[$i];
 				}
@@ -624,7 +624,7 @@ private function _resolve_libs ( $framework, $type, $libs )
 		$exampleLibs = &$this->_libs[ $type ];
 		$srcLibs = DT_Example::$lookup_libraries[ $type ];
 
-		for ( $i=0, $ien=count($libs) ; $i<$ien ; $i++ ) {
+		for ( $i=0, $iLen=count($libs) ; $i<$iLen ; $i++ ) {
 			$lib = $libs[$i];
 
 			if ( strpos($lib, '/') === 0 || strpos($lib, '.') === 0 ) {
@@ -681,17 +681,17 @@ private function _resolve_framework_lib ( $framework, $type, $lib )
 				'jquery' :
 				'dataTables';
 
-			// Always include the core Javascript file.
+			// Always include the core JavaScript file.
 			$out[] = $path.'/js/'.$jsBaseFilename.'.'.$filename.$min.'.js';
 
-			// Possibly include a framework Javascript file. If the framework is
+			// Possibly include a framework JavaScript file. If the framework is
 			// DataTables, then there will be no override JS file.
 			if ( $framework !== 'dataTables' && $component['framework']['js'] ) {
 				$out[] = $path.'/js/'.$filename.'.'.$framework.$min.'.js';
 			}
 		}
 		else if ( $type === 'css' ) {
-			// Possibly include a framework Javascript file.
+			// Possibly include a framework JavaScript file.
 			if ( $component['framework']['css'] ) {
 				$out[] = $path.'/css/'.$filename.'.'.$framework.$min.'.css';
 			}
@@ -949,7 +949,7 @@ private function _libs_for_js () {
 <tr class="even">
     <td>Cedric</td>
     <td>Kelly</td>
-    <td>Senior Javascript Developer</td>
+    <td>Senior JavaScript Developer</td>
     <td>Edinburgh</td>
     <td>29th Mar 12</td>
     <td>$433,060</td>
@@ -1010,7 +1010,7 @@ function ( $type, $row ) {
 				return '<span class="young">'.$row['age'].'</span>';
 			}
 			else if ( $row['age'] < 55 ) {
-				return '<span class="middleaged">'.$row['age'].'</span>';
+				return '<span class="middle-aged">'.$row['age'].'</span>';
 			}
 			return '<span class="old">'.$row['age'].'</span>';
 		},

build/lib/DT_Markdown.php

@@ -15,12 +15,12 @@
  *      paths)
  */
 
-function DT_Markdown($text, $default_claases=array(), $truncateWhiteSpace=false){
+function DT_Markdown($text, $default_classes=array(), $truncateWhiteSpace=false){
 	if ( $truncateWhiteSpace ) {
 		$text = DT_Markdown_Parser::truncateWhiteSpace( $text );
 	}
 
-	$parser = new DT_Markdown_Parser($default_claases);
+	$parser = new DT_Markdown_Parser($default_classes);
 	return $parser->transform($text);
 }
 
@@ -45,7 +45,7 @@ static function truncateWhiteSpace ( $str )
 
 			// Remove the same amount of white space for each line
 			if ( $match && count($match) ) {
-				for ( $i=0, $ien=count($a) ; $i<$ien ; $i++ ) {
+				for ( $i=0, $iLen=count($a) ; $i<$iLen ; $i++ ) {
 					$a[$i] = preg_replace( '/'.$match[0].'/', '', $a[$i], 1 );
 				}
 			}
@@ -112,7 +112,7 @@ function _docLink ( $software, $type, $item, $html )
 			$a = explode('|', $item);
 			$s = array();
 
-			for ( $i=0, $ien=count($a) ; $i<$ien ; $i++ ) {
+			for ( $i=0, $iLen=count($a) ; $i<$iLen ; $i++ ) {
 				$s[] = self::_docLink( $software, $type, $a[$i],
 					htmlspecialchars(trim($a[$i]), ENT_NOQUOTES)
 				);
@@ -210,7 +210,7 @@ function _docLink ( $software, $type, $item, $html )
 				break;
 
 			case 'js': // JS type
-				$lang = 'Javascript';
+				$lang = 'JavaScript';
 				break;
 
 			default: